diff options
| author | Ingela Anderton Andin <ingela@erlang.org> | 2020-03-05 11:21:21 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <ingela@erlang.org> | 2020-03-05 11:21:21 +0100 |
| commit | 115357fb3958132f759bc12aee9c84fd3a6d5248 (patch) | |
| tree | afd8064cd480faec547bfdb9c462e3ff89e08c1c /lib/public_key/asn1/PKIX1Algorithms88.asn1 | |
| parent | afbd3cfe96930eba2dbde9632683a558fa6deb67 (diff) | |
| parent | fa7c7409f42aa8577e56a81efb68044d8a13f873 (diff) | |
| download | erlang-115357fb3958132f759bc12aee9c84fd3a6d5248.tar.gz | |
Merge branch 'ingela/ssl/public_key/edwardcurves-TLS-1.2/OTP-16528' into maint
* ingela/ssl/public_key/edwardcurves-TLS-1.2/OTP-16528:
ssl: Add TLS-1.3 group to ssl_cipher_suite_SUITE
ssl: Add support for key exchange with Edwards curves and RSASSA-PSS in TLS-1.2
public_key: Add support for key exchange with Edward curves
Diffstat (limited to 'lib/public_key/asn1/PKIX1Algorithms88.asn1')
| -rw-r--r-- | lib/public_key/asn1/PKIX1Algorithms88.asn1 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/public_key/asn1/PKIX1Algorithms88.asn1 b/lib/public_key/asn1/PKIX1Algorithms88.asn1 index 6cc6745af6..207ab005a9 100644 --- a/lib/public_key/asn1/PKIX1Algorithms88.asn1 +++ b/lib/public_key/asn1/PKIX1Algorithms88.asn1 @@ -283,4 +283,12 @@ sect571k1 OBJECT IDENTIFIER ::= { ellipticCurve 38 } sect571r1 OBJECT IDENTIFIER ::= { ellipticCurve 39 } + + id-edwards-curve-algs OBJECT IDENTIFIER ::= { 1 3 101 } + + id-X25519 OBJECT IDENTIFIER ::= { id-edwards-curve-algs 110 } + id-X448 OBJECT IDENTIFIER ::= { id-edwards-curve-algs 111 } + id-Ed25519 OBJECT IDENTIFIER ::= { id-edwards-curve-algs 112 } + id-Ed448 OBJECT IDENTIFIER ::= { id-edwards-curve-algs 113 } + END |