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

Merge pull request #219 from JacobBarthelmeh/master

Browse Source 
install user_rsa.h and fix leading bit function
This commit is contained in:
toddouska
2015-12-15 15:57:48 -08:00
parent b9e2ff3055 1cdc6d5edb
commit 94b1df49ae
4 changed files with 85 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@ -61,15 +61,6 @@ EXTRA_DIST+= LICENSING
EXTRA_DIST+= INSTALL
EXTRA_DIST+= IPP
# user crypto plug in example
EXTRA_DIST+= wolfcrypt/user-crypto/configure.ac
EXTRA_DIST+= wolfcrypt/user-crypto/autogen.sh
EXTRA_DIST+= wolfcrypt/user-crypto/include/user_rsa.h
EXTRA_DIST+= wolfcrypt/user-crypto/src/rsa.c
EXTRA_DIST+= wolfcrypt/user-crypto/lib/.gitkeep
EXTRA_DIST+= wolfcrypt/user-crypto/README.txt
EXTRA_DIST+= wolfcrypt/user-crypto/Makefile.am
include wrapper/include.am
include cyassl/include.am
include wolfssl/include.am
@ -81,6 +72,7 @@ include swig/include.am
include src/include.am
include support/include.am
include wolfcrypt/user-crypto/include.am
include wolfcrypt/benchmark/include.am
include wolfcrypt/src/include.am
include wolfcrypt/test/include.am

13
wolfcrypt/user-crypto/include.am Normal file
View File

@ -0,0 +1,13 @@
if BUILD_FAST_RSA
include_HEADERS += wolfcrypt/user-crypto/include/user_rsa.h
endif
# user crypto plug in example
EXTRA_DIST+= wolfcrypt/user-crypto/configure.ac
EXTRA_DIST+= wolfcrypt/user-crypto/autogen.sh
EXTRA_DIST+= wolfcrypt/user-crypto/include/user_rsa.h
EXTRA_DIST+= wolfcrypt/user-crypto/src/rsa.c
EXTRA_DIST+= wolfcrypt/user-crypto/lib/.gitkeep
EXTRA_DIST+= wolfcrypt/user-crypto/README.txt
EXTRA_DIST+= wolfcrypt/user-crypto/Makefile.am

2
wolfcrypt/user-crypto/include/user_rsa.h
View File

@ -106,7 +106,7 @@ WOLFSSL_API int wc_RsaFlattenPublicKey(RsaKey*, byte*, word32*, byte*,
word32*);
#ifdef WOLFSSL_CERT_GEN
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_KEY_GEN)
/* abstracted BN operations with RSA key */
WOLFSSL_API int wc_Rsa_leading_bit(void* BN);
WOLFSSL_API int wc_Rsa_unsigned_bin_size(void* BN);

91
wolfcrypt/user-crypto/src/rsa.c
View File

@ -91,22 +91,56 @@ int wc_InitRsaKey(RsaKey* key, void* heap)
}
#ifdef WOLFSSL_CERT_GEN /* three functions needed for cert gen */
/* three functions needed for cert and key gen */
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_KEY_GEN)
/* return 1 if there is a leading bit*/
int wc_Rsa_leading_bit(void* bn)
{
int ret = 0;
if (ippsExtGet_BN(NULL, &ret, NULL, bn) != ippStsNoErr) {
USER_DEBUG(("Rsa leading bit error\n"));
int dataSz;
Ipp32u* data;
Ipp32u q;
int qSz = sizeof(Ipp32u);
if (ippsExtGet_BN(NULL, &dataSz, NULL, bn) != ippStsNoErr) {
USER_DEBUG(("ippsExtGet_BN Rsa leading bit error\n"));
return USER_CRYPTO_ERROR;
}
return (ret % 8)? 1 : 0; /* if mod 8 bit then an extra byte is needed */
/* convert from size in binary to Ipp32u */
dataSz = dataSz / 32 + ((dataSz % 32)? 1 : 0);
data = (Ipp32u*)XMALLOC(dataSz * sizeof(Ipp32u), NULL,
DYNAMIC_TYPE_USER_CRYPTO);
if (data == NULL) {
USER_DEBUG(("Rsa leading bit memory error\n"));
return 0;
}
/* extract value from BN */
if (ippsExtGet_BN(NULL, NULL, data, bn) != ippStsNoErr) {
USER_DEBUG(("Rsa leading bit error\n"));
XFREE(data, NULL, DYNAMIC_TYPE_USER_CRYPTO);
return 0;
}
/* use method like what's used in wolfssl tfm.c */
q = data[dataSz - 1];
ret = 0;
while (qSz > 0) {
if (q != 0)
ret = (q & 0x80) != 0;
q >>= 8;
qSz--;
}
XFREE(data, NULL, DYNAMIC_TYPE_USER_CRYPTO);
return ret;
}
/* get the size in bytes of BN
cuts off if extra byte is needed so recommended to check wc_Rsa_leading_bit
and adding it to this return value before mallocing memory needed */
/* get the size in bytes of BN */
int wc_Rsa_unsigned_bin_size(void* bn)
{
int ret = 0;
@ -114,7 +148,7 @@ int wc_Rsa_unsigned_bin_size(void* bn)
USER_DEBUG(("Rsa unsigned bin size error\n"));
return USER_CRYPTO_ERROR;
}
return ret / 8; /* size in bytes */
return (ret / 8) + ((ret % 8)? 1: 0); /* size in bytes */
}
#ifndef MP_OKAY
@ -125,12 +159,12 @@ int wc_Rsa_unsigned_bin_size(void* bn)
int wc_Rsa_to_unsigned_bin(void* bn, byte* in, int inLen)
{
if (ippsGetOctString_BN((Ipp8u*)in, inLen, bn) != ippStsNoErr) {
USER_DEBUG(("Rsa unsigned bin error\n"));
USER_DEBUG(("Rsa to unsigned bin error\n"));
return USER_CRYPTO_ERROR;
}
return MP_OKAY;
}
#endif /* WOLFSSL_CERT_GEN */
#endif /* WOLFSSL_CERT_GEN or WOLFSSL_KEY_GEN */
#ifdef OPENSSL_EXTRA /* functions needed for openssl compatibility layer */
@ -1936,6 +1970,7 @@ int wc_MakeRsaKey(RsaKey* key, int size, long e, WC_RNG* rng)
IppsBigNumState* pSrcPublicExp;
Ipp8u* scratchBuffer;
Ipp8u eAry[8];
int trys = 8; /* Miller-Rabin test parameter */
IppsPrimeState* pPrime;
@ -2015,11 +2050,16 @@ int wc_MakeRsaKey(RsaKey* key, int size, long e, WC_RNG* rng)
/* set up initial value of pScrPublicExp */
leng = (int)sizeof(long); /* # of Ipp32u in long */
/* place the value of e into the array eAry then load into BN */
for (i = 0; i < leng; i++) {
eAry[i] = (e >> (8 * (leng - 1 - i))) & 0XFF;
}
ret = init_bn(&pSrcPublicExp, leng);
if (ret != ippStsNoErr)
return USER_CRYPTO_ERROR;
ret = ippsSetOctString_BN((Ipp8u*)&e, leng, pSrcPublicExp);
ret = ippsSetOctString_BN(eAry, leng, pSrcPublicExp);
if (ret != ippStsNoErr)
return USER_CRYPTO_ERROR;
@ -2300,10 +2340,12 @@ static int SetRsaPublicKey(byte* output, RsaKey* key,
return USER_CRYPTO_ERROR;
#endif
if (ippsExtGet_BN(NULL, &rawLen, NULL, key->n) != ippStsNoErr)
leadingBit = wc_Rsa_leading_bit(key->n);
rawLen = wc_Rsa_unsigned_bin_size(key->n);
if ((int)rawLen < 0) {
return USER_CRYPTO_ERROR;
leadingBit = rawLen % 8; /* check for if an extra byte is needed */
rawLen = rawLen/8; /* convert to byte size */
}
rawLen = rawLen + leadingBit;
n[0] = ASN_INTEGER;
nSz = SetLength(rawLen, n + 1) + 1; /* int tag */
@ -2339,10 +2381,12 @@ static int SetRsaPublicKey(byte* output, RsaKey* key,
}
#endif
if (ippsExtGet_BN(NULL, &rawLen, NULL, key->e) != ippStsNoErr)
leadingBit = wc_Rsa_leading_bit(key->e);
rawLen = wc_Rsa_unsigned_bin_size(key->e);
if ((int)rawLen < 0) {
return USER_CRYPTO_ERROR;
leadingBit = rawLen % 8;
rawLen = rawLen/8;
}
rawLen = rawLen + leadingBit;
e[0] = ASN_INTEGER;
eSz = SetLength(rawLen, e + 1) + 1; /* int tag */
@ -2510,15 +2554,18 @@ int wc_RsaKeyToDer(RsaKey* key, byte* output, word32 inLen)
Ipp32u isZero;
IppsBigNumState* keyInt = GetRsaInt(key, i);
/* leading zero */
ippsCmpZero_BN(keyInt, &isZero); /* makes isZero 0 if true */
ippsExtGet_BN(NULL, (int*)&rawLen, NULL, keyInt); /* bit length */
if (rawLen % 8 || !isZero)
rawLen = wc_Rsa_unsigned_bin_size(keyInt);
if ((int)rawLen < 0) {
return USER_CRYPTO_ERROR;
}
/* leading zero */
if (!isZero || wc_Rsa_leading_bit(keyInt))
lbit = 1;
else
lbit = 0;
rawLen /= 8; /* convert to bytes */
rawLen += lbit;
tmps[i] = (byte*)XMALLOC(rawLen + MAX_SEQ_SZ, key->heap,
@ -2548,6 +2595,8 @@ int wc_RsaKeyToDer(RsaKey* key, byte* output, word32 inLen)
}
else {
ret = USER_CRYPTO_ERROR;
USER_DEBUG(("ippsGetOctString_BN error %s\n",
ippGetStatusString(err)));
break;
}
}