diff options
| author | Henrik Nord <[email protected]> | 2012-11-21 15:25:33 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2012-11-21 15:25:39 +0100 |
| commit | dd12df3bb0be7970259e22f10601b950c2e7976f (patch) | |
| tree | 0a5dd6db4b34b68ffc2d0da96ff51f149d38c096 /lib | |
| parent | c8b514e8e67d33ae6179bea156ed1d5047daee5f (diff) | |
| parent | 3b69808d29e4872680cf19399ec6cacc82646433 (diff) | |
| download | otp-dd12df3bb0be7970259e22f10601b950c2e7976f.tar.gz otp-dd12df3bb0be7970259e22f10601b950c2e7976f.tar.bz2 otp-dd12df3bb0be7970259e22f10601b950c2e7976f.zip | |
Merge branch 'as/ssl-sha224-fixes'
* as/ssl-sha224-fixes:
SSL: TLS 1.2, advertise sha224 support
OTP-10586
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index fa1784714f..db21dac942 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -1401,6 +1401,7 @@ default_hash_signs() -> [?TLSEXT_SIGALG(sha512), ?TLSEXT_SIGALG(sha384), ?TLSEXT_SIGALG(sha256), + ?TLSEXT_SIGALG(sha224), ?TLSEXT_SIGALG(sha), ?TLSEXT_SIGALG_DSA(sha), ?TLSEXT_SIGALG_RSA(md5)]}. |