Implement internally opaque bn access from srp

[openssl.git] / crypto / bn / bn_srp.c

diff --git a/crypto/srp/srp_grps.h b/crypto/bn/bn_srp.c
similarity index 94%
rename from crypto/srp/srp_grps.h
rename to crypto/bn/bn_srp.c
index 5babc40ae2adaa2a9c3fee4d74b2f5a066a7c8eb..0a9c2fd78bb8a5978a6ab9ec98113a856a321d3d 100644 (file)
--- a/crypto/srp/srp_grps.h
+++ b/crypto/bn/bn_srp.c
@@ -1,4 +1,20 @@
-/* start of generated data */
+#include "bn_lcl.h"
+
+#ifndef OPENSSL_NO_SRP
+
+#if (BN_BYTES == 8)
+# if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
+#  define bn_pack4(a1,a2,a3,a4) ((a1##UI64<<48)|(a2##UI64<<32)|(a3##UI64<<16)|a4##UI64)
+# elif defined(__arch64__)
+#  define bn_pack4(a1,a2,a3,a4) ((a1##UL<<48)|(a2##UL<<32)|(a3##UL<<16)|a4##UL)
+# else
+#  define bn_pack4(a1,a2,a3,a4) ((a1##ULL<<48)|(a2##ULL<<32)|(a3##ULL<<16)|a4##ULL)
+# endif
+#elif (BN_BYTES == 4)
+# define bn_pack4(a1,a2,a3,a4)  ((a3##UL<<16)|a4##UL), ((a1##UL<<16)|a2##UL)
+#else
+# error "unsupported BN_BYTES"
+#endif
 
 static const BN_ULONG bn_group_1024_value[] = {
        bn_pack4(0x9FC6,0x1D2F,0xC0EB,0x06E3),
@@ -18,7 +34,7 @@ static const BN_ULONG bn_group_1024_value[] = {
        bn_pack4(0x9C33,0xF80A,0xFA8F,0xC5E8),
        bn_pack4(0xEEAF,0x0AB9,0xADB3,0x8DD6)
 };
-static const BIGNUM bn_group_1024 = {
+const BIGNUM bn_group_1024 = {
        (BN_ULONG*)bn_group_1024_value,
        (sizeof bn_group_1024_value)/sizeof(BN_ULONG),
        (sizeof bn_group_1024_value)/sizeof(BN_ULONG),
@@ -52,7 +68,7 @@ static const BN_ULONG bn_group_1536_value[] = {
        bn_pack4(0xB1F1,0x2A86,0x17A4,0x7BBB),
        bn_pack4(0x9DEF,0x3CAF,0xB939,0x277A)
 };
-static const BIGNUM bn_group_1536 = {
+const BIGNUM bn_group_1536 = {
        (BN_ULONG*)bn_group_1536_value,
        (sizeof bn_group_1536_value)/sizeof(BN_ULONG),
        (sizeof bn_group_1536_value)/sizeof(BN_ULONG),
@@ -94,7 +110,7 @@ static const BN_ULONG bn_group_2048_value[] = {
        bn_pack4(0xF166,0xDE5E,0x1389,0x582F),
        bn_pack4(0xAC6B,0xDB41,0x324A,0x9A9B)
 };
-static const BIGNUM bn_group_2048 = {
+const BIGNUM bn_group_2048 = {
        (BN_ULONG*)bn_group_2048_value,
        (sizeof bn_group_2048_value)/sizeof(BN_ULONG),
        (sizeof bn_group_2048_value)/sizeof(BN_ULONG),
@@ -152,7 +168,7 @@ static const BN_ULONG bn_group_3072_value[] = {
        bn_pack4(0xC90F,0xDAA2,0x2168,0xC234),
        bn_pack4(0xFFFF,0xFFFF,0xFFFF,0xFFFF)
 };
-static const BIGNUM bn_group_3072 = {
+const BIGNUM bn_group_3072 = {
        (BN_ULONG*)bn_group_3072_value,
        (sizeof bn_group_3072_value)/sizeof(BN_ULONG),
        (sizeof bn_group_3072_value)/sizeof(BN_ULONG),
@@ -226,7 +242,7 @@ static const BN_ULONG bn_group_4096_value[] = {
        bn_pack4(0xC90F,0xDAA2,0x2168,0xC234),
        bn_pack4(0xFFFF,0xFFFF,0xFFFF,0xFFFF)
 };
-static const BIGNUM bn_group_4096 = {
+const BIGNUM bn_group_4096 = {
        (BN_ULONG*)bn_group_4096_value,
        (sizeof bn_group_4096_value)/sizeof(BN_ULONG),
        (sizeof bn_group_4096_value)/sizeof(BN_ULONG),
@@ -332,7 +348,7 @@ static const BN_ULONG bn_group_6144_value[] = {
        bn_pack4(0xC90F,0xDAA2,0x2168,0xC234),
        bn_pack4(0xFFFF,0xFFFF,0xFFFF,0xFFFF)
 };
-static const BIGNUM bn_group_6144 = {
+const BIGNUM bn_group_6144 = {
        (BN_ULONG*)bn_group_6144_value,
        (sizeof bn_group_6144_value)/sizeof(BN_ULONG),
        (sizeof bn_group_6144_value)/sizeof(BN_ULONG),
@@ -470,7 +486,7 @@ static const BN_ULONG bn_group_8192_value[] = {
        bn_pack4(0xC90F,0xDAA2,0x2168,0xC234),
        bn_pack4(0xFFFF,0xFFFF,0xFFFF,0xFFFF)
 };
-static const BIGNUM bn_group_8192 = {
+const BIGNUM bn_group_8192 = {
        (BN_ULONG*)bn_group_8192_value,
        (sizeof bn_group_8192_value)/sizeof(BN_ULONG),
        (sizeof bn_group_8192_value)/sizeof(BN_ULONG),
@@ -479,7 +495,7 @@ static const BIGNUM bn_group_8192 = {
 };
 
 static const BN_ULONG bn_generator_19_value[] = {19} ;
-static const BIGNUM bn_generator_19 = {
+const BIGNUM bn_generator_19 = {
        (BN_ULONG*)bn_generator_19_value,
        1,
        1,
@@ -487,7 +503,7 @@ static const BIGNUM bn_generator_19 = {
        BN_FLG_STATIC_DATA
 };
 static const BN_ULONG bn_generator_5_value[] = {5} ;
-static const BIGNUM bn_generator_5 = {
+const BIGNUM bn_generator_5 = {
        (BN_ULONG*)bn_generator_5_value,
        1,
        1,
@@ -495,7 +511,7 @@ static const BIGNUM bn_generator_5 = {
        BN_FLG_STATIC_DATA
 };
 static const BN_ULONG bn_generator_2_value[] = {2} ;
-static const BIGNUM bn_generator_2 = {
+const BIGNUM bn_generator_2 = {
        (BN_ULONG*)bn_generator_2_value,
        1,
        1,
@@ -503,15 +519,4 @@ static const BIGNUM bn_generator_2 = {
        BN_FLG_STATIC_DATA
 };
 
-static SRP_gN knowngN[] = {
-       {"8192",(BIGNUM*)&bn_generator_19 , (BIGNUM*)&bn_group_8192},
-       {"6144",(BIGNUM*)&bn_generator_5 , (BIGNUM*)&bn_group_6144},
-       {"4096",(BIGNUM*)&bn_generator_5 , (BIGNUM*)&bn_group_4096},
-       {"3072",(BIGNUM*)&bn_generator_5 , (BIGNUM*)&bn_group_3072},
-       {"2048",(BIGNUM*)&bn_generator_2 , (BIGNUM*)&bn_group_2048},
-       {"1536",(BIGNUM*)&bn_generator_2 , (BIGNUM*)&bn_group_1536},
-       {"1024",(BIGNUM*)&bn_generator_2 , (BIGNUM*)&bn_group_1024},
-};
-#define KNOWN_GN_NUMBER sizeof(knowngN) / sizeof(SRP_gN)
-
-/* end of generated data */
+#endif