Make format strings for bignums, like |BN_DEC_FMT1|, visible. Change-Id: If9641b3367a2bc155d97fe4ee72eb971b088bae0 Reviewed-on: https://boringssl-review.googlesource.com/4602 Reviewed-by: Adam Langley <agl@google.com>
diff --git a/crypto/bn/internal.h b/crypto/bn/internal.h index a239ea2..ed3416a 100644 --- a/crypto/bn/internal.h +++ b/crypto/bn/internal.h
@@ -131,8 +131,6 @@ #define __STDC_FORMAT_MACROS #endif -#include <inttypes.h> - #if defined(OPENSSL_X86_64) && defined(_MSC_VER) && _MSC_VER >= 1400 #pragma warning(push, 3) #include <intrin.h> @@ -167,10 +165,7 @@ #define BN_MASK2h1 (0xffffffff80000000L) #define BN_TBIT (0x8000000000000000L) #define BN_DEC_CONV (10000000000000000000UL) -#define BN_DEC_FMT1 "%" PRIu64 -#define BN_DEC_FMT2 "%019" PRIu64 #define BN_DEC_NUM 19 -#define BN_HEX_FMT1 "%" PRIx64 #elif defined(OPENSSL_32_BIT) @@ -187,10 +182,7 @@ #define BN_MASK2h (0xffff0000L) #define BN_TBIT (0x80000000L) #define BN_DEC_CONV (1000000000L) -#define BN_DEC_FMT1 "%" PRIu32 -#define BN_DEC_FMT2 "%09" PRIu32 #define BN_DEC_NUM 9 -#define BN_HEX_FMT1 "%" PRIx32 #else #error "Must define either OPENSSL_32_BIT or OPENSSL_64_BIT"
diff --git a/include/openssl/bn.h b/include/openssl/bn.h index 917beaf..18aba5f 100644 --- a/include/openssl/bn.h +++ b/include/openssl/bn.h
@@ -126,6 +126,7 @@ #include <openssl/base.h> #include <openssl/thread.h> +#include <inttypes.h> /* for PRIu64 and friends */ #include <stdio.h> /* for FILE* */ #if defined(__cplusplus) @@ -142,9 +143,15 @@ #if defined(OPENSSL_64_BIT) #define BN_ULONG uint64_t #define BN_BITS2 64 +#define BN_DEC_FMT1 "%" PRIu64 +#define BN_DEC_FMT2 "%019" PRIu64 +#define BN_HEX_FMT1 "%" PRIx64 #elif defined(OPENSSL_32_BIT) #define BN_ULONG uint32_t #define BN_BITS2 32 +#define BN_DEC_FMT1 "%" PRIu32 +#define BN_DEC_FMT2 "%09" PRIu32 +#define BN_HEX_FMT1 "%" PRIx32 #else #error "Must define either OPENSSL_32_BIT or OPENSSL_64_BIT" #endif