Merge branch 'peterdmv/ssl/client-auth/OTP-15591'

* peterdmv/ssl/client-auth/OTP-15591:
  ssl: Improve ssl logging
  ssl: Test handling of signature algorithms
  ssl: Handle unencrypted Alert (Illegal Parameter)
  ssl: Improve verification of received Certificate
  ssl: Fix Alert logging
  ssl: Fix get_handshake_context/2
  ssl: Test HelloRetryRequest with client auth
  ssl: Verify signature algorithm in CV
  ssl: Verify CertificateVerify
  ssl: Test client authentication with certificate
  ssl: Validate client certificates (TLS 1.3)
  ssl: Test client authentication (empty cert)
  ssl: Implement state 'wait_cert'
  ssl: Add ssl logger support for CertificateRequest
  ssl: Fix ssl alerts

Change-Id: Id4ba14d373f116038a7cb3ff9fc33faed23031c8

1 files changed, 11 insertions, 3 deletions

diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index f628b4e6d4..7f8e81dbd8 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1114,15 +1114,23 @@ start_basic_client(openssl, Version, Port, ClientOpts) ->
     Exe = "openssl",
     Args0 = ["s_client", "-verify", "2", "-port", integer_to_list(Port),
 	    ssl_test_lib:version_flag(Version),
-	    "-cert", Cert, "-CAfile", CA,
-	    "-key", Key, "-host","localhost", "-msg", "-debug"],
-    Args =
+	    "-CAfile", CA, "-host", "localhost", "-msg", "-debug"],
+    Args1 =
        case Groups0 of
            undefined ->
                Args0;
            G ->
                Args0 ++ ["-groups", G]
        end,
+    Args =
+       case {Cert, Key} of
+           {C, K} when C =:= undefined orelse
+                       K =:= undefined ->
+               Args1;
+           {C, K} ->
+               Args1 ++ ["-cert", C, "-key", K]
+       end,
+
     OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),
     true = port_command(OpenSslPort, "Hello world"),
     OpenSslPort.