clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
98,530 Commits 491 Branches 1,363 Tags 839 MiB
fcc6f2df59
Commit Graph

1086 Commits

Author SHA1 Message Date
Jakub Zelenka
34eb6b53cc Store errors in openssl_digest 2016-02-05 15:32:19 +00:00
Jakub Zelenka
2a9dd980bf Merge branch 'PHP-7.0' 2016-02-04 16:57:41 +00:00
Jakub Zelenka
1ff88d3945 Merge branch 'PHP-5.6' into PHP-7.0 2016-02-04 16:54:44 +00:00
Jakub Zelenka
feab5e6fa0 Split and clean up OpenSSL X509 tests 2016-02-04 16:51:36 +00:00
Jakub Zelenka
899d2b2126 Store errors in openssl_seal and openssl_open 2016-02-04 12:30:53 +00:00
Jakub Zelenka
95a48213a0 Merge branch 'PHP-7.0' into openssl_error_store 2016-02-03 16:30:19 +00:00
Jakub Zelenka
fd6f32f667 Merge branch 'PHP-7.0' 2016-02-03 16:23:37 +00:00
Jakub Zelenka
cdf99ffc69 Merge branch 'PHP-5.6' into PHP-7.0 2016-02-03 16:22:39 +00:00
Jakub Zelenka
1f3906c1ce Rename and clean up OpenSSL tests 2016-02-03 16:20:27 +00:00
Jakub Zelenka
ff1c97f0aa Store errors in openssl_sign and openssl_verify 2016-02-03 13:55:37 +00:00
Jakub Zelenka
c26b87b8ac Rewrite openssl_error_string to use stored errors 2016-02-02 16:26:03 +00:00
Anatol Belski
99d9654f4b Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix directory separator in test
 2016-02-02 09:52:26 +01:00
Anatol Belski
1c2d45d2d1 fix directory separator in test 2016-02-02 09:52:07 +01:00
Stanislav Malyshev
ea35de6e31 Merge branch 'PHP-7.0' 
* PHP-7.0: (35 commits)
  fix tests
  update NEWS
  fix tests
  fix NEWS
  Update NEWS
  update NEWS
  Fixed bug #71475: openssl_seal() uninitialized memory usage
  Fixed bug #71488: Stack overflow when decompressing tar archives
  fix tests
  fix wrong gc sequence
  revert the API string as well
  update NEWS
  Revert "Fix #70720"
  sync NEWS
  reset ext/session to the state of 7.0.2
  update NEWS
  update NEWS
  add missing headers for SIZE_MAX
  backport the escapeshell* functions hardening branch
  add tests
  ...
 2016-02-01 20:46:06 -08:00
Stanislav Malyshev
c631f1ee2b Merge branch 'PHP-7.0.3' into PHP-7.0 
* PHP-7.0.3: (35 commits)
  fix tests
  update NEWS
  fix tests
  fix NEWS
  Update NEWS
  update NEWS
  Fixed bug #71475: openssl_seal() uninitialized memory usage
  Fixed bug #71488: Stack overflow when decompressing tar archives
  fix tests
  fix wrong gc sequence
  revert the API string as well
  update NEWS
  Revert "Fix #70720"
  sync NEWS
  reset ext/session to the state of 7.0.2
  update NEWS
  update NEWS
  add missing headers for SIZE_MAX
  backport the escapeshell* functions hardening branch
  add tests
  ...

Conflicts:
	configure.in
	ext/session/tests/bug69111.phpt
	main/php_version.h
 2016-02-01 20:45:49 -08:00
Jakub Zelenka
ceddf003a7 Store errors in openssl_(public|private)_(en|de)crypt 2016-02-01 18:42:42 +00:00
Stanislav Malyshev
33b1fbbb5c Fixed bug #71475: openssl_seal() uninitialized memory usage 2016-01-31 20:18:46 -08:00
Jakub Zelenka
678300aca6 Merge branch 'PHP-7.0' 2016-01-31 18:14:37 +00:00
Jakub Zelenka
265ccef39b Rename private.key to private_rsa_1024.key in new openssl_seal test 2016-01-31 18:13:37 +00:00
Jakub Zelenka
7295ffdff6 Merge branch 'PHP-7.0' 2016-01-31 14:41:08 +00:00
Jakub Zelenka
d8d20151c3 Merge branch 'PHP-5.6' into PHP-7.0 2016-01-31 14:40:20 +00:00
Jakub Zelenka
ef356912b3 Rewrite OpenSSL SPKI tests to speed them up 
Also fix some CS issue and naming
 2016-01-31 14:28:13 +00:00
Jakub Zelenka
e93ab05489 Add private RSA keys with 2048 and 4096 bit long modulus 2016-01-31 13:57:00 +00:00
Jakub Zelenka
148d013323 Rename private.key to private_rsa_1024.key 2016-01-31 13:54:16 +00:00
Jakub Zelenka
32d8cea840 Store errors in OpenSSL PKCS7 functions 2016-01-31 12:36:51 +00:00
Jakub Zelenka
8a251a8ec8 Store errors in openssl_pbkdf2 2016-01-31 11:55:36 +00:00
Jakub Zelenka
62b489287e Store errors in OpenSSL PKEY functions 2016-01-29 15:01:12 +00:00
Jakub Zelenka
538fbcdb7a Store errors in OpenSSL CSR functions 2016-01-29 13:55:24 +00:00
Jakub Zelenka
9d640c0001 Store errors in OpenSSL PKCS12 functions 2016-01-27 15:38:52 +00:00
Jakub Zelenka
f9f9ef2c2e Store errors in openssl_x509_checkpurpose 2016-01-26 16:15:49 +00:00
Xinchen Hui
c58ad955a9 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71443 (Segfault using built-in webserver with intl using symfony)
  Fix memory leak with not freeing OpenSSL errors
  check for NULL and avoid crashes
  Update libmagic.patch for PHP-5.6
  Fixed bug #7143	(finfo throws notice for specific python file)
 2016-01-26 15:57:49 +08:00
Jakub Zelenka
67c1921e2b Merge branch 'PHP-5.6' into PHP-7.0 2016-01-25 17:19:18 +00:00
Jakub Zelenka
a63d0f55da Fix memory leak with not freeing OpenSSL errors 2016-01-25 16:50:16 +00:00
Jakub Zelenka
0e2a5cdc1a Store main errors in openssl_x509_parse 2016-01-22 16:43:23 +00:00
Jakub Zelenka
116d64ff58 Store errors in openssl_x509_fingerprint 2016-01-21 16:41:27 +00:00
Jakub Zelenka
555126e90b Store errors in openssl_x509_export 2016-01-20 20:31:09 +00:00
Jakub Zelenka
63f8ef6ee1 Store errors in OpenSSL SPKI functions 2016-01-19 19:43:48 +00:00
Jakub Zelenka
b5c990c39b Store errors for some OpenSSL RAND handling 2016-01-10 18:28:01 +00:00
Jakub Zelenka
fb3a7e0ef4 Add error storing to the OpenSSL CONF part 2016-01-10 17:38:49 +00:00
Jakub Zelenka
d5a148e237 Use and fix storing errors in openssl_x509_export_to_file 
Also use persistent memory to prevent segfualt
 2016-01-09 18:45:02 +00:00
Jakub Zelenka
19d40fc2b0 Implement logic for OpenSSL error storing 2016-01-09 17:45:08 +00:00
Jakub Zelenka
e453af3851 Warn about passing tag for non AEAD modes 2016-01-09 17:25:53 +00:00
Jakub Zelenka
1d111320b9 Add initial almost empty php_openssl_store_errors 2016-01-08 14:57:31 +00:00
Jakub Zelenka
e00ba47d40 Add global data for storing OpenSSL errors 2016-01-07 16:38:24 +00:00
Jakub Zelenka
ae0ce19fa8 Merge branch 'master' into openssl_aead 2016-01-06 14:43:07 +00:00
Jakub Zelenka
55abb5d395 Fix and test OpenSSL CCM decryption 2016-01-05 14:19:00 +00:00
Jakub Zelenka
9b95dd5e37 Merge branch 'PHP-7.0' 2016-01-04 16:53:30 +00:00
Jakub Zelenka
0ea63cb2a8 Fix small CS label issue in openssl.c 2016-01-04 16:52:52 +00:00
Dominic Luechinger
e4bdf51f0a Replaced whitespaces with tabs and fixed aligments 2016-01-04 16:46:32 +00:00
Jakub Zelenka
5897256d04 Fix and test OpenSSL CCM encryption 2016-01-04 14:07:19 +00:00
Jakub Zelenka
8daecc59eb Test error cases in openssl_decrypt for GCM mode 2016-01-03 17:25:59 +00:00
Jakub Zelenka
651e6b628b Comment out warning when cipher update fail 
There has never been any warning for that
 2016-01-03 17:24:06 +00:00
Jakub Zelenka
72381b09ea Fix arginfo for openssl_decrypt (tag is not ref) 2016-01-03 17:21:57 +00:00
Jakub Zelenka
a866503bca Test invalid auth tag length in encryption 2016-01-02 17:01:54 +00:00
Lior Kaplan
3d5438bf7b Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update header to PHP Version 7
  Happy new year (Update copyright to 2016)
  Happy new year (Update copyright to 2016)
 2016-01-01 20:04:31 +02:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Jakub Zelenka
52ffdf9fc3 Test and fix encrypting empty IV for AEAD mode 2015-12-31 16:33:57 +00:00
Jakub Zelenka
74f2998212 Add an initial openssl decrypt GCM test 2015-12-30 18:18:05 +00:00
Jakub Zelenka
8070e04733 Add more aes-128-gcm test vectors 2015-12-29 18:54:22 +00:00
Jakub Zelenka
a00d1eccc7 Add an initial openssl encrypt GCM test 2015-12-28 19:16:05 +00:00
Jakub Zelenka
5e9540f77d Add AES CCM ciphers when linked with OpenSSL 1.0.1 
These ciphers are not added by OpenSSL_add_all_algorithms in 1.0.1
 2015-12-27 18:03:36 +00:00
Jakub Zelenka
213844de49 Fix EVP_EncryptFinal and EVP_DecryptFinal 2015-12-26 20:33:03 +00:00
Tom Van Looy
618b961124 Remove leftovers of TSRMLS in code 2015-12-25 11:13:39 +01:00
Jakub Zelenka
fc3575aaf1 Retrieve tag in AEAD cipher mode encryption 2015-12-13 19:05:19 +00:00
Jakub Zelenka
c54174255d Simplify AAD condition 2015-12-07 19:19:44 +00:00
Jakub Zelenka
da0c2a4b6b Implement AAD setting 2015-12-06 20:09:41 +00:00
Jakub Zelenka
32495cbfdd Add php_openssl_cipher_update to group enc and dec logic 2015-12-04 20:27:18 +00:00
Jakub Zelenka
e74368a8a1 Set AEAD tag or tag_len if supplied 2015-12-03 19:16:11 +00:00
Jakub Zelenka
c993151115 Add AEAD IV init 2015-12-01 19:34:12 +00:00
Jakub Zelenka
4b22c063bf Move password checkign to php_openssl_cipher_init 2015-11-15 19:11:24 +00:00
Jakub Zelenka
be57cafb56 Merge branch 'master' of git.php.net:php-src into openssl_aead 2015-11-15 19:10:34 +00:00
Jakub Zelenka
570cdc05d7 Merge branch 'PHP-5.6' into PHP-7.0 2015-11-09 18:23:29 +00:00
Jakub Zelenka
1a12403002 Remove SNI test that trigger request to sni.velox.ch 
This has been requested by Kaspar Brand who provides
sni.velox.ch. That site is only for interactive
testing and not for unit/integration/regression testing.
Although this test is run only in special cases (when
SNI_TESTS is defined) it should still be removed.

Also this test is not reliable as it depends on external
resources.
 2015-11-09 18:11:18 +00:00
Jakub Zelenka
dcabd9403a Move php_openssl_validate_iv to php_openssl_cipher_init and fix some issues 2015-11-08 18:03:17 +00:00
Jakub Zelenka
3ce5e46338 Change return value from php_openssl_validate_iv 2015-11-03 19:35:02 +00:00
Jakub Zelenka
2eb3e2c3ba Use php_openssl_cipher_init in openssl_decrypt 2015-11-02 21:39:38 +00:00
Jakub Zelenka
789ee143b2 Use php_openssl_cipher_init in openssl_encrypt 2015-11-01 13:30:42 +00:00
Jakub Zelenka
c09f3e399e Use correct type for tag_len 2015-11-01 13:19:52 +00:00
Jakub Zelenka
19e60a1f52 Merge branch 'master' into openssl_aead 2015-11-01 12:59:18 +00:00
Jakub Zelenka
e62db72111 Use standard title for new openssl tests 2015-10-29 19:11:57 +00:00
root
06c6b51e7d new tests to openssl module, don't covered yet. 2015-10-29 19:06:40 +00:00
Jakub Zelenka
6418786fc3 Merge branch 'master' of git.php.net:php-src into openssl_aead 2015-10-29 19:04:17 +00:00
Dmitry Stogov
c67fc6bb09 Fixed memory leak in php_stream_context_set_option() 2015-10-29 20:06:55 +03:00
Jakub Zelenka
41de89f61b Merge branch 'PHP-5.6' into PHP-7.0 2015-10-29 19:14:25 +00:00
Jakub Zelenka
496c46942f Add php_openssl_cipher_init 2015-10-26 19:08:24 +00:00
Jakub Zelenka
054b27d3f2 Merge branch 'master' into openssl_aead 2015-10-26 18:36:06 +00:00
Anatol Belski
83bfefeccb Fixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64 2015-10-26 15:54:29 +01:00
Jakub Zelenka
2ee99f8954 Check EVP_SealFinal return code 
This can be done since we no longer support OpenSSL 0.9.6
 2015-10-25 17:53:39 +00:00
Jakub Zelenka
a6534b8f73 Use openssl allocated cipher context 2015-10-07 20:18:33 +01:00
marcosptf
dae3ab8e7a Update openssl_x509_checkpurpose.phpt 2015-09-29 10:41:24 +02:00
root
fc3580c9d5 add test to openssl ext 2015-09-29 10:41:22 +02:00
Dmitry Stogov
ad4fa8f758 Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P(). 2015-09-24 22:39:59 +03:00
Jakub Zelenka
2f744cd3c5 Add and use function for loading cipher mode info 2015-09-23 19:56:24 +01:00
Anatol Belski
257693614e add test 2015-09-23 19:48:38 +02:00
Anatol Belski
ca89d9a797 expose openssl config path so it can be tested 2015-09-23 19:48:20 +02:00
Anatol Belski
aba42e3dda use bundled openssl.cnf 2015-09-23 17:14:59 +02:00
Anatol Belski
77b9acd326 add test 2015-09-23 14:17:04 +02:00
Anatol Belski
15d43095d7 expose openssl config path so it can be tested 2015-09-23 14:17:03 +02:00
Jakub Zelenka
96698b5d6d Add and check AEAD params in openssl_encrypt and openssl_decrypt 2015-09-21 18:48:21 +01:00
Jakub Zelenka
2ed246ed89 Add an initial preparation for OpenSSL AEAD 2015-09-20 14:00:24 +01:00
Jakub Zelenka
6a81363405 Require at least OpenSSL version 0.9.8 2015-09-20 13:01:15 +01:00
Jakub Zelenka
76783a26d2 Merge branch 'PHP-5.6' into PHP-7.0 2015-09-20 12:38:58 +01:00
Jakub Zelenka
dcd569aad6 Use tabs for arg info indent in openssl.c 2015-09-20 12:34:35 +01:00
Jakub Zelenka
e235cb65fb Fix request #70438: Add IV parameter for openssl_seal and openssl_open 2015-09-06 19:09:56 +01:00
Jakub Zelenka
473ccf47a5 Merge branch 'PHP-5.6' 2015-09-06 16:42:37 +01:00
Jakub Zelenka
d47029167d Fix bug #60632: openssl_seal fails with AES 2015-09-06 16:39:59 +01:00
Christoph M. Becker
28e82cc714 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #70395: Missing ARG_INFO for openssl_seal()
 2015-09-05 03:19:43 +02:00
Christoph M. Becker
43b26c7b21 Fix #70395: Missing ARG_INFO for openssl_seal() 
This patch adds the missing ARG_INFO for the optional 5th parameter $method.
 2015-09-05 03:08:02 +02:00
Jakub Zelenka
6b9f31ab74 Merge branch 'PHP-5.6' 2015-08-27 20:17:33 +01:00
Jakub Zelenka
ad028ebc11 Use new range checks in openssl ext 2015-08-26 19:55:29 +01:00
Jakub Zelenka
c39336d1d8 Fix bug #55259 (openssl extension does not get the DH parameters from DH key resource) 2015-08-25 20:26:11 +01:00
Anatol Belski
78b2b1d6f7 fix test 
backport from master
 2015-08-23 17:27:55 +02:00
Jakub Zelenka
7ad1703413 Add overflow check for openssl_pkcs12_read 2015-08-20 19:29:54 +01:00
Jakub Zelenka
c3f0c87564 Add overflow checks for openssl_pkey_* functions 2015-08-19 20:10:14 +01:00
Jakub Zelenka
478ecc674b Move overflow checks in openssl_pbkdf2 2015-08-19 20:06:58 +01:00
Jakub Zelenka
6a201b3651 Use macros for openssl overflow checks 
It reduces code duplications
 2015-08-18 20:17:04 +01:00
Jakub Zelenka
618c327a56 Fix possible overflow in openssl_pbkdf2 
Especially key_length would lead to the crash if it overflowed
to the negative value.
 2015-08-18 19:46:59 +01:00
Jakub Zelenka
c4a98e876c Check and use correct signature_len type for EVP_VerifyFinal 2015-08-17 18:43:02 +01:00
Jakub Zelenka
f3abea9f91 Fix some int overflows in openssl 
There might be more. I just did a quick check for enc/dec, rand
and one BN call.
 2015-08-16 15:43:00 +01:00
Stanislav Malyshev
ed709d5aa0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  fix test
  update NEWS
  Fix bug #70019 - limit extracted files to given directory
  Do not do convert_to_* on unserialize, it messes up references
  Fix #69793 - limit what we accept when unserializing exception
  Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
  Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
  ignore signatures for packages too
  Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
  Fixed bug #69892
  Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
  Improved fix for Bug #69441
  Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
  Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
  Fix bug #70081: check types for SOAP variables

Conflicts:
	ext/soap/php_http.c
	ext/spl/spl_observer.c
 2015-08-04 15:29:13 -07:00
Stanislav Malyshev
69ed3969dd Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #70019 - limit extracted files to given directory
  Do not do convert_to_* on unserialize, it messes up references
  Fix #69793 - limit what we accept when unserializing exception
  Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
  Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
  ignore signatures for packages too
  Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
  Fixed bug #69892
  Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
  Improved fix for Bug #69441
  Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
  Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
  Fix bug #70081: check types for SOAP variables

Conflicts:
	.gitignore
	ext/date/php_date.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
 2015-08-04 14:10:57 -07:00
Stanislav Malyshev
16023f3e3b Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes 2015-07-26 17:43:16 -07:00
Stanislav Malyshev
97047e7665 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
  fix test
  update NEWS
  Fix bug #70019 - limit extracted files to given directory
  Do not do convert_to_* on unserialize, it messes up references
  Fix #69793 - limit what we accept when unserializing exception
  Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
  Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
  ignore signatures for packages too
  Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
  Fixed bug #69892
  Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
  Improved fix for Bug #69441
  Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
  Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
  Fix bug #70081: check types for SOAP variables

Conflicts:
	Zend/zend_exceptions.c
	ext/date/php_date.c
	ext/openssl/openssl.c
	ext/phar/phar_internal.h
	ext/soap/php_http.c
	ext/spl/spl_array.c
	ext/spl/spl_dllist.c
	ext/spl/spl_observer.c
	ext/standard/tests/serialize/bug69152.phpt
	sapi/cli/tests/005.phpt
 2015-08-04 16:14:24 -07:00
Anatol Belski
545b364d56 remove TSRMLS_* 
either remains or merged in from PHP5
 2015-08-02 13:42:01 +02:00
Anatol Belski
b281211979 fix backport mistake 
in 5.6 it has to be explicitly copied to avoid double free
 2015-07-03 16:21:02 +02:00
Anatol Belski
d870683d6b backport c01943bffc into 5.6 2015-07-03 11:16:02 +02:00
Anatol Belski
c01943bffc fix improper behavior 
openssl_spki_export() is documented to return string, but it's
obviously not achieved writing it to stdout :)
 2015-07-03 10:15:52 +02:00
Dmitry Stogov
4a2e40bb86 Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). 2015-06-30 04:05:24 +03:00
Tjerk Meesters
03a670eaaa Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
 2015-06-26 06:03:29 +08:00
Tjerk Meesters
2ff3dafccf Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs 
Squashed commit of the following:

commit a64c1d9bc4
Author: Tomasz Sawicki <falundir@gmail.com>
Date:   Wed Jun 24 08:49:37 2015 +0200

    Fix #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs

    The "key values mismatch" error is triggered in openssl_pkcs12_read by
    PKCS12_parse, because it uses X509_check_private_key to separate main
    certificate (which corresponds to private key) from extra certificates.
    Extra certificates usually comes first (p12 contents are reversed as
    stack) and X509_check_private_key triggers X509_R_KEY_VALUES_MISMATCH
    error.
    The fix pops "key values mismatch" error from OpenSSL error stack for
    each extra certificate if there are any.
 2015-06-26 05:33:28 +08:00
Nikita Popov
8a83aed458 Drop duplicate object-to-type notices 
We already generate a recoverable fatal for these earlier, no need
to throw an additional notice.
 2015-06-22 16:25:32 +02:00
Nikita Popov
5d3cf577aa Make convert_to_* safe with rc>1 
This only involves switching zval_dtor to zval_ptr_dtor for arrays
and making the convert_to_object for arrays a bit more generic.

All the other changes outside zend_operators.c just make use of
this new ability (use COPY instead of DUP).

What's still missing: Proper references handling. I've seen many
convert_to* calls that will break when a reference is used.

Also fixes bug #69788.
 2015-06-11 23:23:57 +02:00
Radu Brănișcan
0c7634fcc7 Corrected line comment 5256 
From the text "dectupt" to "decrypt"
 2015-05-23 11:11:58 +02:00
Anatol Belski
c93a360661 fix _timezone usage for vc14 2015-05-10 18:17:24 +02:00
Rasmus Lerdorf
741382d968 Remove SSLv3 test dependencies 
SSLv3 is going away. Debian8 already ships with an openssl
with no SSLv3 support which was causing these tests to fail.

Conflicts:
	ext/openssl/tests/session_meta_capture.phpt
 2015-05-05 10:40:55 +02:00
Nikita Popov
2a87a42cd4 Dropped CN_match and SNI_server_name context options 2015-04-24 18:18:18 +02:00
Stanislav Malyshev
cb9f58d046 Merge branch 'pull-request/1203' 
* pull-request/1203:
  Update openssl.c
 2015-04-18 19:32:14 -07:00
Remi Collet
9340c5b347 Merge branch 'PHP-5.6' 
* PHP-5.6:
  skip test when xml not available
 2015-04-17 15:21:03 +02:00
Remi Collet
342acbe1c6 skip test when xml not available 2015-04-17 15:20:22 +02:00
Daniel Lowrey
4f07330e79 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix Bug #69402: Reading empty SSL stream hangs until timeout

Conflicts:
	ext/openssl/xp_ssl.c
 2015-04-14 09:27:37 -06:00
Daniel Lowrey
81f356b4ae Fix Bug #69402: Reading empty SSL stream hangs until timeout 2015-04-14 09:25:11 -06:00
Daniel Lowrey
601d60a978 Fix Bug #69402: Reading empty SSL stream hangs until timeout 2015-04-14 09:24:40 -06:00
Kalle Sommer Nielsen
156ac232cb Fix test for systems where openssl's time_t have an offset set 2015-04-09 19:57:44 +02:00
Kalle Sommer Nielsen
8d3c4e5988 Fix test on systems where EOL isn't "\n", like Windows 2015-04-08 23:56:29 +02:00
Dmitry Stogov
5ba72e5f80 Fixed resource leak 2015-04-08 23:37:05 +03:00
Rasmus Lerdorf
32484e3f5f Remove SSLv3 test dependencies 
SSLv3 is going away. Debian8 already ships with an openssl
with no SSLv3 support which was causing these tests to fail.
 2015-04-08 09:55:55 -07:00
Eric F
321bafccde Update openssl.c 
Adding additional checks for sslv3.
 2015-03-30 01:30:09 +02:00
Leigh
456f4a78d2 Add RAND_egd check for compiling against LibreSSL 2015-03-27 13:33:22 +01:00
Leigh
a04ab4b54b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add RAND_egd check for compiling against LibreSSL
 2015-03-27 13:26:48 +01:00