aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <henrik@erlang.org>2012-11-21 15:25:33 +0100
committerHenrik Nord <henrik@erlang.org>2012-11-21 15:25:39 +0100
commitdd12df3bb0be7970259e22f10601b950c2e7976f (patch)
tree0a5dd6db4b34b68ffc2d0da96ff51f149d38c096
parentc8b514e8e67d33ae6179bea156ed1d5047daee5f (diff)
parent3b69808d29e4872680cf19399ec6cacc82646433 (diff)
downloadotp-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
-rw-r--r--lib/ssl/src/ssl_handshake.erl1
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)]}.