iliaa                                    Wed, 27 Jan 2010 12:55:01 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=294089

Log:
Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation)

Bug: http://bugs.php.net/50859 (Open) openssl-1.0.0_beta5 deprecates md2
      
Changed paths:
    U   php/php-src/branches/PHP_5_2/NEWS
    U   php/php-src/branches/PHP_5_2/ext/openssl/openssl.c
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/openssl/openssl.c
    U   php/php-src/trunk/ext/openssl/openssl.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS   2010-01-27 12:36:22 UTC (rev 294088)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-01-27 12:55:01 UTC (rev 294089)
@@ -18,6 +18,8 @@
   gdImageFilledPolygon (libgd #100). (Takeshi Abe)
 - Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey)

+- Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation).
+  (Ilia, hanno at hboeck dot de)
 - Fixed bug #50832 (HTTP fopen wrapper does not support passwordless HTTP
   authentication). (Jani)
 - Fixed bug #50823 (ReflectionFunction::isDeprecated producing "cannot be 
called

Modified: php/php-src/branches/PHP_5_2/ext/openssl/openssl.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/openssl/openssl.c  2010-01-27 12:36:22 UTC 
(rev 294088)
+++ php/php-src/branches/PHP_5_2/ext/openssl/openssl.c  2010-01-27 12:55:01 UTC 
(rev 294089)
@@ -59,7 +59,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
@@ -649,9 +651,11 @@
                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;
@@ -705,7 +709,9 @@
        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 */

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2010-01-27 12:36:22 UTC (rev 294088)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-01-27 12:55:01 UTC (rev 294089)
@@ -22,6 +22,8 @@
 - Remove output buffering for error messages sent through stderr on
   Windows. (Pierre)

+- Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation).
+  (Ilia, hanno at hboeck dot de)
 - Fixed bug #50829 (php.ini directive pdo_mysql.default_socket is ignored).
   (Ilia)
 - Fixed bug #50832 (HTTP fopen wrapper does not support passwordless HTTP

Modified: php/php-src/branches/PHP_5_3/ext/openssl/openssl.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/openssl/openssl.c  2010-01-27 12:36:22 UTC 
(rev 294088)
+++ php/php-src/branches/PHP_5_3/ext/openssl/openssl.c  2010-01-27 12:55:01 UTC 
(rev 294089)
@@ -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 @@
                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 @@
        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 */

Modified: php/php-src/trunk/ext/openssl/openssl.c
===================================================================
--- php/php-src/trunk/ext/openssl/openssl.c     2010-01-27 12:36:22 UTC (rev 
294088)
+++ php/php-src/trunk/ext/openssl/openssl.c     2010-01-27 12:55:01 UTC (rev 
294089)
@@ -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 @@
                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 @@
        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 */

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

Reply via email to