From 95092696bff9a4a5e7c5eca39b6e40bfe7f2addf Mon Sep 17 00:00:00 2001 From: David Garske Date: Tue, 6 Nov 2018 08:38:47 -0800 Subject: [PATCH] Fix to make sure `mp_toradix` and `mp_radix_size` are included for `OPENSSL_EXTRA`. --- wolfcrypt/src/integer.c | 2 +- wolfcrypt/src/tfm.c | 2 +- wolfssl/wolfcrypt/types.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wolfcrypt/src/integer.c b/wolfcrypt/src/integer.c index 358561c7b..5dbe641c1 100644 --- a/wolfcrypt/src/integer.c +++ b/wolfcrypt/src/integer.c @@ -4835,7 +4835,7 @@ LBL_U:mp_clear (&v); #if !defined(NO_DSA) || defined(HAVE_ECC) || defined(WOLFSSL_KEY_GEN) || \ defined(HAVE_COMP_KEY) || defined(WOLFSSL_DEBUG_MATH) || \ - defined(DEBUG_WOLFSSL) + defined(DEBUG_WOLFSSL) || defined(OPENSSL_EXTRA) /* chars used in radix conversions */ const char *mp_s_rmap = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ\ diff --git a/wolfcrypt/src/tfm.c b/wolfcrypt/src/tfm.c index 6ee58c0b6..567229ca3 100644 --- a/wolfcrypt/src/tfm.c +++ b/wolfcrypt/src/tfm.c @@ -3721,7 +3721,7 @@ int mp_add_d(fp_int *a, fp_digit b, fp_int *c) #if !defined(NO_DSA) || defined(HAVE_ECC) || defined(WOLFSSL_KEY_GEN) || \ defined(HAVE_COMP_KEY) || defined(WOLFSSL_DEBUG_MATH) || \ - defined(DEBUG_WOLFSSL) + defined(DEBUG_WOLFSSL) || defined(OPENSSL_EXTRA) /* chars used in radix conversions */ static const char* const fp_s_rmap = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ" diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h index 5008b181f..ba06dd266 100644 --- a/wolfssl/wolfcrypt/types.h +++ b/wolfssl/wolfcrypt/types.h @@ -753,7 +753,7 @@ #if defined(WOLFSSL_KEY_GEN) || defined(HAVE_COMP_KEY) || \ defined(WOLFSSL_DEBUG_MATH) || defined(DEBUG_WOLFSSL) || \ - defined(WOLFSSL_PUBLIC_MP) || \ + defined(WOLFSSL_PUBLIC_MP) || defined(OPENSSL_EXTRA) || \ (defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT)) #undef WC_MP_TO_RADIX #define WC_MP_TO_RADIX