wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 20:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup of the RSA exponent hard coded value.

Browse Source
This commit is contained in:
David Garske
2017-11-06 09:20:06 -08:00
parent 231ebeea0e
commit e591576cdf
6 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ssl.c
View File

@@ -20078,7 +20078,7 @@ int wolfSSL_RSA_generate_key_ex(WOLFSSL_RSA* rsa, int bits, WOLFSSL_BIGNUM* bn,
if (wc_InitRng(rng) < 0) if (wc_InitRng(rng) < 0)
WOLFSSL_MSG("RNG init failed"); WOLFSSL_MSG("RNG init failed");
else if (wc_MakeRsaKey((RsaKey*)rsa->internal, else if (wc_MakeRsaKey((RsaKey*)rsa->internal,
bits, 65537, rng) != MP_OKAY) bits, WC_RSA_EXPONENT, rng) != MP_OKAY)
WOLFSSL_MSG("wc_MakeRsaKey failed"); WOLFSSL_MSG("wc_MakeRsaKey failed");
else if (SetRsaExternal(rsa) != WOLFSSL_SUCCESS) else if (SetRsaExternal(rsa) != WOLFSSL_SUCCESS)
WOLFSSL_MSG("SetRsaExternal failed"); WOLFSSL_MSG("SetRsaExternal failed");

26
tests/api.c
View File

@@ -7799,7 +7799,7 @@ static int test_wc_MakeRsaKey (void)
if (ret == 0) { if (ret == 0) {
ret = wc_InitRng(&rng); ret = wc_InitRng(&rng);
if (ret == 0) { if (ret == 0) {
ret = wc_MakeRsaKey(&genKey, 1024, 65537, &rng); ret = wc_MakeRsaKey(&genKey, 1024, WC_RSA_EXPONENT, &rng);
if (ret == 0 && wc_FreeRsaKey(&genKey) != 0) { if (ret == 0 && wc_FreeRsaKey(&genKey) != 0) {
ret = WOLFSSL_FATAL_ERROR; ret = WOLFSSL_FATAL_ERROR;
} }
@@ -7808,9 +7808,9 @@ static int test_wc_MakeRsaKey (void)
#ifndef HAVE_USER_RSA #ifndef HAVE_USER_RSA
/* Test bad args. */ /* Test bad args. */
if (ret == 0) { if (ret == 0) {
ret = wc_MakeRsaKey(NULL, 1024, 65537, &rng); ret = wc_MakeRsaKey(NULL, 1024, WC_RSA_EXPONENT, &rng);
if (ret == BAD_FUNC_ARG) { if (ret == BAD_FUNC_ARG) {
ret = wc_MakeRsaKey(&genKey, 1024, 65537, NULL); ret = wc_MakeRsaKey(&genKey, 1024, WC_RSA_EXPONENT, NULL);
} }
if (ret == BAD_FUNC_ARG) { if (ret == BAD_FUNC_ARG) {
/* e < 3 */ /* e < 3 */
@@ -7829,9 +7829,9 @@ static int test_wc_MakeRsaKey (void)
#else #else
/* Test bad args. */ /* Test bad args. */
if (ret == 0) { if (ret == 0) {
ret = wc_MakeRsaKey(NULL, 1024, 65537, &rng); ret = wc_MakeRsaKey(NULL, 1024, WC_RSA_EXPONENT, &rng);
if (ret == USER_CRYPTO_ERROR) { if (ret == USER_CRYPTO_ERROR) {
ret = wc_MakeRsaKey(&genKey, 1024, 65537, NULL); ret = wc_MakeRsaKey(&genKey, 1024, WC_RSA_EXPONENT, NULL);
} }
if (ret == USER_CRYPTO_ERROR) { if (ret == USER_CRYPTO_ERROR) {
/* e < 3 */ /* e < 3 */
@@ -7942,7 +7942,7 @@ static int test_wc_RsaKeyToDer (void)
} }
/* Make key. */ /* Make key. */
if (ret == 0) { if (ret == 0) {
ret = wc_MakeRsaKey(&genKey, 1024, 65537, &rng); ret = wc_MakeRsaKey(&genKey, 1024, WC_RSA_EXPONENT, &rng);
if (ret != 0) { if (ret != 0) {
ret = WOLFSSL_FATAL_ERROR; ret = WOLFSSL_FATAL_ERROR;
} }
@@ -8035,7 +8035,7 @@ static int test_wc_RsaKeyToPublicDer (void)
ret = wc_InitRng(&rng); ret = wc_InitRng(&rng);
} }
if (ret == 0) { if (ret == 0) {
ret = wc_MakeRsaKey(&key, 1024, 65537, &rng); ret = wc_MakeRsaKey(&key, 1024, WC_RSA_EXPONENT, &rng);
} }
printf(testingFmt, "wc_RsaKeyToPublicDer()"); printf(testingFmt, "wc_RsaKeyToPublicDer()");
@@ -8123,7 +8123,7 @@ static int test_wc_RsaPublicEncryptDecrypt (void)
ret = wc_InitRng(&rng); ret = wc_InitRng(&rng);
} }
if (ret == 0) { if (ret == 0) {
ret = wc_MakeRsaKey(&key, 1024, 65537, &rng); ret = wc_MakeRsaKey(&key, 1024, WC_RSA_EXPONENT, &rng);
} }
/* Encrypt. */ /* Encrypt. */
printf(testingFmt, "wc_RsaPublicEncrypt()"); printf(testingFmt, "wc_RsaPublicEncrypt()");
@@ -8211,7 +8211,7 @@ static int test_wc_RsaPublicEncryptDecrypt_ex (void)
ret = wc_InitRng(&rng); ret = wc_InitRng(&rng);
} }
if (ret == 0) { if (ret == 0) {
ret = wc_MakeRsaKey(&key, 1024, 65537, &rng); ret = wc_MakeRsaKey(&key, 1024, WC_RSA_EXPONENT, &rng);
} }
/* Encrypt */ /* Encrypt */
printf(testingFmt, "wc_RsaPublicEncrypt_ex()"); printf(testingFmt, "wc_RsaPublicEncrypt_ex()");
@@ -8318,7 +8318,7 @@ static int test_wc_RsaSSL_SignVerify (void)
} }
if (ret == 0) { if (ret == 0) {
ret = wc_MakeRsaKey(&key, 1024, 65537, &rng); ret = wc_MakeRsaKey(&key, 1024, WC_RSA_EXPONENT, &rng);
} }
/* Sign. */ /* Sign. */
printf(testingFmt, "wc_RsaSSL_Sign()"); printf(testingFmt, "wc_RsaSSL_Sign()");
@@ -8464,7 +8464,7 @@ static int test_wc_RsaEncryptSize (void)
printf(testingFmt, "wc_RsaEncryptSize()"); printf(testingFmt, "wc_RsaEncryptSize()");
if (ret == 0) { if (ret == 0) {
ret = wc_MakeRsaKey(&key, 1024, 65537, &rng); ret = wc_MakeRsaKey(&key, 1024, WC_RSA_EXPONENT, &rng);
if (ret == 0) { if (ret == 0) {
ret = wc_RsaEncryptSize(&key); ret = wc_RsaEncryptSize(&key);
} }
@@ -8481,7 +8481,7 @@ static int test_wc_RsaEncryptSize (void)
} }
if (ret == 0) { if (ret == 0) {
ret = wc_MakeRsaKey(&key, FOURK_BUF, 65537, &rng); ret = wc_MakeRsaKey(&key, FOURK_BUF, WC_RSA_EXPONENT, &rng);
if (ret == 0) { if (ret == 0) {
ret = wc_RsaEncryptSize(&key); ret = wc_RsaEncryptSize(&key);
} }
@@ -8538,7 +8538,7 @@ static int test_wc_RsaFlattenPublicKey (void)
} }
if (ret == 0) { if (ret == 0) {
ret = wc_MakeRsaKey(&key, 1024, 65537, &rng); ret = wc_MakeRsaKey(&key, 1024, WC_RSA_EXPONENT, &rng);
if (ret >= 0) { if (ret >= 0) {
ret = 0; ret = 0;
} else { } else {

2
wolfcrypt/benchmark/benchmark.c
View File

@@ -2944,7 +2944,7 @@ void bench_rsaKeyGen(int doAsync)
int ret = 0, i, count = 0, times, pending = 0; int ret = 0, i, count = 0, times, pending = 0;
int k, keySz; int k, keySz;
const int keySizes[2] = {1024, 2048}; const int keySizes[2] = {1024, 2048};
const long rsa_e_val = 65537; const long rsa_e_val = WC_RSA_EXPONENT;
/* clear for done cleanup */ /* clear for done cleanup */
XMEMSET(genKey, 0, sizeof(genKey)); XMEMSET(genKey, 0, sizeof(genKey));

2
wolfcrypt/test/test.c
View File

@@ -8220,7 +8220,7 @@ int rsa_test(void)
if (ret != 0) { if (ret != 0) {
ERROR_OUT(-5550, exit_rsa); ERROR_OUT(-5550, exit_rsa);
} }
ret = wc_MakeRsaKey(&genKey, 1024, 65537, &rng); ret = wc_MakeRsaKey(&genKey, 1024, WC_RSA_EXPONENT, &rng);
if (ret != 0) { if (ret != 0) {
ERROR_OUT(-5551, exit_rsa); ERROR_OUT(-5551, exit_rsa);
} }

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

@@ -50,12 +50,12 @@
#define WOLFSSL_RSA_TYPE_DEFINED #define WOLFSSL_RSA_TYPE_DEFINED
#endif #endif
enum { enum {
RSA_PUBLIC = 0, RSA_PUBLIC = 0,
RSA_PRIVATE = 1, RSA_PRIVATE = 1,
}; };
/* RSA */ /* RSA */
struct RsaKey { struct RsaKey {
IppsBigNumState* n; IppsBigNumState* n;

8
wolfssl/wolfcrypt/rsa.h
View File

@@ -27,6 +27,13 @@
#ifndef NO_RSA #ifndef NO_RSA
/* RSA default exponent */
#ifndef WC_RSA_EXPONENT
#define WC_RSA_EXPONENT 65537L
#endif
/* allow for user to plug in own crypto */ /* allow for user to plug in own crypto */
#if !defined(HAVE_FIPS) && (defined(HAVE_USER_RSA) || defined(HAVE_FAST_RSA)) #if !defined(HAVE_FIPS) && (defined(HAVE_USER_RSA) || defined(HAVE_FAST_RSA))
#include "user_rsa.h" #include "user_rsa.h"
@@ -90,7 +97,6 @@ enum {
#endif #endif
}; };
/* RSA */ /* RSA */
struct RsaKey { struct RsaKey {
mp_int n, e, d, p, q, dP, dQ, u; mp_int n, e, d, p, q, dP, dQ, u;