[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/openssl/openssl.c

2013-02-17 Thread Stanislav Malyshev 
Commit:0841eca580d7914eaadeb4270d48f72c5c42ba2c
Author:Stanislav Malyshev  Sun, 17 Feb 2013 13:29:34 
-0800
Parents:   432d59ab5560202a46b01d05455418e9fc810365 
7b0107cc5d3d90655957680ef9cf916dce6875a7
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0841eca580d7914eaadeb4270d48f72c5c42ba2c

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #61930: openssl corrupts ssl key resource when using 
openssl_get_publickey()

Bugs:
https://bugs.php.net/61930

Changed paths:
  MM  ext/openssl/openssl.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/openssl/openssl.c

2013-08-19 Thread Stanislav Malyshev 
Commit:8e0f1100990c5a2e9ccc91e76ae884cbbdf24356
Author:Stanislav Malyshev  Mon, 19 Aug 2013 01:04:19 
-0700
Parents:   bcf785fb6667194ff70ef6f903189a495c15eb40 
cf96aa155ec5e9fbee7af339ca7d4dd98c2086a4
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=8e0f1100990c5a2e9ccc91e76ae884cbbdf24356

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix using wrong buffer pointer

Changed paths:
  MM  ext/openssl/openssl.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/openssl/openssl.c

2013-12-10 Thread Stanislav Malyshev 
Commit:41cd53329871cb99799cd9a8f76151312be2e960
Author:Stanislav Malyshev  Tue, 10 Dec 2013 11:35:26 
-0800
Parents:   bc8f7761f37d0cadfe72725c7b5e37d698b4db5d 
b1b23abc868e25f9ee083e8837c37867516ee380
Branches:  PHP-5.5 PHP-5.6 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=41cd53329871cb99799cd9a8f76151312be2e960

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse

Changed paths:
  MM  ext/openssl/openssl.c


Diff:



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