From e31933777a3a59b3ebc949918eb158166e7d9c1d Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Wed, 16 Sep 2020 15:43:08 +0000
Subject: Make cipher_set_test() log failures and continue, rather than
 aborting.

---
 src/regress/lib/libssl/ciphers/cipherstest.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/regress/lib/libssl/ciphers/cipherstest.c b/src/regress/lib/libssl/ciphers/cipherstest.c
index 34ac96e48c..94e1a8c73b 100644
--- a/src/regress/lib/libssl/ciphers/cipherstest.c
+++ b/src/regress/lib/libssl/ciphers/cipherstest.c
@@ -398,7 +398,7 @@ cipher_set_test()
 	SSL_CIPHER *cipher;
 	SSL_CTX *ctx = NULL;
 	SSL *ssl = NULL;
-	int failed = 1;
+	int failed = 0;
 	size_t i;
 	int j;
 
@@ -448,26 +448,18 @@ cipher_set_test()
 			fprintf(stderr, "FAIL: test %zu - got cipher %d with "
 			    "id %lx, want %lx\n", i, j,
 			    SSL_CIPHER_get_id(cipher), cst->cids[j]);
-			goto failed;
+			failed |= 1;
 		}
 		if (cst->cids[j] != 0) {
 			fprintf(stderr, "FAIL: test %zu - got %d ciphers, "
 			    "expected more", i, sk_SSL_CIPHER_num(ciphers));
-			goto failed;
+			failed |= 1;
 		}
 
 		SSL_CTX_free(ctx);
-		ctx = NULL;
 		SSL_free(ssl);
-		ssl = NULL;
 	}
 
-	failed = 0;
-
- failed:
-	SSL_CTX_free(ctx);
-	SSL_free(ssl);
-
 	return failed;
 }
 
-- 
cgit v1.2.3-55-g6feb