]> granicus.if.org Git - php/commitdiff
fix #38486 (openssl extension does not build correctly)
authorAntony Dovgal <tony2001@php.net>
Fri, 18 Aug 2006 13:02:38 +0000 (13:02 +0000)
committerAntony Dovgal <tony2001@php.net>
Fri, 18 Aug 2006 13:02:38 +0000 (13:02 +0000)
ext/openssl/openssl.c

index fe13cc7714e835cd7e86a2b6fa2172cc719c6f6d..3c230a5f7e5ad31edb931c7994ee9ee5ed0f368f 100644 (file)
@@ -70,7 +70,9 @@ enum php_openssl_key_type {
        OPENSSL_KEYTYPE_DSA,
        OPENSSL_KEYTYPE_DH,
        OPENSSL_KEYTYPE_DEFAULT = OPENSSL_KEYTYPE_RSA,
+#ifdef EVP_PKEY_EC
        OPENSSL_KEYTYPE_EC = OPENSSL_KEYTYPE_DH +1
+#endif
 };
 
 enum php_openssl_cipher_type {
@@ -695,7 +697,9 @@ PHP_MINIT_FUNCTION(openssl)
        REGISTER_LONG_CONSTANT("OPENSSL_KEYTYPE_DSA", OPENSSL_KEYTYPE_DSA, CONST_CS|CONST_PERSISTENT);
 #endif
        REGISTER_LONG_CONSTANT("OPENSSL_KEYTYPE_DH", OPENSSL_KEYTYPE_DH, CONST_CS|CONST_PERSISTENT);
+#ifdef EVP_PKEY_EC
        REGISTER_LONG_CONSTANT("OPENSSL_KEYTYPE_EC", OPENSSL_KEYTYPE_EC, CONST_CS|CONST_PERSISTENT);
+#endif
 
        /* Determine default SSL configuration file */
        config_filename = getenv("OPENSSL_CONF");
@@ -2327,9 +2331,11 @@ PHP_FUNCTION(openssl_pkey_get_details)
                case EVP_PKEY_DH:
                        ktype = OPENSSL_KEYTYPE_DH;
                        break;
+#ifdef EVP_PKEY_EC 
                case EVP_PKEY_EC:
                        ktype = OPENSSL_KEYTYPE_EC;
                        break;
+#endif
                default:
                        ktype = -1;
                        break;