From 438617e024403f8a9ea0244362df9e44ccdbca1b Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Tue, 9 May 2017 18:58:50 +0200
Subject: ssl: Use new cert generation

---
 lib/ssl/test/ssl_test_lib.erl | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'lib/ssl/test/ssl_test_lib.erl')

diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 3b9073ac0b..0b44108930 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -384,10 +384,6 @@ cert_options(Config) ->
 			      "badkey.pem"]),
     PskSharedSecret = <<1,2,3,4,5,6,7,8,9,10,11,12,13,14,15>>,
 
-    SNIServerACertFile = filename:join([proplists:get_value(priv_dir, Config), "a.server", "cert.pem"]),
-    SNIServerAKeyFile = filename:join([proplists:get_value(priv_dir, Config), "a.server", "key.pem"]),
-    SNIServerBCertFile = filename:join([proplists:get_value(priv_dir, Config), "b.server", "cert.pem"]),
-    SNIServerBKeyFile = filename:join([proplists:get_value(priv_dir, Config), "b.server", "key.pem"]),
     [{client_opts, [{cacertfile, ClientCaCertFile}, 
 		    {certfile, ClientCertFile},  
 		    {keyfile, ClientKeyFile}]}, 
@@ -445,21 +441,15 @@ cert_options(Config) ->
      {server_bad_cert, [{ssl_imp, new},{cacertfile, ServerCaCertFile},
 			{certfile, BadCertFile}, {keyfile, ServerKeyFile}]},
      {server_bad_key, [{ssl_imp, new},{cacertfile, ServerCaCertFile},
-		       {certfile, ServerCertFile}, {keyfile, BadKeyFile}]},
-     {sni_server_opts, [{sni_hosts, [
-                                     {"a.server", [
-                                                   {certfile, SNIServerACertFile},
-                                                   {keyfile, SNIServerAKeyFile}
-                                                  ]},
-                                     {"b.server", [
-                                                   {certfile, SNIServerBCertFile},
-                                                   {keyfile, SNIServerBKeyFile}
-                                                  ]}
-                                    ]}]}
+		       {certfile, ServerCertFile}, {keyfile, BadKeyFile}]}
      | Config].
 
 
 make_dsa_cert(Config) ->
+    ClientFileBase = filename:join([proplists:get_value(priv_dir, Config), "client"]),
+    ServerFileBase = filename:join([proplists:get_value(priv_dir, Config), "server"]),
+    file:make_dir(ClientFileBase),
+    file:make_dir(ServerFileBase),
     {ServerCaCertFile, ServerCertFile, ServerKeyFile} = 
 	make_cert_files("server", Config, dsa, dsa, "", []),
     {ClientCaCertFile, ClientCertFile, ClientKeyFile} = 
-- 
cgit v1.2.3