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

Merge pull request #270 from JacobBarthelmeh/OAEP

Browse Source 
Use type enum wc_HashType rather than int for OAEP functions.
This commit is contained in:
dgarske
2016-01-21 08:50:00 -08:00
parent 3098e09f42 63d1f81fb1
commit e1abf5f623
3 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
wolfcrypt/src/rsa.c
View File

@ -227,7 +227,7 @@ int wc_FreeRsaKey(RsaKey* key)
out: mask output after generation out: mask output after generation
outSz: size of output buffer outSz: size of output buffer
*/ */
static int wc_MGF1(int hType, byte* seed, word32 seedSz, static int wc_MGF1(enum wc_HashType hType, byte* seed, word32 seedSz,
byte* out, word32 outSz) byte* out, word32 outSz)
{ {
byte* tmp; byte* tmp;
@ -347,7 +347,7 @@ static int wc_MGF(int type, byte* seed, word32 seedSz,
static int wc_RsaPad_OAEP(const byte* input, word32 inputLen, byte* pkcsBlock, static int wc_RsaPad_OAEP(const byte* input, word32 inputLen, byte* pkcsBlock,
word32 pkcsBlockLen, byte padValue, WC_RNG* rng, word32 pkcsBlockLen, byte padValue, WC_RNG* rng,
int hType, int mgf, byte* optLabel, word32 labelLen) enum wc_HashType hType, int mgf, byte* optLabel, word32 labelLen)
{ {
int ret; int ret;
int hLen; int hLen;
@ -542,8 +542,8 @@ static int wc_RsaPad(const byte* input, word32 inputLen, byte* pkcsBlock,
#ifndef WC_NO_RSA_OAEP #ifndef WC_NO_RSA_OAEP
/* helper function to direct which padding is used */ /* helper function to direct which padding is used */
static int wc_RsaPad_ex(const byte* input, word32 inputLen, byte* pkcsBlock, static int wc_RsaPad_ex(const byte* input, word32 inputLen, byte* pkcsBlock,
word32 pkcsBlockLen, byte padValue, WC_RNG* rng, int padType, word32 pkcsBlockLen, byte padValue, WC_RNG* rng, int padType,
int hType, int mgf, byte* optLabel, word32 labelLen) enum wc_HashType hType, int mgf, byte* optLabel, word32 labelLen)
{ {
int ret; int ret;
@ -580,7 +580,8 @@ static int wc_RsaPad_ex(const byte* input, word32 inputLen, byte* pkcsBlock,
/* UnPad plaintext, set start to *output, return length of plaintext, /* UnPad plaintext, set start to *output, return length of plaintext,
* < 0 on error */ * < 0 on error */
static int wc_RsaUnPad_OAEP(byte *pkcsBlock, unsigned int pkcsBlockLen, static int wc_RsaUnPad_OAEP(byte *pkcsBlock, unsigned int pkcsBlockLen,
byte **output, int hType, int mgf, byte* optLabel, word32 labelLen) byte **output, enum wc_HashType hType, int mgf,
byte* optLabel, word32 labelLen)
{ {
int hLen; int hLen;
int ret; int ret;
@ -593,7 +594,7 @@ static int wc_RsaUnPad_OAEP(byte *pkcsBlock, unsigned int pkcsBlockLen,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
tmp = XMALLOC(pkcsBlockLen, NULL, DYNAMIC_TYPE_TMP_BUFFER); tmp = (byte*)XMALLOC(pkcsBlockLen, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (tmp == NULL) { if (tmp == NULL) {
return MEMORY_E; return MEMORY_E;
} }
@ -703,8 +704,8 @@ static int RsaUnPad(const byte *pkcsBlock, unsigned int pkcsBlockLen,
#ifndef WC_NO_RSA_OAEP #ifndef WC_NO_RSA_OAEP
/* helper function to direct unpadding */ /* helper function to direct unpadding */
static int wc_RsaUnPad_ex(byte* pkcsBlock, word32 pkcsBlockLen, byte** out, static int wc_RsaUnPad_ex(byte* pkcsBlock, word32 pkcsBlockLen, byte** out,
byte padValue, int padType, int hType, int mgf, byte padValue, int padType, enum wc_HashType hType,
byte* optLabel, word32 labelLen) int mgf, byte* optLabel, word32 labelLen)
{ {
int ret; int ret;
@ -877,8 +878,8 @@ int wc_RsaPublicEncrypt(const byte* in, word32 inLen, byte* out, word32 outLen,
label : optional label label : optional label
labelSz : size of optional label buffer */ labelSz : size of optional label buffer */
int wc_RsaPublicEncrypt_ex(const byte* in, word32 inLen, byte* out, int wc_RsaPublicEncrypt_ex(const byte* in, word32 inLen, byte* out,
word32 outLen, RsaKey* key, WC_RNG* rng, word32 outLen, RsaKey* key, WC_RNG* rng, int type,
int type, int hash, int mgf, byte* label, word32 labelSz) enum wc_HashType hash, int mgf, byte* label, word32 labelSz)
{ {
int sz, ret; int sz, ret;
@ -942,7 +943,8 @@ int wc_RsaPrivateDecryptInline(byte* in, word32 inLen, byte** out, RsaKey* key)
label : optional label label : optional label
labelSz : size of optional label buffer */ labelSz : size of optional label buffer */
int wc_RsaPrivateDecryptInline_ex(byte* in, word32 inLen, byte** out, int wc_RsaPrivateDecryptInline_ex(byte* in, word32 inLen, byte** out,
RsaKey* key, int type, int hash, int mgf, byte* label, word32 labelSz) RsaKey* key, int type, enum wc_HashType hash, int mgf,
byte* label, word32 labelSz)
{ {
int ret; int ret;
@ -1024,7 +1026,8 @@ int wc_RsaPrivateDecrypt(const byte* in, word32 inLen, byte* out, word32 outLen,
label : optional label label : optional label
labelSz : size of optional label buffer */ labelSz : size of optional label buffer */
int wc_RsaPrivateDecrypt_ex(const byte* in, word32 inLen, byte* out, word32 outLen, int wc_RsaPrivateDecrypt_ex(const byte* in, word32 inLen, byte* out, word32 outLen,
RsaKey* key, int type, int hash, int mgf, byte* label, word32 labelSz) RsaKey* key, int type, enum wc_HashType hash, int mgf,
byte* label, word32 labelSz)
{ {
int plainLen; int plainLen;
byte* tmp; byte* tmp;

4
wolfcrypt/test/test.c
View File

@ -4098,13 +4098,13 @@ int rsa_test(void)
/* check using pkcsv15 padding with _ex API */ /* check using pkcsv15 padding with _ex API */
XMEMSET(plain, 0, sizeof(plain)); XMEMSET(plain, 0, sizeof(plain));
ret = wc_RsaPublicEncrypt_ex(in, inLen, out, sizeof(out), &key, &rng, ret = wc_RsaPublicEncrypt_ex(in, inLen, out, sizeof(out), &key, &rng,
WC_RSA_PKCSV15_PAD, 0, 0, NULL, 0); WC_RSA_PKCSV15_PAD, WC_HASH_TYPE_NONE, 0, NULL, 0);
if (ret < 0) { if (ret < 0) {
free(tmp); free(tmp);
return -443; return -443;
} }
ret = wc_RsaPrivateDecrypt_ex(out, ret, plain, sizeof(plain), &key, ret = wc_RsaPrivateDecrypt_ex(out, ret, plain, sizeof(plain), &key,
WC_RSA_PKCSV15_PAD, 0, 0, NULL, 0); WC_RSA_PKCSV15_PAD, WC_HASH_TYPE_NONE, 0, NULL, 0);
if (ret < 0) { if (ret < 0) {
free(tmp); free(tmp);
return -444; return -444;

12
wolfssl/wolfcrypt/rsa.h
View File

@ -124,14 +124,14 @@ WOLFSSL_API int wc_RsaPublicKeyDecodeRaw(const byte* n, word32 nSz,
#define WC_RSA_OAEP_PAD 1 #define WC_RSA_OAEP_PAD 1
WOLFSSL_API int wc_RsaPublicEncrypt_ex(const byte* in, word32 inLen, byte* out, WOLFSSL_API int wc_RsaPublicEncrypt_ex(const byte* in, word32 inLen, byte* out,
word32 outLen, RsaKey* key, WC_RNG* rng, word32 outLen, RsaKey* key, WC_RNG* rng, int type,
int type, int hash, int mgf, byte* label, word32 lableSz); enum wc_HashType hash, int mgf, byte* label, word32 lableSz);
WOLFSSL_API int wc_RsaPrivateDecrypt_ex(const byte* in, word32 inLen, WOLFSSL_API int wc_RsaPrivateDecrypt_ex(const byte* in, word32 inLen,
byte* out, word32 outLen, RsaKey* key, byte* out, word32 outLen, RsaKey* key, int type,
int type, int hash, int mgf, byte* label, word32 lableSz); enum wc_HashType hash, int mgf, byte* label, word32 lableSz);
WOLFSSL_API int wc_RsaPrivateDecryptInline_ex(byte* in, word32 inLen, WOLFSSL_API int wc_RsaPrivateDecryptInline_ex(byte* in, word32 inLen,
byte** out, RsaKey* key, byte** out, RsaKey* key, int type, enum wc_HashType hash,
int type, int hash, int mgf, byte* label, word32 lableSz); int mgf, byte* label, word32 lableSz);
#endif /* HAVE_FIPS*/ #endif /* HAVE_FIPS*/
WOLFSSL_API int wc_RsaFlattenPublicKey(RsaKey*, byte*, word32*, byte*, WOLFSSL_API int wc_RsaFlattenPublicKey(RsaKey*, byte*, word32*, byte*,
word32*); word32*);