]> granicus.if.org Git - apache/commitdiff
ab: follow up to r1738415: EC_curve_nid2nist() available in OpenSSL-1.0.2 and later.
authorYann Ylavic <ylavic@apache.org>
Fri, 29 Apr 2016 08:02:24 +0000 (08:02 +0000)
committerYann Ylavic <ylavic@apache.org>
Fri, 29 Apr 2016 08:02:24 +0000 (08:02 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1741566 13f79535-47bb-0310-9956-ffa450edef68

support/ab.c

index aa75dcf48e0401c955e43448ce6f57ba7882b8e7..d7cf8decff5e41f1b952529ff7f77fd54dccf08a 100644 (file)
@@ -725,11 +725,13 @@ static void ssl_proceed_handshake(struct connection *c)
                         break;
 #ifndef OPENSSL_NO_EC
                     case EVP_PKEY_EC: {
-                        const char *cname;
+                        const char *cname = NULL;
                         EC_KEY *ec = EVP_PKEY_get1_EC_KEY(key);
                         int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec));
                         EC_KEY_free(ec);
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
                         cname = EC_curve_nid2nist(nid);
+#endif
                         if (!cname)
                             cname = OBJ_nid2sn(nid);