aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/src/crypto.erl
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-09-20 10:32:59 +0200
committerHenrik Nord <[email protected]>2011-09-20 10:33:04 +0200
commit4b18ef90369c52a9344b851025519f397ccb8543 (patch)
tree59190f15bee6d38bcd9ca54974a429129c51aa1c /lib/crypto/src/crypto.erl
parent5b3f4c143cf7c9cd32437bfc9882f6ceb960648e (diff)
parent6cd2fa9346d51ab936873d96b5c96bf5c15ddcf0 (diff)
downloadotp-4b18ef90369c52a9344b851025519f397ccb8543.tar.gz
otp-4b18ef90369c52a9344b851025519f397ccb8543.tar.bz2
otp-4b18ef90369c52a9344b851025519f397ccb8543.zip
Merge branch 'cr/md2-With-RSA-Encryption' into dev
* cr/md2-With-RSA-Encryption: Document crypto:sha_mac_96/2 to compute an SHA MAC, not MD5 Support md2WithRSAEncryption certificates in public_key Support 'md2' hash in crypto:rsa_sign/3 and crypto:rsa_verify/4 OTP-9554
Diffstat (limited to 'lib/crypto/src/crypto.erl')
-rw-r--r--lib/crypto/src/crypto.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index c3e13d6b91..ddad00f4b4 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -91,7 +91,7 @@
aes_ctr_stream_init, aes_ctr_stream_encrypt, aes_ctr_stream_decrypt,
info_lib]).
--type rsa_digest_type() :: 'md5' | 'sha'.
+-type rsa_digest_type() :: 'md2' | 'md5' | 'sha'.
-type dss_digest_type() :: 'none' | 'sha'.
-type crypto_integer() :: binary() | integer().