aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/src/crypto.erl
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2011-09-28 11:49:47 +0200
committerSverker Eriksson <[email protected]>2011-09-28 11:49:47 +0200
commit2fa5d1e5146513f933c584c9bd444b7f03793820 (patch)
tree42bbdbdef3dd595609d7a75a1c85a757c7a2368e /lib/crypto/src/crypto.erl
parentb83073436a39553da458b19ef572ded9cd051611 (diff)
parenta474b24b6121ef411a3a3bda3e50cd69b5fbec17 (diff)
downloadotp-2fa5d1e5146513f933c584c9bd444b7f03793820.tar.gz
otp-2fa5d1e5146513f933c584c9bd444b7f03793820.tar.bz2
otp-2fa5d1e5146513f933c584c9bd444b7f03793820.zip
Merge branch 'sverker/revert-md2-With-RSA-Encryption' into dev
* sverker/revert-md2-With-RSA-Encryption: Revert "Prepare for release" Revert "Support md2WithRSAEncryption certificates in public_key" Revert "Support 'md2' hash in crypto:rsa_sign/3 and crypto:rsa_verify/4"
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 ddad00f4b4..c3e13d6b91 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() :: 'md2' | 'md5' | 'sha'.
+-type rsa_digest_type() :: 'md5' | 'sha'.
-type dss_digest_type() :: 'none' | 'sha'.
-type crypto_integer() :: binary() | integer().