Branch: Tag:

2014-04-21

2014-04-21 20:19:03 by Martin Nilsson <nilsson@opera.com>

Rename DHParameters to Parameters to avoid name redundancy.

3:   //!      //! Diffie-Hellman parameters. - class DHParameters + class Parameters   {   #if constant(Nettle.DH_Params)    inherit Nettle.DH_Params;
102:   //!   //! @note   //! Not allowed for use with FIPS 140. - DHParameters MODPGroup1 = + Parameters MODPGroup1 =    /* p = 2^768 - 2 ^704 - 1 + 2^64 * floor( 2^638 Pi + 149686 ) */ -  DHParameters(Gmp.mpz("FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1" +  Parameters(Gmp.mpz("FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1"    "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD"    "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245"    "E485B576 625E7EC6 F44C42E9 A63A3620 FFFFFFFF FFFFFFFF",
116:   //!   //! @note   //! Not allowed for use with FIPS 140. - DHParameters MODPGroup2 = + Parameters MODPGroup2 =    /* p = 2^1024 - 2^960 - 1 + 2^64 * floor( 2^894 Pi + 129093 ) */ -  DHParameters(Gmp.mpz("FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1" +  Parameters(Gmp.mpz("FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1"    "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD"    "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245"    "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED"
131:   //!   //! @note   //! Not allowed for use with FIPS 140. - DHParameters MODPGroup5 = + Parameters MODPGroup5 =    /* p = 2^1536 - 2^1472 - 1 + 2^64 * floor( 2^1406 Pi + 741804 ) */ -  DHParameters(Gmp.mpz("FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1" +  Parameters(Gmp.mpz("FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1"    "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD"    "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245"    "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED"
146:   //! MODP Group 14 (2048 bit).   //!   //! RFC 3526 3 - DHParameters MODPGroup14 = + Parameters MODPGroup14 =    /* p = 2^2048 - 2^1984 - 1 + 2^64 * floor( 2^1918 Pi + 124476 ) */ -  DHParameters(Gmp.mpz("FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1" +  Parameters(Gmp.mpz("FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1"    "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD"    "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245"    "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED"
163:   //! MODP Group 15 (3072 bit).   //!   //! RFC 3526 3 - DHParameters MODPGroup15 = + Parameters MODPGroup15 =    /* p = 2^3072 - 2^3008 - 1 + 2^64 * floor( 2^2942 Pi + 1690314 ) */ -  DHParameters(Gmp.mpz("FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1" +  Parameters(Gmp.mpz("FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1"    "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD"    "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245"    "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED"
186:   //! MODP Group 16 (4096 bit).   //!   //! RFC 3526 5 - DHParameters MODPGroup16 = + Parameters MODPGroup16 =    /* p = 2^4096 - 2^4032 - 1 + 2^64 * floor( 2^3966 Pi + 240904 ) */ -  DHParameters(Gmp.mpz("FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1" +  Parameters(Gmp.mpz("FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1"    "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD"    "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245"    "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED"
214:   //! MODP Group 17 (6144 bit).   //!   //! RFC 3526 6 - DHParameters MODPGroup17 = + Parameters MODPGroup17 =    /* p = 2^6144 - 2^6080 - 1 + 2^64 * floor( 2^6014 Pi + 929484 ) */ -  DHParameters( +  Parameters(    Gmp.mpz("FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 29024E08"    "8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD EF9519B3 CD3A431B"    "302B0A6D F25F1437 4FE1356D 6D51C245 E485B576 625E7EC6 F44C42E9"
249:   //! MODP Group 18 (8192 bit).   //!   //! RFC 3526 7 - DHParameters MODPGroup18 = + Parameters MODPGroup18 =    /* p = 2^8192 - 2^8128 - 1 + 2^64 * floor( 2^8062 Pi + 4743158 ) */ -  DHParameters(Gmp.mpz("FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1" +  Parameters(Gmp.mpz("FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1"    "29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD"    "EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245"    "E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED"
298:   //! MODP Group 22 (1024-bit with 160-bit Subgroup).   //!   //! RFC 5114 2.1 - DHParameters MODPGroup22 = -  DHParameters(Gmp.mpz("B10B8F96 A080E01D DE92DE5E AE5D54EC 52C99FBC FB06A3C6" + Parameters MODPGroup22 = +  Parameters(Gmp.mpz("B10B8F96 A080E01D DE92DE5E AE5D54EC 52C99FBC FB06A3C6"    "9A6A9DCA 52D23B61 6073E286 75A23D18 9838EF1E 2EE652C0"    "13ECB4AE A9061123 24975C3C D49B83BF ACCBDD7D 90C4BD70"    "98488E9C 219A7372 4EFFD6FA E5644738 FAA31A4F F55BCCC0"
316:   //! MODP Group 23 (2048-bit with 224-bit Subgroup).   //!   //! RFC 5114 2.2 - DHParameters MODPGroup = -  DHParameters(Gmp.mpz("AD107E1E 9123A9D0 D660FAA7 9559C51F A20D64E5 683B9FD1" + Parameters MODPGroup = +  Parameters(Gmp.mpz("AD107E1E 9123A9D0 D660FAA7 9559C51F A20D64E5 683B9FD1"    "B54B1597 B61D0A75 E6FA141D F95A56DB AF9A3C40 7BA1DF15"    "EB3D688A 309C180E 1DE6B85A 1274A0A6 6D3F8152 AD6AC212"    "9037C9ED EFDA4DF8 D91E8FEF 55B7394B 7AD5B7D0 B6C12207"
345:   //! MODP Group 24 (2048-bit with 256-bit Subgroup).   //!   //! RFC 5114 2.3 - DHParameters MODPGroup24 = -  DHParameters(Gmp.mpz("87A8E61D B4B6663C FFBBD19C 65195999 8CEEF608 660DD0F2" + Parameters MODPGroup24 = +  Parameters(Gmp.mpz("87A8E61D B4B6663C FFBBD19C 65195999 8CEEF608 660DD0F2"    "5D2CEED4 435E3B00 E00DF8F1 D61957D4 FAF7DF45 61B2AA30"    "16C3D911 34096FAA 3BF4296D 830E9A7C 209E0C64 97517ABD"    "5A8A9D30 6BCF67ED 91F9E672 5B4758C0 22E0B1EF 4275BF7B"