diff options
| author | Erlang/OTP <[email protected]> | 2018-11-15 12:26:08 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-11-15 12:26:08 +0100 |
| commit | ac9b007a55f78659104eb43efed5a2821a753826 (patch) | |
| tree | aae6360222c49a41396ea52db85fe85c68dce5bb /lib/public_key/src/public_key.erl | |
| parent | 876751e39f704355fdf99e765c6ede17d1bc3c1b (diff) | |
| parent | d5b6ff00b123de2d822a951a788678b0ee63d71a (diff) | |
| download | otp-ac9b007a55f78659104eb43efed5a2821a753826.tar.gz otp-ac9b007a55f78659104eb43efed5a2821a753826.tar.bz2 otp-ac9b007a55f78659104eb43efed5a2821a753826.zip | |
Merge branch 'ingela/public_key/DSA-SHA2/OTP-15367' into maint-21
* ingela/public_key/DSA-SHA2/OTP-15367:
public_key: Add additional ASN-1 definitions for DSA SHA2 support
public_key: Add DSA with SHA2 support
Diffstat (limited to 'lib/public_key/src/public_key.erl')
| -rw-r--r-- | lib/public_key/src/public_key.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl index 3f609ce6c6..dca1e0766e 100644 --- a/lib/public_key/src/public_key.erl +++ b/lib/public_key/src/public_key.erl @@ -609,6 +609,10 @@ pkix_sign_types(?'id-dsa-with-sha1') -> {sha, dsa}; pkix_sign_types(?'id-dsaWithSHA1') -> {sha, dsa}; +pkix_sign_types(?'id-dsa-with-sha224') -> + {sha224, dsa}; +pkix_sign_types(?'id-dsa-with-sha256') -> + {sha256, dsa}; pkix_sign_types(?'ecdsa-with-SHA1') -> {sha, ecdsa}; pkix_sign_types(?'ecdsa-with-SHA256') -> |