diff options
| author | Amitay Isaacs <amitay@ozlabs.org> | 2021-03-29 18:20:53 +1100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2021-04-08 12:18:09 +0100 |
| commit | 5de32f22e731ea151e1c5aac7703cde2573cb4a4 (patch) | |
| tree | 19a9a93e24ec4ca4f516e248391dcb3e87801c44 /crypto/bn | |
| parent | bbed0d1cbd436af6797d7837e270bff4ca4d5a10 (diff) | |
Use numbers definition of int128_t and uint128_t
Signed-off-by: Amitay Isaacs <amitay@ozlabs.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14784)
Diffstat (limited to 'crypto/bn')
| -rw-r--r-- | crypto/bn/bn_div.c | 2 | ||||
| -rw-r--r-- | crypto/bn/bn_local.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/crypto/bn/bn_div.c b/crypto/bn/bn_div.c index cf4309cdf4..b486e3411a 100644 --- a/crypto/bn/bn_div.c +++ b/crypto/bn/bn_div.c @@ -97,7 +97,7 @@ BN_ULONG bn_div_3_words(const BN_ULONG *m, BN_ULONG d1, BN_ULONG d0); */ # if BN_BITS2 == 64 && defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16 # undef BN_ULLONG -# define BN_ULLONG __uint128_t +# define BN_ULLONG uint128_t # define BN_LLONG # endif diff --git a/crypto/bn/bn_local.h b/crypto/bn/bn_local.h index e93b7e9a0b..30863713d6 100644 --- a/crypto/bn/bn_local.h +++ b/crypto/bn/bn_local.h @@ -23,6 +23,7 @@ # include "crypto/bn.h" # include "internal/cryptlib.h" +# include "internal/numbers.h" /* * These preprocessor symbols control various aspects of the bignum headers @@ -375,9 +376,9 @@ struct bn_gencb_st { */ # if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16 && \ (defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)) -# define BN_UMULT_HIGH(a,b) (((__uint128_t)(a)*(b))>>64) +# define BN_UMULT_HIGH(a,b) (((uint128_t)(a)*(b))>>64) # define BN_UMULT_LOHI(low,high,a,b) ({ \ - __uint128_t ret=(__uint128_t)(a)*(b); \ + uint128_t ret=(uint128_t)(a)*(b); \ (high)=ret>>64; (low)=ret; }) # elif defined(__alpha) && (defined(SIXTY_FOUR_BIT_LONG) || defined(SIXTY_FOUR_BIT)) # if defined(__DECC) |