diff options
| author | Ingela Anderton Andin <ingela@erlang.org> | 2020-03-05 11:22:53 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <ingela@erlang.org> | 2020-03-05 11:22:53 +0100 |
| commit | 05ee9df64325678b6c8f8fc961b37b4631902c41 (patch) | |
| tree | bbfaa258bd4354b244dd48158c0f39325ec10710 /lib/ssl/src/tls_v1.erl | |
| parent | 616280e981858a4988d8c981b2e3b88a32377942 (diff) | |
| parent | 115357fb3958132f759bc12aee9c84fd3a6d5248 (diff) | |
| download | erlang-05ee9df64325678b6c8f8fc961b37b4631902c41.tar.gz | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/tls_v1.erl')
| -rw-r--r-- | lib/ssl/src/tls_v1.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_v1.erl b/lib/ssl/src/tls_v1.erl index 1371ac7637..0cf086442f 100644 --- a/lib/ssl/src/tls_v1.erl +++ b/lib/ssl/src/tls_v1.erl @@ -884,7 +884,9 @@ oid_to_enum(?secp384r1) -> 24; oid_to_enum(?secp521r1) -> 25; oid_to_enum(?brainpoolP256r1) -> 26; oid_to_enum(?brainpoolP384r1) -> 27; -oid_to_enum(?brainpoolP512r1) -> 28. +oid_to_enum(?brainpoolP512r1) -> 28; +oid_to_enum(?'id-X25519') -> 29; +oid_to_enum(?'id-X448') -> 30. enum_to_oid(1) -> ?sect163k1; enum_to_oid(2) -> ?sect163r1; @@ -914,5 +916,7 @@ enum_to_oid(25) -> ?secp521r1; enum_to_oid(26) -> ?brainpoolP256r1; enum_to_oid(27) -> ?brainpoolP384r1; enum_to_oid(28) -> ?brainpoolP512r1; +enum_to_oid(29) -> ?'id-X25519'; +enum_to_oid(30) -> ?'id-X448'; enum_to_oid(_) -> undefined. |