diff options
| author | Matt Caswell <matt@openssl.org> | 2018-02-28 14:59:44 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-03-02 10:14:31 +0000 |
| commit | 13735cfef69dfac2d36229810ea0400e2bc6526d (patch) | |
| tree | 1f4b01e1f1eeb5a1876141515fc82ec043ca9042 /crypto/objects | |
| parent | f7869f1be610aaec85f25351a50b52e8130a2421 (diff) | |
Integrate X448 and Ed448 into libcrypto
This adds all of the relevant EVP plumbing required to make
X448 and Ed448 work.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/5481)
Diffstat (limited to 'crypto/objects')
| -rw-r--r-- | crypto/objects/obj_xref.h | 3 | ||||
| -rw-r--r-- | crypto/objects/obj_xref.txt | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/crypto/objects/obj_xref.h b/crypto/objects/obj_xref.h index ebd5bf5a9f..9606e57d61 100644 --- a/crypto/objects/obj_xref.h +++ b/crypto/objects/obj_xref.h @@ -74,6 +74,7 @@ static const nid_triple sigoid_srt[] = { {NID_id_tc26_signwithdigest_gost3410_2012_512, NID_id_GostR3411_2012_512, NID_id_GostR3410_2012_512}, {NID_ED25519, NID_undef, NID_ED25519}, + {NID_ED448, NID_undef, NID_ED448}, {NID_RSA_SHA3_224, NID_sha3_224, NID_rsaEncryption}, {NID_RSA_SHA3_256, NID_sha3_256, NID_rsaEncryption}, {NID_RSA_SHA3_384, NID_sha3_384, NID_rsaEncryption}, @@ -120,8 +121,8 @@ static const nid_triple *const sigoid_srt_xref[] = { &sigoid_srt[28], &sigoid_srt[40], &sigoid_srt[41], - &sigoid_srt[43], &sigoid_srt[44], &sigoid_srt[45], &sigoid_srt[46], + &sigoid_srt[47], }; diff --git a/crypto/objects/obj_xref.txt b/crypto/objects/obj_xref.txt index c8dee7b880..ca3e74461d 100644 --- a/crypto/objects/obj_xref.txt +++ b/crypto/objects/obj_xref.txt @@ -22,6 +22,7 @@ RSA_SHA3_512 sha3_512 rsaEncryption # method should handle this explicitly. rsassaPss undef rsaEncryption ED25519 undef ED25519 +ED448 undef ED448 # Alternative deprecated OIDs. By using the older "rsa" OID this # type will be recognized by not normally used. |