bn_mul.h   bn_mul.h 
skipping to change at line 609 skipping to change at line 609
#define MULADDC_STOP \ #define MULADDC_STOP \
" \ " \
str r2, %0; \ str r2, %0; \
str r1, %1; \ str r1, %1; \
str r0, %2; \ str r0, %2; \
" \ " \
: "=m" (c), "=m" (d), "=m" (s) \ : "=m" (c), "=m" (d), "=m" (s) \
: "m" (s), "m" (d), "m" (c), "m" (b) \ : "m" (s), "m" (d), "m" (c), "m" (b) \
: "r0", "r1", "r2", "r3", "r4", "r5", \ : "r0", "r1", "r2", "r3", "r4", "r5", \
"r6", "r7", "r8", "r9" \ "r6", "r7", "r8", "r9", "cc" \
); );
#else #else
#define MULADDC_INIT \ #define MULADDC_INIT \
asm( \ asm( \
" \ " \
ldr r0, %3; \ ldr r0, %3; \
ldr r1, %4; \ ldr r1, %4; \
ldr r2, %5; \ ldr r2, %5; \
skipping to change at line 643 skipping to change at line 643
#define MULADDC_STOP \ #define MULADDC_STOP \
" \ " \
str r2, %0; \ str r2, %0; \
str r1, %1; \ str r1, %1; \
str r0, %2; \ str r0, %2; \
" \ " \
: "=m" (c), "=m" (d), "=m" (s) \ : "=m" (c), "=m" (d), "=m" (s) \
: "m" (s), "m" (d), "m" (c), "m" (b) \ : "m" (s), "m" (d), "m" (c), "m" (b) \
: "r0", "r1", "r2", "r3", "r4", "r5", \ : "r0", "r1", "r2", "r3", "r4", "r5", \
"r6", "r7" \ "r6", "r7", "cc" \
); );
#endif /* Thumb */ #endif /* Thumb */
#endif /* ARMv3 */ #endif /* ARMv3 */
#if defined(__alpha__) #if defined(__alpha__)
#define MULADDC_INIT \ #define MULADDC_INIT \
asm( "ldq $1, %0 " :: "m" (s)); \ asm( "ldq $1, %0 " :: "m" (s)); \
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 md.h   md.h 
skipping to change at line 201 skipping to change at line 201
/** /**
* \brief Returns the size of the message digest output. * \brief Returns the size of the message digest output.
* *
* \param md_info message digest info * \param md_info message digest info
* *
* \return size of the message digest output. * \return size of the message digest output.
*/ */
static inline unsigned char md_get_size( const md_info_t *md_info ) static inline unsigned char md_get_size( const md_info_t *md_info )
{ {
if( md_info == NULL )
return( 0 );
return md_info->size; return md_info->size;
} }
/** /**
* \brief Returns the type of the message digest output. * \brief Returns the type of the message digest output.
* *
* \param md_info message digest info * \param md_info message digest info
* *
* \return type of the message digest output. * \return type of the message digest output.
*/ */
static inline md_type_t md_get_type( const md_info_t *md_info ) static inline md_type_t md_get_type( const md_info_t *md_info )
{ {
if( md_info == NULL )
return( POLARSSL_MD_NONE );
return md_info->type; return md_info->type;
} }
/** /**
* \brief Returns the name of the message digest output. * \brief Returns the name of the message digest output.
* *
* \param md_info message digest info * \param md_info message digest info
* *
* \return name of the message digest output. * \return name of the message digest output.
*/ */
static inline const char *md_get_name( const md_info_t *md_info ) static inline const char *md_get_name( const md_info_t *md_info )
{ {
if( md_info == NULL )
return( NULL );
return md_info->name; return md_info->name;
} }
/** /**
* \brief Set-up the given context for a new message digest * \brief Set-up the given context for a new message digest
* *
* \param ctx generic message digest context. * \param ctx generic message digest context.
* *
* \returns 0 on success, POLARSSL_ERR_MD_BAD_INPUT_DATA if paramete r * \returns 0 on success, POLARSSL_ERR_MD_BAD_INPUT_DATA if paramete r
* verification fails. * verification fails.
 End of changes. 3 change blocks. 
0 lines changed or deleted 9 lines changed or added


 ssl.h   ssl.h 
skipping to change at line 493 skipping to change at line 493
/* /*
* User settings * User settings
*/ */
int endpoint; /*!< 0: client, 1: server */ int endpoint; /*!< 0: client, 1: server */
int authmode; /*!< verification mode */ int authmode; /*!< verification mode */
int client_auth; /*!< flag for client auth. */ int client_auth; /*!< flag for client auth. */
int verify_result; /*!< verification result */ int verify_result; /*!< verification result */
int disable_renegotiation; /*!< enable/disable renegotiation */ int disable_renegotiation; /*!< enable/disable renegotiation */
int allow_legacy_renegotiation; /*!< allow legacy renegotiation */ int allow_legacy_renegotiation; /*!< allow legacy renegotiation */
const int *ciphersuites; /*!< allowed ciphersuites */ const int **ciphersuites; /*!< allowed ciphersuites / versio n */
#if defined(POLARSSL_DHM_C) #if defined(POLARSSL_DHM_C)
mpi dhm_P; /*!< prime modulus for DHM */ mpi dhm_P; /*!< prime modulus for DHM */
mpi dhm_G; /*!< generator for DHM */ mpi dhm_G; /*!< generator for DHM */
#endif #endif
/* /*
* TLS extensions * TLS extensions
*/ */
unsigned char *hostname; unsigned char *hostname;
skipping to change at line 720 skipping to change at line 720
* it to NULL or make a full copy of the certificate when * it to NULL or make a full copy of the certificate when
* storing the session for use in this function. * storing the session for use in this function.
* *
* \param ssl SSL context * \param ssl SSL context
* \param session session context * \param session session context
*/ */
void ssl_set_session( ssl_context *ssl, const ssl_session *session ); void ssl_set_session( ssl_context *ssl, const ssl_session *session );
/** /**
* \brief Set the list of allowed ciphersuites * \brief Set the list of allowed ciphersuites
* (Default: ssl_default_ciphersuites)
* (Overrides all version specific lists)
* *
* \param ssl SSL context * \param ssl SSL context
* \param ciphersuites 0-terminated list of allowed ciphersuites * \param ciphersuites 0-terminated list of allowed ciphersuites
*/ */
void ssl_set_ciphersuites( ssl_context *ssl, const int *ciphersuites ); void ssl_set_ciphersuites( ssl_context *ssl, const int *ciphersuites );
/** /**
* \brief Set the list of allowed ciphersuites for a specific
* version of the protocol.
* (Default: ssl_default_ciphersuites)
* (Only useful on the server side)
*
* \param ssl SSL context
* \param ciphersuites 0-terminated list of allowed ciphersuites
* \param major Major version number (only SSL_MAJOR_VERSION_3
* supported)
* \param minor Minor version number (SSL_MINOR_VERSION_0,
* SSL_MINOR_VERSION_1 and SSL_MINOR_VERSION_2,
* SSL_MINOR_VERSION_3 supported)
*/
void ssl_set_ciphersuites_for_version( ssl_context *ssl,
const int *ciphersuites,
int major, int minor );
/**
* \brief Set the data required to verify peer certificate * \brief Set the data required to verify peer certificate
* *
* \param ssl SSL context * \param ssl SSL context
* \param ca_chain trusted CA chain (meaning all fully trusted top-level CA s) * \param ca_chain trusted CA chain (meaning all fully trusted top-level CA s)
* \param ca_crl trusted CA CRLs * \param ca_crl trusted CA CRLs
* \param peer_cn expected peer CommonName (or NULL) * \param peer_cn expected peer CommonName (or NULL)
*/ */
void ssl_set_ca_chain( ssl_context *ssl, x509_cert *ca_chain, void ssl_set_ca_chain( ssl_context *ssl, x509_cert *ca_chain,
x509_crl *ca_crl, const char *peer_cn ); x509_crl *ca_crl, const char *peer_cn );
 End of changes. 3 change blocks. 
1 lines changed or deleted 21 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 6 #define POLARSSL_VERSION_PATCH 7
/** /**
* 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 0x01020600 #define POLARSSL_VERSION_NUMBER 0x01020700
#define POLARSSL_VERSION_STRING "1.2.6" #define POLARSSL_VERSION_STRING "1.2.7"
#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.6" #define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.7"
#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/