From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 13 Sep 2013 15:19:15 +0000 (+0100)
Subject: Add missing code from SSL_CONF backport.
X-Git-Tag: OpenSSL_1_0_2-beta1~284
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a41735288c0d80f3fcb72051bdf75d2d33fed08d;p=openssl

Add missing code from SSL_CONF backport.
---

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index ea10a52f91..10f094fcd5 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -525,6 +525,8 @@ int tls1_set_curves_list(unsigned char **pext, size_t *pextlen,
 	ncb.nidcnt = 0;
 	if (!CONF_parse_list(str, ':', 1, nid_cb, &ncb))
 		return 0;
+	if (pext == NULL)
+		return 1;
 	return tls1_set_curves(pext, pextlen, ncb.nid_arr, ncb.nidcnt);
 	}
 /* For an EC key set TLS id and required compression based on parameters */