X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;ds=sidebyside;f=test%2Fssltestlib.c;h=3f63cf9c20b4a0b9b11a2dd36a3732eb965add70;hb=9aa78c36ec3bdcf09742f6dea403fc09d40d420f;hp=67d8cd0284c5d49f05c359ecec91efb2385787d6;hpb=0f00ed7720257512924a7c891336d66e1c1083fa;p=openssl.git diff --git a/test/ssltestlib.c b/test/ssltestlib.c index 67d8cd0284..3f63cf9c20 100644 --- a/test/ssltestlib.c +++ b/test/ssltestlib.c @@ -724,10 +724,18 @@ int create_ssl_ctx_pair(const SSL_METHOD *sm, const SSL_METHOD *cm, SSL_CTX *serverctx = NULL; SSL_CTX *clientctx = NULL; - if (!TEST_ptr(serverctx = SSL_CTX_new(sm)) - || (cctx != NULL && !TEST_ptr(clientctx = SSL_CTX_new(cm)))) + if (*sctx != NULL) + serverctx = *sctx; + else if (!TEST_ptr(serverctx = SSL_CTX_new(sm))) goto err; + if (cctx != NULL) { + if (*cctx != NULL) + clientctx = *cctx; + else if (!TEST_ptr(clientctx = SSL_CTX_new(cm))) + goto err; + } + if ((min_proto_version > 0 && !TEST_true(SSL_CTX_set_min_proto_version(serverctx, min_proto_version)))