X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=test%2Fssl-tests%2F06-sni-ticket.conf;h=9620e015a1a9e343e09204afaf11cb20728f2e72;hp=3a22e6907b9db0fd9337c03848a761d5890ffdb1;hb=f9b1b6644a3a8fc6d617625ad979ee61cb67d381;hpb=5c753de668322bf9903a49ba713b2cbc62667571;ds=sidebyside diff --git a/test/ssl-tests/06-sni-ticket.conf b/test/ssl-tests/06-sni-ticket.conf index 3a22e6907b..9620e015a1 100644 --- a/test/ssl-tests/06-sni-ticket.conf +++ b/test/ssl-tests/06-sni-ticket.conf @@ -26,8 +26,8 @@ ssl_conf = 0-sni-session-ticket-ssl [0-sni-session-ticket-ssl] server = 0-sni-session-ticket-server -server2 = 0-sni-session-ticket-server2 client = 0-sni-session-ticket-client +server2 = 0-sni-session-ticket-server2 [0-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -35,25 +35,29 @@ CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [0-sni-session-ticket-server2] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [0-sni-session-ticket-client] CipherString = DEFAULT Options = SessionTicket VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-0] ExpectedResult = Success +SessionTicketExpected = No +server = 0-sni-session-ticket-server-extra +client = 0-sni-session-ticket-client-extra + +[0-sni-session-ticket-server-extra] +BrokenSessionTicket = Yes + +[0-sni-session-ticket-client-extra] ServerName = server1 -SessionTicketExpected = Broken # =========================================================== @@ -63,8 +67,8 @@ ssl_conf = 1-sni-session-ticket-ssl [1-sni-session-ticket-ssl] server = 1-sni-session-ticket-server -server2 = 1-sni-session-ticket-server2 client = 1-sni-session-ticket-client +server2 = 1-sni-session-ticket-server2 [1-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -72,25 +76,30 @@ CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [1-sni-session-ticket-server2] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [1-sni-session-ticket-client] CipherString = DEFAULT Options = SessionTicket VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-1] ExpectedResult = Success -ServerName = server1 +ExpectedServerName = server1 SessionTicketExpected = Yes +server = 1-sni-session-ticket-server-extra +client = 1-sni-session-ticket-client-extra + +[1-sni-session-ticket-server-extra] +ServerNameCallback = IgnoreMismatch + +[1-sni-session-ticket-client-extra] +ServerName = server1 # =========================================================== @@ -100,8 +109,8 @@ ssl_conf = 2-sni-session-ticket-ssl [2-sni-session-ticket-ssl] server = 2-sni-session-ticket-server -server2 = 2-sni-session-ticket-server2 client = 2-sni-session-ticket-client +server2 = 2-sni-session-ticket-server2 [2-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -109,25 +118,30 @@ CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [2-sni-session-ticket-server2] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [2-sni-session-ticket-client] CipherString = DEFAULT Options = SessionTicket VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-2] ExpectedResult = Success -ServerName = server2 +ExpectedServerName = server2 SessionTicketExpected = Yes +server = 2-sni-session-ticket-server-extra +client = 2-sni-session-ticket-client-extra + +[2-sni-session-ticket-server-extra] +ServerNameCallback = IgnoreMismatch + +[2-sni-session-ticket-client-extra] +ServerName = server2 # =========================================================== @@ -137,8 +151,8 @@ ssl_conf = 3-sni-session-ticket-ssl [3-sni-session-ticket-ssl] server = 3-sni-session-ticket-server -server2 = 3-sni-session-ticket-server2 client = 3-sni-session-ticket-client +server2 = 3-sni-session-ticket-server2 [3-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -146,25 +160,30 @@ CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [3-sni-session-ticket-server2] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [3-sni-session-ticket-client] CipherString = DEFAULT Options = SessionTicket VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-3] ExpectedResult = Success -ServerName = server1 +ExpectedServerName = server1 SessionTicketExpected = Yes +server = 3-sni-session-ticket-server-extra +client = 3-sni-session-ticket-client-extra + +[3-sni-session-ticket-server-extra] +ServerNameCallback = IgnoreMismatch + +[3-sni-session-ticket-client-extra] +ServerName = server1 # =========================================================== @@ -174,8 +193,8 @@ ssl_conf = 4-sni-session-ticket-ssl [4-sni-session-ticket-ssl] server = 4-sni-session-ticket-server -server2 = 4-sni-session-ticket-server2 client = 4-sni-session-ticket-client +server2 = 4-sni-session-ticket-server2 [4-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -183,25 +202,30 @@ CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [4-sni-session-ticket-server2] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [4-sni-session-ticket-client] CipherString = DEFAULT Options = SessionTicket VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-4] ExpectedResult = Success -ServerName = server2 +ExpectedServerName = server2 SessionTicketExpected = No +server = 4-sni-session-ticket-server-extra +client = 4-sni-session-ticket-client-extra + +[4-sni-session-ticket-server-extra] +ServerNameCallback = IgnoreMismatch + +[4-sni-session-ticket-client-extra] +ServerName = server2 # =========================================================== @@ -211,8 +235,8 @@ ssl_conf = 5-sni-session-ticket-ssl [5-sni-session-ticket-ssl] server = 5-sni-session-ticket-server -server2 = 5-sni-session-ticket-server2 client = 5-sni-session-ticket-client +server2 = 5-sni-session-ticket-server2 [5-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -220,25 +244,30 @@ CipherString = DEFAULT Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [5-sni-session-ticket-server2] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [5-sni-session-ticket-client] CipherString = DEFAULT Options = SessionTicket VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-5] ExpectedResult = Success -ServerName = server1 +ExpectedServerName = server1 SessionTicketExpected = No +server = 5-sni-session-ticket-server-extra +client = 5-sni-session-ticket-client-extra + +[5-sni-session-ticket-server-extra] +ServerNameCallback = IgnoreMismatch + +[5-sni-session-ticket-client-extra] +ServerName = server1 # =========================================================== @@ -248,8 +277,8 @@ ssl_conf = 6-sni-session-ticket-ssl [6-sni-session-ticket-ssl] server = 6-sni-session-ticket-server -server2 = 6-sni-session-ticket-server2 client = 6-sni-session-ticket-client +server2 = 6-sni-session-ticket-server2 [6-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -257,25 +286,30 @@ CipherString = DEFAULT Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [6-sni-session-ticket-server2] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [6-sni-session-ticket-client] CipherString = DEFAULT Options = SessionTicket VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-6] ExpectedResult = Success -ServerName = server2 +ExpectedServerName = server2 SessionTicketExpected = No +server = 6-sni-session-ticket-server-extra +client = 6-sni-session-ticket-client-extra + +[6-sni-session-ticket-server-extra] +ServerNameCallback = IgnoreMismatch + +[6-sni-session-ticket-client-extra] +ServerName = server2 # =========================================================== @@ -285,8 +319,8 @@ ssl_conf = 7-sni-session-ticket-ssl [7-sni-session-ticket-ssl] server = 7-sni-session-ticket-server -server2 = 7-sni-session-ticket-server2 client = 7-sni-session-ticket-client +server2 = 7-sni-session-ticket-server2 [7-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -294,25 +328,30 @@ CipherString = DEFAULT Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [7-sni-session-ticket-server2] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [7-sni-session-ticket-client] CipherString = DEFAULT Options = SessionTicket VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-7] ExpectedResult = Success -ServerName = server1 +ExpectedServerName = server1 SessionTicketExpected = No +server = 7-sni-session-ticket-server-extra +client = 7-sni-session-ticket-client-extra + +[7-sni-session-ticket-server-extra] +ServerNameCallback = IgnoreMismatch + +[7-sni-session-ticket-client-extra] +ServerName = server1 # =========================================================== @@ -322,8 +361,8 @@ ssl_conf = 8-sni-session-ticket-ssl [8-sni-session-ticket-ssl] server = 8-sni-session-ticket-server -server2 = 8-sni-session-ticket-server2 client = 8-sni-session-ticket-client +server2 = 8-sni-session-ticket-server2 [8-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -331,25 +370,30 @@ CipherString = DEFAULT Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [8-sni-session-ticket-server2] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [8-sni-session-ticket-client] CipherString = DEFAULT Options = SessionTicket VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-8] ExpectedResult = Success -ServerName = server2 +ExpectedServerName = server2 SessionTicketExpected = No +server = 8-sni-session-ticket-server-extra +client = 8-sni-session-ticket-client-extra + +[8-sni-session-ticket-server-extra] +ServerNameCallback = IgnoreMismatch + +[8-sni-session-ticket-client-extra] +ServerName = server2 # =========================================================== @@ -359,8 +403,8 @@ ssl_conf = 9-sni-session-ticket-ssl [9-sni-session-ticket-ssl] server = 9-sni-session-ticket-server -server2 = 9-sni-session-ticket-server2 client = 9-sni-session-ticket-client +server2 = 9-sni-session-ticket-server2 [9-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -368,25 +412,30 @@ CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [9-sni-session-ticket-server2] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [9-sni-session-ticket-client] CipherString = DEFAULT Options = -SessionTicket VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-9] ExpectedResult = Success -ServerName = server1 +ExpectedServerName = server1 SessionTicketExpected = No +server = 9-sni-session-ticket-server-extra +client = 9-sni-session-ticket-client-extra + +[9-sni-session-ticket-server-extra] +ServerNameCallback = IgnoreMismatch + +[9-sni-session-ticket-client-extra] +ServerName = server1 # =========================================================== @@ -396,8 +445,8 @@ ssl_conf = 10-sni-session-ticket-ssl [10-sni-session-ticket-ssl] server = 10-sni-session-ticket-server -server2 = 10-sni-session-ticket-server2 client = 10-sni-session-ticket-client +server2 = 10-sni-session-ticket-server2 [10-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -405,25 +454,30 @@ CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [10-sni-session-ticket-server2] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [10-sni-session-ticket-client] CipherString = DEFAULT Options = -SessionTicket VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-10] ExpectedResult = Success -ServerName = server2 +ExpectedServerName = server2 SessionTicketExpected = No +server = 10-sni-session-ticket-server-extra +client = 10-sni-session-ticket-client-extra + +[10-sni-session-ticket-server-extra] +ServerNameCallback = IgnoreMismatch + +[10-sni-session-ticket-client-extra] +ServerName = server2 # =========================================================== @@ -433,8 +487,8 @@ ssl_conf = 11-sni-session-ticket-ssl [11-sni-session-ticket-ssl] server = 11-sni-session-ticket-server -server2 = 11-sni-session-ticket-server2 client = 11-sni-session-ticket-client +server2 = 11-sni-session-ticket-server2 [11-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -442,25 +496,30 @@ CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [11-sni-session-ticket-server2] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [11-sni-session-ticket-client] CipherString = DEFAULT Options = -SessionTicket VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-11] ExpectedResult = Success -ServerName = server1 +ExpectedServerName = server1 SessionTicketExpected = No +server = 11-sni-session-ticket-server-extra +client = 11-sni-session-ticket-client-extra + +[11-sni-session-ticket-server-extra] +ServerNameCallback = IgnoreMismatch + +[11-sni-session-ticket-client-extra] +ServerName = server1 # =========================================================== @@ -470,8 +529,8 @@ ssl_conf = 12-sni-session-ticket-ssl [12-sni-session-ticket-ssl] server = 12-sni-session-ticket-server -server2 = 12-sni-session-ticket-server2 client = 12-sni-session-ticket-client +server2 = 12-sni-session-ticket-server2 [12-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -479,25 +538,30 @@ CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [12-sni-session-ticket-server2] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [12-sni-session-ticket-client] CipherString = DEFAULT Options = -SessionTicket VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-12] ExpectedResult = Success -ServerName = server2 +ExpectedServerName = server2 SessionTicketExpected = No +server = 12-sni-session-ticket-server-extra +client = 12-sni-session-ticket-client-extra + +[12-sni-session-ticket-server-extra] +ServerNameCallback = IgnoreMismatch + +[12-sni-session-ticket-client-extra] +ServerName = server2 # =========================================================== @@ -507,8 +571,8 @@ ssl_conf = 13-sni-session-ticket-ssl [13-sni-session-ticket-ssl] server = 13-sni-session-ticket-server -server2 = 13-sni-session-ticket-server2 client = 13-sni-session-ticket-client +server2 = 13-sni-session-ticket-server2 [13-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -516,25 +580,30 @@ CipherString = DEFAULT Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [13-sni-session-ticket-server2] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [13-sni-session-ticket-client] CipherString = DEFAULT Options = -SessionTicket VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-13] ExpectedResult = Success -ServerName = server1 +ExpectedServerName = server1 SessionTicketExpected = No +server = 13-sni-session-ticket-server-extra +client = 13-sni-session-ticket-client-extra + +[13-sni-session-ticket-server-extra] +ServerNameCallback = IgnoreMismatch + +[13-sni-session-ticket-client-extra] +ServerName = server1 # =========================================================== @@ -544,8 +613,8 @@ ssl_conf = 14-sni-session-ticket-ssl [14-sni-session-ticket-ssl] server = 14-sni-session-ticket-server -server2 = 14-sni-session-ticket-server2 client = 14-sni-session-ticket-client +server2 = 14-sni-session-ticket-server2 [14-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -553,25 +622,30 @@ CipherString = DEFAULT Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [14-sni-session-ticket-server2] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT Options = SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [14-sni-session-ticket-client] CipherString = DEFAULT Options = -SessionTicket VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-14] ExpectedResult = Success -ServerName = server2 +ExpectedServerName = server2 SessionTicketExpected = No +server = 14-sni-session-ticket-server-extra +client = 14-sni-session-ticket-client-extra + +[14-sni-session-ticket-server-extra] +ServerNameCallback = IgnoreMismatch + +[14-sni-session-ticket-client-extra] +ServerName = server2 # =========================================================== @@ -581,8 +655,8 @@ ssl_conf = 15-sni-session-ticket-ssl [15-sni-session-ticket-ssl] server = 15-sni-session-ticket-server -server2 = 15-sni-session-ticket-server2 client = 15-sni-session-ticket-client +server2 = 15-sni-session-ticket-server2 [15-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -590,25 +664,30 @@ CipherString = DEFAULT Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [15-sni-session-ticket-server2] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [15-sni-session-ticket-client] CipherString = DEFAULT Options = -SessionTicket VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-15] ExpectedResult = Success -ServerName = server1 +ExpectedServerName = server1 SessionTicketExpected = No +server = 15-sni-session-ticket-server-extra +client = 15-sni-session-ticket-client-extra + +[15-sni-session-ticket-server-extra] +ServerNameCallback = IgnoreMismatch + +[15-sni-session-ticket-client-extra] +ServerName = server1 # =========================================================== @@ -618,8 +697,8 @@ ssl_conf = 16-sni-session-ticket-ssl [16-sni-session-ticket-ssl] server = 16-sni-session-ticket-server -server2 = 16-sni-session-ticket-server2 client = 16-sni-session-ticket-client +server2 = 16-sni-session-ticket-server2 [16-sni-session-ticket-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem @@ -627,24 +706,29 @@ CipherString = DEFAULT Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [16-sni-session-ticket-server2] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT Options = -SessionTicket PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem - [16-sni-session-ticket-client] CipherString = DEFAULT Options = -SessionTicket VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer - [test-16] ExpectedResult = Success -ServerName = server2 +ExpectedServerName = server2 SessionTicketExpected = No +server = 16-sni-session-ticket-server-extra +client = 16-sni-session-ticket-client-extra + +[16-sni-session-ticket-server-extra] +ServerNameCallback = IgnoreMismatch + +[16-sni-session-ticket-client-extra] +ServerName = server2