Fixed ssl_pkcs11_decrypt() prototype

This commit is contained in:
Paul Bakker 2013-10-04 11:01:27 +02:00
parent 62087eed22
commit 495830dd1f
2 changed files with 8 additions and 4 deletions

View file

@ -3,6 +3,7 @@ PolarSSL ChangeLog
= Branch 1.2 = Branch 1.2
Bugfix Bugfix
* Fixed memory leak in RSA as a result of introduction of blinding * Fixed memory leak in RSA as a result of introduction of blinding
* Fixed ssl_pkcs11_decrypt() prototype
= Version 1.2.9 released 2013-10-01 = Version 1.2.9 released 2013-10-01
Changes Changes

View file

@ -132,15 +132,18 @@ int pkcs11_sign( pkcs11_context *ctx,
/** /**
* 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_rng,
size_t output_max_len ) 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, output, return pkcs11_decrypt( (pkcs11_context *) ctx, mode, olen, input, output,
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 )