| base64.h | | base64.h | |
| | | | |
| skipping to change at line 66 | | skipping to change at line 66 | |
| | | | |
| /** | | /** | |
| * \brief Decode a base64-formatted buffer | | * \brief Decode a base64-formatted buffer | |
| * | | * | |
| * \param dst destination buffer | | * \param dst destination buffer | |
| * \param dlen size of the buffer | | * \param dlen size of the buffer | |
| * \param src source buffer | | * \param src source buffer | |
| * \param slen amount of data to be decoded | | * \param slen amount of data to be decoded | |
| * | | * | |
| * \return 0 if successful, POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL, o
r | | * \return 0 if successful, POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL, o
r | |
|
| * POLARSSL_ERR_BASE64_INVALID_DATA if the input data is no | | * POLARSSL_ERR_BASE64_INVALID_CHARACTER if the input data | |
| t | | is | |
| * correct. *dlen is always updated to reflect the amount | | * not correct. *dlen is always updated to reflect the amou | |
| | | nt | |
| * of data that has (or would have) been written. | | * of data that has (or would have) been written. | |
| * | | * | |
| * \note Call this function with *dlen = 0 to obtain the | | * \note Call this function with *dlen = 0 to obtain the | |
| * required buffer size in *dlen | | * required buffer size in *dlen | |
| */ | | */ | |
| int base64_decode( unsigned char *dst, size_t *dlen, | | int base64_decode( unsigned char *dst, size_t *dlen, | |
| const unsigned char *src, size_t slen ); | | const unsigned char *src, size_t slen ); | |
| | | | |
| /** | | /** | |
| * \brief Checkup routine | | * \brief Checkup routine | |
| | | | |
End of changes. 1 change blocks. |
| 3 lines changed or deleted | | 4 lines changed or added | |
|
| config.h | | config.h | |
| | | | |
| skipping to change at line 142 | | skipping to change at line 142 | |
| /** | | /** | |
| * \def POLARSSL_DEBUG_MSG | | * \def POLARSSL_DEBUG_MSG | |
| * | | * | |
| * Requires: POLARSSL_DEBUG_C | | * Requires: POLARSSL_DEBUG_C | |
| * | | * | |
| * Enable all SSL/TLS debugging messages. | | * Enable all SSL/TLS debugging messages. | |
| */ | | */ | |
| #define POLARSSL_DEBUG_MSG | | #define POLARSSL_DEBUG_MSG | |
| | | | |
| /** | | /** | |
|
| | | * \def POLARSSL_ERROR_STRERROR_DUMMY | |
| | | * | |
| | | * Enable a dummy error function to make use of error_strerror() in | |
| | | * third party libraries easier. | |
| | | * | |
| | | * Disable if you run into name conflicts and want to really remove the | |
| | | * error_strerror() | |
| | | */ | |
| | | #define POLARSSL_ERROR_STRERROR_DUMMY | |
| | | | |
| | | /** | |
| * \def POLARSSL_GENPRIME | | * \def POLARSSL_GENPRIME | |
| * | | * | |
| * Requires: POLARSSL_BIGNUM_C, POLARSSL_RSA_C | | * Requires: POLARSSL_BIGNUM_C, POLARSSL_RSA_C | |
| * | | * | |
| * Enable the RSA prime-number generation code. | | * Enable the RSA prime-number generation code. | |
| */ | | */ | |
| #define POLARSSL_GENPRIME | | #define POLARSSL_GENPRIME | |
| | | | |
| /** | | /** | |
| * \def POLARSSL_FS_IO | | * \def POLARSSL_FS_IO | |
| | | | |
| skipping to change at line 209 | | skipping to change at line 220 | |
| */ | | */ | |
| | | | |
| /** | | /** | |
| * \def POLARSSL_SELF_TEST | | * \def POLARSSL_SELF_TEST | |
| * | | * | |
| * Enable the checkup functions (*_self_test). | | * Enable the checkup functions (*_self_test). | |
| */ | | */ | |
| #define POLARSSL_SELF_TEST | | #define POLARSSL_SELF_TEST | |
| | | | |
| /** | | /** | |
|
| | | * \def POLARSSL_SSL_DEBUG_ALL | |
| | | * | |
| | | * Enable the debug messages in SSL module for all issues. | |
| | | * Debug messages have been disabled in some places to prevent timing | |
| | | * attacks due to (unbalanced) debugging function calls. | |
| | | * | |
| | | * If you need all error reporting you should enable this during debugging, | |
| | | * but remove this for production servers that should log as well. | |
| | | * | |
| | | * Uncomment this macro to report all debug messages on errors introducing | |
| | | * a timing side-channel. | |
| | | * | |
| | | #define POLARSSL_SSL_DEBUG_ALL | |
| | | */ | |
| | | | |
| | | /** | |
| * \def POLARSSL_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION | | * \def POLARSSL_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION | |
| * | | * | |
| * If set, the X509 parser will not break-off when parsing an X509 certific
ate | | * If set, the X509 parser will not break-off when parsing an X509 certific
ate | |
| * and encountering an unknown critical extension. | | * and encountering an unknown critical extension. | |
| * | | * | |
| * Uncomment to prevent an error. | | * Uncomment to prevent an error. | |
| * | | * | |
| #define POLARSSL_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION | | #define POLARSSL_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION | |
| */ | | */ | |
| /* \} name */ | | /* \} name */ | |
| | | | |
| skipping to change at line 241 | | skipping to change at line 268 | |
| * | | * | |
| * Module: library/aes.c | | * Module: library/aes.c | |
| * Caller: library/ssl_tls.c | | * Caller: library/ssl_tls.c | |
| * library/pem.c | | * library/pem.c | |
| * library/ctr_drbg.c | | * library/ctr_drbg.c | |
| * | | * | |
| * This module enables the following ciphersuites: | | * This module enables the following ciphersuites: | |
| * SSL_RSA_AES_128_SHA | | * SSL_RSA_AES_128_SHA | |
| * SSL_RSA_AES_256_SHA | | * SSL_RSA_AES_256_SHA | |
| * SSL_EDH_RSA_AES_256_SHA | | * SSL_EDH_RSA_AES_256_SHA | |
|
| | | * | |
| | | * PEM uses AES for decrypting encrypted keys. | |
| */ | | */ | |
| #define POLARSSL_AES_C | | #define POLARSSL_AES_C | |
| | | | |
| /** | | /** | |
| * \def POLARSSL_ARC4_C | | * \def POLARSSL_ARC4_C | |
| * | | * | |
| * Enable the ARCFOUR stream cipher. | | * Enable the ARCFOUR stream cipher. | |
| * | | * | |
| * Module: library/arc4.c | | * Module: library/arc4.c | |
| * Caller: library/ssl_tls.c | | * Caller: library/ssl_tls.c | |
| | | | |
| skipping to change at line 368 | | skipping to change at line 397 | |
| * This module provides debugging functions. | | * This module provides debugging functions. | |
| */ | | */ | |
| #define POLARSSL_DEBUG_C | | #define POLARSSL_DEBUG_C | |
| | | | |
| /** | | /** | |
| * \def POLARSSL_DES_C | | * \def POLARSSL_DES_C | |
| * | | * | |
| * Enable the DES block cipher. | | * Enable the DES block cipher. | |
| * | | * | |
| * Module: library/des.c | | * Module: library/des.c | |
|
| * Caller: library/ssl_tls.c | | * Caller: library/pem.c | |
| | | * library/ssl_tls.c | |
| * | | * | |
| * This module enables the following ciphersuites: | | * This module enables the following ciphersuites: | |
| * SSL_RSA_DES_168_SHA | | * SSL_RSA_DES_168_SHA | |
| * SSL_EDH_RSA_DES_168_SHA | | * SSL_EDH_RSA_DES_168_SHA | |
|
| | | * | |
| | | * PEM uses DES/3DES for decrypting encrypted keys. | |
| */ | | */ | |
| #define POLARSSL_DES_C | | #define POLARSSL_DES_C | |
| | | | |
| /** | | /** | |
| * \def POLARSSL_DHM_C | | * \def POLARSSL_DHM_C | |
| * | | * | |
| * Enable the Diffie-Hellman-Merkle key exchange. | | * Enable the Diffie-Hellman-Merkle key exchange. | |
| * | | * | |
| * Module: library/dhm.c | | * Module: library/dhm.c | |
| * Caller: library/ssl_cli.c | | * Caller: library/ssl_cli.c | |
| | | | |
| skipping to change at line 476 | | skipping to change at line 508 | |
| * | | * | |
| #define POLARSSL_MD4_C | | #define POLARSSL_MD4_C | |
| */ | | */ | |
| | | | |
| /** | | /** | |
| * \def POLARSSL_MD5_C | | * \def POLARSSL_MD5_C | |
| * | | * | |
| * Enable the MD5 hash algorithm | | * Enable the MD5 hash algorithm | |
| * | | * | |
| * Module: library/md5.c | | * Module: library/md5.c | |
|
| * Caller: library/ssl_tls.c | | * Caller: library/pem.c | |
| | | * library/ssl_tls.c | |
| * library/x509parse.c | | * library/x509parse.c | |
| * | | * | |
| * This module is required for SSL/TLS and X.509. | | * This module is required for SSL/TLS and X.509. | |
|
| | | * PEM uses MD5 for decrypting encrypted keys. | |
| */ | | */ | |
| #define POLARSSL_MD5_C | | #define POLARSSL_MD5_C | |
| | | | |
| /** | | /** | |
| * \def POLARSSL_NET_C | | * \def POLARSSL_NET_C | |
| * | | * | |
| * Enable the TCP/IP networking routines. | | * Enable the TCP/IP networking routines. | |
| * | | * | |
| * Module: library/net.c | | * Module: library/net.c | |
| * Caller: | | * Caller: | |
| | | | |
End of changes. 7 change blocks. |
| 2 lines changed or deleted | | 36 lines changed or added | |
|
| version.h | | version.h | |
| | | | |
| skipping to change at line 42 | | skipping to change at line 42 | |
| #define POLARSSL_VERSION_H | | #define POLARSSL_VERSION_H | |
| | | | |
| #include "config.h" | | #include "config.h" | |
| | | | |
| /** | | /** | |
| * The version number x.y.z is split into three parts. | | * The version number x.y.z is split into three parts. | |
| * Major, Minor, Patchlevel | | * Major, Minor, Patchlevel | |
| */ | | */ | |
| #define POLARSSL_VERSION_MAJOR 1 | | #define POLARSSL_VERSION_MAJOR 1 | |
| #define POLARSSL_VERSION_MINOR 1 | | #define POLARSSL_VERSION_MINOR 1 | |
|
| #define POLARSSL_VERSION_PATCH 5 | | #define POLARSSL_VERSION_PATCH 6 | |
| | | | |
| /** | | /** | |
| * The single version number has the following structure: | | * The single version number has the following structure: | |
| * MMNNPP00 | | * MMNNPP00 | |
| * Major version | Minor version | Patch version | | * Major version | Minor version | Patch version | |
| */ | | */ | |
|
| #define POLARSSL_VERSION_NUMBER 0x01010500 | | #define POLARSSL_VERSION_NUMBER 0x01010600 | |
| #define POLARSSL_VERSION_STRING "1.1.5" | | #define POLARSSL_VERSION_STRING "1.1.6" | |
| #define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.1.5" | | #define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.1.6" | |
| | | | |
| #if defined(POLARSSL_VERSION_C) | | #if defined(POLARSSL_VERSION_C) | |
| | | | |
| /** | | /** | |
| * Get the version number. | | * Get the version number. | |
| * | | * | |
| * \return The constructed version number in the format | | * \return The constructed version number in the format | |
| * MMNNPP00 (Major, Minor, Patch). | | * MMNNPP00 (Major, Minor, Patch). | |
| */ | | */ | |
| unsigned int version_get_number( void ); | | unsigned int version_get_number( void ); | |
| | | | |
End of changes. 2 change blocks. |
| 4 lines changed or deleted | | 4 lines changed or added | |
|