diff options
Diffstat (limited to 'cpp/src/IceSSL/Util.cpp')
| -rw-r--r-- | cpp/src/IceSSL/Util.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp index ca11f1ced17..9881cd3cb66 100644 --- a/cpp/src/IceSSL/Util.cpp +++ b/cpp/src/IceSSL/Util.cpp @@ -31,6 +31,9 @@ using namespace std; using namespace Ice; using namespace IceSSL; +namespace +{ + #ifndef OPENSSL_NO_DH // The following arrays are predefined Diffie Hellman group parameters. @@ -39,7 +42,7 @@ using namespace IceSSL; // They are not keys themselves, but the basis for generating DH keys // on the fly. -static unsigned char dh512_p[] = +unsigned char dh512_p[] = { 0xF5,0x2A,0xFF,0x3C,0xE1,0xB1,0x29,0x40,0x18,0x11,0x8D,0x7C, 0x84,0xA7,0x0A,0x72,0xD6,0x86,0xC4,0x03,0x19,0xC8,0x07,0x29, @@ -49,9 +52,9 @@ static unsigned char dh512_p[] = 0xE9,0x2A,0x05,0x5F, }; -static unsigned char dh512_g[] = { 0x02 }; +unsigned char dh512_g[] = { 0x02 }; -static unsigned char dh1024_p[] = +unsigned char dh1024_p[] = { 0xF4,0x88,0xFD,0x58,0x4E,0x49,0xDB,0xCD,0x20,0xB4,0x9D,0xE4, 0x91,0x07,0x36,0x6B,0x33,0x6C,0x38,0x0D,0x45,0x1D,0x0F,0x7C, @@ -66,9 +69,9 @@ static unsigned char dh1024_p[] = 0xA2,0x5E,0xC3,0x55,0xE9,0x2F,0x78,0xC7, }; -static unsigned char dh1024_g[] = { 0x02 }; +unsigned char dh1024_g[] = { 0x02 }; -static unsigned char dh2048_p[] = +unsigned char dh2048_p[] = { 0xF6,0x42,0x57,0xB7,0x08,0x7F,0x08,0x17,0x72,0xA2,0xBA,0xD6, 0xA9,0x42,0xF3,0x05,0xE8,0xF9,0x53,0x11,0x39,0x4F,0xB6,0xF1, @@ -94,9 +97,9 @@ static unsigned char dh2048_p[] = 0xE9,0x32,0x0B,0x3B, }; -static unsigned char dh2048_g[] = { 0x02 }; +unsigned char dh2048_g[] = { 0x02 }; -static unsigned char dh4096_p[] = +unsigned char dh4096_p[] = { 0xFA,0x14,0x72,0x52,0xC1,0x4D,0xE1,0x5A,0x49,0xD4,0xEF,0x09, 0x2D,0xC0,0xA8,0xFD,0x55,0xAB,0xD7,0xD9,0x37,0x04,0x28,0x09, @@ -143,7 +146,9 @@ static unsigned char dh4096_p[] = 0xB9,0xBD,0x78,0xE1,0x84,0x41,0xA0,0xDF, }; -static unsigned char dh4096_g[] = { 0x02 }; +unsigned char dh4096_g[] = { 0x02 }; + +} // // Convert a predefined parameter set into a DH value. |