eden-emu/mbedtls
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix pkcs11.c to conform to PolarSSL 1.3 API.

Browse source 
This restores previous functionality, and thus still allows only RSA to be
used through PKCS#11.

Signed-off-by: Steffan Karger <steffan.karger@fox-it.com>
Signed-off-by: Paul Bakker <p.j.bakker@polarssl.org>
This commit is contained in:
Steffan Karger 2013-11-13 16:57:58 +01:00 • committed by Paul Bakker
parent 44cf68f262
commit 28d81a009c
4 changed files with 56 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/polarssl/pk.h
View file

@ -188,7 +188,7 @@ typedef int (*pk_rsa_alt_decrypt_func)( void *ctx, int mode, size_t *olen,
size_t output_max_len );
typedef int (*pk_rsa_alt_sign_func)( void *ctx,
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng,
int mode, int hash_id, unsigned int hashlen,
int mode, md_type_t md_alg, unsigned int hashlen,
const unsigned char *hash, unsigned char *sig );
typedef size_t (*pk_rsa_alt_key_len_func)( void *ctx );

6
include/polarssl/pkcs11.h
View file

@ -128,7 +128,7 @@ int pkcs11_decrypt( pkcs11_context *ctx,
*/
int pkcs11_sign( pkcs11_context *ctx,
int mode,
int hash_id,
md_type_t md_alg,
unsigned int hashlen,
const unsigned char *hash,
unsigned char *sig );
@ -146,12 +146,12 @@ static inline int ssl_pkcs11_decrypt( void *ctx, int mode, size_t *olen,
static inline int ssl_pkcs11_sign( void *ctx,
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng,
int mode, int hash_id, unsigned int hashlen,
int mode, md_type_t md_alg, unsigned int hashlen,
const unsigned char *hash, unsigned char *sig )
{
((void) f_rng);
((void) p_rng);
return pkcs11_sign( (pkcs11_context *) ctx, mode, hash_id,
return pkcs11_sign( (pkcs11_context *) ctx, mode, md_alg,
hashlen, hash, sig );
}

2
include/polarssl/ssl.h
View file

@ -374,7 +374,7 @@ typedef int (*rsa_decrypt_func)( void *ctx, int mode, size_t *olen,
size_t output_max_len );
typedef int (*rsa_sign_func)( void *ctx,
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng,
int mode, int hash_id, unsigned int hashlen,
int mode, md_type_t md_alg, unsigned int hashlen,
const unsigned char *hash, unsigned char *sig );
typedef size_t (*rsa_key_len_func)( void *ctx );