aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_handshake.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2011-01-17 14:16:52 +0100
committerErlang/OTP <[email protected]>2011-01-17 14:16:52 +0100
commitd0f8327fd0bae3024ba28c05a9276d55d1f0fca7 (patch)
tree2af35f0e0742463a8e9dd5548f8706cc941e6e53 /lib/ssl/src/ssl_handshake.erl
parentebd4190e1ea0a211d474b96d53e4b0f873134a85 (diff)
parentecb20a2d826016db0a80c1e626f4b8fe4303d152 (diff)
downloadotp-d0f8327fd0bae3024ba28c05a9276d55d1f0fca7.tar.gz
otp-d0f8327fd0bae3024ba28c05a9276d55d1f0fca7.tar.bz2
otp-d0f8327fd0bae3024ba28c05a9276d55d1f0fca7.zip
Merge branch 'ia/ssl/unknown-extension-handling-verify-none/OTP-9029' into maint-r14
* ia/ssl/unknown-extension-handling-verify-none/OTP-9029: Prepare for release Verification of a critical extended_key_usage-extension corrected
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
-rw-r--r--lib/ssl/src/ssl_handshake.erl16
1 files changed, 7 insertions, 9 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 125c28b373..1f4c44d115 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -194,14 +194,12 @@ certify(#certificate{asn1_certificates = ASN1Certs}, CertDbRef,
{fun(OtpCert, ExtensionOrError, {SslState, UserState}) ->
case ssl_certificate:validate_extension(OtpCert,
ExtensionOrError,
- SslState) of
- {valid, _} ->
- apply_user_fun(Fun, OtpCert,
- ExtensionOrError, UserState,
- SslState);
- {fail, Reason} ->
- apply_user_fun(Fun, OtpCert, Reason, UserState,
- SslState);
+ SslState) of
+ {valid, NewSslState} ->
+ {valid, {NewSslState, UserState}};
+ {fail, Reason} ->
+ apply_user_fun(Fun, OtpCert, Reason, UserState,
+ SslState);
{unknown, _} ->
apply_user_fun(Fun, OtpCert,
ExtensionOrError, UserState, SslState)