]> granicus.if.org Git - php/commitdiff
Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation)
authorIlia Alshanetsky <iliaa@php.net>
Wed, 27 Jan 2010 12:55:01 +0000 (12:55 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Wed, 27 Jan 2010 12:55:01 +0000 (12:55 +0000)
ext/openssl/openssl.c

index 103496cc85df9fd9f074d190ba0380e4c91ef0ab..6e100c3fda0fa1c83de0d2bd4fe725d8dd8a3238 100644 (file)
@@ -58,7 +58,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
 
@@ -916,10 +918,12 @@ 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;
-                       case OPENSSL_ALGO_DSS1:
+#endif
+               case OPENSSL_ALGO_DSS1:
                        mdtype = (EVP_MD *) EVP_dss1();
                        break;
                default:
@@ -1000,7 +1004,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 */