pkcs11.h   pkcs11.h 
skipping to change at line 135 skipping to change at line 135
int pkcs11_sign( pkcs11_context *ctx, int pkcs11_sign( pkcs11_context *ctx,
int mode, int mode,
int hash_id, int hash_id,
unsigned int hashlen, unsigned int hashlen,
const unsigned char *hash, const unsigned char *hash,
unsigned char *sig ); unsigned char *sig );
/** /**
* SSL/TLS wrappers for PKCS#11 functions * SSL/TLS wrappers for PKCS#11 functions
*/ */
static inline int ssl_pkcs11_decrypt( void *ctx, int mode, size_t *olen, static inline int ssl_pkcs11_decrypt( void *ctx,
const unsigned char *input, unsigned char *output, int (*f_rng)(void *, unsigned char *, size_t), void *p
size_t output_max_len ) _rng,
int mode, size_t *olen, const unsigned char *input,
unsigned char *output, size_t output_max_len )
{ {
((void) f_rng);
((void) p_rng);
return pkcs11_decrypt( (pkcs11_context *) ctx, mode, olen, input, outpu t, return pkcs11_decrypt( (pkcs11_context *) ctx, mode, olen, input, outpu t,
output_max_len ); output_max_len );
} }
static inline int ssl_pkcs11_sign( void *ctx, static inline int ssl_pkcs11_sign( void *ctx,
int (*f_rng)(void *, unsigned char *, size_t), void *p _rng, int (*f_rng)(void *, unsigned char *, size_t), void *p _rng,
int mode, int hash_id, unsigned int hashlen, int mode, int hash_id, unsigned int hashlen,
const unsigned char *hash, unsigned char *sig ) const unsigned char *hash, unsigned char *sig )
{ {
((void) f_rng); ((void) f_rng);
 End of changes. 2 change blocks. 
3 lines changed or deleted 7 lines changed or added


 rsa.h   rsa.h 
skipping to change at line 154 skipping to change at line 154
mpi P; /*!< 1st prime factor */ mpi P; /*!< 1st prime factor */
mpi Q; /*!< 2nd prime factor */ mpi Q; /*!< 2nd prime factor */
mpi DP; /*!< D % (P - 1) */ mpi DP; /*!< D % (P - 1) */
mpi DQ; /*!< D % (Q - 1) */ mpi DQ; /*!< D % (Q - 1) */
mpi QP; /*!< 1 / (Q % P) */ mpi QP; /*!< 1 / (Q % P) */
mpi RN; /*!< cached R^2 mod N */ mpi RN; /*!< cached R^2 mod N */
mpi RP; /*!< cached R^2 mod P */ mpi RP; /*!< cached R^2 mod P */
mpi RQ; /*!< cached R^2 mod Q */ mpi RQ; /*!< cached R^2 mod Q */
#if !defined(POLARSSL_RSA_NO_CRT)
mpi Vi; /*!< cached blinding value */
mpi Vf; /*!< cached un-blinding value */
#endif
int padding; /*!< RSA_PKCS_V15 for 1.5 padding and int padding; /*!< RSA_PKCS_V15 for 1.5 padding and
RSA_PKCS_v21 for OAEP/PSS */ RSA_PKCS_v21 for OAEP/PSS */
int hash_id; /*!< Hash identifier of md_type_t as int hash_id; /*!< Hash identifier of md_type_t as
specified in the md.h header file specified in the md.h header file
for the EME-OAEP and EMSA-PSS for the EME-OAEP and EMSA-PSS
encoding */ encoding */
} }
rsa_context; rsa_context;
#ifdef __cplusplus #ifdef __cplusplus
 End of changes. 1 change blocks. 
5 lines changed or deleted 0 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 9 #define POLARSSL_VERSION_PATCH 10
/** /**
* 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 0x01020900 #define POLARSSL_VERSION_NUMBER 0x01020A00
#define POLARSSL_VERSION_STRING "1.2.9" #define POLARSSL_VERSION_STRING "1.2.10"
#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.9" #define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.10"
#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/