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
7b0107cc5d
fix bug #61930 : openssl corrupts ssl key resource when using openssl_get_publickey()
2013-02-17 13:28:42 -08:00
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
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
84202c367e
commit for php bug 61421
...
enabling SHA2 and RMD160 for openssl signature verification
2012-09-15 22:59:34 -07:00
c7be96b08f
Revert "Add PBKDF2 support via openssl()"
...
This reverts commit b5b8ea1050
2012-06-12 11:22:49 -07:00
a2bfad051d
Revert "Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell."
...
This reverts commit bccd1e672f
2012-06-12 11:21:54 -07:00
5b3c9f4fd1
One more time
2012-06-11 16:23:27 -07:00
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
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
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
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
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
733aaf23b1
- Fixed build (PKCS5_PBKDF2_HMAC is from 1.0.0)
2012-06-11 14:08:38 -03:00
32040b574e
Merge branch '5.4'
...
* 5.4:
Add PBKDF2 support via openssl()
2012-06-11 00:29:02 -07:00
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
5ef66f2cf5
Fixed bug #61124 (Crash when decoding an invalid base64 encoded string).
2012-02-23 01:26:46 +00:00
6c331093b4
Fixed bug #61124 (Crash when decoding an invalid base64 encoded string).
2012-02-23 01:26:46 +00:00
8775a37559
- Year++
2012-01-01 13:15:04 +00:00
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
d705b11a1e
fix uninitialized var that may lead to crash
2011-12-26 02:16:37 +00:00
2f15c1d717
fix uninitialized var that may lead to crash
2011-12-26 02:16:37 +00:00
61f3d36ac1
Fix segfault in older versions of OpenSSL (before 0.9.8i)
2011-12-18 05:14:32 +00:00
beda5efd41
Fix segfault in older versions of OpenSSL (before 0.9.8i)
2011-12-18 05:14:32 +00:00
b69cfde570
Make sure that we set the strong crypto result to false as well as returning false.
2011-12-07 20:50:33 +00:00
287e1917cf
Make sure that we set the strong crypto result to false as well as returning false.
2011-12-07 20:50:33 +00:00
1d5028be3d
- Fixed bug #55646 : textual data is returned in UTF-8, but is input in
...
another encoding. 5.4 only as this implies a BC break.
2011-09-12 17:23:10 +00:00
1fbf911905
- Fixed bug #55646 : textual data is returned in UTF-8, but is input in
...
another encoding. 5.4 only as this implies a BC break.
2011-09-12 17:23:10 +00:00
4b30846b50
- Make usage of new PHP_FE_END macro
2011-07-25 11:35:02 +00:00
da376383e8
- Make usage of new PHP_FE_END macro
2011-07-25 11:35:02 +00:00
b03817afb5
- re apply the rng change specific to windows, long term it should be a std function but as this function was badly introduced in the 1st place, we have to fix the bad things here instead, pls do not revert again, bad idea.
2011-07-19 23:01:41 +00:00
69c3f8cbba
- re apply the rng change specific to windows, long term it should be a std function but as this function was badly introduced in the 1st place, we have to fix the bad things here instead, pls do not revert again, bad idea.
2011-07-19 23:01:41 +00:00
591e0e446f
Revert change to use a special Windows version of openssl_random_pseudo_bytes().
...
Lets discuss this on internals first. We're advertising something from the OpenSSL library
and then subverting it with another Windows OS call.
What are the implications of this? Should we make this available in ext/standard/ instead?
2011-07-19 22:29:55 +00:00
25fb19764a
Revert change to use a special Windows version of openssl_random_pseudo_bytes().
...
Lets discuss this on internals first. We're advertising something from the OpenSSL library
and then subverting it with another Windows OS call.
What are the implications of this? Should we make this available in ext/standard/ instead?
2011-07-19 22:29:55 +00:00
64a0c79a07
openssl_encrypt() / openssl_decrypt() were flawed and truncated the key to the default size for the case of a variable key length cipher.
...
The result is a key of 448 bits being passed to the blowfish algorithm would be truncated to 128 bit.
Also fixed an error in the zend_parse_parameters() having an invalid character being used.
2011-07-19 22:15:56 +00:00
02581a0052
openssl_encrypt() / openssl_decrypt() were flawed and truncated the key to the default size for the case of a variable key length cipher.
...
The result is a key of 448 bits being passed to the blowfish algorithm would be truncated to 128 bit.
Also fixed an error in the zend_parse_parameters() having an invalid character being used.
2011-07-19 22:15:56 +00:00
8278f831a5
- use php_win32_get_random_bytes instead of over slow and partially wrong openssl's version
2011-07-10 14:59:33 +00:00
5fb2570742
- use php_win32_get_random_bytes instead of over slow and partially wrong openssl's version
2011-07-10 14:59:33 +00:00
3c8bd9ebb6
- did I not kill that already? (do not use rand_screen, pointless on server and not TS)
2011-06-16 13:06:41 +00:00
104cd28e95
- did I not kill that already? (do not use rand_screen, pointless on server and not TS)
2011-06-16 13:06:41 +00:00
32b5f8a1a3
- Added new parameter parsing option (p - for valid path (string without null byte in the middle))
...
# The tests will be fixed in the next commits
2011-06-06 21:28:16 +00:00
4737910b69
- Added new parameter parsing option (p - for valid path (string without null byte in the middle))
...
# The tests will be fixed in the next commits
2011-06-06 21:28:16 +00:00
30f19bd524
Allow management of your own padding in openssl_encrypt/decrypt.
...
For using mcrypt / openssl interchangeabley managing your own padding is the only solution.
2011-05-20 18:56:13 +00:00
9e7ae3b2d0
Allow management of your own padding in openssl_encrypt/decrypt.
...
For using mcrypt / openssl interchangeabley managing your own padding is the only solution.
2011-05-20 18:56:13 +00:00
0c8438462c
The project calls itself OpenSSL and not openSSL, so let's keep it
...
that way in our code as well.
2011-04-25 16:50:30 +00:00
380c3e5127
SSLV2 patch cleanup
2011-04-24 23:27:48 +00:00
f922e31129
- fix bug #54061 , memory leak in openssl_decrypt
2011-02-21 12:47:38 +00:00
b526a6ef44
- fix bug #54060 , memory leak in openssl_encrypt
2011-02-21 10:07:31 +00:00
0203cc3d44
- Year++
2011-01-01 02:17:06 +00:00
Stanislav Malyshev