aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2012-08-20 15:29:26 +0200
committerIngela Anderton Andin <[email protected]>2012-08-22 14:00:43 +0200
commit18581081644018b4a77234f68b6c67e789bc943b (patch)
tree66a027fdf7d8034f9f452f0d016925fa1f7bda25
parentc5541a4c03b89fcbcb0dd1bfab8460b1287cc6cb (diff)
downloadotp-18581081644018b4a77234f68b6c67e789bc943b.tar.gz
otp-18581081644018b4a77234f68b6c67e789bc943b.tar.bz2
otp-18581081644018b4a77234f68b6c67e789bc943b.zip
public_key: Add sha224 to RSA sign/verify
-rw-r--r--lib/public_key/doc/src/public_key.xml2
-rw-r--r--lib/public_key/src/public_key.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index f64274d608..2d455e4e15 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -82,7 +82,7 @@
<p><code> rsa_padding() = 'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding'
| 'rsa_no_padding'</code></p>
- <p><code> rsa_digest_type() = 'md5' | 'sha' </code></p>
+ <p><code> rsa_digest_type() = 'md5' | 'sha' | 'sha224' | 'sha256' | 'sha384' | 'sha512' </code></p>
<p><code> dss_digest_type() = 'sha' </code></p>
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index 686a11a7b2..d5df53e848 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -48,7 +48,7 @@
-type rsa_padding() :: 'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding'
| 'rsa_no_padding'.
-type public_crypt_options() :: [{rsa_pad, rsa_padding()}].
--type rsa_digest_type() :: 'md5' | 'sha'| 'sha256' | 'sha384' | 'sha512'.
+-type rsa_digest_type() :: 'md5' | 'sha'| 'sha224' | 'sha256' | 'sha384' | 'sha512'.
-type dss_digest_type() :: 'none' | 'sha'. %% None is for backwards compatibility
-define(UINT32(X), X:32/unsigned-big-integer).