feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #2627 from SparkiDev/rsa_sign_vfy

Browse Source 
Change signature generation to verify by default
This commit is contained in:
toddouska
2019-11-27 14:08:07 -08:00
committed by GitHub
parent e1ebb39296 23878512c6
commit b396ed0984
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
wolfcrypt/src/signature.c
View File

@ -319,6 +319,16 @@ int wc_SignatureGenerateHash(
const byte* hash_data, word32 hash_len,
byte* sig, word32 *sig_len,
const void* key, word32 key_len, WC_RNG* rng)
{
return wc_SignatureGenerateHash_ex(hash_type, sig_type, hash_data, hash_len,
sig, sig_len, key, key_len, rng, 1);
}
int wc_SignatureGenerateHash_ex(
enum wc_HashType hash_type, enum wc_SignatureType sig_type,
const byte* hash_data, word32 hash_len,
byte* sig, word32 *sig_len,
const void* key, word32 key_len, WC_RNG* rng, int verify)
{
int ret;
@ -393,6 +403,11 @@ int wc_SignatureGenerateHash(
break;
}
if (ret == 0 && verify) {
ret = wc_SignatureVerifyHash(hash_type, sig_type, hash_data, hash_len,
sig, *sig_len, key, key_len);
}
return ret;
}
@ -401,6 +416,16 @@ int wc_SignatureGenerate(
const byte* data, word32 data_len,
byte* sig, word32 *sig_len,
const void* key, word32 key_len, WC_RNG* rng)
{
return wc_SignatureGenerate_ex(hash_type, sig_type, data, data_len, sig,
sig_len, key, key_len, rng, 1);
}
int wc_SignatureGenerate_ex(
enum wc_HashType hash_type, enum wc_SignatureType sig_type,
const byte* data, word32 data_len,
byte* sig, word32 *sig_len,
const void* key, word32 key_len, WC_RNG* rng, int verify)
{
int ret;
word32 hash_len, hash_enc_len;
@ -467,6 +492,11 @@ int wc_SignatureGenerate(
}
}
if (ret == 0 && verify) {
ret = wc_SignatureVerifyHash(hash_type, sig_type, hash_data,
hash_enc_len, sig, *sig_len, key, key_len);
}
#ifdef WOLFSSL_SMALL_STACK
XFREE(hash_data, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif

11
wolfssl/wolfcrypt/signature.h
View File

@ -62,12 +62,23 @@ WOLFSSL_API int wc_SignatureGenerateHash(
const byte* hash_data, word32 hash_len,
byte* sig, word32 *sig_len,
const void* key, word32 key_len, WC_RNG* rng);
WOLFSSL_API int wc_SignatureGenerateHash_ex(
enum wc_HashType hash_type, enum wc_SignatureType sig_type,
const byte* hash_data, word32 hash_len,
byte* sig, word32 *sig_len,
const void* key, word32 key_len, WC_RNG* rng, int verify);
WOLFSSL_API int wc_SignatureGenerate(
enum wc_HashType hash_type, enum wc_SignatureType sig_type,
const byte* data, word32 data_len,
byte* sig, word32 *sig_len,
const void* key, word32 key_len,
WC_RNG* rng);
WOLFSSL_API int wc_SignatureGenerate_ex(
enum wc_HashType hash_type, enum wc_SignatureType sig_type,
const byte* data, word32 data_len,
byte* sig, word32 *sig_len,
const void* key, word32 key_len,
WC_RNG* rng, int verify);
#ifdef __cplusplus
} /* extern "C" */