diff --git a/crypto/bn/bn_srp.c b/crypto/bn/bn_srp.c index 34e11ce774..047e2e3433 100644 --- a/crypto/bn/bn_srp.c +++ b/crypto/bn/bn_srp.c @@ -48,7 +48,7 @@ static const BN_ULONG bn_group_1024_value[] = { bn_pack4(0xEEAF, 0x0AB9, 0xADB3, 0x8DD6) }; -const BIGNUM bn_group_1024 = { +const BIGNUM ossl_bn_group_1024 = { (BN_ULONG *)bn_group_1024_value, OSSL_NELEM(bn_group_1024_value), OSSL_NELEM(bn_group_1024_value), @@ -83,7 +83,7 @@ static const BN_ULONG bn_group_1536_value[] = { bn_pack4(0x9DEF, 0x3CAF, 0xB939, 0x277A) }; -const BIGNUM bn_group_1536 = { +const BIGNUM ossl_bn_group_1536 = { (BN_ULONG *)bn_group_1536_value, OSSL_NELEM(bn_group_1536_value), OSSL_NELEM(bn_group_1536_value), @@ -126,7 +126,7 @@ static const BN_ULONG bn_group_2048_value[] = { bn_pack4(0xAC6B, 0xDB41, 0x324A, 0x9A9B) }; -const BIGNUM bn_group_2048 = { +const BIGNUM ossl_bn_group_2048 = { (BN_ULONG *)bn_group_2048_value, OSSL_NELEM(bn_group_2048_value), OSSL_NELEM(bn_group_2048_value), @@ -185,7 +185,7 @@ static const BN_ULONG bn_group_3072_value[] = { bn_pack4(0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF) }; -const BIGNUM bn_group_3072 = { +const BIGNUM ossl_bn_group_3072 = { (BN_ULONG *)bn_group_3072_value, OSSL_NELEM(bn_group_3072_value), OSSL_NELEM(bn_group_3072_value), @@ -260,7 +260,7 @@ static const BN_ULONG bn_group_4096_value[] = { bn_pack4(0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF) }; -const BIGNUM bn_group_4096 = { +const BIGNUM ossl_bn_group_4096 = { (BN_ULONG *)bn_group_4096_value, OSSL_NELEM(bn_group_4096_value), OSSL_NELEM(bn_group_4096_value), @@ -367,7 +367,7 @@ static const BN_ULONG bn_group_6144_value[] = { bn_pack4(0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF) }; -const BIGNUM bn_group_6144 = { +const BIGNUM ossl_bn_group_6144 = { (BN_ULONG *)bn_group_6144_value, OSSL_NELEM(bn_group_6144_value), OSSL_NELEM(bn_group_6144_value), @@ -506,7 +506,7 @@ static const BN_ULONG bn_group_8192_value[] = { bn_pack4(0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF) }; -const BIGNUM bn_group_8192 = { +const BIGNUM ossl_bn_group_8192 = { (BN_ULONG *)bn_group_8192_value, OSSL_NELEM(bn_group_8192_value), OSSL_NELEM(bn_group_8192_value), @@ -516,7 +516,7 @@ const BIGNUM bn_group_8192 = { static const BN_ULONG bn_generator_19_value[] = { 19 }; -const BIGNUM bn_generator_19 = { +const BIGNUM ossl_bn_generator_19 = { (BN_ULONG *)bn_generator_19_value, 1, 1, @@ -525,7 +525,7 @@ const BIGNUM bn_generator_19 = { }; static const BN_ULONG bn_generator_5_value[] = { 5 }; -const BIGNUM bn_generator_5 = { +const BIGNUM ossl_bn_generator_5 = { (BN_ULONG *)bn_generator_5_value, 1, 1, @@ -534,7 +534,7 @@ const BIGNUM bn_generator_5 = { }; static const BN_ULONG bn_generator_2_value[] = { 2 }; -const BIGNUM bn_generator_2 = { +const BIGNUM ossl_bn_generator_2 = { (BN_ULONG *)bn_generator_2_value, 1, 1, diff --git a/crypto/srp/srp_lib.c b/crypto/srp/srp_lib.c index 38bde78bfa..df0d3720ff 100644 --- a/crypto/srp/srp_lib.c +++ b/crypto/srp/srp_lib.c @@ -291,13 +291,13 @@ int SRP_Verify_A_mod_N(const BIGNUM *A, const BIGNUM *N) } static SRP_gN knowngN[] = { - {"8192", &bn_generator_19, &bn_group_8192}, - {"6144", &bn_generator_5, &bn_group_6144}, - {"4096", &bn_generator_5, &bn_group_4096}, - {"3072", &bn_generator_5, &bn_group_3072}, - {"2048", &bn_generator_2, &bn_group_2048}, - {"1536", &bn_generator_2, &bn_group_1536}, - {"1024", &bn_generator_2, &bn_group_1024}, + {"8192", &ossl_bn_generator_19, &ossl_bn_group_8192}, + {"6144", &ossl_bn_generator_5, &ossl_bn_group_6144}, + {"4096", &ossl_bn_generator_5, &ossl_bn_group_4096}, + {"3072", &ossl_bn_generator_5, &ossl_bn_group_3072}, + {"2048", &ossl_bn_generator_2, &ossl_bn_group_2048}, + {"1536", &ossl_bn_generator_2, &ossl_bn_group_1536}, + {"1024", &ossl_bn_generator_2, &ossl_bn_group_1024}, }; # define KNOWN_GN_NUMBER sizeof(knowngN) / sizeof(SRP_gN) diff --git a/include/crypto/bn_srp.h b/include/crypto/bn_srp.h index 897618cd9e..805f4a4343 100644 --- a/include/crypto/bn_srp.h +++ b/include/crypto/bn_srp.h @@ -9,24 +9,24 @@ #ifndef OPENSSL_NO_SRP -extern const BIGNUM bn_group_1024; +extern const BIGNUM ossl_bn_group_1024; -extern const BIGNUM bn_group_1536; +extern const BIGNUM ossl_bn_group_1536; -extern const BIGNUM bn_group_2048; +extern const BIGNUM ossl_bn_group_2048; -extern const BIGNUM bn_group_3072; +extern const BIGNUM ossl_bn_group_3072; -extern const BIGNUM bn_group_4096; +extern const BIGNUM ossl_bn_group_4096; -extern const BIGNUM bn_group_6144; +extern const BIGNUM ossl_bn_group_6144; -extern const BIGNUM bn_group_8192; +extern const BIGNUM ossl_bn_group_8192; -extern const BIGNUM bn_generator_19; +extern const BIGNUM ossl_bn_generator_19; -extern const BIGNUM bn_generator_5; +extern const BIGNUM ossl_bn_generator_5; -extern const BIGNUM bn_generator_2; +extern const BIGNUM ossl_bn_generator_2; #endif