diff options
| author |   jsing <jsing@openbsd.org> | 2019-09-05 16:17:48 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2019-09-05 16:17:48 +0000 |
| commit | 765524e19314db1d138022dc3c715c26738a35ee (patch) | |
| tree | 80100afb2d66edfb8a486bb08945c36bcd2b6506 | |
| parent | Build ecdh_kdf.c (diff) | |
| download | wireguard-openbsd-765524e19314db1d138022dc3c715c26738a35ee.tar.xz wireguard-openbsd-765524e19314db1d138022dc3c715c26738a35ee.zip | |
Add objects for ECDH schemes in RFC 5753.
Based on OpenSSL 1.1.1b.
ok inoguchi@ tb@
| -rw-r--r-- | lib/libcrypto/objects/obj_mac.num | 12 | ||||
| -rw-r--r-- | lib/libcrypto/objects/objects.txt | 20 |
2 files changed, 32 insertions, 0 deletions
diff --git a/lib/libcrypto/objects/obj_mac.num b/lib/libcrypto/objects/obj_mac.num index 0db95694d27..0490fd7b870 100644 --- a/lib/libcrypto/objects/obj_mac.num +++ b/lib/libcrypto/objects/obj_mac.num @@ -977,3 +977,15 @@ sm4_cfb128 976 sm4_cfb1 977 sm4_cfb8 978 sm4_ctr 979 +dhSinglePass_stdDH_sha1kdf_scheme 980 +dhSinglePass_stdDH_sha224kdf_scheme 981 +dhSinglePass_stdDH_sha256kdf_scheme 982 +dhSinglePass_stdDH_sha384kdf_scheme 983 +dhSinglePass_stdDH_sha512kdf_scheme 984 +dhSinglePass_cofactorDH_sha1kdf_scheme 985 +dhSinglePass_cofactorDH_sha224kdf_scheme 986 +dhSinglePass_cofactorDH_sha256kdf_scheme 987 +dhSinglePass_cofactorDH_sha384kdf_scheme 988 +dhSinglePass_cofactorDH_sha512kdf_scheme 989 +dh_std_kdf 990 +dh_cofactor_kdf 991 diff --git a/lib/libcrypto/objects/objects.txt b/lib/libcrypto/objects/objects.txt index 7aefca0b4ae..424217f47b1 100644 --- a/lib/libcrypto/objects/objects.txt +++ b/lib/libcrypto/objects/objects.txt @@ -1318,6 +1318,26 @@ sm-scheme 104 7 : SM4-CTR : sm4-ctr : AES-192-CBC-HMAC-SHA1 : aes-192-cbc-hmac-sha1 : AES-256-CBC-HMAC-SHA1 : aes-256-cbc-hmac-sha1 +# ECDH schemes from RFC 5753 +!Alias x9-63-scheme 1 3 133 16 840 63 0 +!Alias secg-scheme certicom-arc 1 + +x9-63-scheme 2 : dhSinglePass-stdDH-sha1kdf-scheme +secg-scheme 11 0 : dhSinglePass-stdDH-sha224kdf-scheme +secg-scheme 11 1 : dhSinglePass-stdDH-sha256kdf-scheme +secg-scheme 11 2 : dhSinglePass-stdDH-sha384kdf-scheme +secg-scheme 11 3 : dhSinglePass-stdDH-sha512kdf-scheme + +x9-63-scheme 3 : dhSinglePass-cofactorDH-sha1kdf-scheme +secg-scheme 14 0 : dhSinglePass-cofactorDH-sha224kdf-scheme +secg-scheme 14 1 : dhSinglePass-cofactorDH-sha256kdf-scheme +secg-scheme 14 2 : dhSinglePass-cofactorDH-sha384kdf-scheme +secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme + +# DH NIDs for use with lookup tables. + : dh-std-kdf + : dh-cofactor-kdf + identified-organization 36 : teletrust teletrust 3 3 2 8 1 : brainpool brainpool 1 1 : brainpoolP160r1 |