diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-04-30 17:53:15 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-04-30 17:53:15 +0200 |
| commit | f743042759642c37d9208d3c35fbbfd24b090db3 (patch) | |
| tree | 8a31cb7567bfd28bbb2914d749f4a32ccc6fd6b1 /lib/public_key | |
| parent | 5593c7237c691eeef73a157d0aabe7a254b15912 (diff) | |
| parent | 01d2d677916d5143b6e501bb7230d1ad13592ede (diff) | |
| download | otp-f743042759642c37d9208d3c35fbbfd24b090db3.tar.gz otp-f743042759642c37d9208d3c35fbbfd24b090db3.tar.bz2 otp-f743042759642c37d9208d3c35fbbfd24b090db3.zip | |
Merge branch 'ingela/ssl/backported-ssl-enhancments/ERL-929/ERL-893/PR-2215/OTP-15785' into maint
Diffstat (limited to 'lib/public_key')
| -rw-r--r-- | lib/public_key/src/pubkey_cert.erl | 4 | ||||
| -rw-r--r-- | lib/public_key/src/public_key.erl | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl index 61a1239d26..12c61e158f 100644 --- a/lib/public_key/src/pubkey_cert.erl +++ b/lib/public_key/src/pubkey_cert.erl @@ -1187,6 +1187,8 @@ sign_algorithm(#'ECPrivateKey'{parameters = Parms}, Opts) -> parameters = Parms}. rsa_digest_oid(sha1) -> ?'sha1WithRSAEncryption'; +rsa_digest_oid(sha) -> + ?'sha1WithRSAEncryption'; rsa_digest_oid(sha512) -> ?'sha512WithRSAEncryption'; rsa_digest_oid(sha384) -> @@ -1198,6 +1200,8 @@ rsa_digest_oid(md5) -> ecdsa_digest_oid(sha1) -> ?'ecdsa-with-SHA1'; +ecdsa_digest_oid(sha) -> + ?'ecdsa-with-SHA1'; ecdsa_digest_oid(sha512) -> ?'ecdsa-with-SHA512'; ecdsa_digest_oid(sha384) -> diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl index 47c5dbb95a..d02df27a00 100644 --- a/lib/public_key/src/public_key.erl +++ b/lib/public_key/src/public_key.erl @@ -112,6 +112,7 @@ -type ssh_file() :: openssh_public_key | rfc4716_public_key | known_hosts | auth_keys. -type digest_type() :: none % None is for backwards compatibility + | sha1 % Backwards compatibility | crypto:rsa_digest_type() | crypto:dss_digest_type() | crypto:ecdsa_digest_type(). |