Veres Lajos
6c4af15d6c
typos (orig)
2013-07-15 00:19:32 -07:00
Stanislav Malyshev
8ac131503d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
2013-06-10 14:31:57 -07:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
jas-
525e27e1e5
Fix for challenge string length pointed out by Kalle Nielsen
2013-05-06 18:43:13 -06:00
jas-
8f56ac8401
Address feature request #38917 for native SPKAC (HTML5 keygen element) support
2013-05-06 16:36:06 -06:00
Stanislav Malyshev
0841eca580
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()
2013-02-17 13:29:34 -08:00
Stanislav Malyshev
7b0107cc5d
fix bug #61930 : openssl corrupts ssl key resource when using openssl_get_publickey()
2013-02-17 13:28:42 -08:00
Lars Strojny
6b48a86a17
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-31 00:33:46 +01:00
Lars Strojny
836a2b1131
NEWS entry new OpenSSL option [doc]
2013-01-31 00:32:44 +01:00
Daniel Lowrey
4a01ddfb55
Added ssl context option, "disable_compression"
...
The CRIME attack vector exploits TLS compression. This patch adds a stream context option
allowing servers to disable TLS compression for versions of OpenSSL >= 1.0.0 (which first
introduced the SSL_OP_NO_COMPRESSION option). A summary rundown of the CRIME attack can
be found at https://community.qualys.com/blogs/securitylabs/2012/09/14/crime-information-leakage-attack-against-ssltls
Thanks to @DaveRandom for pointing out the relevant section of code.
2013-01-31 00:31:10 +01:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Stanislav Malyshev
088640adb2
Merge branch 'PHp-5.4'
...
* PHp-5.4:
news for bug #61421
commit for php bug 61421 enabling SHA2 and RMD160 for openssl signature verification
2012-09-15 23:02:44 -07:00
Mark Jones
84202c367e
commit for php bug 61421
...
enabling SHA2 and RMD160 for openssl signature verification
2012-09-15 22:59:34 -07:00
Stanislav Malyshev
c7be96b08f
Revert "Add PBKDF2 support via openssl()"
...
This reverts commit b5b8ea1050
.
Looks like we don't have agreement yet on this for 5.4. Let's keep it in 5.5 for now.
2012-06-12 11:22:49 -07:00
Stanislav Malyshev
a2bfad051d
Revert "Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell."
...
This reverts commit bccd1e672f
.
Looks like we don't have agreement yet on this for 5.4. Let's keep it in 5.5 for now.
2012-06-12 11:21:54 -07:00
Scott MacVicar
5b3c9f4fd1
One more time
2012-06-11 16:23:27 -07:00
Scott MacVicar
bcd671d999
Merge branch '5.4'
...
* 5.4:
Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell.
Add PBKDF2 support via openssl()
Conflicts:
ext/openssl/openssl.c
2012-06-11 16:04:01 -07:00
Scott MacVicar
aadf59dfa4
Add PBKDF2 support via openssl()
...
Summary:
No easy way to put these in the hash extension since we don't really support optional
parameters to certain algorithms. Implemented in openssl for now since it has it already
and is pretty stable.
Only SHA1 is confirmed to work as an algorithm but openssl has a parameter so it can be
changed in the future.
Will backport to 5.4 potentially with Stas' approval.
Test Plan:
Ran newly added tests which came from RFC 6070
2012-06-11 15:59:58 -07:00
Scott MacVicar
bccd1e672f
Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell.
...
Summary:
Stas pointed out that this is named pretty poorly. Go for openssl_pbkdf2()
2012-06-11 15:41:41 -07:00
Scott MacVicar
b5b8ea1050
Add PBKDF2 support via openssl()
...
Summary:
No easy way to put these in the hash extension since we don't really support optional
parameters to certain algorithms. Implemented in openssl for now since it has it already
and is pretty stable.
Only SHA1 is confirmed to work as an algorithm but openssl has a parameter so it can be
changed in the future.
Will backport to 5.4 potentially with Stas' approval.
Test Plan:
Ran newly added tests which came from RFC 6070
2012-06-11 13:35:25 -07:00
Scott MacVicar
b481ebae55
Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell.
...
Summary:
Stas pointed out that this is named pretty poorly. Go for openssl_pbkdf2()
2012-06-11 12:38:54 -07:00
Felipe Pena
733aaf23b1
- Fixed build (PKCS5_PBKDF2_HMAC is from 1.0.0)
2012-06-11 14:08:38 -03:00
Scott MacVicar
32040b574e
Merge branch '5.4'
...
* 5.4:
Add PBKDF2 support via openssl()
2012-06-11 00:29:02 -07:00
Scott MacVicar
f4847efc5d
Add PBKDF2 support via openssl()
...
Summary:
No easy way to put these in the hash extension since we don't really support optional
parameters to certain algorithms. Implemented in openssl for now since it has it already
and is pretty stable.
Only SHA1 is confirmed to work as an algorithm but openssl has a parameter so it can be
changed in the future.
Will backport to 5.4 potentially with Stas' approval.
Test Plan:
Ran newly added tests which came from RFC 6070
2012-06-11 00:24:44 -07:00
Anatoliy Belsky
40bbc7a1ed
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #61401 ext\openssl\tests\004.phpt fails
Fix bug #61404 ext\openssl\tests\021.phpt fails
Fix bug #61404 ext\openssl\tests\021.phpt fails
Fix bug #61448 intl tests fail with icu >= 4.8
2012-03-28 17:25:23 +02:00
Anatoliy Belsky
fa0d507923
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61401 ext\openssl\tests\004.phpt fails
Fix bug #61404 ext\openssl\tests\021.phpt fails
Fix bug #61448 intl tests fail with icu >= 4.8
2012-03-28 17:13:16 +02:00
Anatoliy Belsky
bff8152565
Fix bug #61401 ext\openssl\tests\004.phpt fails
2012-03-28 17:11:58 +02:00
Anatoliy Belsky
b905167458
Fix bug #61404 ext\openssl\tests\021.phpt fails
2012-03-28 16:23:46 +02:00
Anatoliy Belsky
4c5b427124
Fix bug #61404 ext\openssl\tests\021.phpt fails
2012-03-28 16:15:36 +02:00
Anatoliy Belsky
bd7bb973b1
Fix bug #61404 ext\openssl\tests\021.phpt fails
2012-03-28 16:04:56 +02:00
Anatoliy Belsky
fe8494d781
Merge branch '5.4'
...
* 5.4:
Fix bug #61405 ext\openssl\tests\022.phpt fails
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
2012-03-27 16:32:14 +02:00
Anatoliy Belsky
8d7a489b97
Merge branch '5.3' into 5.4
...
* 5.3:
Fix bug #61405 ext\openssl\tests\022.phpt fails
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
2012-03-27 16:15:15 +02:00
Anatoliy Belsky
b638d3020c
Fix bug #61405 ext\openssl\tests\022.phpt fails
2012-03-27 16:07:59 +02:00
Anatoliy Belsky
e55718b091
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
2012-03-27 16:07:59 +02:00
Anatoliy Belsky
7fdd35d697
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
2012-03-27 16:07:25 +02:00
Anatoliy Belsky
686effc677
Merge branch '5.4'
...
* 5.4:
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
2012-03-27 15:34:57 +02:00
Anatoliy Belsky
5f3ba55a3c
Merge branch '5.3' into 5.4
...
* 5.3:
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
2012-03-27 15:27:20 +02:00
Anatoliy Belsky
5f6bed180e
Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
2012-03-27 15:23:01 +02:00
Olivier DOUCET
ad832abba1
test for bug #61124
2012-02-25 13:27:57 +00:00
Olivier DOUCET
118dd43555
test for bug #61124
2012-02-25 13:27:57 +00:00
Olivier DOUCET
f14a1e0aed
test for bug #61124
2012-02-25 13:27:57 +00:00
Scott MacVicar
5ef66f2cf5
Fixed bug #61124 (Crash when decoding an invalid base64 encoded string).
2012-02-23 01:26:46 +00:00
Scott MacVicar
6c331093b4
Fixed bug #61124 (Crash when decoding an invalid base64 encoded string).
2012-02-23 01:26:46 +00:00
Scott MacVicar
f424fe8aed
Fixed bug #61124 (Crash when decoding an invalid base64 encoded string).
2012-02-23 01:26:46 +00:00
Christopher Jones
b0678ea229
Fix OpenSSL version-dependent diff. "Time Stamp signing" is not in openssl 0.9. Skip current test for 0.9. New test for 0.9 approved by Stas
2012-02-07 01:15:13 +00:00
Christopher Jones
73ccc0a5e9
Fix OpenSSL version-dependent diff. "Time Stamp signing" is not in openssl 0.9. Skip current test for 0.9. New test for 0.9 approved by Stas
2012-02-07 01:15:13 +00:00
Christopher Jones
df02fbae3e
Fix OpenSSL version-dependent diff. "Time Stamp signing" is not in openssl 0.9. Skip current test for 0.9. New test for 0.9 approved by Stas
2012-02-07 01:15:13 +00:00
Rasmus Lerdorf
f6f283c3e2
Another openssl test that is dependent on the openssl version. The output has
...
changed in more recent versions. Synch with newer output and consider changing
the test to only pick out the more stable fields instead of all of them.
2012-02-05 10:08:16 +00:00
Rasmus Lerdorf
8d5f83dde5
Another openssl test that is dependent on the openssl version. The output has
...
changed in more recent versions. Synch with newer output and consider changing
the test to only pick out the more stable fields instead of all of them.
2012-02-05 10:08:16 +00:00