SSL tests: compress generated output a little

Don't emit duplicate server/client sections when they are
identical. Instead, just point to the same section.

Reviewed-by: Rich Salz <rsalz@openssl.org>

1 files changed, 32 insertions, 120 deletions

diff --git a/test/ssl-tests/11-dtls_resumption.conf b/test/ssl-tests/11-dtls_resumption.conf
index 62e1799bcc..0822f1e467 100644
--- a/test/ssl-tests/11-dtls_resumption.conf
+++ b/test/ssl-tests/11-dtls_resumption.conf
@@ -25,9 +25,9 @@ ssl_conf = 0-resumption-ssl
 
 [0-resumption-ssl]
 server = 0-resumption-server
-resume-server = 0-resumption-resume-server
-resume-client = 0-resumption-resume-client
 client = 0-resumption-client
+resume-server = 0-resumption-resume-server
+resume-client = 0-resumption-client
 
 [0-resumption-server]
 Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
@@ -48,11 +48,6 @@ CipherString = DEFAULT
 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
 VerifyMode = Peer
 
-[0-resumption-resume-client]
-CipherString = DEFAULT
-VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
-VerifyMode = Peer
-
 [test-0]
 HandshakeMode = Resume
 Method = DTLS
@@ -67,9 +62,9 @@ ssl_conf = 1-resumption-ssl
 
 [1-resumption-ssl]
 server = 1-resumption-server
-resume-server = 1-resumption-resume-server
-resume-client = 1-resumption-resume-client
 client = 1-resumption-client
+resume-server = 1-resumption-resume-server
+resume-client = 1-resumption-client
 
 [1-resumption-server]
 Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
@@ -90,11 +85,6 @@ CipherString = DEFAULT
 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
 VerifyMode = Peer
 
-[1-resumption-resume-client]
-CipherString = DEFAULT
-VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
-VerifyMode = Peer
-
 [test-1]
 HandshakeMode = Resume
 Method = DTLS
@@ -109,9 +99,9 @@ ssl_conf = 2-resumption-ssl
 
 [2-resumption-ssl]
 server = 2-resumption-server
-resume-server = 2-resumption-resume-server
-resume-client = 2-resumption-resume-client
 client = 2-resumption-client
+resume-server = 2-resumption-resume-server
+resume-client = 2-resumption-client
 
 [2-resumption-server]
 Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
@@ -132,11 +122,6 @@ CipherString = DEFAULT
 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
 VerifyMode = Peer
 
-[2-resumption-resume-client]
-CipherString = DEFAULT
-VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
-VerifyMode = Peer
-
 [test-2]
 HandshakeMode = Resume
 Method = DTLS
@@ -151,9 +136,9 @@ ssl_conf = 3-resumption-ssl
 
 [3-resumption-ssl]
 server = 3-resumption-server
-resume-server = 3-resumption-resume-server
-resume-client = 3-resumption-resume-client
 client = 3-resumption-client
+resume-server = 3-resumption-resume-server
+resume-client = 3-resumption-client
 
 [3-resumption-server]
 Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
@@ -174,11 +159,6 @@ CipherString = DEFAULT
 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
 VerifyMode = Peer
 
-[3-resumption-resume-client]
-CipherString = DEFAULT
-VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
-VerifyMode = Peer
-
 [test-3]
 HandshakeMode = Resume
 Method = DTLS
@@ -193,9 +173,9 @@ ssl_conf = 4-resumption-ssl
 
 [4-resumption-ssl]
 server = 4-resumption-server
-resume-server = 4-resumption-resume-server
-resume-client = 4-resumption-resume-client
 client = 4-resumption-client
+resume-server = 4-resumption-resume-server
+resume-client = 4-resumption-client
 
 [4-resumption-server]
 Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
@@ -216,11 +196,6 @@ CipherString = DEFAULT
 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
 VerifyMode = Peer
 
-[4-resumption-resume-client]
-CipherString = DEFAULT
-VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
-VerifyMode = Peer
-
 [test-4]
 HandshakeMode = Resume
 Method = DTLS
@@ -235,9 +210,9 @@ ssl_conf = 5-resumption-ssl
 
 [5-resumption-ssl]
 server = 5-resumption-server
-resume-server = 5-resumption-resume-server
-resume-client = 5-resumption-resume-client
 client = 5-resumption-client
+resume-server = 5-resumption-resume-server
+resume-client = 5-resumption-client
 
 [5-resumption-server]
 Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
@@ -258,11 +233,6 @@ CipherString = DEFAULT
 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
 VerifyMode = Peer
 
-[5-resumption-resume-client]
-CipherString = DEFAULT
-VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
-VerifyMode = Peer
-
 [test-5]
 HandshakeMode = Resume
 Method = DTLS
@@ -277,9 +247,9 @@ ssl_conf = 6-resumption-ssl
 
 [6-resumption-ssl]
 server = 6-resumption-server
-resume-server = 6-resumption-resume-server
-resume-client = 6-resumption-resume-client
 client = 6-resumption-client
+resume-server = 6-resumption-resume-server
+resume-client = 6-resumption-client
 
 [6-resumption-server]
 Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
@@ -300,11 +270,6 @@ CipherString = DEFAULT
 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
 VerifyMode = Peer
 
-[6-resumption-resume-client]
-CipherString = DEFAULT
-VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
-VerifyMode = Peer
-
 [test-6]
 HandshakeMode = Resume
 Method = DTLS
@@ -319,9 +284,9 @@ ssl_conf = 7-resumption-ssl
 
 [7-resumption-ssl]
 server = 7-resumption-server
-resume-server = 7-resumption-resume-server
-resume-client = 7-resumption-resume-client
 client = 7-resumption-client
+resume-server = 7-resumption-resume-server
+resume-client = 7-resumption-client
 
 [7-resumption-server]
 Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
@@ -342,11 +307,6 @@ CipherString = DEFAULT
 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
 VerifyMode = Peer
 
-[7-resumption-resume-client]
-CipherString = DEFAULT
-VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
-VerifyMode = Peer
-
 [test-7]
 HandshakeMode = Resume
 Method = DTLS
@@ -361,9 +321,9 @@ ssl_conf = 8-resumption-ssl
 
 [8-resumption-ssl]
 server = 8-resumption-server
-resume-server = 8-resumption-resume-server
-resume-client = 8-resumption-resume-client
 client = 8-resumption-client
+resume-server = 8-resumption-server
+resume-client = 8-resumption-resume-client
 
 [8-resumption-server]
 Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
@@ -371,12 +331,6 @@ CipherString = DEFAULT
 Options = SessionTicket
 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
 
-[8-resumption-resume-server]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT
-Options = SessionTicket
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
 [8-resumption-client]
 CipherString = DEFAULT
 MaxProtocol = DTLSv1
@@ -404,9 +358,9 @@ ssl_conf = 9-resumption-ssl
 
 [9-resumption-ssl]
 server = 9-resumption-server
-resume-server = 9-resumption-resume-server
-resume-client = 9-resumption-resume-client
 client = 9-resumption-client
+resume-server = 9-resumption-server
+resume-client = 9-resumption-resume-client
 
 [9-resumption-server]
 Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
@@ -414,12 +368,6 @@ CipherString = DEFAULT
 Options = -SessionTicket
 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
 
-[9-resumption-resume-server]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT
-Options = -SessionTicket
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
 [9-resumption-client]
 CipherString = DEFAULT
 MaxProtocol = DTLSv1
@@ -447,9 +395,9 @@ ssl_conf = 10-resumption-ssl
 
 [10-resumption-ssl]
 server = 10-resumption-server
-resume-server = 10-resumption-resume-server
-resume-client = 10-resumption-resume-client
 client = 10-resumption-client
+resume-server = 10-resumption-server
+resume-client = 10-resumption-resume-client
 
 [10-resumption-server]
 Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
@@ -457,12 +405,6 @@ CipherString = DEFAULT
 Options = SessionTicket
 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
 
-[10-resumption-resume-server]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT
-Options = SessionTicket
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
 [10-resumption-client]
 CipherString = DEFAULT
 MaxProtocol = DTLSv1
@@ -490,9 +432,9 @@ ssl_conf = 11-resumption-ssl
 
 [11-resumption-ssl]
 server = 11-resumption-server
-resume-server = 11-resumption-resume-server
-resume-client = 11-resumption-resume-client
 client = 11-resumption-client
+resume-server = 11-resumption-server
+resume-client = 11-resumption-resume-client
 
 [11-resumption-server]
 Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
@@ -500,12 +442,6 @@ CipherString = DEFAULT
 Options = -SessionTicket
 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
 
-[11-resumption-resume-server]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT
-Options = -SessionTicket
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
 [11-resumption-client]
 CipherString = DEFAULT
 MaxProtocol = DTLSv1
@@ -533,9 +469,9 @@ ssl_conf = 12-resumption-ssl
 
 [12-resumption-ssl]
 server = 12-resumption-server
-resume-server = 12-resumption-resume-server
-resume-client = 12-resumption-resume-client
 client = 12-resumption-client
+resume-server = 12-resumption-server
+resume-client = 12-resumption-resume-client
 
 [12-resumption-server]
 Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
@@ -543,12 +479,6 @@ CipherString = DEFAULT
 Options = SessionTicket
 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
 
-[12-resumption-resume-server]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT
-Options = SessionTicket
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
 [12-resumption-client]
 CipherString = DEFAULT
 MaxProtocol = DTLSv1.2
@@ -576,9 +506,9 @@ ssl_conf = 13-resumption-ssl
 
 [13-resumption-ssl]
 server = 13-resumption-server
-resume-server = 13-resumption-resume-server
-resume-client = 13-resumption-resume-client
 client = 13-resumption-client
+resume-server = 13-resumption-server
+resume-client = 13-resumption-resume-client
 
 [13-resumption-server]
 Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
@@ -586,12 +516,6 @@ CipherString = DEFAULT
 Options = -SessionTicket
 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
 
-[13-resumption-resume-server]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT
-Options = -SessionTicket
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
 [13-resumption-client]
 CipherString = DEFAULT
 MaxProtocol = DTLSv1.2
@@ -619,9 +543,9 @@ ssl_conf = 14-resumption-ssl
 
 [14-resumption-ssl]
 server = 14-resumption-server
-resume-server = 14-resumption-resume-server
-resume-client = 14-resumption-resume-client
 client = 14-resumption-client
+resume-server = 14-resumption-server
+resume-client = 14-resumption-resume-client
 
 [14-resumption-server]
 Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
@@ -629,12 +553,6 @@ CipherString = DEFAULT
 Options = SessionTicket
 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
 
-[14-resumption-resume-server]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT
-Options = SessionTicket
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
 [14-resumption-client]
 CipherString = DEFAULT
 MaxProtocol = DTLSv1.2
@@ -662,9 +580,9 @@ ssl_conf = 15-resumption-ssl
 
 [15-resumption-ssl]
 server = 15-resumption-server
-resume-server = 15-resumption-resume-server
-resume-client = 15-resumption-resume-client
 client = 15-resumption-client
+resume-server = 15-resumption-server
+resume-client = 15-resumption-resume-client
 
 [15-resumption-server]
 Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
@@ -672,12 +590,6 @@ CipherString = DEFAULT
 Options = -SessionTicket
 PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
 
-[15-resumption-resume-server]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT
-Options = -SessionTicket
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
 [15-resumption-client]
 CipherString = DEFAULT
 MaxProtocol = DTLSv1.2