summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2013-09-13 16:19:15 +0100
committerDr. Stephen Henson <steve@openssl.org>2013-09-14 13:53:44 +0100
commita41735288c0d80f3fcb72051bdf75d2d33fed08d (patch)
tree058d69e5ce0f617049cb5e5e253512d330f9e8d0 /ssl
parent033864842607895730d97baf4103da24f1207762 (diff)
Add missing code from SSL_CONF backport.
Diffstat (limited to 'ssl')
-rw-r--r--ssl/t1_lib.c2
1 files changed, 2 insertions, 0 deletions
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 */