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

Cleanup of some macro logic for enabling the mp_toradix.

Browse Source
This commit is contained in:
David Garske
2018-08-14 12:58:00 -06:00
parent be33e69b22
commit 1c297b3ac4
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wolfcrypt/src/integer.c
View File

@@ -4913,10 +4913,7 @@ int mp_read_radix (mp_int * a, const char *str, int radix)
} }
#endif /* !defined(NO_DSA) || defined(HAVE_ECC) */ #endif /* !defined(NO_DSA) || defined(HAVE_ECC) */
#if defined(WOLFSSL_KEY_GEN) || defined(HAVE_COMP_KEY) || \ #ifdef WC_MP_TO_RADIX
defined(WOLFSSL_DEBUG_MATH) || defined(DEBUG_WOLFSSL) || \
defined(WOLFSSL_PUBLIC_MP) || \
(defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT))
/* returns size of ASCII representation */ /* returns size of ASCII representation */
int mp_radix_size (mp_int *a, int radix, int *size) int mp_radix_size (mp_int *a, int radix, int *size)
@@ -5056,7 +5053,7 @@ void mp_dump(const char* desc, mp_int* a, byte verbose)
} }
#endif /* WOLFSSL_DEBUG_MATH */ #endif /* WOLFSSL_DEBUG_MATH */
#endif /* defined(WOLFSSL_KEY_GEN) || defined(HAVE_COMP_KEY) || defined(WOLFSSL_DEBUG_MATH) */ #endif /* WC_MP_TO_RADIX */
#endif /* WOLFSSL_SP_MATH */ #endif /* WOLFSSL_SP_MATH */

18
wolfcrypt/src/tfm.c
View File

@@ -2606,10 +2606,8 @@ int mp_montgomery_calc_normalization(mp_int *a, mp_int *b)
#endif /* WOLFSSL_KEYGEN || HAVE_ECC */ #endif /* WOLFSSL_KEYGEN || HAVE_ECC */
#if defined(WOLFSSL_KEY_GEN) || defined(HAVE_COMP_KEY) || \ #if defined(WC_MP_TO_RADIX) || !defined(NO_DH) || !defined(NO_DSA) || \
defined(WOLFSSL_DEBUG_MATH) || defined(DEBUG_WOLFSSL) || \ !defined(NO_RSA)
defined(WOLFSSL_PUBLIC_MP) || !defined(NO_DH) || !defined(NO_DSA) || \
!defined(NO_RSA) || (defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT))
#ifdef WOLFSSL_KEY_GEN #ifdef WOLFSSL_KEY_GEN
/* swap the elements of two integers, for cases where you can't simply swap the /* swap the elements of two integers, for cases where you can't simply swap the
@@ -2755,10 +2753,11 @@ int mp_mod_d(fp_int *a, fp_digit b, fp_digit *c)
return fp_mod_d(a, b, c); return fp_mod_d(a, b, c);
} }
#endif /* defined(WOLFSSL_KEY_GEN) || defined(HAVE_COMP_KEY) || defined(WOLFSSL_DEBUG_MATH) */ #endif /* WC_MP_TO_RADIX || !NO_DH || !NO_DSA || !NO_RSA */
#if !defined(NO_DH) || !defined(NO_DSA) || !defined(NO_RSA) || defined(WOLFSSL_KEY_GEN) #if !defined(NO_DH) || !defined(NO_DSA) || !defined(NO_RSA) || \
defined(WOLFSSL_KEY_GEN)
static int fp_isprime_ex(fp_int *a, int t); static int fp_isprime_ex(fp_int *a, int t);
/* static int fp_isprime(fp_int *a); */ /* static int fp_isprime(fp_int *a); */
@@ -3368,10 +3367,7 @@ int mp_set(fp_int *a, fp_digit b)
} }
#endif #endif
#if defined(WOLFSSL_KEY_GEN) || defined(HAVE_COMP_KEY) || \ #ifdef WC_MP_TO_RADIX
defined(WOLFSSL_DEBUG_MATH) || defined(DEBUG_WOLFSSL) || \
defined(WOLFSSL_PUBLIC_MP) || \
(defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT))
/* returns size of ASCII representation */ /* returns size of ASCII representation */
int mp_radix_size (mp_int *a, int radix, int *size) int mp_radix_size (mp_int *a, int radix, int *size)
@@ -3505,7 +3501,7 @@ void mp_dump(const char* desc, mp_int* a, byte verbose)
} }
#endif /* WOLFSSL_DEBUG_MATH */ #endif /* WOLFSSL_DEBUG_MATH */
#endif /* defined(WOLFSSL_KEY_GEN) || defined(HAVE_COMP_KEY) || defined(WOLFSSL_DEBUG_MATH) */ #endif /* WC_MP_TO_RADIX */
int mp_abs(mp_int* a, mp_int* b) int mp_abs(mp_int* a, mp_int* b)

4
wolfcrypt/src/wolfmath.c
View File

@@ -171,7 +171,11 @@ int wc_export_int(mp_int* mp, byte* buf, word32* len, word32 keySz,
XMEMSET(buf, 0, *len); XMEMSET(buf, 0, *len);
if (encType == WC_TYPE_HEX_STR) { if (encType == WC_TYPE_HEX_STR) {
#ifdef WC_MP_TO_RADIX
err = mp_tohex(mp, (char*)buf); err = mp_tohex(mp, (char*)buf);
#else
err = NOT_COMPILED_IN;
#endif
} }
else { else {
err = mp_to_unsigned_bin(mp, buf + (keySz - mp_unsigned_bin_size(mp))); err = mp_to_unsigned_bin(mp, buf + (keySz - mp_unsigned_bin_size(mp)));

7
wolfssl/wolfcrypt/types.h
View File

@@ -712,6 +712,13 @@
#define WC_NORETURN #define WC_NORETURN
#endif #endif
#if defined(WOLFSSL_KEY_GEN) || defined(HAVE_COMP_KEY) || \
defined(WOLFSSL_DEBUG_MATH) || defined(DEBUG_WOLFSSL) || \
defined(WOLFSSL_PUBLIC_MP) || \
(defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT))
#undef WC_MP_TO_RADIX
#define WC_MP_TO_RADIX
#endif
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */