Accepting request 906782 from security:tls
OBS-URL: https://build.opensuse.org/request/show/906782 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl-1_1?expand=0&rev=25
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
11b1c70b4c
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 17 14:28:52 UTC 2021 - Jason Sikes <jsikes@suse.com>
|
||||||
|
|
||||||
|
- Added openssl-add_rfc3526_rfc7919.patch
|
||||||
|
* Genpkey: "-pkeyopt dh_param:" can now choose modp_* (rfc3526)
|
||||||
|
and ffdhe* (rfc7919) groups. Example:
|
||||||
|
$ openssl genpkey -genparam -algorithm DH -pkeyopt dh_param:ffdhe4096
|
||||||
|
* DH_new_by_nid(), DH_get_nid(), and EVP_PKEY_CTX_set_dh_nid():
|
||||||
|
NID_modp_* groups are now available, similar to NID_ffdhe*.
|
||||||
|
* Fixes bsc#1180995 - openssl s_server fails when FIPS is enabled
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Mar 25 23:51:47 UTC 2021 - Jason Sikes <jsikes@suse.com>
|
Thu Mar 25 23:51:47 UTC 2021 - Jason Sikes <jsikes@suse.com>
|
||||||
|
|
||||||
|
|||||||
@ -91,6 +91,7 @@ Patch52: openssl-1.1.1-system-cipherlist.patch
|
|||||||
Patch53: openssl-1_1-seclevel.patch
|
Patch53: openssl-1_1-seclevel.patch
|
||||||
Patch54: openssl-1_1-use-seclevel2-in-tests.patch
|
Patch54: openssl-1_1-use-seclevel2-in-tests.patch
|
||||||
Patch55: openssl-1_1-disable-test_srp-sslapi.patch
|
Patch55: openssl-1_1-disable-test_srp-sslapi.patch
|
||||||
|
Patch56: openssl-add_rfc3526_rfc7919.patch
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
%if 0%{?suse_version} && ! 0%{?sle_version}
|
%if 0%{?suse_version} && ! 0%{?sle_version}
|
||||||
Requires: crypto-policies
|
Requires: crypto-policies
|
||||||
|
|||||||
726
openssl-add_rfc3526_rfc7919.patch
Normal file
726
openssl-add_rfc3526_rfc7919.patch
Normal file
@ -0,0 +1,726 @@
|
|||||||
|
diff --git a/crypto/bn/bn_dh.c b/crypto/bn/bn_dh.c
|
||||||
|
index 58c44f0..1094716 100644
|
||||||
|
--- a/crypto/bn/bn_dh.c
|
||||||
|
+++ b/crypto/bn/bn_dh.c
|
||||||
|
@@ -13,6 +13,488 @@
|
||||||
|
#ifndef OPENSSL_NO_DH
|
||||||
|
#include <openssl/dh.h>
|
||||||
|
#include "crypto/bn_dh.h"
|
||||||
|
+
|
||||||
|
+# if BN_BITS2 == 64
|
||||||
|
+# define BN_DEF(lo, hi) (BN_ULONG)hi << 32 | lo
|
||||||
|
+# else
|
||||||
|
+# define BN_DEF(lo, hi) lo, hi
|
||||||
|
+# endif
|
||||||
|
+
|
||||||
|
+/* DH parameters from RFC3526 */
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ * "1536-bit MODP Group" from RFC3526, Section 2.
|
||||||
|
+ *
|
||||||
|
+ * The prime is: 2^1536 - 2^1472 - 1 + 2^64 * { [2^1406 pi] + 741804 }
|
||||||
|
+ *
|
||||||
|
+ * RFC3526 specifies a generator of 2.
|
||||||
|
+ * RFC2412 specifies a generator of 22.
|
||||||
|
+ */
|
||||||
|
+static const BN_ULONG modp_1536_p[] = {
|
||||||
|
+ BN_DEF(0xFFFFFFFF, 0xFFFFFFFF), BN_DEF(0xCA237327, 0xF1746C08),
|
||||||
|
+ BN_DEF(0x4ABC9804, 0x670C354E), BN_DEF(0x7096966D, 0x9ED52907),
|
||||||
|
+ BN_DEF(0x208552BB, 0x1C62F356), BN_DEF(0xDCA3AD96, 0x83655D23),
|
||||||
|
+ BN_DEF(0xFD24CF5F, 0x69163FA8), BN_DEF(0x1C55D39A, 0x98DA4836),
|
||||||
|
+ BN_DEF(0xA163BF05, 0xC2007CB8), BN_DEF(0xECE45B3D, 0x49286651),
|
||||||
|
+ BN_DEF(0x7C4B1FE6, 0xAE9F2411), BN_DEF(0x5A899FA5, 0xEE386BFB),
|
||||||
|
+ BN_DEF(0xF406B7ED, 0x0BFF5CB6), BN_DEF(0xA637ED6B, 0xF44C42E9),
|
||||||
|
+ BN_DEF(0x625E7EC6, 0xE485B576), BN_DEF(0x6D51C245, 0x4FE1356D),
|
||||||
|
+ BN_DEF(0xF25F1437, 0x302B0A6D), BN_DEF(0xCD3A431B, 0xEF9519B3),
|
||||||
|
+ BN_DEF(0x8E3404DD, 0x514A0879), BN_DEF(0x3B139B22, 0x020BBEA6),
|
||||||
|
+ BN_DEF(0x8A67CC74, 0x29024E08), BN_DEF(0x80DC1CD1, 0xC4C6628B),
|
||||||
|
+ BN_DEF(0x2168C234, 0xC90FDAA2), BN_DEF(0xFFFFFFFF, 0xFFFFFFFF)
|
||||||
|
+};
|
||||||
|
+/* q = (p - 1) / 2 */
|
||||||
|
+static const BN_ULONG modp_1536_q[] = {
|
||||||
|
+ BN_DEF(0xFFFFFFFF, 0xFFFFFFFF), BN_DEF(0x6511B993, 0x78BA3604),
|
||||||
|
+ BN_DEF(0x255E4C02, 0xB3861AA7), BN_DEF(0xB84B4B36, 0xCF6A9483),
|
||||||
|
+ BN_DEF(0x1042A95D, 0x0E3179AB), BN_DEF(0xEE51D6CB, 0xC1B2AE91),
|
||||||
|
+ BN_DEF(0x7E9267AF, 0x348B1FD4), BN_DEF(0x0E2AE9CD, 0xCC6D241B),
|
||||||
|
+ BN_DEF(0x50B1DF82, 0xE1003E5C), BN_DEF(0xF6722D9E, 0x24943328),
|
||||||
|
+ BN_DEF(0xBE258FF3, 0xD74F9208), BN_DEF(0xAD44CFD2, 0xF71C35FD),
|
||||||
|
+ BN_DEF(0x7A035BF6, 0x85FFAE5B), BN_DEF(0xD31BF6B5, 0x7A262174),
|
||||||
|
+ BN_DEF(0x312F3F63, 0xF242DABB), BN_DEF(0xB6A8E122, 0xA7F09AB6),
|
||||||
|
+ BN_DEF(0xF92F8A1B, 0x98158536), BN_DEF(0xE69D218D, 0xF7CA8CD9),
|
||||||
|
+ BN_DEF(0xC71A026E, 0x28A5043C), BN_DEF(0x1D89CD91, 0x0105DF53),
|
||||||
|
+ BN_DEF(0x4533E63A, 0x94812704), BN_DEF(0xC06E0E68, 0x62633145),
|
||||||
|
+ BN_DEF(0x10B4611A, 0xE487ED51), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF)
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+/*-
|
||||||
|
+ * "2048-bit MODP Group" from RFC3526, Section 3.
|
||||||
|
+ *
|
||||||
|
+ * The prime is: 2^2048 - 2^1984 - 1 + 2^64 * { [2^1918 pi] + 124476 }
|
||||||
|
+ *
|
||||||
|
+ * RFC3526 specifies a generator of 2.
|
||||||
|
+ */
|
||||||
|
+static const BN_ULONG modp_2048_p[] = {
|
||||||
|
+ BN_DEF(0xFFFFFFFF, 0xFFFFFFFF), BN_DEF(0x8AACAA68, 0x15728E5A),
|
||||||
|
+ BN_DEF(0x98FA0510, 0x15D22618), BN_DEF(0xEA956AE5, 0x3995497C),
|
||||||
|
+ BN_DEF(0x95581718, 0xDE2BCBF6), BN_DEF(0x6F4C52C9, 0xB5C55DF0),
|
||||||
|
+ BN_DEF(0xEC07A28F, 0x9B2783A2), BN_DEF(0x180E8603, 0xE39E772C),
|
||||||
|
+ BN_DEF(0x2E36CE3B, 0x32905E46), BN_DEF(0xCA18217C, 0xF1746C08),
|
||||||
|
+ BN_DEF(0x4ABC9804, 0x670C354E), BN_DEF(0x7096966D, 0x9ED52907),
|
||||||
|
+ BN_DEF(0x208552BB, 0x1C62F356), BN_DEF(0xDCA3AD96, 0x83655D23),
|
||||||
|
+ BN_DEF(0xFD24CF5F, 0x69163FA8), BN_DEF(0x1C55D39A, 0x98DA4836),
|
||||||
|
+ BN_DEF(0xA163BF05, 0xC2007CB8), BN_DEF(0xECE45B3D, 0x49286651),
|
||||||
|
+ BN_DEF(0x7C4B1FE6, 0xAE9F2411), BN_DEF(0x5A899FA5, 0xEE386BFB),
|
||||||
|
+ BN_DEF(0xF406B7ED, 0x0BFF5CB6), BN_DEF(0xA637ED6B, 0xF44C42E9),
|
||||||
|
+ BN_DEF(0x625E7EC6, 0xE485B576), BN_DEF(0x6D51C245, 0x4FE1356D),
|
||||||
|
+ BN_DEF(0xF25F1437, 0x302B0A6D), BN_DEF(0xCD3A431B, 0xEF9519B3),
|
||||||
|
+ BN_DEF(0x8E3404DD, 0x514A0879), BN_DEF(0x3B139B22, 0x020BBEA6),
|
||||||
|
+ BN_DEF(0x8A67CC74, 0x29024E08), BN_DEF(0x80DC1CD1, 0xC4C6628B),
|
||||||
|
+ BN_DEF(0x2168C234, 0xC90FDAA2), BN_DEF(0xFFFFFFFF, 0xFFFFFFFF)
|
||||||
|
+};
|
||||||
|
+/* q = (p - 1) / 2 */
|
||||||
|
+static const BN_ULONG modp_2048_q[] = {
|
||||||
|
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF), BN_DEF(0x45565534, 0x0AB9472D),
|
||||||
|
+ BN_DEF(0x4C7D0288, 0x8AE9130C), BN_DEF(0x754AB572, 0x1CCAA4BE),
|
||||||
|
+ BN_DEF(0x4AAC0B8C, 0xEF15E5FB), BN_DEF(0x37A62964, 0xDAE2AEF8),
|
||||||
|
+ BN_DEF(0x7603D147, 0xCD93C1D1), BN_DEF(0x0C074301, 0xF1CF3B96),
|
||||||
|
+ BN_DEF(0x171B671D, 0x19482F23), BN_DEF(0x650C10BE, 0x78BA3604),
|
||||||
|
+ BN_DEF(0x255E4C02, 0xB3861AA7), BN_DEF(0xB84B4B36, 0xCF6A9483),
|
||||||
|
+ BN_DEF(0x1042A95D, 0x0E3179AB), BN_DEF(0xEE51D6CB, 0xC1B2AE91),
|
||||||
|
+ BN_DEF(0x7E9267AF, 0x348B1FD4), BN_DEF(0x0E2AE9CD, 0xCC6D241B),
|
||||||
|
+ BN_DEF(0x50B1DF82, 0xE1003E5C), BN_DEF(0xF6722D9E, 0x24943328),
|
||||||
|
+ BN_DEF(0xBE258FF3, 0xD74F9208), BN_DEF(0xAD44CFD2, 0xF71C35FD),
|
||||||
|
+ BN_DEF(0x7A035BF6, 0x85FFAE5B), BN_DEF(0xD31BF6B5, 0x7A262174),
|
||||||
|
+ BN_DEF(0x312F3F63, 0xF242DABB), BN_DEF(0xB6A8E122, 0xA7F09AB6),
|
||||||
|
+ BN_DEF(0xF92F8A1B, 0x98158536), BN_DEF(0xE69D218D, 0xF7CA8CD9),
|
||||||
|
+ BN_DEF(0xC71A026E, 0x28A5043C), BN_DEF(0x1D89CD91, 0x0105DF53),
|
||||||
|
+ BN_DEF(0x4533E63A, 0x94812704), BN_DEF(0xC06E0E68, 0x62633145),
|
||||||
|
+ BN_DEF(0x10B4611A, 0xE487ED51), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+/*-
|
||||||
|
+ * "3072-bit MODP Group" from RFC3526, Section 4.
|
||||||
|
+ *
|
||||||
|
+ * The prime is: 2^3072 - 2^3008 - 1 + 2^64 * { [2^2942 pi] + 1690314 }
|
||||||
|
+ *
|
||||||
|
+ * RFC3526 specifies a generator of 2.
|
||||||
|
+ */
|
||||||
|
+static const BN_ULONG modp_3072_p[] = {
|
||||||
|
+ BN_DEF(0xFFFFFFFF, 0xFFFFFFFF), BN_DEF(0xA93AD2CA, 0x4B82D120),
|
||||||
|
+ BN_DEF(0xE0FD108E, 0x43DB5BFC), BN_DEF(0x74E5AB31, 0x08E24FA0),
|
||||||
|
+ BN_DEF(0xBAD946E2, 0x770988C0), BN_DEF(0x7A615D6C, 0xBBE11757),
|
||||||
|
+ BN_DEF(0x177B200C, 0x521F2B18), BN_DEF(0x3EC86A64, 0xD8760273),
|
||||||
|
+ BN_DEF(0xD98A0864, 0xF12FFA06), BN_DEF(0x1AD2EE6B, 0xCEE3D226),
|
||||||
|
+ BN_DEF(0x4A25619D, 0x1E8C94E0), BN_DEF(0xDB0933D7, 0xABF5AE8C),
|
||||||
|
+ BN_DEF(0xA6E1E4C7, 0xB3970F85), BN_DEF(0x5D060C7D, 0x8AEA7157),
|
||||||
|
+ BN_DEF(0x58DBEF0A, 0xECFB8504), BN_DEF(0xDF1CBA64, 0xA85521AB),
|
||||||
|
+ BN_DEF(0x04507A33, 0xAD33170D), BN_DEF(0x8AAAC42D, 0x15728E5A),
|
||||||
|
+ BN_DEF(0x98FA0510, 0x15D22618), BN_DEF(0xEA956AE5, 0x3995497C),
|
||||||
|
+ BN_DEF(0x95581718, 0xDE2BCBF6), BN_DEF(0x6F4C52C9, 0xB5C55DF0),
|
||||||
|
+ BN_DEF(0xEC07A28F, 0x9B2783A2), BN_DEF(0x180E8603, 0xE39E772C),
|
||||||
|
+ BN_DEF(0x2E36CE3B, 0x32905E46), BN_DEF(0xCA18217C, 0xF1746C08),
|
||||||
|
+ BN_DEF(0x4ABC9804, 0x670C354E), BN_DEF(0x7096966D, 0x9ED52907),
|
||||||
|
+ BN_DEF(0x208552BB, 0x1C62F356), BN_DEF(0xDCA3AD96, 0x83655D23),
|
||||||
|
+ BN_DEF(0xFD24CF5F, 0x69163FA8), BN_DEF(0x1C55D39A, 0x98DA4836),
|
||||||
|
+ BN_DEF(0xA163BF05, 0xC2007CB8), BN_DEF(0xECE45B3D, 0x49286651),
|
||||||
|
+ BN_DEF(0x7C4B1FE6, 0xAE9F2411), BN_DEF(0x5A899FA5, 0xEE386BFB),
|
||||||
|
+ BN_DEF(0xF406B7ED, 0x0BFF5CB6), BN_DEF(0xA637ED6B, 0xF44C42E9),
|
||||||
|
+ BN_DEF(0x625E7EC6, 0xE485B576), BN_DEF(0x6D51C245, 0x4FE1356D),
|
||||||
|
+ BN_DEF(0xF25F1437, 0x302B0A6D), BN_DEF(0xCD3A431B, 0xEF9519B3),
|
||||||
|
+ BN_DEF(0x8E3404DD, 0x514A0879), BN_DEF(0x3B139B22, 0x020BBEA6),
|
||||||
|
+ BN_DEF(0x8A67CC74, 0x29024E08), BN_DEF(0x80DC1CD1, 0xC4C6628B),
|
||||||
|
+ BN_DEF(0x2168C234, 0xC90FDAA2), BN_DEF(0xFFFFFFFF, 0xFFFFFFFF)
|
||||||
|
+};
|
||||||
|
+/* q = (p - 1) / 2 */
|
||||||
|
+static const BN_ULONG modp_3072_q[] = {
|
||||||
|
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF), BN_DEF(0x549D6965, 0x25C16890),
|
||||||
|
+ BN_DEF(0x707E8847, 0xA1EDADFE), BN_DEF(0x3A72D598, 0x047127D0),
|
||||||
|
+ BN_DEF(0x5D6CA371, 0x3B84C460), BN_DEF(0xBD30AEB6, 0x5DF08BAB),
|
||||||
|
+ BN_DEF(0x0BBD9006, 0x290F958C), BN_DEF(0x9F643532, 0x6C3B0139),
|
||||||
|
+ BN_DEF(0x6CC50432, 0xF897FD03), BN_DEF(0x0D697735, 0xE771E913),
|
||||||
|
+ BN_DEF(0x2512B0CE, 0x8F464A70), BN_DEF(0x6D8499EB, 0xD5FAD746),
|
||||||
|
+ BN_DEF(0xD370F263, 0xD9CB87C2), BN_DEF(0xAE83063E, 0x457538AB),
|
||||||
|
+ BN_DEF(0x2C6DF785, 0x767DC282), BN_DEF(0xEF8E5D32, 0xD42A90D5),
|
||||||
|
+ BN_DEF(0x82283D19, 0xD6998B86), BN_DEF(0x45556216, 0x0AB9472D),
|
||||||
|
+ BN_DEF(0x4C7D0288, 0x8AE9130C), BN_DEF(0x754AB572, 0x1CCAA4BE),
|
||||||
|
+ BN_DEF(0x4AAC0B8C, 0xEF15E5FB), BN_DEF(0x37A62964, 0xDAE2AEF8),
|
||||||
|
+ BN_DEF(0x7603D147, 0xCD93C1D1), BN_DEF(0x0C074301, 0xF1CF3B96),
|
||||||
|
+ BN_DEF(0x171B671D, 0x19482F23), BN_DEF(0x650C10BE, 0x78BA3604),
|
||||||
|
+ BN_DEF(0x255E4C02, 0xB3861AA7), BN_DEF(0xB84B4B36, 0xCF6A9483),
|
||||||
|
+ BN_DEF(0x1042A95D, 0x0E3179AB), BN_DEF(0xEE51D6CB, 0xC1B2AE91),
|
||||||
|
+ BN_DEF(0x7E9267AF, 0x348B1FD4), BN_DEF(0x0E2AE9CD, 0xCC6D241B),
|
||||||
|
+ BN_DEF(0x50B1DF82, 0xE1003E5C), BN_DEF(0xF6722D9E, 0x24943328),
|
||||||
|
+ BN_DEF(0xBE258FF3, 0xD74F9208), BN_DEF(0xAD44CFD2, 0xF71C35FD),
|
||||||
|
+ BN_DEF(0x7A035BF6, 0x85FFAE5B), BN_DEF(0xD31BF6B5, 0x7A262174),
|
||||||
|
+ BN_DEF(0x312F3F63, 0xF242DABB), BN_DEF(0xB6A8E122, 0xA7F09AB6),
|
||||||
|
+ BN_DEF(0xF92F8A1B, 0x98158536), BN_DEF(0xE69D218D, 0xF7CA8CD9),
|
||||||
|
+ BN_DEF(0xC71A026E, 0x28A5043C), BN_DEF(0x1D89CD91, 0x0105DF53),
|
||||||
|
+ BN_DEF(0x4533E63A, 0x94812704), BN_DEF(0xC06E0E68, 0x62633145),
|
||||||
|
+ BN_DEF(0x10B4611A, 0xE487ED51), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+/*-
|
||||||
|
+ * "4096-bit MODP Group" from RFC3526, Section 5.
|
||||||
|
+ *
|
||||||
|
+ * The prime is: 2^4096 - 2^4032 - 1 + 2^64 * { [2^3966 pi] + 240904 }
|
||||||
|
+ *
|
||||||
|
+ * RFC3526 specifies a generator of 2.
|
||||||
|
+ */
|
||||||
|
+static const BN_ULONG modp_4096_p[] = {
|
||||||
|
+ BN_DEF(0xFFFFFFFF, 0xFFFFFFFF), BN_DEF(0x34063199, 0x4DF435C9),
|
||||||
|
+ BN_DEF(0x90A6C08F, 0x86FFB7DC), BN_DEF(0x8D8FDDC1, 0x93B4EA98),
|
||||||
|
+ BN_DEF(0xD5B05AA9, 0xD0069127), BN_DEF(0x2170481C, 0xB81BDD76),
|
||||||
|
+ BN_DEF(0xCEE2D7AF, 0x1F612970), BN_DEF(0x515BE7ED, 0x233BA186),
|
||||||
|
+ BN_DEF(0xA090C3A2, 0x99B2964F), BN_DEF(0x4E6BC05D, 0x287C5947),
|
||||||
|
+ BN_DEF(0x1FBECAA6, 0x2E8EFC14), BN_DEF(0x04DE8EF9, 0xDBBBC2DB),
|
||||||
|
+ BN_DEF(0x2AD44CE8, 0x2583E9CA), BN_DEF(0xB6150BDA, 0x1A946834),
|
||||||
|
+ BN_DEF(0x6AF4E23C, 0x99C32718), BN_DEF(0xBDBA5B26, 0x88719A10),
|
||||||
|
+ BN_DEF(0xA787E6D7, 0x1A723C12), BN_DEF(0xA9210801, 0x4B82D120),
|
||||||
|
+ BN_DEF(0xE0FD108E, 0x43DB5BFC), BN_DEF(0x74E5AB31, 0x08E24FA0),
|
||||||
|
+ BN_DEF(0xBAD946E2, 0x770988C0), BN_DEF(0x7A615D6C, 0xBBE11757),
|
||||||
|
+ BN_DEF(0x177B200C, 0x521F2B18), BN_DEF(0x3EC86A64, 0xD8760273),
|
||||||
|
+ BN_DEF(0xD98A0864, 0xF12FFA06), BN_DEF(0x1AD2EE6B, 0xCEE3D226),
|
||||||
|
+ BN_DEF(0x4A25619D, 0x1E8C94E0), BN_DEF(0xDB0933D7, 0xABF5AE8C),
|
||||||
|
+ BN_DEF(0xA6E1E4C7, 0xB3970F85), BN_DEF(0x5D060C7D, 0x8AEA7157),
|
||||||
|
+ BN_DEF(0x58DBEF0A, 0xECFB8504), BN_DEF(0xDF1CBA64, 0xA85521AB),
|
||||||
|
+ BN_DEF(0x04507A33, 0xAD33170D), BN_DEF(0x8AAAC42D, 0x15728E5A),
|
||||||
|
+ BN_DEF(0x98FA0510, 0x15D22618), BN_DEF(0xEA956AE5, 0x3995497C),
|
||||||
|
+ BN_DEF(0x95581718, 0xDE2BCBF6), BN_DEF(0x6F4C52C9, 0xB5C55DF0),
|
||||||
|
+ BN_DEF(0xEC07A28F, 0x9B2783A2), BN_DEF(0x180E8603, 0xE39E772C),
|
||||||
|
+ BN_DEF(0x2E36CE3B, 0x32905E46), BN_DEF(0xCA18217C, 0xF1746C08),
|
||||||
|
+ BN_DEF(0x4ABC9804, 0x670C354E), BN_DEF(0x7096966D, 0x9ED52907),
|
||||||
|
+ BN_DEF(0x208552BB, 0x1C62F356), BN_DEF(0xDCA3AD96, 0x83655D23),
|
||||||
|
+ BN_DEF(0xFD24CF5F, 0x69163FA8), BN_DEF(0x1C55D39A, 0x98DA4836),
|
||||||
|
+ BN_DEF(0xA163BF05, 0xC2007CB8), BN_DEF(0xECE45B3D, 0x49286651),
|
||||||
|
+ BN_DEF(0x7C4B1FE6, 0xAE9F2411), BN_DEF(0x5A899FA5, 0xEE386BFB),
|
||||||
|
+ BN_DEF(0xF406B7ED, 0x0BFF5CB6), BN_DEF(0xA637ED6B, 0xF44C42E9),
|
||||||
|
+ BN_DEF(0x625E7EC6, 0xE485B576), BN_DEF(0x6D51C245, 0x4FE1356D),
|
||||||
|
+ BN_DEF(0xF25F1437, 0x302B0A6D), BN_DEF(0xCD3A431B, 0xEF9519B3),
|
||||||
|
+ BN_DEF(0x8E3404DD, 0x514A0879), BN_DEF(0x3B139B22, 0x020BBEA6),
|
||||||
|
+ BN_DEF(0x8A67CC74, 0x29024E08), BN_DEF(0x80DC1CD1, 0xC4C6628B),
|
||||||
|
+ BN_DEF(0x2168C234, 0xC90FDAA2), BN_DEF(0xFFFFFFFF, 0xFFFFFFFF)
|
||||||
|
+};
|
||||||
|
+/* q = (p - 1) / 2 */
|
||||||
|
+static const BN_ULONG modp_4096_q[] = {
|
||||||
|
+ BN_DEF(0xFFFFFFFF, 0xFFFFFFFF), BN_DEF(0x9A0318CC, 0xA6FA1AE4),
|
||||||
|
+ BN_DEF(0x48536047, 0xC37FDBEE), BN_DEF(0x46C7EEE0, 0xC9DA754C),
|
||||||
|
+ BN_DEF(0xEAD82D54, 0x68034893), BN_DEF(0x10B8240E, 0xDC0DEEBB),
|
||||||
|
+ BN_DEF(0x67716BD7, 0x8FB094B8), BN_DEF(0x28ADF3F6, 0x119DD0C3),
|
||||||
|
+ BN_DEF(0xD04861D1, 0xCCD94B27), BN_DEF(0xA735E02E, 0x143E2CA3),
|
||||||
|
+ BN_DEF(0x0FDF6553, 0x97477E0A), BN_DEF(0x826F477C, 0x6DDDE16D),
|
||||||
|
+ BN_DEF(0x156A2674, 0x12C1F4E5), BN_DEF(0x5B0A85ED, 0x0D4A341A),
|
||||||
|
+ BN_DEF(0x357A711E, 0x4CE1938C), BN_DEF(0x5EDD2D93, 0xC438CD08),
|
||||||
|
+ BN_DEF(0x53C3F36B, 0x8D391E09), BN_DEF(0x54908400, 0x25C16890),
|
||||||
|
+ BN_DEF(0x707E8847, 0xA1EDADFE), BN_DEF(0x3A72D598, 0x047127D0),
|
||||||
|
+ BN_DEF(0x5D6CA371, 0x3B84C460), BN_DEF(0xBD30AEB6, 0x5DF08BAB),
|
||||||
|
+ BN_DEF(0x0BBD9006, 0x290F958C), BN_DEF(0x9F643532, 0x6C3B0139),
|
||||||
|
+ BN_DEF(0x6CC50432, 0xF897FD03), BN_DEF(0x0D697735, 0xE771E913),
|
||||||
|
+ BN_DEF(0x2512B0CE, 0x8F464A70), BN_DEF(0x6D8499EB, 0xD5FAD746),
|
||||||
|
+ BN_DEF(0xD370F263, 0xD9CB87C2), BN_DEF(0xAE83063E, 0x457538AB),
|
||||||
|
+ BN_DEF(0x2C6DF785, 0x767DC282), BN_DEF(0xEF8E5D32, 0xD42A90D5),
|
||||||
|
+ BN_DEF(0x82283D19, 0xD6998B86), BN_DEF(0x45556216, 0x0AB9472D),
|
||||||
|
+ BN_DEF(0x4C7D0288, 0x8AE9130C), BN_DEF(0x754AB572, 0x1CCAA4BE),
|
||||||
|
+ BN_DEF(0x4AAC0B8C, 0xEF15E5FB), BN_DEF(0x37A62964, 0xDAE2AEF8),
|
||||||
|
+ BN_DEF(0x7603D147, 0xCD93C1D1), BN_DEF(0x0C074301, 0xF1CF3B96),
|
||||||
|
+ BN_DEF(0x171B671D, 0x19482F23), BN_DEF(0x650C10BE, 0x78BA3604),
|
||||||
|
+ BN_DEF(0x255E4C02, 0xB3861AA7), BN_DEF(0xB84B4B36, 0xCF6A9483),
|
||||||
|
+ BN_DEF(0x1042A95D, 0x0E3179AB), BN_DEF(0xEE51D6CB, 0xC1B2AE91),
|
||||||
|
+ BN_DEF(0x7E9267AF, 0x348B1FD4), BN_DEF(0x0E2AE9CD, 0xCC6D241B),
|
||||||
|
+ BN_DEF(0x50B1DF82, 0xE1003E5C), BN_DEF(0xF6722D9E, 0x24943328),
|
||||||
|
+ BN_DEF(0xBE258FF3, 0xD74F9208), BN_DEF(0xAD44CFD2, 0xF71C35FD),
|
||||||
|
+ BN_DEF(0x7A035BF6, 0x85FFAE5B), BN_DEF(0xD31BF6B5, 0x7A262174),
|
||||||
|
+ BN_DEF(0x312F3F63, 0xF242DABB), BN_DEF(0xB6A8E122, 0xA7F09AB6),
|
||||||
|
+ BN_DEF(0xF92F8A1B, 0x98158536), BN_DEF(0xE69D218D, 0xF7CA8CD9),
|
||||||
|
+ BN_DEF(0xC71A026E, 0x28A5043C), BN_DEF(0x1D89CD91, 0x0105DF53),
|
||||||
|
+ BN_DEF(0x4533E63A, 0x94812704), BN_DEF(0xC06E0E68, 0x62633145),
|
||||||
|
+ BN_DEF(0x10B4611A, 0xE487ED51), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+/*-
|
||||||
|
+ * "6144-bit MODP Group" from RFC3526, Section 6.
|
||||||
|
+ *
|
||||||
|
+ * The prime is: 2^6144 - 2^6080 - 1 + 2^64 * { [2^6014 pi] + 929484 }
|
||||||
|
+ *
|
||||||
|
+ * RFC3526 specifies a generator of 2.
|
||||||
|
+ */
|
||||||
|
+static const BN_ULONG modp_6144_p[] = {
|
||||||
|
+ BN_DEF(0xFFFFFFFF, 0xFFFFFFFF), BN_DEF(0x6DCC4024, 0xE694F91E),
|
||||||
|
+ BN_DEF(0x0B7474D6, 0x12BF2D5B), BN_DEF(0x3F4860EE, 0x043E8F66),
|
||||||
|
+ BN_DEF(0x6E3C0468, 0x387FE8D7), BN_DEF(0x2EF29632, 0xDA56C9EC),
|
||||||
|
+ BN_DEF(0xA313D55C, 0xEB19CCB1), BN_DEF(0x8A1FBFF0, 0xF550AA3D),
|
||||||
|
+ BN_DEF(0xB7C5DA76, 0x06A1D58B), BN_DEF(0xF29BE328, 0xA79715EE),
|
||||||
|
+ BN_DEF(0x0F8037E0, 0x14CC5ED2), BN_DEF(0xBF48E1D8, 0xCC8F6D7E),
|
||||||
|
+ BN_DEF(0x2B4154AA, 0x4BD407B2), BN_DEF(0xFF585AC5, 0x0F1D45B7),
|
||||||
|
+ BN_DEF(0x36CC88BE, 0x23A97A7E), BN_DEF(0xBEC7E8F3, 0x59E7C97F),
|
||||||
|
+ BN_DEF(0x900B1C9E, 0xB5A84031), BN_DEF(0x46980C82, 0xD55E702F),
|
||||||
|
+ BN_DEF(0x6E74FEF6, 0xF482D7CE), BN_DEF(0xD1721D03, 0xF032EA15),
|
||||||
|
+ BN_DEF(0xC64B92EC, 0x5983CA01), BN_DEF(0x378CD2BF, 0x6FB8F401),
|
||||||
|
+ BN_DEF(0x2BD7AF42, 0x33205151), BN_DEF(0xE6CC254B, 0xDB7F1447),
|
||||||
|
+ BN_DEF(0xCED4BB1B, 0x44CE6CBA), BN_DEF(0xCF9B14ED, 0xDA3EDBEB),
|
||||||
|
+ BN_DEF(0x865A8918, 0x179727B0), BN_DEF(0x9027D831, 0xB06A53ED),
|
||||||
|
+ BN_DEF(0x413001AE, 0xE5DB382F), BN_DEF(0xAD9E530E, 0xF8FF9406),
|
||||||
|
+ BN_DEF(0x3DBA37BD, 0xC9751E76), BN_DEF(0x602646DE, 0xC1D4DCB2),
|
||||||
|
+ BN_DEF(0xD27C7026, 0x36C3FAB4), BN_DEF(0x34028492, 0x4DF435C9),
|
||||||
|
+ BN_DEF(0x90A6C08F, 0x86FFB7DC), BN_DEF(0x8D8FDDC1, 0x93B4EA98),
|
||||||
|
+ BN_DEF(0xD5B05AA9, 0xD0069127), BN_DEF(0x2170481C, 0xB81BDD76),
|
||||||
|
+ BN_DEF(0xCEE2D7AF, 0x1F612970), BN_DEF(0x515BE7ED, 0x233BA186),
|
||||||
|
+ BN_DEF(0xA090C3A2, 0x99B2964F), BN_DEF(0x4E6BC05D, 0x287C5947),
|
||||||
|
+ BN_DEF(0x1FBECAA6, 0x2E8EFC14), BN_DEF(0x04DE8EF9, 0xDBBBC2DB),
|
||||||
|
+ BN_DEF(0x2AD44CE8, 0x2583E9CA), BN_DEF(0xB6150BDA, 0x1A946834),
|
||||||
|
+ BN_DEF(0x6AF4E23C, 0x99C32718), BN_DEF(0xBDBA5B26, 0x88719A10),
|
||||||
|
+ BN_DEF(0xA787E6D7, 0x1A723C12), BN_DEF(0xA9210801, 0x4B82D120),
|
||||||
|
+ BN_DEF(0xE0FD108E, 0x43DB5BFC), BN_DEF(0x74E5AB31, 0x08E24FA0),
|
||||||
|
+ BN_DEF(0xBAD946E2, 0x770988C0), BN_DEF(0x7A615D6C, 0xBBE11757),
|
||||||
|
+ BN_DEF(0x177B200C, 0x521F2B18), BN_DEF(0x3EC86A64, 0xD8760273),
|
||||||
|
+ BN_DEF(0xD98A0864, 0xF12FFA06), BN_DEF(0x1AD2EE6B, 0xCEE3D226),
|
||||||
|
+ BN_DEF(0x4A25619D, 0x1E8C94E0), BN_DEF(0xDB0933D7, 0xABF5AE8C),
|
||||||
|
+ BN_DEF(0xA6E1E4C7, 0xB3970F85), BN_DEF(0x5D060C7D, 0x8AEA7157),
|
||||||
|
+ BN_DEF(0x58DBEF0A, 0xECFB8504), BN_DEF(0xDF1CBA64, 0xA85521AB),
|
||||||
|
+ BN_DEF(0x04507A33, 0xAD33170D), BN_DEF(0x8AAAC42D, 0x15728E5A),
|
||||||
|
+ BN_DEF(0x98FA0510, 0x15D22618), BN_DEF(0xEA956AE5, 0x3995497C),
|
||||||
|
+ BN_DEF(0x95581718, 0xDE2BCBF6), BN_DEF(0x6F4C52C9, 0xB5C55DF0),
|
||||||
|
+ BN_DEF(0xEC07A28F, 0x9B2783A2), BN_DEF(0x180E8603, 0xE39E772C),
|
||||||
|
+ BN_DEF(0x2E36CE3B, 0x32905E46), BN_DEF(0xCA18217C, 0xF1746C08),
|
||||||
|
+ BN_DEF(0x4ABC9804, 0x670C354E), BN_DEF(0x7096966D, 0x9ED52907),
|
||||||
|
+ BN_DEF(0x208552BB, 0x1C62F356), BN_DEF(0xDCA3AD96, 0x83655D23),
|
||||||
|
+ BN_DEF(0xFD24CF5F, 0x69163FA8), BN_DEF(0x1C55D39A, 0x98DA4836),
|
||||||
|
+ BN_DEF(0xA163BF05, 0xC2007CB8), BN_DEF(0xECE45B3D, 0x49286651),
|
||||||
|
+ BN_DEF(0x7C4B1FE6, 0xAE9F2411), BN_DEF(0x5A899FA5, 0xEE386BFB),
|
||||||
|
+ BN_DEF(0xF406B7ED, 0x0BFF5CB6), BN_DEF(0xA637ED6B, 0xF44C42E9),
|
||||||
|
+ BN_DEF(0x625E7EC6, 0xE485B576), BN_DEF(0x6D51C245, 0x4FE1356D),
|
||||||
|
+ BN_DEF(0xF25F1437, 0x302B0A6D), BN_DEF(0xCD3A431B, 0xEF9519B3),
|
||||||
|
+ BN_DEF(0x8E3404DD, 0x514A0879), BN_DEF(0x3B139B22, 0x020BBEA6),
|
||||||
|
+ BN_DEF(0x8A67CC74, 0x29024E08), BN_DEF(0x80DC1CD1, 0xC4C6628B),
|
||||||
|
+ BN_DEF(0x2168C234, 0xC90FDAA2), BN_DEF(0xFFFFFFFF, 0xFFFFFFFF)
|
||||||
|
+};
|
||||||
|
+/* q = (p - 1) / 2 */
|
||||||
|
+static const BN_ULONG modp_6144_q[] = {
|
||||||
|
+ BN_DEF(0xFFFFFFFF, 0x7FFFFFFF), BN_DEF(0x36E62012, 0x734A7C8F),
|
||||||
|
+ BN_DEF(0x85BA3A6B, 0x095F96AD), BN_DEF(0x1FA43077, 0x021F47B3),
|
||||||
|
+ BN_DEF(0xB71E0234, 0x1C3FF46B), BN_DEF(0x17794B19, 0x6D2B64F6),
|
||||||
|
+ BN_DEF(0xD189EAAE, 0x758CE658), BN_DEF(0xC50FDFF8, 0x7AA8551E),
|
||||||
|
+ BN_DEF(0xDBE2ED3B, 0x0350EAC5), BN_DEF(0x794DF194, 0x53CB8AF7),
|
||||||
|
+ BN_DEF(0x07C01BF0, 0x0A662F69), BN_DEF(0x5FA470EC, 0x6647B6BF),
|
||||||
|
+ BN_DEF(0x15A0AA55, 0xA5EA03D9), BN_DEF(0xFFAC2D62, 0x078EA2DB),
|
||||||
|
+ BN_DEF(0x1B66445F, 0x91D4BD3F), BN_DEF(0xDF63F479, 0x2CF3E4BF),
|
||||||
|
+ BN_DEF(0xC8058E4F, 0x5AD42018), BN_DEF(0xA34C0641, 0x6AAF3817),
|
||||||
|
+ BN_DEF(0x373A7F7B, 0xFA416BE7), BN_DEF(0xE8B90E81, 0x7819750A),
|
||||||
|
+ BN_DEF(0xE325C976, 0xACC1E500), BN_DEF(0x9BC6695F, 0x37DC7A00),
|
||||||
|
+ BN_DEF(0x95EBD7A1, 0x999028A8), BN_DEF(0xF36612A5, 0xEDBF8A23),
|
||||||
|
+ BN_DEF(0x676A5D8D, 0xA267365D), BN_DEF(0xE7CD8A76, 0x6D1F6DF5),
|
||||||
|
+ BN_DEF(0x432D448C, 0x8BCB93D8), BN_DEF(0xC813EC18, 0x583529F6),
|
||||||
|
+ BN_DEF(0xA09800D7, 0x72ED9C17), BN_DEF(0x56CF2987, 0xFC7FCA03),
|
||||||
|
+ BN_DEF(0x1EDD1BDE, 0x64BA8F3B), BN_DEF(0x3013236F, 0x60EA6E59),
|
||||||
|
+ BN_DEF(0x693E3813, 0x1B61FD5A), BN_DEF(0x9A014249, 0xA6FA1AE4),
|
||||||
|
+ BN_DEF(0x48536047, 0xC37FDBEE), BN_DEF(0x46C7EEE0, 0xC9DA754C),
|
||||||
|
+ BN_DEF(0xEAD82D54, 0x68034893), BN_DEF(0x10B8240E, 0xDC0DEEBB),
|
||||||
|
+ BN_DEF(0x67716BD7, 0x8FB094B8), BN_DEF(0x28ADF3F6, 0x119DD0C3),
|
||||||
|
+ BN_DEF(0xD04861D1, 0xCCD94B27), BN_DEF(0xA735E02E, 0x143E2CA3),
|
||||||
|
+ BN_DEF(0x0FDF6553, 0x97477E0A), BN_DEF(0x826F477C, 0x6DDDE16D),
|
||||||
|
+ BN_DEF(0x156A2674, 0x12C1F4E5), BN_DEF(0x5B0A85ED, 0x0D4A341A),
|
||||||
|
+ BN_DEF(0x357A711E, 0x4CE1938C), BN_DEF(0x5EDD2D93, 0xC438CD08),
|
||||||
|
+ BN_DEF(0x53C3F36B, 0x8D391E09), BN_DEF(0x54908400, 0x25C16890),
|
||||||
|
+ BN_DEF(0x707E8847, 0xA1EDADFE), BN_DEF(0x3A72D598, 0x047127D0),
|
||||||
|
+ BN_DEF(0x5D6CA371, 0x3B84C460), BN_DEF(0xBD30AEB6, 0x5DF08BAB),
|
||||||
|
+ BN_DEF(0x0BBD9006, 0x290F958C), BN_DEF(0x9F643532, 0x6C3B0139),
|
||||||
|
+ BN_DEF(0x6CC50432, 0xF897FD03), BN_DEF(0x0D697735, 0xE771E913),
|
||||||
|
+ BN_DEF(0x2512B0CE, 0x8F464A70), BN_DEF(0x6D8499EB, 0xD5FAD746),
|
||||||
|
+ BN_DEF(0xD370F263, 0xD9CB87C2), BN_DEF(0xAE83063E, 0x457538AB),
|
||||||
|
+ BN_DEF(0x2C6DF785, 0x767DC282), BN_DEF(0xEF8E5D32, 0xD42A90D5),
|
||||||
|
+ BN_DEF(0x82283D19, 0xD6998B86), BN_DEF(0x45556216, 0x0AB9472D),
|
||||||
|
+ BN_DEF(0x4C7D0288, 0x8AE9130C), BN_DEF(0x754AB572, 0x1CCAA4BE),
|
||||||
|
+ BN_DEF(0x4AAC0B8C, 0xEF15E5FB), BN_DEF(0x37A62964, 0xDAE2AEF8),
|
||||||
|
+ BN_DEF(0x7603D147, 0xCD93C1D1), BN_DEF(0x0C074301, 0xF1CF3B96),
|
||||||
|
+ BN_DEF(0x171B671D, 0x19482F23), BN_DEF(0x650C10BE, 0x78BA3604),
|
||||||
|
+ BN_DEF(0x255E4C02, 0xB3861AA7), BN_DEF(0xB84B4B36, 0xCF6A9483),
|
||||||
|
+ BN_DEF(0x1042A95D, 0x0E3179AB), BN_DEF(0xEE51D6CB, 0xC1B2AE91),
|
||||||
|
+ BN_DEF(0x7E9267AF, 0x348B1FD4), BN_DEF(0x0E2AE9CD, 0xCC6D241B),
|
||||||
|
+ BN_DEF(0x50B1DF82, 0xE1003E5C), BN_DEF(0xF6722D9E, 0x24943328),
|
||||||
|
+ BN_DEF(0xBE258FF3, 0xD74F9208), BN_DEF(0xAD44CFD2, 0xF71C35FD),
|
||||||
|
+ BN_DEF(0x7A035BF6, 0x85FFAE5B), BN_DEF(0xD31BF6B5, 0x7A262174),
|
||||||
|
+ BN_DEF(0x312F3F63, 0xF242DABB), BN_DEF(0xB6A8E122, 0xA7F09AB6),
|
||||||
|
+ BN_DEF(0xF92F8A1B, 0x98158536), BN_DEF(0xE69D218D, 0xF7CA8CD9),
|
||||||
|
+ BN_DEF(0xC71A026E, 0x28A5043C), BN_DEF(0x1D89CD91, 0x0105DF53),
|
||||||
|
+ BN_DEF(0x4533E63A, 0x94812704), BN_DEF(0xC06E0E68, 0x62633145),
|
||||||
|
+ BN_DEF(0x10B4611A, 0xE487ED51), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ * "8192-bit MODP Group" from RFC3526, Section 7.
|
||||||
|
+ *
|
||||||
|
+ * The prime is: 2^8192 - 2^8128 - 1 + 2^64 * { [2^8062 pi] + 4743158 }
|
||||||
|
+ *
|
||||||
|
+ * RFC3526 specifies a generator of 2.
|
||||||
|
+ */
|
||||||
|
+static const BN_ULONG modp_8192_p[] = {
|
||||||
|
+ BN_DEF(0xFFFFFFFF, 0xFFFFFFFF), BN_DEF(0x98EDD3DF, 0x60C980DD),
|
||||||
|
+ BN_DEF(0x80B96E71, 0xC81F56E8), BN_DEF(0x765694DF, 0x9E3050E2),
|
||||||
|
+ BN_DEF(0x5677E9AA, 0x9558E447), BN_DEF(0xFC026E47, 0xC9190DA6),
|
||||||
|
+ BN_DEF(0xD5EE382B, 0x889A002E), BN_DEF(0x481C6CD7, 0x4009438B),
|
||||||
|
+ BN_DEF(0xEB879F92, 0x359046F4), BN_DEF(0x1ECFA268, 0xFAF36BC3),
|
||||||
|
+ BN_DEF(0x7EE74D73, 0xB1D510BD), BN_DEF(0x5DED7EA1, 0xF9AB4819),
|
||||||
|
+ BN_DEF(0x0846851D, 0x64F31CC5), BN_DEF(0xA0255DC1, 0x4597E899),
|
||||||
|
+ BN_DEF(0x74AB6A36, 0xDF310EE0), BN_DEF(0x3F44F82D, 0x6D2A13F8),
|
||||||
|
+ BN_DEF(0xB3A278A6, 0x062B3CF5), BN_DEF(0xED5BDD3A, 0x79683303),
|
||||||
|
+ BN_DEF(0xA2C087E8, 0xFA9D4B7F), BN_DEF(0x2F8385DD, 0x4BCBC886),
|
||||||
|
+ BN_DEF(0x6CEA306B, 0x3473FC64), BN_DEF(0x1A23F0C7, 0x13EB57A8),
|
||||||
|
+ BN_DEF(0xA4037C07, 0x22222E04), BN_DEF(0xFC848AD9, 0xE3FDB8BE),
|
||||||
|
+ BN_DEF(0xE39D652D, 0x238F16CB), BN_DEF(0x2BF1C978, 0x3423B474),
|
||||||
|
+ BN_DEF(0x5AE4F568, 0x3AAB639C), BN_DEF(0x6BA42466, 0x2576F693),
|
||||||
|
+ BN_DEF(0x8AFC47ED, 0x741FA7BF), BN_DEF(0x8D9DD300, 0x3BC832B6),
|
||||||
|
+ BN_DEF(0x73B931BA, 0xD8BEC4D0), BN_DEF(0xA932DF8C, 0x38777CB6),
|
||||||
|
+ BN_DEF(0x12FEE5E4, 0x74A3926F), BN_DEF(0x6DBE1159, 0xE694F91E),
|
||||||
|
+ BN_DEF(0x0B7474D6, 0x12BF2D5B), BN_DEF(0x3F4860EE, 0x043E8F66),
|
||||||
|
+ BN_DEF(0x6E3C0468, 0x387FE8D7), BN_DEF(0x2EF29632, 0xDA56C9EC),
|
||||||
|
+ BN_DEF(0xA313D55C, 0xEB19CCB1), BN_DEF(0x8A1FBFF0, 0xF550AA3D),
|
||||||
|
+ BN_DEF(0xB7C5DA76, 0x06A1D58B), BN_DEF(0xF29BE328, 0xA79715EE),
|
||||||
|
+ BN_DEF(0x0F8037E0, 0x14CC5ED2), BN_DEF(0xBF48E1D8, 0xCC8F6D7E),
|
||||||
|
+ BN_DEF(0x2B4154AA, 0x4BD407B2), BN_DEF(0xFF585AC5, 0x0F1D45B7),
|
||||||
|
+ BN_DEF(0x36CC88BE, 0x23A97A7E), BN_DEF(0xBEC7E8F3, 0x59E7C97F),
|
||||||
|
+ BN_DEF(0x900B1C9E, 0xB5A84031), BN_DEF(0x46980C82, 0xD55E702F),
|
||||||
|
+ BN_DEF(0x6E74FEF6, 0xF482D7CE), BN_DEF(0xD1721D03, 0xF032EA15),
|
||||||
|
+ BN_DEF(0xC64B92EC, 0x5983CA01), BN_DEF(0x378CD2BF, 0x6FB8F401),
|
||||||
|
+ BN_DEF(0x2BD7AF42, 0x33205151), BN_DEF(0xE6CC254B, 0xDB7F1447),
|
||||||
|
+ BN_DEF(0xCED4BB1B, 0x44CE6CBA), BN_DEF(0xCF9B14ED, 0xDA3EDBEB),
|
||||||
|
+ BN_DEF(0x865A8918, 0x179727B0), BN_DEF(0x9027D831, 0xB06A53ED),
|
||||||
|
+ BN_DEF(0x413001AE, 0xE5DB382F), BN_DEF(0xAD9E530E, 0xF8FF9406),
|
||||||
|
+ BN_DEF(0x3DBA37BD, 0xC9751E76), BN_DEF(0x602646DE, 0xC1D4DCB2),
|
||||||
|
+ BN_DEF(0xD27C7026, 0x36C3FAB4), BN_DEF(0x34028492, 0x4DF435C9),
|
||||||
|
+ BN_DEF(0x90A6C08F, 0x86FFB7DC), BN_DEF(0x8D8FDDC1, 0x93B4EA98),
|
||||||
|
+ BN_DEF(0xD5B05AA9, 0xD0069127), BN_DEF(0x2170481C, 0xB81BDD76),
|
||||||
|
+ BN_DEF(0xCEE2D7AF, 0x1F612970), BN_DEF(0x515BE7ED, 0x233BA186),
|
||||||
|
+ BN_DEF(0xA090C3A2, 0x99B2964F), BN_DEF(0x4E6BC05D, 0x287C5947),
|
||||||
|
+ BN_DEF(0x1FBECAA6, 0x2E8EFC14), BN_DEF(0x04DE8EF9, 0xDBBBC2DB),
|
||||||
|
+ BN_DEF(0x2AD44CE8, 0x2583E9CA), BN_DEF(0xB6150BDA, 0x1A946834),
|
||||||
|
+ BN_DEF(0x6AF4E23C, 0x99C32718), BN_DEF(0xBDBA5B26, 0x88719A10),
|
||||||
|
+ BN_DEF(0xA787E6D7, 0x1A723C12), BN_DEF(0xA9210801, 0x4B82D120),
|
||||||
|
+ BN_DEF(0xE0FD108E, 0x43DB5BFC), BN_DEF(0x74E5AB31, 0x08E24FA0),
|
||||||
|
+ BN_DEF(0xBAD946E2, 0x770988C0), BN_DEF(0x7A615D6C, 0xBBE11757),
|
||||||
|
+ BN_DEF(0x177B200C, 0x521F2B18), BN_DEF(0x3EC86A64, 0xD8760273),
|
||||||
|
+ BN_DEF(0xD98A0864, 0xF12FFA06), BN_DEF(0x1AD2EE6B, 0xCEE3D226),
|
||||||
|
+ BN_DEF(0x4A25619D, 0x1E8C94E0), BN_DEF(0xDB0933D7, 0xABF5AE8C),
|
||||||
|
+ BN_DEF(0xA6E1E4C7, 0xB3970F85), BN_DEF(0x5D060C7D, 0x8AEA7157),
|
||||||
|
+ BN_DEF(0x58DBEF0A, 0xECFB8504), BN_DEF(0xDF1CBA64, 0xA85521AB),
|
||||||
|
+ BN_DEF(0x04507A33, 0xAD33170D), BN_DEF(0x8AAAC42D, 0x15728E5A),
|
||||||
|
+ BN_DEF(0x98FA0510, 0x15D22618), BN_DEF(0xEA956AE5, 0x3995497C),
|
||||||
|
+ BN_DEF(0x95581718, 0xDE2BCBF6), BN_DEF(0x6F4C52C9, 0xB5C55DF0),
|
||||||
|
+ BN_DEF(0xEC07A28F, 0x9B2783A2), BN_DEF(0x180E8603, 0xE39E772C),
|
||||||
|
+ BN_DEF(0x2E36CE3B, 0x32905E46), BN_DEF(0xCA18217C, 0xF1746C08),
|
||||||
|
+ BN_DEF(0x4ABC9804, 0x670C354E), BN_DEF(0x7096966D, 0x9ED52907),
|
||||||
|
+ BN_DEF(0x208552BB, 0x1C62F356), BN_DEF(0xDCA3AD96, 0x83655D23),
|
||||||
|
+ BN_DEF(0xFD24CF5F, 0x69163FA8), BN_DEF(0x1C55D39A, 0x98DA4836),
|
||||||
|
+ BN_DEF(0xA163BF05, 0xC2007CB8), BN_DEF(0xECE45B3D, 0x49286651),
|
||||||
|
+ BN_DEF(0x7C4B1FE6, 0xAE9F2411), BN_DEF(0x5A899FA5, 0xEE386BFB),
|
||||||
|
+ BN_DEF(0xF406B7ED, 0x0BFF5CB6), BN_DEF(0xA637ED6B, 0xF44C42E9),
|
||||||
|
+ BN_DEF(0x625E7EC6, 0xE485B576), BN_DEF(0x6D51C245, 0x4FE1356D),
|
||||||
|
+ BN_DEF(0xF25F1437, 0x302B0A6D), BN_DEF(0xCD3A431B, 0xEF9519B3),
|
||||||
|
+ BN_DEF(0x8E3404DD, 0x514A0879), BN_DEF(0x3B139B22, 0x020BBEA6),
|
||||||
|
+ BN_DEF(0x8A67CC74, 0x29024E08), BN_DEF(0x80DC1CD1, 0xC4C6628B),
|
||||||
|
+ BN_DEF(0x2168C234, 0xC90FDAA2), BN_DEF(0xFFFFFFFF, 0xFFFFFFFF)
|
||||||
|
+};
|
||||||
|
+/* q = (p - 1) / 2 */
|
||||||
|
+static const BN_ULONG modp_8192_q[] = {
|
||||||
|
+ BN_DEF(0xFFFFFFFF, 0xFFFFFFFF), BN_DEF(0xCC76E9EF, 0xB064C06E),
|
||||||
|
+ BN_DEF(0x405CB738, 0xE40FAB74), BN_DEF(0x3B2B4A6F, 0x4F182871),
|
||||||
|
+ BN_DEF(0xAB3BF4D5, 0xCAAC7223), BN_DEF(0x7E013723, 0xE48C86D3),
|
||||||
|
+ BN_DEF(0x6AF71C15, 0xC44D0017), BN_DEF(0xA40E366B, 0x2004A1C5),
|
||||||
|
+ BN_DEF(0x75C3CFC9, 0x1AC8237A), BN_DEF(0x8F67D134, 0xFD79B5E1),
|
||||||
|
+ BN_DEF(0xBF73A6B9, 0xD8EA885E), BN_DEF(0xAEF6BF50, 0xFCD5A40C),
|
||||||
|
+ BN_DEF(0x8423428E, 0xB2798E62), BN_DEF(0xD012AEE0, 0x22CBF44C),
|
||||||
|
+ BN_DEF(0x3A55B51B, 0xEF988770), BN_DEF(0x1FA27C16, 0x369509FC),
|
||||||
|
+ BN_DEF(0xD9D13C53, 0x03159E7A), BN_DEF(0xF6ADEE9D, 0x3CB41981),
|
||||||
|
+ BN_DEF(0xD16043F4, 0xFD4EA5BF), BN_DEF(0x17C1C2EE, 0xA5E5E443),
|
||||||
|
+ BN_DEF(0x36751835, 0x9A39FE32), BN_DEF(0x0D11F863, 0x89F5ABD4),
|
||||||
|
+ BN_DEF(0x5201BE03, 0x91111702), BN_DEF(0x7E42456C, 0xF1FEDC5F),
|
||||||
|
+ BN_DEF(0xF1CEB296, 0x11C78B65), BN_DEF(0x15F8E4BC, 0x1A11DA3A),
|
||||||
|
+ BN_DEF(0x2D727AB4, 0x1D55B1CE), BN_DEF(0xB5D21233, 0x92BB7B49),
|
||||||
|
+ BN_DEF(0xC57E23F6, 0x3A0FD3DF), BN_DEF(0x46CEE980, 0x1DE4195B),
|
||||||
|
+ BN_DEF(0x39DC98DD, 0x6C5F6268), BN_DEF(0x54996FC6, 0x1C3BBE5B),
|
||||||
|
+ BN_DEF(0x897F72F2, 0xBA51C937), BN_DEF(0x36DF08AC, 0x734A7C8F),
|
||||||
|
+ BN_DEF(0x85BA3A6B, 0x095F96AD), BN_DEF(0x1FA43077, 0x021F47B3),
|
||||||
|
+ BN_DEF(0xB71E0234, 0x1C3FF46B), BN_DEF(0x17794B19, 0x6D2B64F6),
|
||||||
|
+ BN_DEF(0xD189EAAE, 0x758CE658), BN_DEF(0xC50FDFF8, 0x7AA8551E),
|
||||||
|
+ BN_DEF(0xDBE2ED3B, 0x0350EAC5), BN_DEF(0x794DF194, 0x53CB8AF7),
|
||||||
|
+ BN_DEF(0x07C01BF0, 0x0A662F69), BN_DEF(0x5FA470EC, 0x6647B6BF),
|
||||||
|
+ BN_DEF(0x15A0AA55, 0xA5EA03D9), BN_DEF(0xFFAC2D62, 0x078EA2DB),
|
||||||
|
+ BN_DEF(0x1B66445F, 0x91D4BD3F), BN_DEF(0xDF63F479, 0x2CF3E4BF),
|
||||||
|
+ BN_DEF(0xC8058E4F, 0x5AD42018), BN_DEF(0xA34C0641, 0x6AAF3817),
|
||||||
|
+ BN_DEF(0x373A7F7B, 0xFA416BE7), BN_DEF(0xE8B90E81, 0x7819750A),
|
||||||
|
+ BN_DEF(0xE325C976, 0xACC1E500), BN_DEF(0x9BC6695F, 0x37DC7A00),
|
||||||
|
+ BN_DEF(0x95EBD7A1, 0x999028A8), BN_DEF(0xF36612A5, 0xEDBF8A23),
|
||||||
|
+ BN_DEF(0x676A5D8D, 0xA267365D), BN_DEF(0xE7CD8A76, 0x6D1F6DF5),
|
||||||
|
+ BN_DEF(0x432D448C, 0x8BCB93D8), BN_DEF(0xC813EC18, 0x583529F6),
|
||||||
|
+ BN_DEF(0xA09800D7, 0x72ED9C17), BN_DEF(0x56CF2987, 0xFC7FCA03),
|
||||||
|
+ BN_DEF(0x1EDD1BDE, 0x64BA8F3B), BN_DEF(0x3013236F, 0x60EA6E59),
|
||||||
|
+ BN_DEF(0x693E3813, 0x1B61FD5A), BN_DEF(0x9A014249, 0xA6FA1AE4),
|
||||||
|
+ BN_DEF(0x48536047, 0xC37FDBEE), BN_DEF(0x46C7EEE0, 0xC9DA754C),
|
||||||
|
+ BN_DEF(0xEAD82D54, 0x68034893), BN_DEF(0x10B8240E, 0xDC0DEEBB),
|
||||||
|
+ BN_DEF(0x67716BD7, 0x8FB094B8), BN_DEF(0x28ADF3F6, 0x119DD0C3),
|
||||||
|
+ BN_DEF(0xD04861D1, 0xCCD94B27), BN_DEF(0xA735E02E, 0x143E2CA3),
|
||||||
|
+ BN_DEF(0x0FDF6553, 0x97477E0A), BN_DEF(0x826F477C, 0x6DDDE16D),
|
||||||
|
+ BN_DEF(0x156A2674, 0x12C1F4E5), BN_DEF(0x5B0A85ED, 0x0D4A341A),
|
||||||
|
+ BN_DEF(0x357A711E, 0x4CE1938C), BN_DEF(0x5EDD2D93, 0xC438CD08),
|
||||||
|
+ BN_DEF(0x53C3F36B, 0x8D391E09), BN_DEF(0x54908400, 0x25C16890),
|
||||||
|
+ BN_DEF(0x707E8847, 0xA1EDADFE), BN_DEF(0x3A72D598, 0x047127D0),
|
||||||
|
+ BN_DEF(0x5D6CA371, 0x3B84C460), BN_DEF(0xBD30AEB6, 0x5DF08BAB),
|
||||||
|
+ BN_DEF(0x0BBD9006, 0x290F958C), BN_DEF(0x9F643532, 0x6C3B0139),
|
||||||
|
+ BN_DEF(0x6CC50432, 0xF897FD03), BN_DEF(0x0D697735, 0xE771E913),
|
||||||
|
+ BN_DEF(0x2512B0CE, 0x8F464A70), BN_DEF(0x6D8499EB, 0xD5FAD746),
|
||||||
|
+ BN_DEF(0xD370F263, 0xD9CB87C2), BN_DEF(0xAE83063E, 0x457538AB),
|
||||||
|
+ BN_DEF(0x2C6DF785, 0x767DC282), BN_DEF(0xEF8E5D32, 0xD42A90D5),
|
||||||
|
+ BN_DEF(0x82283D19, 0xD6998B86), BN_DEF(0x45556216, 0x0AB9472D),
|
||||||
|
+ BN_DEF(0x4C7D0288, 0x8AE9130C), BN_DEF(0x754AB572, 0x1CCAA4BE),
|
||||||
|
+ BN_DEF(0x4AAC0B8C, 0xEF15E5FB), BN_DEF(0x37A62964, 0xDAE2AEF8),
|
||||||
|
+ BN_DEF(0x7603D147, 0xCD93C1D1), BN_DEF(0x0C074301, 0xF1CF3B96),
|
||||||
|
+ BN_DEF(0x171B671D, 0x19482F23), BN_DEF(0x650C10BE, 0x78BA3604),
|
||||||
|
+ BN_DEF(0x255E4C02, 0xB3861AA7), BN_DEF(0xB84B4B36, 0xCF6A9483),
|
||||||
|
+ BN_DEF(0x1042A95D, 0x0E3179AB), BN_DEF(0xEE51D6CB, 0xC1B2AE91),
|
||||||
|
+ BN_DEF(0x7E9267AF, 0x348B1FD4), BN_DEF(0x0E2AE9CD, 0xCC6D241B),
|
||||||
|
+ BN_DEF(0x50B1DF82, 0xE1003E5C), BN_DEF(0xF6722D9E, 0x24943328),
|
||||||
|
+ BN_DEF(0xBE258FF3, 0xD74F9208), BN_DEF(0xAD44CFD2, 0xF71C35FD),
|
||||||
|
+ BN_DEF(0x7A035BF6, 0x85FFAE5B), BN_DEF(0xD31BF6B5, 0x7A262174),
|
||||||
|
+ BN_DEF(0x312F3F63, 0xF242DABB), BN_DEF(0xB6A8E122, 0xA7F09AB6),
|
||||||
|
+ BN_DEF(0xF92F8A1B, 0x98158536), BN_DEF(0xE69D218D, 0xF7CA8CD9),
|
||||||
|
+ BN_DEF(0xC71A026E, 0x28A5043C), BN_DEF(0x1D89CD91, 0x0105DF53),
|
||||||
|
+ BN_DEF(0x4533E63A, 0x94812704), BN_DEF(0xC06E0E68, 0x62633145),
|
||||||
|
+ BN_DEF(0x10B4611A, 0xE487ED51), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+
|
||||||
|
/* DH parameters from RFC5114 */
|
||||||
|
|
||||||
|
# if BN_BITS2 == 64
|
||||||
|
@@ -508,5 +990,17 @@ make_dh_bn(ffdhe4096_p)
|
||||||
|
make_dh_bn(ffdhe6144_p)
|
||||||
|
make_dh_bn(ffdhe8192_p)
|
||||||
|
|
||||||
|
+make_dh_bn(modp_1536_p)
|
||||||
|
+make_dh_bn(modp_1536_q)
|
||||||
|
+make_dh_bn(modp_2048_p)
|
||||||
|
+make_dh_bn(modp_2048_q)
|
||||||
|
+make_dh_bn(modp_3072_p)
|
||||||
|
+make_dh_bn(modp_3072_q)
|
||||||
|
+make_dh_bn(modp_4096_p)
|
||||||
|
+make_dh_bn(modp_4096_q)
|
||||||
|
+make_dh_bn(modp_6144_p)
|
||||||
|
+make_dh_bn(modp_6144_q)
|
||||||
|
+make_dh_bn(modp_8192_p)
|
||||||
|
+make_dh_bn(modp_8192_q)
|
||||||
|
|
||||||
|
#endif
|
||||||
|
diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c
|
||||||
|
index e0805e7..261c8a1 100644
|
||||||
|
--- a/crypto/dh/dh_pmeth.c
|
||||||
|
+++ b/crypto/dh/dh_pmeth.c
|
||||||
|
@@ -351,6 +351,10 @@ static int pkey_dh_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /*
|
||||||
|
+ * Look for a safe prime group for key establishment. Which uses
|
||||||
|
+ * either RFC_3526 (modp_XXXX) or RFC_7919 (ffdheXXXX).
|
||||||
|
+ */
|
||||||
|
if (dctx->param_nid != 0) {
|
||||||
|
if ((dh = DH_new_by_nid(dctx->param_nid)) == NULL)
|
||||||
|
return 0;
|
||||||
|
diff --git a/crypto/dh/dh_rfc7919.c b/crypto/dh/dh_rfc7919.c
|
||||||
|
index 03d30a1..f339bd9 100644
|
||||||
|
--- a/crypto/dh/dh_rfc7919.c
|
||||||
|
+++ b/crypto/dh/dh_rfc7919.c
|
||||||
|
@@ -38,6 +38,18 @@ DH *DH_new_by_nid(int nid)
|
||||||
|
return dh_param_init(&_bignum_ffdhe6144_p, 375);
|
||||||
|
case NID_ffdhe8192:
|
||||||
|
return dh_param_init(&_bignum_ffdhe8192_p, 400);
|
||||||
|
+ case NID_modp_1536:
|
||||||
|
+ return dh_param_init(&_bignum_modp_1536_p, 175);
|
||||||
|
+ case NID_modp_2048:
|
||||||
|
+ return dh_param_init(&_bignum_modp_2048_p, 225);
|
||||||
|
+ case NID_modp_3072:
|
||||||
|
+ return dh_param_init(&_bignum_modp_3072_p, 275);
|
||||||
|
+ case NID_modp_4096:
|
||||||
|
+ return dh_param_init(&_bignum_modp_4096_p, 325);
|
||||||
|
+ case NID_modp_6144:
|
||||||
|
+ return dh_param_init(&_bignum_modp_6144_p, 375);
|
||||||
|
+ case NID_modp_8192:
|
||||||
|
+ return dh_param_init(&_bignum_modp_8192_p, 400);
|
||||||
|
default:
|
||||||
|
DHerr(DH_F_DH_NEW_BY_NID, DH_R_INVALID_PARAMETER_NID);
|
||||||
|
return NULL;
|
||||||
|
@@ -60,6 +72,18 @@ int DH_get_nid(const DH *dh)
|
||||||
|
nid = NID_ffdhe6144;
|
||||||
|
else if (!BN_cmp(dh->p, &_bignum_ffdhe8192_p))
|
||||||
|
nid = NID_ffdhe8192;
|
||||||
|
+ else if (!BN_cmp(dh->p, &_bignum_modp_1536_p))
|
||||||
|
+ nid = NID_modp_1536;
|
||||||
|
+ else if (!BN_cmp(dh->p, &_bignum_modp_2048_p))
|
||||||
|
+ nid = NID_modp_2048;
|
||||||
|
+ else if (!BN_cmp(dh->p, &_bignum_modp_3072_p))
|
||||||
|
+ nid = NID_modp_3072;
|
||||||
|
+ else if (!BN_cmp(dh->p, &_bignum_modp_4096_p))
|
||||||
|
+ nid = NID_modp_4096;
|
||||||
|
+ else if (!BN_cmp(dh->p, &_bignum_modp_6144_p))
|
||||||
|
+ nid = NID_modp_6144;
|
||||||
|
+ else if (!BN_cmp(dh->p, &_bignum_modp_8192_p))
|
||||||
|
+ nid = NID_modp_8192;
|
||||||
|
else
|
||||||
|
return NID_undef;
|
||||||
|
if (dh->q != NULL) {
|
||||||
|
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
|
||||||
|
index 12ca5ec..2fbd9a9 100644
|
||||||
|
--- a/crypto/objects/obj_dat.h
|
||||||
|
+++ b/crypto/objects/obj_dat.h
|
||||||
|
@@ -1078,7 +1078,7 @@ static const unsigned char so[7762] = {
|
||||||
|
0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x0D, /* [ 7753] OBJ_hmacWithSHA512_256 */
|
||||||
|
};
|
||||||
|
|
||||||
|
-#define NUM_NID 1196
|
||||||
|
+#define NUM_NID 1202
|
||||||
|
static const ASN1_OBJECT nid_objs[NUM_NID] = {
|
||||||
|
{"UNDEF", "undefined", NID_undef},
|
||||||
|
{"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},
|
||||||
|
@@ -2276,9 +2276,15 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
|
||||||
|
{"hmacWithSHA512-224", "hmacWithSHA512-224", NID_hmacWithSHA512_224, 8, &so[7745]},
|
||||||
|
{"hmacWithSHA512-256", "hmacWithSHA512-256", NID_hmacWithSHA512_256, 8, &so[7753]},
|
||||||
|
{"SSHKDF", "sshkdf", NID_sshkdf},
|
||||||
|
+ {"modp_1536", "modp_1536", NID_modp_1536},
|
||||||
|
+ {"modp_2048", "modp_2048", NID_modp_2048},
|
||||||
|
+ {"modp_3072", "modp_3072", NID_modp_3072},
|
||||||
|
+ {"modp_4096", "modp_4096", NID_modp_4096},
|
||||||
|
+ {"modp_6144", "modp_6144", NID_modp_6144},
|
||||||
|
+ {"modp_8192", "modp_8192", NID_modp_8192},
|
||||||
|
};
|
||||||
|
|
||||||
|
-#define NUM_SN 1187
|
||||||
|
+#define NUM_SN 1193
|
||||||
|
static const unsigned int sn_objs[NUM_SN] = {
|
||||||
|
364, /* "AD_DVCS" */
|
||||||
|
419, /* "AES-128-CBC" */
|
||||||
|
@@ -3121,6 +3127,12 @@ static const unsigned int sn_objs[NUM_SN] = {
|
||||||
|
506, /* "mime-mhs-bodies" */
|
||||||
|
505, /* "mime-mhs-headings" */
|
||||||
|
488, /* "mobileTelephoneNumber" */
|
||||||
|
+ 1196, /* "modp_1536" */
|
||||||
|
+ 1197, /* "modp_2048" */
|
||||||
|
+ 1198, /* "modp_3072" */
|
||||||
|
+ 1199, /* "modp_4096" */
|
||||||
|
+ 1200, /* "modp_6144" */
|
||||||
|
+ 1201, /* "modp_8192" */
|
||||||
|
136, /* "msCTLSign" */
|
||||||
|
135, /* "msCodeCom" */
|
||||||
|
134, /* "msCodeInd" */
|
||||||
|
@@ -3469,7 +3481,7 @@ static const unsigned int sn_objs[NUM_SN] = {
|
||||||
|
1093, /* "x509ExtAdmission" */
|
||||||
|
};
|
||||||
|
|
||||||
|
-#define NUM_LN 1187
|
||||||
|
+#define NUM_LN 1193
|
||||||
|
static const unsigned int ln_objs[NUM_LN] = {
|
||||||
|
363, /* "AD Time Stamping" */
|
||||||
|
405, /* "ANSI X9.62" */
|
||||||
|
@@ -4305,6 +4317,12 @@ static const unsigned int ln_objs[NUM_LN] = {
|
||||||
|
506, /* "mime-mhs-bodies" */
|
||||||
|
505, /* "mime-mhs-headings" */
|
||||||
|
488, /* "mobileTelephoneNumber" */
|
||||||
|
+ 1196, /* "modp_1536" */
|
||||||
|
+ 1197, /* "modp_2048" */
|
||||||
|
+ 1198, /* "modp_3072" */
|
||||||
|
+ 1199, /* "modp_4096" */
|
||||||
|
+ 1200, /* "modp_6144" */
|
||||||
|
+ 1201, /* "modp_8192" */
|
||||||
|
481, /* "nSRecord" */
|
||||||
|
173, /* "name" */
|
||||||
|
681, /* "onBasis" */
|
||||||
|
diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
|
||||||
|
index 231c183..7ee5912 100644
|
||||||
|
--- a/crypto/objects/obj_mac.num
|
||||||
|
+++ b/crypto/objects/obj_mac.num
|
||||||
|
@@ -1193,3 +1193,9 @@ magma_mac 1192
|
||||||
|
hmacWithSHA512_224 1193
|
||||||
|
hmacWithSHA512_256 1194
|
||||||
|
sshkdf 1195
|
||||||
|
+modp_1536 1196
|
||||||
|
+modp_2048 1197
|
||||||
|
+modp_3072 1198
|
||||||
|
+modp_4096 1199
|
||||||
|
+modp_6144 1200
|
||||||
|
+modp_8192 1201
|
||||||
|
diff --git a/doc/man3/DH_new_by_nid.pod b/doc/man3/DH_new_by_nid.pod
|
||||||
|
index 73636c5..fcea642 100644
|
||||||
|
--- a/doc/man3/DH_new_by_nid.pod
|
||||||
|
+++ b/doc/man3/DH_new_by_nid.pod
|
||||||
|
@@ -14,7 +14,9 @@ DH_new_by_nid, DH_get_nid - get or find DH named parameters
|
||||||
|
|
||||||
|
DH_new_by_nid() creates and returns a DH structure containing named parameters
|
||||||
|
B<nid>. Currently B<nid> must be B<NID_ffdhe2048>, B<NID_ffdhe3072>,
|
||||||
|
-B<NID_ffdhe4096>, B<NID_ffdhe6144> or B<NID_ffdhe8192>.
|
||||||
|
+B<NID_ffdhe4096>, B<NID_ffdhe6144> or B<NID_ffdhe8192>,
|
||||||
|
+B<NID_modp_1536>, B<NID_modp_2048>, B<NID_modp_3072>,
|
||||||
|
+B<NID_modp_4096>, B<NID_modp_6144> or B<NID_modp_8192>.
|
||||||
|
|
||||||
|
DH_get_nid() determines if the parameters contained in B<dh> match
|
||||||
|
any named set. It returns the NID corresponding to the matching parameters or
|
||||||
|
diff --git a/doc/man3/EVP_PKEY_CTX_ctrl.pod b/doc/man3/EVP_PKEY_CTX_ctrl.pod
|
||||||
|
index e475316..9c695b9 100644
|
||||||
|
--- a/doc/man3/EVP_PKEY_CTX_ctrl.pod
|
||||||
|
+++ b/doc/man3/EVP_PKEY_CTX_ctrl.pod
|
||||||
|
@@ -294,10 +294,11 @@ The EVP_PKEY_CTX_set_dh_pad() macro sets the DH padding mode. If B<pad> is
|
||||||
|
If B<pad> is zero (the default) then no padding is performed.
|
||||||
|
|
||||||
|
EVP_PKEY_CTX_set_dh_nid() sets the DH parameters to values corresponding to
|
||||||
|
-B<nid> as defined in RFC7919. The B<nid> parameter must be B<NID_ffdhe2048>,
|
||||||
|
-B<NID_ffdhe3072>, B<NID_ffdhe4096>, B<NID_ffdhe6144>, B<NID_ffdhe8192>
|
||||||
|
-or B<NID_undef> to clear the stored value. This macro can be called during
|
||||||
|
-parameter or key generation.
|
||||||
|
+I<nid> as defined in RFC7919 or RFC3526. The I<nid> parameter must be
|
||||||
|
+B<NID_ffdhe2048>, B<NID_ffdhe3072>, B<NID_ffdhe4096>, B<NID_ffdhe6144>,
|
||||||
|
+B<NID_ffdhe8192>, B<NID_modp_1536>, B<NID_modp_2048>, B<NID_modp_3072>,
|
||||||
|
+B<NID_modp_4096>, B<NID_modp_6144>, B<NID_modp_8192> or B<NID_undef> to clear
|
||||||
|
+the stored value. This function can be called during parameter or key generation.
|
||||||
|
The nid parameter and the rfc5114 parameter are mutually exclusive.
|
||||||
|
|
||||||
|
The EVP_PKEY_CTX_set_dh_rfc5114() and EVP_PKEY_CTX_set_dhx_rfc5114() macros are
|
||||||
|
diff --git a/include/crypto/bn_dh.h b/include/crypto/bn_dh.h
|
||||||
|
index 70ebca2..5cb83d0 100644
|
||||||
|
--- a/include/crypto/bn_dh.h
|
||||||
|
+++ b/include/crypto/bn_dh.h
|
||||||
|
@@ -22,3 +22,10 @@ extern const BIGNUM _bignum_ffdhe4096_p;
|
||||||
|
extern const BIGNUM _bignum_ffdhe6144_p;
|
||||||
|
extern const BIGNUM _bignum_ffdhe8192_p;
|
||||||
|
extern const BIGNUM _bignum_const_2;
|
||||||
|
+
|
||||||
|
+extern const BIGNUM _bignum_modp_1536_p;
|
||||||
|
+extern const BIGNUM _bignum_modp_2048_p;
|
||||||
|
+extern const BIGNUM _bignum_modp_3072_p;
|
||||||
|
+extern const BIGNUM _bignum_modp_4096_p;
|
||||||
|
+extern const BIGNUM _bignum_modp_6144_p;
|
||||||
|
+extern const BIGNUM _bignum_modp_8192_p;
|
||||||
|
diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
|
||||||
|
index 4616eaf..cfaedf5 100644
|
||||||
|
--- a/include/openssl/obj_mac.h
|
||||||
|
+++ b/include/openssl/obj_mac.h
|
||||||
|
@@ -5103,6 +5103,24 @@
|
||||||
|
#define SN_ffdhe8192 "ffdhe8192"
|
||||||
|
#define NID_ffdhe8192 1130
|
||||||
|
|
||||||
|
+#define SN_modp_1536 "modp_1536"
|
||||||
|
+#define NID_modp_1536 1196
|
||||||
|
+
|
||||||
|
+#define SN_modp_2048 "modp_2048"
|
||||||
|
+#define NID_modp_2048 1197
|
||||||
|
+
|
||||||
|
+#define SN_modp_3072 "modp_3072"
|
||||||
|
+#define NID_modp_3072 1198
|
||||||
|
+
|
||||||
|
+#define SN_modp_4096 "modp_4096"
|
||||||
|
+#define NID_modp_4096 1199
|
||||||
|
+
|
||||||
|
+#define SN_modp_6144 "modp_6144"
|
||||||
|
+#define NID_modp_6144 1200
|
||||||
|
+
|
||||||
|
+#define SN_modp_8192 "modp_8192"
|
||||||
|
+#define NID_modp_8192 1201
|
||||||
|
+
|
||||||
|
#define SN_ISO_UA "ISO-UA"
|
||||||
|
#define NID_ISO_UA 1150
|
||||||
|
#define OBJ_ISO_UA OBJ_member_body,804L
|
||||||
Loading…
Reference in New Issue
Block a user