config.h   config.h 
skipping to change at line 699 skipping to change at line 699
/** /**
* \def POLARSSL_SHA2_C * \def POLARSSL_SHA2_C
* *
* Enable the SHA-224 and SHA-256 cryptographic hash algorithms. * Enable the SHA-224 and SHA-256 cryptographic hash algorithms.
* *
* Module: library/sha2.c * Module: library/sha2.c
* Caller: library/md_wrap.c * Caller: library/md_wrap.c
* library/x509parse.c * library/x509parse.c
* *
* This module adds support for SHA-224 and SHA-256. * This module adds support for SHA-224 and SHA-256.
* This module is required for the SSL/TLS 1.2 PRF function.
*/ */
#define POLARSSL_SHA2_C #define POLARSSL_SHA2_C
/** /**
* \def POLARSSL_SHA4_C * \def POLARSSL_SHA4_C
* *
* Enable the SHA-384 and SHA-512 cryptographic hash algorithms. * Enable the SHA-384 and SHA-512 cryptographic hash algorithms.
* *
* Module: library/sha4.c * Module: library/sha4.c
* Caller: library/md_wrap.c * Caller: library/md_wrap.c
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 ssl.h   ssl.h 
skipping to change at line 196 skipping to change at line 196
#define SSL_HASH_MD5 1 #define SSL_HASH_MD5 1
#define SSL_HASH_SHA1 2 #define SSL_HASH_SHA1 2
#define SSL_HASH_SHA224 3 #define SSL_HASH_SHA224 3
#define SSL_HASH_SHA256 4 #define SSL_HASH_SHA256 4
#define SSL_HASH_SHA384 5 #define SSL_HASH_SHA384 5
#define SSL_HASH_SHA512 6 #define SSL_HASH_SHA512 6
#define SSL_SIG_RSA 1 #define SSL_SIG_RSA 1
/* /*
* Client Certificate Types
*/
#define SSL_CERT_TYPE_RSA_SIGN 1
/*
* Message, alert and handshake types * Message, alert and handshake types
*/ */
#define SSL_MSG_CHANGE_CIPHER_SPEC 20 #define SSL_MSG_CHANGE_CIPHER_SPEC 20
#define SSL_MSG_ALERT 21 #define SSL_MSG_ALERT 21
#define SSL_MSG_HANDSHAKE 22 #define SSL_MSG_HANDSHAKE 22
#define SSL_MSG_APPLICATION_DATA 23 #define SSL_MSG_APPLICATION_DATA 23
#define SSL_ALERT_LEVEL_WARNING 1 #define SSL_ALERT_LEVEL_WARNING 1
#define SSL_ALERT_LEVEL_FATAL 2 #define SSL_ALERT_LEVEL_FATAL 2
skipping to change at line 353 skipping to change at line 358
/* /*
* This structure contains the parameters only needed during handshake. * This structure contains the parameters only needed during handshake.
*/ */
struct _ssl_handshake_params struct _ssl_handshake_params
{ {
/* /*
* Handshake specific crypto variables * Handshake specific crypto variables
*/ */
int sig_alg; /*!< Signature algorithm */ int sig_alg; /*!< Signature algorithm */
int cert_type; /*!< Requested cert type */
int verify_sig_alg; /*!< Signature algorithm for verif
y */
#if defined(POLARSSL_DHM_C) #if defined(POLARSSL_DHM_C)
dhm_context dhm_ctx; /*!< DHM key exchange */ dhm_context dhm_ctx; /*!< DHM key exchange */
#endif #endif
/* /*
* Checksum contexts * Checksum contexts
*/ */
md5_context fin_md5; md5_context fin_md5;
sha1_context fin_sha1; sha1_context fin_sha1;
sha2_context fin_sha2; sha2_context fin_sha2;
skipping to change at line 417 skipping to change at line 424
int (*f_sni)(void *, ssl_context *, const unsigned char *, size_t); int (*f_sni)(void *, ssl_context *, const unsigned char *, size_t);
void *p_rng; /*!< context for the RNG function */ void *p_rng; /*!< context for the RNG function */
void *p_dbg; /*!< context for the debug function */ void *p_dbg; /*!< context for the debug function */
void *p_recv; /*!< context for reading operations */ void *p_recv; /*!< context for reading operations */
void *p_send; /*!< context for writing operations */ void *p_send; /*!< context for writing operations */
void *p_vrfy; /*!< context for verification */ void *p_vrfy; /*!< context for verification */
void *p_get_cache; /*!< context for cache retrieval */ void *p_get_cache; /*!< context for cache retrieval */
void *p_set_cache; /*!< context for cache store */ void *p_set_cache; /*!< context for cache store */
void *p_sni; /*!< context for SNI extension */ void *p_sni; /*!< context for SNI extension */
void *p_hw_data; /*!< context for HW acceleration */
/* /*
* Session layer * Session layer
*/ */
ssl_session *session_in; /*!< current session data (in) * / ssl_session *session_in; /*!< current session data (in) * /
ssl_session *session_out; /*!< current session data (out) * / ssl_session *session_out; /*!< current session data (out) * /
ssl_session *session; /*!< negotiated session data * / ssl_session *session; /*!< negotiated session data * /
ssl_session *session_negotiate; /*!< session data in negotiation * / ssl_session *session_negotiate; /*!< session data in negotiation * /
ssl_handshake_params *handshake; /*!< params required only during ssl_handshake_params *handshake; /*!< params required only during
 End of changes. 3 change blocks. 
0 lines changed or deleted 9 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 2 #define POLARSSL_VERSION_MINOR 2
#define POLARSSL_VERSION_PATCH 1 #define POLARSSL_VERSION_PATCH 2
/** /**
* 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 0x01020100 #define POLARSSL_VERSION_NUMBER 0x01020200
#define POLARSSL_VERSION_STRING "1.2.1" #define POLARSSL_VERSION_STRING "1.2.2"
#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.1" #define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.2"
#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

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/