diff options
author | Ingela Anderton Andin <[email protected]> | 2010-06-08 12:19:49 +0000 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2010-06-08 15:37:24 +0200 |
commit | 59b1c9eac599c563610cfe6e7bf8517ed58d54d3 (patch) | |
tree | 4b7d890fa31213e4a7c1a93704b724aee0503866 /lib/ssl/src/ssl_ssl3.erl | |
parent | 899bcc01ae88166529c473f603e0f82e6052ccc8 (diff) | |
download | otp-59b1c9eac599c563610cfe6e7bf8517ed58d54d3.tar.gz otp-59b1c9eac599c563610cfe6e7bf8517ed58d54d3.tar.bz2 otp-59b1c9eac599c563610cfe6e7bf8517ed58d54d3.zip |
Move dsa ticket to r14a release
(This is the merge of r13 version to r14_dev)
Diffstat (limited to 'lib/ssl/src/ssl_ssl3.erl')
-rw-r--r-- | lib/ssl/src/ssl_ssl3.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_ssl3.erl b/lib/ssl/src/ssl_ssl3.erl index 1cecd10e81..400298a322 100644 --- a/lib/ssl/src/ssl_ssl3.erl +++ b/lib/ssl/src/ssl_ssl3.erl @@ -147,7 +147,7 @@ suites() -> ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA, ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA, ?TLS_RSA_WITH_AES_128_CBC_SHA, - %% ?TLS_RSA_WITH_IDEA_CBC_SHA, + ?TLS_RSA_WITH_IDEA_CBC_SHA, ?TLS_RSA_WITH_RC4_128_SHA, ?TLS_RSA_WITH_RC4_128_MD5, ?TLS_RSA_WITH_DES_CBC_SHA |