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

Code review changes per Chris.

Browse Source
This commit is contained in:
jrblixt
2017-08-16 16:08:50 -06:00
parent dd5430d188
commit 9909c8428c
1 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
tests/api.c
View File

@ -8526,9 +8526,7 @@ static int test_wc_InitDsaKey (void)
static int test_wc_DsaSignVerify (void) static int test_wc_DsaSignVerify (void)
{ {
int ret = 0; int ret = 0;
#if !defined(NO_DSA)
#if !defined(NO_DSA) && (defined(USE_CERT_BUFFERS_1024)\
|| defined(USE_CERT_BUFFERS_2048))
DsaKey key; DsaKey key;
WC_RNG rng; WC_RNG rng;
Sha sha; Sha sha;
@ -8537,16 +8535,26 @@ static int test_wc_DsaSignVerify (void)
word32 idx = 0; word32 idx = 0;
word32 bytes; word32 bytes;
int answer; int answer;
#ifdef USE_CERT_BUFFERS_1024 #ifdef USE_CERT_BUFFERS_1024
byte tmp[ONEK_BUF]; byte tmp[ONEK_BUF];
XMEMSET(tmp, 0, sizeof(tmp));
XMEMCPY(tmp, dsa_key_der_1024, sizeof_dsa_key_der_1024); XMEMCPY(tmp, dsa_key_der_1024, sizeof_dsa_key_der_1024);
bytes = sizeof_dsa_key_der_1024; bytes = sizeof_dsa_key_der_1024;
#else #elif defined(USE_CERT_BUFFERS_2048)
byte tmp[TWOK_BUF]; byte tmp[TWOK_BUF];
XMEMSET(tmp, 0, sizeof(tmp));
XMEMCPY(tmp, dsa_key_der_2048, sizeof_dsa_key_der_2048); XMEMCPY(tmp, dsa_key_der_2048, sizeof_dsa_key_der_2048);
bytes = sizeof_dsa_key_der_2048; bytes = sizeof_dsa_key_der_2048;
#endif #else
byte tmp[TWOK_BUF];
XMEMSET(tmp, 0, sizeof(tmp));
FILE* fp = fopen("./certs/dsa2048.der", "rb");
if (!fp) {
return SSL_BAD_FILE;
}
bytes = (word32) fread(tmp, 1, sizeof(tmp), fp);
fclose(fp);
#endif /* END USE_CERT_BUFFERS_1024 */
ret = wc_InitSha(&sha); ret = wc_InitSha(&sha);
if (ret == 0) { if (ret == 0) {
@ -8646,8 +8654,7 @@ static int test_wc_DsaPublicPrivateKeyDecode (void)
{ {
int ret = 0; int ret = 0;
#if !defined(NO_DSA) && (defined(USE_CERT_BUFFERS_1024)\ #if !defined(NO_DSA)
|| defined(USE_CERT_BUFFERS_2048))
DsaKey key; DsaKey key;
word32 bytes; word32 bytes;
word32 idx = 0; word32 idx = 0;
@ -8658,11 +8665,20 @@ static int test_wc_DsaPublicPrivateKeyDecode (void)
byte tmp[ONEK_BUF]; byte tmp[ONEK_BUF];
XMEMCPY(tmp, dsa_key_der_1024, sizeof_dsa_key_der_1024); XMEMCPY(tmp, dsa_key_der_1024, sizeof_dsa_key_der_1024);
bytes = sizeof_dsa_key_der_1024; bytes = sizeof_dsa_key_der_1024;
#else #elif defined(USE_CERT_BUFFERS_2048)
byte tmp[TWOK_BUF]; byte tmp[TWOK_BUF];
XMEMCPY(tmp, dsa_key_der_2048, sizeof_dsa_key_der_2048); XMEMCPY(tmp, dsa_key_der_2048, sizeof_dsa_key_der_2048);
bytes = sizeof_dsa_key_der_2048; bytes = sizeof_dsa_key_der_2048;
#endif #else
byte tmp[TWOK_BUF];
XMEMSET(tmp, 0, sizeof(tmp));
FILE* fp = fopen("./certs/dsa2048.der", "rb");
if (!fp) {
return SSL_BAD_FILE;
}
bytes = (word32) fread(tmp, 1, sizeof(tmp), fp);
fclose(fp);
#endif /* END USE_CERT_BUFFERS_1024 */
ret = wc_InitDsaKey(&key); ret = wc_InitDsaKey(&key);
@ -8802,8 +8818,7 @@ static int test_wc_DsaKeyToDer (void)
{ {
int ret = 0; int ret = 0;
#if !defined(NO_DSA) && defined(WOLFSSL_KEY_GEN)\ #if !defined(NO_DSA) && defined(WOLFSSL_KEY_GEN)
&& ( defined(USE_CERT_BUFFERS_1024) || defined(USE_CERT_BUFFERS_2048) )
DsaKey genKey; DsaKey genKey;
WC_RNG rng; WC_RNG rng;
word32 bytes; word32 bytes;
@ -8816,14 +8831,25 @@ static int test_wc_DsaKeyToDer (void)
XMEMSET(der, 0, sizeof(der)); XMEMSET(der, 0, sizeof(der));
XMEMCPY(tmp, dsa_key_der_1024, sizeof_dsa_key_der_1024); XMEMCPY(tmp, dsa_key_der_1024, sizeof_dsa_key_der_1024);
bytes = sizeof_dsa_key_der_1024; bytes = sizeof_dsa_key_der_1024;
#else #elif defined(USE_CERT_BUFFERS_2048)
byte tmp[TWOK_BUF]; byte tmp[TWOK_BUF];
byte der[TWOK_BUF]; byte der[TWOK_BUF];
XMEMSET(tmp, 0, sizeof(tmp)); XMEMSET(tmp, 0, sizeof(tmp));
XMEMSET(der, 0, sizeof(der)); XMEMSET(der, 0, sizeof(der));
XMEMCPY(tmp, dsa_key_der_2048, sizeof_dsa_key_der_2048); XMEMCPY(tmp, dsa_key_der_2048, sizeof_dsa_key_der_2048);
bytes = sizeof_dsa_key_der_2048; bytes = sizeof_dsa_key_der_2048;
#endif #else
byte tmp[TWOK_BUF];
byte der[TWOK_BUF];
XMEMSET(tmp, 0, sizeof(tmp));
XMEMSET(der, 0, sizeof(der));
FILE* fp = fopen("./certs/dsa2048.der", "rb");
if (!fp) {
return SSL_BAD_FILE;
}
bytes = (word32) fread(tmp, 1, sizeof(tmp), fp);
fclose(fp);
#endif /* END USE_CERT_BUFFERS_1024 */
ret = wc_InitRng(&rng); ret = wc_InitRng(&rng);
if (ret == 0) { if (ret == 0) {