diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2014-03-13 12:40:14 +0200 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-03-13 12:40:14 +0200 |
| commit | 356c442558661a2be00bfe7acd6a9abc4c7f97d0 (patch) | |
| tree | 72e5ce05bffe8ba43a3435f5ef37e7629341f4a1 /ext/openssl | |
| parent | f7b9c12ed91461c18c6de6f5c75e998625f8de76 (diff) | |
| parent | 737c187013624122584ed6d18a39a34599717458 (diff) | |
| download | php-git-356c442558661a2be00bfe7acd6a9abc4c7f97d0.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Typo fix: sicret -> secret
Diffstat (limited to 'ext/openssl')
| -rwxr-xr-x | ext/openssl/openssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 9d8f66cf90..374f886e44 100755 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -5077,7 +5077,7 @@ PHP_FUNCTION(openssl_cipher_iv_length) /* {{{ proto string openssl_dh_compute_key(string pub_key, resource dh_key) - Computes shared sicret for public value of remote DH key and local DH key */ + Computes shared secret for public value of remote DH key and local DH key */ PHP_FUNCTION(openssl_dh_compute_key) { zval *key; |