hnangelo                Tue Jul 15 02:59:57 2008 UTC

  Added files:                 (Branch: PHP_5_3)
    /php-src/ext/openssl/tests  023.phpt 025.phpt cert.crt private.key 

  Modified files:              
    /php-src/ext/openssl        openssl.c 
  Log:
  Fix uninitilized variables in openssl_pkcs7_encrypt() and openssl_pkcs7_sign()
  
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.13&r2=1.98.2.5.2.41.2.14&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.13 
php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.14
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.13    Tue Jul 15 02:43:30 2008
+++ php-src/ext/openssl/openssl.c       Tue Jul 15 02:59:56 2008
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: openssl.c,v 1.98.2.5.2.41.2.13 2008/07/15 02:43:30 hnangelo Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.41.2.14 2008/07/15 02:59:56 hnangelo Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -3475,6 +3475,7 @@
        if (zheaders) {
                zend_hash_internal_pointer_reset_ex(HASH_OF(zheaders), &hpos);
                while(zend_hash_get_current_data_ex(HASH_OF(zheaders), 
(void**)&zcertval, &hpos) == SUCCESS) {
+                       strindex = NULL;
                        zend_hash_get_current_key_ex(HASH_OF(zheaders), 
&strindex, &strindexlen, &intindex, 0, &hpos);
 
                        convert_to_string_ex(zcertval);
@@ -3584,6 +3585,7 @@
        if (zheaders) {
                zend_hash_internal_pointer_reset_ex(HASH_OF(zheaders), &hpos);
                while(zend_hash_get_current_data_ex(HASH_OF(zheaders), 
(void**)&hval, &hpos) == SUCCESS) {
+                       strindex = NULL;
                        zend_hash_get_current_key_ex(HASH_OF(zheaders), 
&strindex, &strindexlen, &intindex, 0, &hpos);
 
                        convert_to_string_ex(hval);

http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/023.phpt?view=markup&rev=1.1
Index: php-src/ext/openssl/tests/023.phpt
+++ php-src/ext/openssl/tests/023.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/025.phpt?view=markup&rev=1.1
Index: php-src/ext/openssl/tests/025.phpt
+++ php-src/ext/openssl/tests/025.phpt

http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/cert.crt?view=markup&rev=1.1
Index: php-src/ext/openssl/tests/cert.crt
+++ php-src/ext/openssl/tests/cert.crt

http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/private.key?view=markup&rev=1.1
Index: php-src/ext/openssl/tests/private.key
+++ php-src/ext/openssl/tests/private.key



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

Reply via email to