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

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]),