mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2027 from dgarske/fix_buildopts

Browse Source 
Fixes for various build options and warnings
This commit is contained in:
toddouska 2019-01-16 10:32:19 -08:00 committed by GitHub
commit 5d262e9123
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 57 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cyassl/ctaocrypt/settings.h
View File

@ -184,7 +184,7 @@
#ifdef MBED #ifdef MBED
#define CYASSL_USER_IO #define CYASSL_USER_IO
#define NO_FILESYSTEM #define NO_FILESYSTEM
#define NO_CERT #define NO_CERTS
#define USE_CERT_BUFFERS_1024 #define USE_CERT_BUFFERS_1024
#define NO_WRITEV #define NO_WRITEV
#define NO_DEV_RANDOM #define NO_DEV_RANDOM

2
src/internal.c
View File

@ -18194,8 +18194,8 @@ static int DoServerKeyExchange(WOLFSSL* ssl, const byte* input,
args->idx += length; args->idx += length;
ssl->peerEccKeyPresent = 1; ssl->peerEccKeyPresent = 1;
break;
#endif #endif
break;
} }
#endif /* HAVE_ECC || HAVE_CURVE25519 */ #endif /* HAVE_ECC || HAVE_CURVE25519 */
#if !defined(NO_DH) && !defined(NO_PSK) #if !defined(NO_DH) && !defined(NO_PSK)

4
src/ssl.c
View File

@ -30919,7 +30919,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
{ OCSP_NONCE_OID, OCSP_NONCE_OID, oidOcspType, "OCSP_nonce" }, { OCSP_NONCE_OID, OCSP_NONCE_OID, oidOcspType, "OCSP_nonce" },
#endif /* HAVE_OCSP */ #endif /* HAVE_OCSP */
#ifndef NO_CERT #ifndef NO_CERTS
/* oidCertExtType */ /* oidCertExtType */
{ BASIC_CA_OID, BASIC_CA_OID, oidCertExtType, "X509 basic ca" }, { BASIC_CA_OID, BASIC_CA_OID, oidCertExtType, "X509 basic ca" },
{ ALT_NAMES_OID, ALT_NAMES_OID, oidCertExtType, "X509 alt names" }, { ALT_NAMES_OID, ALT_NAMES_OID, oidCertExtType, "X509 alt names" },
@ -35791,7 +35791,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_d2i_AutoPrivateKey(WOLFSSL_EVP_PKEY** pkey,
} }
#endif #endif
#if defined(OPENSSL_ALL) && !defined(NO_CERT) && defined(WOLFSSL_CERT_GEN) && \ #if defined(OPENSSL_ALL) && !defined(NO_CERTS) && defined(WOLFSSL_CERT_GEN) && \
defined(WOLFSSL_CERT_REQ) defined(WOLFSSL_CERT_REQ)
int wolfSSL_i2d_X509_REQ(WOLFSSL_X509* req, unsigned char** out) int wolfSSL_i2d_X509_REQ(WOLFSSL_X509* req, unsigned char** out)
{ {

4
src/tls.c
View File

@ -9453,7 +9453,7 @@ int TLSX_WriteRequest(WOLFSSL* ssl, byte* output, byte msgType, word16* pOffset)
#endif #endif
} }
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
#ifndef NO_CERT #ifndef NO_CERTS
else if (msgType == certificate_request) { else if (msgType == certificate_request) {
XMEMSET(semaphore, 0xff, SEMAPHORE_SIZE); XMEMSET(semaphore, 0xff, SEMAPHORE_SIZE);
TURN_OFF(semaphore, TLSX_ToSemaphore(TLSX_SIGNATURE_ALGORITHMS)); TURN_OFF(semaphore, TLSX_ToSemaphore(TLSX_SIGNATURE_ALGORITHMS));
@ -9579,7 +9579,7 @@ int TLSX_GetResponseSize(WOLFSSL* ssl, byte msgType, word16* pLength)
#endif #endif
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
#ifndef NO_CERT #ifndef NO_CERTS
case certificate: case certificate:
XMEMSET(semaphore, 0xff, SEMAPHORE_SIZE); XMEMSET(semaphore, 0xff, SEMAPHORE_SIZE);
TURN_OFF(semaphore, TLSX_ToSemaphore(TLSX_STATUS_REQUEST)); TURN_OFF(semaphore, TLSX_ToSemaphore(TLSX_STATUS_REQUEST));

12
tests/api.c
View File

@ -21364,7 +21364,7 @@ static void test_CheckCertSignature(void)
{ {
#if !defined(NO_CERTS) && defined(WOLFSSL_SMALL_CERT_VERIFY) #if !defined(NO_CERTS) && defined(WOLFSSL_SMALL_CERT_VERIFY)
WOLFSSL_CERT_MANAGER* cm = NULL; WOLFSSL_CERT_MANAGER* cm = NULL;
#if !defined(NO_FILESYSTEM) #if !defined(NO_FILESYSTEM) && (!defined(NO_RSA) || defined(HAVE_ECC))
FILE* fp; FILE* fp;
byte cert[4096]; byte cert[4096];
int certSz; int certSz;
@ -21427,6 +21427,10 @@ static void test_CheckCertSignature(void)
#endif #endif
#endif #endif
(void)fp;
(void)cert;
(void)certSz;
wolfSSL_CertManagerFree(cm); wolfSSL_CertManagerFree(cm);
#endif #endif
} }
@ -21613,7 +21617,7 @@ static void test_EVP_PKEY_ec(void)
#endif #endif
} }
#if defined(OPENSSL_ALL) && !defined(NO_CERT) #if defined(OPENSSL_ALL) && !defined(NO_CERTS)
static void free_x509(X509* x) static void free_x509(X509* x)
{ {
AssertIntEQ((x == (X509*)1 || x == (X509*)2), 1); AssertIntEQ((x == (X509*)1 || x == (X509*)2), 1);
@ -21622,7 +21626,7 @@ static void free_x509(X509* x)
static void test_sk_X509(void) static void test_sk_X509(void)
{ {
#if defined(OPENSSL_ALL) && !defined(NO_CERT) #if defined(OPENSSL_ALL) && !defined(NO_CERTS)
STACK_OF(X509)* s; STACK_OF(X509)* s;
AssertNotNull(s = sk_X509_new()); AssertNotNull(s = sk_X509_new());
@ -21661,7 +21665,7 @@ static void test_X509_get_signature_nid(void)
static void test_X509_REQ(void) static void test_X509_REQ(void)
{ {
#if defined(OPENSSL_ALL) && !defined(NO_CERT) && defined(WOLFSSL_CERT_GEN) && \ #if defined(OPENSSL_ALL) && !defined(NO_CERTS) && defined(WOLFSSL_CERT_GEN) && \
defined(WOLFSSL_CERT_REQ) defined(WOLFSSL_CERT_REQ)
X509_NAME* name; X509_NAME* name;
#if !defined(NO_RSA) || defined(HAVE_ECC) #if !defined(NO_RSA) || defined(HAVE_ECC)

24
wolfcrypt/benchmark/benchmark.c
View File

@ -572,7 +572,7 @@ static const char* bench_desc_words[][9] = {
#endif #endif
#endif #endif
#if (!defined(NO_RSA) && !defined(WOLFSSL_RSA_PUBLIC_ONLY)) || !defined(NO_DH) \ #if (!defined(NO_RSA) && !defined(WOLFSSL_RSA_VERIFY_ONLY)) || !defined(NO_DH) \
|| defined(WOLFSSL_KEYGEN) || defined(HAVE_ECC) \ || defined(WOLFSSL_KEYGEN) || defined(HAVE_ECC) \
|| defined(HAVE_CURVE25519) || defined(HAVE_ED25519) || defined(HAVE_CURVE25519) || defined(HAVE_ED25519)
#define HAVE_LOCAL_RNG #define HAVE_LOCAL_RNG
@ -4187,12 +4187,15 @@ void bench_rsa(int doAsync)
goto exit_bench_rsa; goto exit_bench_rsa;
} }
#ifndef WOLFSSL_RSA_VERIFY_ONLY
#ifdef WC_RSA_BLINDING #ifdef WC_RSA_BLINDING
ret = wc_RsaSetRNG(&rsaKey[i], &rng); ret = wc_RsaSetRNG(&rsaKey[i], &rng);
if (ret != 0) if (ret != 0)
goto exit_bench_rsa; goto exit_bench_rsa;
#endif #endif
#endif
#ifndef WOLFSSL_RSA_PUBLIC_ONLY
/* decode the private key */ /* decode the private key */
idx = 0; idx = 0;
if ((ret = wc_RsaPrivateKeyDecode(tmp, &idx, &rsaKey[i], if ((ret = wc_RsaPrivateKeyDecode(tmp, &idx, &rsaKey[i],
@ -4200,6 +4203,25 @@ void bench_rsa(int doAsync)
printf("wc_RsaPrivateKeyDecode failed! %d\n", ret); printf("wc_RsaPrivateKeyDecode failed! %d\n", ret);
goto exit_bench_rsa; goto exit_bench_rsa;
} }
#else
#ifdef USE_CERT_BUFFERS_2048
ret = mp_read_unsigned_bin(&rsaKey[i].n, &tmp[12], 256);
if (ret != 0) {
printf("wc_RsaPrivateKeyDecode failed! %d\n", ret);
goto exit_bench_rsa;
}
ret = mp_set_int(&rsaKey[i].e, WC_RSA_EXPONENT);
if (ret != 0) {
printf("wc_RsaPrivateKeyDecode failed! %d\n", ret);
goto exit_bench_rsa;
}
#else
#error Not supported yet!
#endif
(void)idx;
(void)bytes;
#endif
} }
bench_rsa_helper(doAsync, rsaKey, rsaKeySz); bench_rsa_helper(doAsync, rsaKey, rsaKeySz);

4
wolfcrypt/src/memory.c
View File

@ -1012,7 +1012,7 @@ void *xmalloc(size_t n, void* heap, int type, const char* func,
else else
p32 = malloc(n + sizeof(word32) * 4); p32 = malloc(n + sizeof(word32) * 4);
p32[0] = n; p32[0] = (word32)n;
p = (void*)(p32 + 4); p = (void*)(p32 + 4);
fprintf(stderr, "Alloc: %p -> %u (%d) at %s:%s:%d\n", p, (word32)n, type, fprintf(stderr, "Alloc: %p -> %u (%d) at %s:%s:%d\n", p, (word32)n, type,
@ -1042,7 +1042,7 @@ void *xrealloc(void *p, size_t n, void* heap, int type, const char* func,
p32 = realloc(oldp32, n + sizeof(word32) * 4); p32 = realloc(oldp32, n + sizeof(word32) * 4);
if (p32 != NULL) { if (p32 != NULL) {
p32[0] = n; p32[0] = (word32)n;
newp = (void*)(p32 + 4); newp = (void*)(p32 + 4);
fprintf(stderr, "Alloc: %p -> %u (%d) at %s:%s:%d\n", newp, (word32)n, fprintf(stderr, "Alloc: %p -> %u (%d) at %s:%s:%d\n", newp, (word32)n,

2
wolfcrypt/src/rsa.c
View File

@ -2807,7 +2807,7 @@ int wc_RsaPSS_Sign_ex(const byte* in, word32 inLen, byte* out, word32 outLen,
#endif #endif
#endif #endif
#if !defined(WOLFSSL_RSA_PUBLIC_ONLY) || !defined(WOLFSSL_SP_MATH) #if !defined(WOLFSSL_RSA_VERIFY_ONLY) || !defined(WOLFSSL_SP_MATH)
int wc_RsaEncryptSize(RsaKey* key) int wc_RsaEncryptSize(RsaKey* key)
{ {
int ret; int ret;

26
wolfcrypt/src/sp_int.c
View File

@ -52,7 +52,7 @@ int sp_init(sp_int* a)
return MP_OKAY; return MP_OKAY;
} }
#if !defined(WOLFSSL_RSA_PUBLIC_ONLY) && (!defined(NO_DH) || defined(HAVE_ECC)) #if !defined(WOLFSSL_RSA_PUBLIC_ONLY) || (!defined(NO_DH) || defined(HAVE_ECC))
/* Initialize up to six big numbers to be zero. /* Initialize up to six big numbers to be zero.
* *
* a SP integer. * a SP integer.
@ -288,7 +288,7 @@ int sp_leading_bit(sp_int* a)
return bit; return bit;
} }
#if !defined(WOLFSSL_RSA_VERIFY_ONLY) && (!defined(NO_DH) || defined(HAVE_ECC)) #if !defined(WOLFSSL_RSA_VERIFY_ONLY) || (!defined(NO_DH) || defined(HAVE_ECC))
/* Convert the big number to an array of bytes in big-endian format. /* Convert the big number to an array of bytes in big-endian format.
* The array must be large enough for encoded number - use mp_unsigned_bin_size * The array must be large enough for encoded number - use mp_unsigned_bin_size
* to calculate the number of bytes required. * to calculate the number of bytes required.
@ -340,7 +340,7 @@ int sp_to_unsigned_bin_len(sp_int* a, byte* out, int outSz)
return MP_OKAY; return MP_OKAY;
} }
#if !defined(WOLFSSL_RSA_PUBLIC_ONLY) && (!defined(NO_DH) || defined(HAVE_ECC)) #if !defined(WOLFSSL_RSA_PUBLIC_ONLY) || (!defined(NO_DH) || defined(HAVE_ECC))
/* Ensure the data in the big number is zeroed. /* Ensure the data in the big number is zeroed.
* *
* a SP integer. * a SP integer.
@ -350,7 +350,9 @@ void sp_forcezero(sp_int* a)
ForceZero(a->dp, a->used * sizeof(sp_int_digit)); ForceZero(a->dp, a->used * sizeof(sp_int_digit));
a->used = 0; a->used = 0;
} }
#endif
#if !defined(WOLFSSL_RSA_VERIFY_ONLY) || (!defined(NO_DH) || defined(HAVE_ECC))
/* Copy value of big number a into b. /* Copy value of big number a into b.
* *
* a SP integer. * a SP integer.
@ -380,7 +382,7 @@ int sp_set(sp_int* a, sp_int_digit d)
return MP_OKAY; return MP_OKAY;
} }
#if !defined(NO_DH) || defined(HAVE_ECC) #if defined(WC_MP_TO_RADIX) || !defined(NO_DH) || defined(HAVE_ECC)
/* Checks whether the value of the big number is zero. /* Checks whether the value of the big number is zero.
* *
* a SP integer. * a SP integer.
@ -392,7 +394,7 @@ int sp_iszero(sp_int* a)
} }
#endif #endif
#if !defined(WOLFSSL_RSA_VERIFY_ONLY) && (!defined(NO_DH) || defined(HAVE_ECC)) #if !defined(WOLFSSL_RSA_VERIFY_ONLY) || (!defined(NO_DH) || defined(HAVE_ECC))
/* Recalculate the number of digits used. /* Recalculate the number of digits used.
* *
* a SP integer. * a SP integer.
@ -477,7 +479,7 @@ int sp_cmp_d(sp_int *a, sp_int_digit d)
return MP_EQ; return MP_EQ;
} }
#if !defined(WOLFSSL_RSA_VERIFY_ONLY) && (!defined(NO_DH) || defined(HAVE_ECC)) #if !defined(WOLFSSL_RSA_VERIFY_ONLY) || (!defined(NO_DH) || defined(HAVE_ECC))
/* Left shift the number by number of bits. /* Left shift the number by number of bits.
* Bits may be larger than the word size. * Bits may be larger than the word size.
* *
@ -618,7 +620,7 @@ int sp_add_d(sp_int* a, sp_int_digit d, sp_int* r)
return MP_OKAY; return MP_OKAY;
} }
#if !defined(WOLFSSL_RSA_VERIFY_ONLY) && (!defined(NO_DH) || defined(HAVE_ECC)) #if !defined(WOLFSSL_RSA_VERIFY_ONLY) || (!defined(NO_DH) || defined(HAVE_ECC))
/* Left shift the big number by a number of digits. /* Left shift the big number by a number of digits.
* WIll chop off digits overflowing maximum size. * WIll chop off digits overflowing maximum size.
* *
@ -674,7 +676,7 @@ int sp_add(sp_int* a, sp_int* b, sp_int* r)
return MP_OKAY; return MP_OKAY;
} }
#endif /* NO_PWDBASED */ #endif /* NO_PWDBASED */
#endif #endif /* !WOLFSSL_RSA_VERIFY_ONLY || (!NO_DH || HAVE_ECC) */
#ifndef NO_RSA #ifndef NO_RSA
/* Set a number into the big number. /* Set a number into the big number.
@ -690,7 +692,7 @@ int sp_set_int(sp_int* a, unsigned long b)
return MP_OKAY; return MP_OKAY;
} }
#endif #endif /* !NO_RSA */
#ifdef WC_MP_TO_RADIX #ifdef WC_MP_TO_RADIX
/* Hex string characters. */ /* Hex string characters. */
@ -731,7 +733,7 @@ int sp_tohex(sp_int* a, char* str)
return MP_OKAY; return MP_OKAY;
} }
#endif #endif /* WC_MP_TO_RADIX */
#if !defined(USE_FAST_MATH) #if !defined(USE_FAST_MATH)
/* Returns the run time settings. /* Returns the run time settings.
@ -742,7 +744,7 @@ word32 CheckRunTimeSettings(void)
{ {
return CTC_SETTINGS; return CTC_SETTINGS;
} }
#endif #endif /* !USE_FAST_MATH */
#endif #endif /* WOLFSSL_SP_MATH */

4
wolfcrypt/test/test.c
View File

@ -9024,7 +9024,7 @@ int certext_test(void)
} }
#endif /* WOLFSSL_CERT_EXT && WOLFSSL_TEST_CERT */ #endif /* WOLFSSL_CERT_EXT && WOLFSSL_TEST_CERT */
#if !defined(NO_ASN) && !defined(WOLFSSL_RSA_VERIFY_ONLY) #if !defined(NO_ASN) && !defined(WOLFSSL_RSA_PUBLIC_ONLY)
static int rsa_flatten_test(RsaKey* key) static int rsa_flatten_test(RsaKey* key)
{ {
int ret; int ret;
@ -10903,7 +10903,7 @@ int rsa_test(void)
if (ret != 0) { if (ret != 0) {
ERROR_OUT(-7004, exit_rsa); ERROR_OUT(-7004, exit_rsa);
} }
#elif defined(WOLFSSL_RSA_VERIFY_ONLY) #elif defined(WOLFSSL_RSA_PUBLIC_ONLY)
#ifdef USE_CERT_BUFFERS_2048 #ifdef USE_CERT_BUFFERS_2048
ret = mp_read_unsigned_bin(&key.n, &tmp[12], 256); ret = mp_read_unsigned_bin(&key.n, &tmp[12], 256);
if (ret != 0) { if (ret != 0) {

2
wolfssl/wolfcrypt/settings.h
View File

@ -325,7 +325,7 @@
#ifdef MBED #ifdef MBED
#define WOLFSSL_USER_IO #define WOLFSSL_USER_IO
#define NO_FILESYSTEM #define NO_FILESYSTEM
#define NO_CERT #define NO_CERTS
#if !defined(USE_CERT_BUFFERS_2048) && !defined(USE_CERT_BUFFERS_4096) #if !defined(USE_CERT_BUFFERS_2048) && !defined(USE_CERT_BUFFERS_4096)
#define USE_CERT_BUFFERS_1024 #define USE_CERT_BUFFERS_1024
#endif #endif