Try to clean the maze of <openssl/bn.h> defines regarding the BN internals.

The intent of this change is to only keep support for two kind of architectures:
- those with 32-bit int and long, and 64-bit long long, where
  ``long * long -> long long'' multiplication routines are available.
- those with 64-bit int and long, and no 128-bit long long type.

This gets rid of the SIXTY_FOUR_BIT_LONG, SIXTY_FOUR_BIT (not the same!),
THIRTY_TWO_BIT, SIXTEEN_BIT and EIGHT_BIT defines.

After this change, the types and defines are as follows:

arch:           64bit           32bit           rationale
BN_LLONG        undefined       defined         defined if l * l -> ll
BN_ULLONG       undefined       u long long     result of BN_LONG * BN_LONG
BN_ULONG        u long          u int           native register size
BN_LONG         long            int             the same, signed
BN_BITS         128             64              size of 2*BN_ULONG in bits
BN_BYTES        8               4               size of 2*BN_ULONG in bytes
BN_BITS2        64              32              BN_BITS / 2

Tested on various 32-bit and 64-bit OpenBSD systems of various endianness.

1 files changed, 1 insertions, 28 deletions

diff --git a/src/lib/libcrypto/bn/bn_lib.c b/src/lib/libcrypto/bn/bn_lib.c
index c8de547ba5..9787a31dbb 100644
--- a/src/lib/libcrypto/bn/bn_lib.c
+++ b/src/lib/libcrypto/bn/bn_lib.c
@@ -160,7 +160,7 @@ int BN_num_bits_word(BN_ULONG l)
                 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
                 };
 
-#if defined(SIXTY_FOUR_BIT_LONG)
+#ifdef _LP64
         if (l & 0xffffffff00000000L)
                 {
                 if (l & 0xffff000000000000L)
@@ -181,32 +181,8 @@ int BN_num_bits_word(BN_ULONG l)
                         }
                 }
         else
-#else
-#ifdef SIXTY_FOUR_BIT
-        if (l & 0xffffffff00000000LL)
-                {
-                if (l & 0xffff000000000000LL)
-                        {
-                        if (l & 0xff00000000000000LL)
-                                {
-                                return(bits[(int)(l>>56)]+56);
-                                }
-                        else    return(bits[(int)(l>>48)]+48);
-                        }
-                else
-                        {
-                        if (l & 0x0000ff0000000000LL)
-                                {
-                                return(bits[(int)(l>>40)]+40);
-                                }
-                        else    return(bits[(int)(l>>32)]+32);
-                        }
-                }
-        else
-#endif
 #endif
                 {
-#if defined(THIRTY_TWO_BIT) || defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
                 if (l & 0xffff0000L)
                         {
                         if (l & 0xff000000L)
@@ -214,13 +190,10 @@ int BN_num_bits_word(BN_ULONG l)
                         else    return(bits[(int)(l>>16L)]+16);
                         }
                 else
-#endif
                         {
-#if defined(THIRTY_TWO_BIT) || defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
                         if (l & 0xff00L)
                                 return(bits[(int)(l>>8)]+8);
                         else    
-#endif
                                 return(bits[(int)(l   )]  );
                         }
                 }