aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2014-03-28 11:07:37 +0100
committerHans Nilsson <[email protected]>2014-03-28 11:07:37 +0100
commit7b132ffe5fa684fb7a2ed7a7a4e1cf082382d857 (patch)
treec99fb1f4bf8fe65f41ff96e9038f942ecb7a88bb /lib
parent5205b635180f3ae93935d6ff10656d03e606135c (diff)
parent0f77d574b9a92170513523ba71527ae29c9ab100 (diff)
downloadotp-7b132ffe5fa684fb7a2ed7a7a4e1cf082382d857.tar.gz
otp-7b132ffe5fa684fb7a2ed7a7a4e1cf082382d857.tar.bz2
otp-7b132ffe5fa684fb7a2ed7a7a4e1cf082382d857.zip
Merge branch 'hans/ssl/ssl_crl_SUITE_bob'
* hans/ssl/ssl_crl_SUITE_bob: ssl: fix crl test suite error with unexpected web server response
Diffstat (limited to 'lib')
-rw-r--r--lib/ssl/test/ssl_crl_SUITE.erl12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_crl_SUITE.erl b/lib/ssl/test/ssl_crl_SUITE.erl
index da0349904c..4eacf3adfc 100644
--- a/lib/ssl/test/ssl_crl_SUITE.erl
+++ b/lib/ssl/test/ssl_crl_SUITE.erl
@@ -494,9 +494,15 @@ fetch([{uniformResourceIdentifier, "http"++_=URL}|Rest]) ->
_ ->
ct:log("~p:~p~npublic_key:pem_entry_decode,~nBody=~p~n)",[?MODULE,?LINE,{'CertificateList', Body, not_encrypted}]),
%% assume DER encoded
- CertList = public_key:pem_entry_decode(
- {'CertificateList', Body, not_encrypted}),
- {Body, CertList}
+ try
+ public_key:pem_entry_decode({'CertificateList', Body, not_encrypted})
+ of
+ CertList -> {Body, CertList}
+ catch
+ _C:_E ->
+ ct:log("~p:~p~nfailed DER assumption~nRest=~p", [?MODULE,?LINE,Rest]),
+ fetch(Rest)
+ end
end;
{error, _Reason} ->
ct:log("~p:~p~nfailed to get CRL ~p~n", [?MODULE,?LINE, _Reason]),