aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/src/public_key.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-10-23 15:42:19 +0200
committerIngela Anderton Andin <[email protected]>2018-10-23 15:42:19 +0200
commitbe27826d4509d311b83067cbd5ddaed1351ed4da (patch)
tree82b66e1c3cdc248bef8f0802afa46b3502f07b96 /lib/public_key/src/public_key.erl
parentcaf1586989e6162699e5c2791c26029f65a535a4 (diff)
parentaf2ddfc529242736b4dca0dee87018685318d020 (diff)
downloadotp-be27826d4509d311b83067cbd5ddaed1351ed4da.tar.gz
otp-be27826d4509d311b83067cbd5ddaed1351ed4da.tar.bz2
otp-be27826d4509d311b83067cbd5ddaed1351ed4da.zip
Merge branch 'maint'
Diffstat (limited to 'lib/public_key/src/public_key.erl')
-rw-r--r--lib/public_key/src/public_key.erl4
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') ->