]> granicus.if.org Git - php/commitdiff
- Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation)
authorPierre Joye <pajoye@php.net>
Thu, 4 Feb 2010 09:23:22 +0000 (09:23 +0000)
committerPierre Joye <pajoye@php.net>
Thu, 4 Feb 2010 09:23:22 +0000 (09:23 +0000)
ext/openssl/openssl.c

index 4270aa6de25478bb5455b6ec81f8f329b7226ea2..b18108f7e18f456745adade9a2fc4f88be7a0d18 100644 (file)
@@ -61,7 +61,9 @@
 #define OPENSSL_ALGO_SHA1      1
 #define OPENSSL_ALGO_MD5       2
 #define OPENSSL_ALGO_MD4       3
+#ifdef HAVE_OPENSSL_MD2_H
 #define OPENSSL_ALGO_MD2       4
+#endif
 #define OPENSSL_ALGO_DSS1      5
 
 #define DEBUG_SMIME    0
@@ -917,9 +919,11 @@ static EVP_MD * php_openssl_get_evp_md_from_algo(long algo) { /* {{{ */
                case OPENSSL_ALGO_MD4:
                        mdtype = (EVP_MD *) EVP_md4();
                        break;
+#ifdef HAVE_OPENSSL_MD2_H
                case OPENSSL_ALGO_MD2:
                        mdtype = (EVP_MD *) EVP_md2();
                        break;
+#endif
                case OPENSSL_ALGO_DSS1:
                        mdtype = (EVP_MD *) EVP_dss1();
                        break;
@@ -1001,7 +1005,9 @@ PHP_MINIT_FUNCTION(openssl)
        REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA1", OPENSSL_ALGO_SHA1, CONST_CS|CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD5", OPENSSL_ALGO_MD5, CONST_CS|CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD4", OPENSSL_ALGO_MD4, CONST_CS|CONST_PERSISTENT);
+#ifdef HAVE_OPENSSL_MD2_H
        REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD2", OPENSSL_ALGO_MD2, CONST_CS|CONST_PERSISTENT);
+#endif
        REGISTER_LONG_CONSTANT("OPENSSL_ALGO_DSS1", OPENSSL_ALGO_DSS1, CONST_CS|CONST_PERSISTENT);
 
        /* flags for S/MIME */