aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-08-10 15:52:52 +0200
committerIngela Anderton Andin <[email protected]>2016-08-10 15:52:52 +0200
commitdc283f13c69da78c0825fc55b8559428d84da059 (patch)
tree04d373203465c02c4b2e1e6b02475046ef147aba
parent1b5d791020f466c154404d16d4222585f46b556d (diff)
parent4ab154e94aaaf6cb4e610595a31609559eb1732c (diff)
downloadotp-dc283f13c69da78c0825fc55b8559428d84da059.tar.gz
otp-dc283f13c69da78c0825fc55b8559428d84da059.tar.bz2
otp-dc283f13c69da78c0825fc55b8559428d84da059.zip
Merge branch 'maint'
-rw-r--r--lib/ssl/src/ssl_handshake.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 47af1f861c..081efda768 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -658,7 +658,7 @@ select_hashsign(#certificate_request{hashsign_algorithms = #hash_sign_algos{hash
?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_signature_algorithm)
end;
select_hashsign(#certificate_request{}, Cert, _, Version) ->
- select_hashsign(undefined, Cert, undefined, undefined, Version).
+ select_hashsign(undefined, Cert, undefined, [], Version).
%%--------------------------------------------------------------------
-spec select_hashsign_algs({atom(), atom()}| undefined, oid(), ssl_record:ssl_version()) ->