[PHP-CVS] cvs: php-src(PHP_5_2) /ext/openssl openssl.c

[Antony Dovgal]

tony2001                Fri Aug 18 13:02:37 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/openssl        openssl.c 
  Log:
  fix #38486 (openssl extension does not build correctly)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.11&r2=1.98.2.5.2.12&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.11 
php-src/ext/openssl/openssl.c:1.98.2.5.2.12
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.11 Tue Aug 15 20:27:20 2006
+++ php-src/ext/openssl/openssl.c       Fri Aug 18 13:02:37 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: openssl.c,v 1.98.2.5.2.11 2006/08/15 20:27:20 pajoye Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.12 2006/08/18 13:02:37 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -70,7 +70,9 @@
        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 @@
        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 @@
                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;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php