com php-src: Fix bug #71915 (openssl_random_pseudo_byte s is not fork-safe): NEWS ext/openssl/openssl.c

From: Date: Sun, 12 Jun 2016 17:14:21 +0000
Subject: com php-src: Fix bug #71915 (openssl_random_pseudo_byte s is not fork-safe): NEWS ext/openssl/openssl.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92361@lists.php.net to get a copy of this message
Commit: 0e2447cd11f4b72257e5d2609f923177e9736c3c Author: Jakub Zelenka <bukka@php.net> Sun, 12 Jun 2016 18:11:38 +0100 Parents: 54310d95f91bcd286e4bae67891402f782c1e767 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0e2447cd11f4b72257e5d2609f923177e9736c3c Log: Fix bug #71915 (openssl_random_pseudo_bytes is not fork-safe) Add time to the entropy before using RAND_bytes Bugs: https://bugs.php.net/71915 Changed paths: M NEWS M ext/openssl/openssl.c Diff: diff --git a/NEWS b/NEWS index b730703..37907b3 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ PHP NEWS ?? ??? 2016, PHP 5.6.24 - OpenSSL: + . Fixed bug #71915 (openssl_random_pseudo_bytes is not fork-safe). + (Jakub Zelenka) . Fixed bug #72336 (openssl_pkey_new does not fail for invalid DSA params). (Jakub Zelenka) diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index da71d71..844132b 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -967,6 +967,22 @@ static void php_openssl_dispose_config(struct php_x509_request * req TSRMLS_DC) } /* }}} */ +#ifdef PHP_WIN32 +#define PHP_OPENSSL_RAND_ADD_TIME() ((void) 0) +#else +#define PHP_OPENSSL_RAND_ADD_TIME() php_openssl_rand_add_timeval() + +static inline void php_openssl_rand_add_timeval() /* {{{ */ +{ + struct timeval tv; + + gettimeofday(&tv, NULL); + RAND_add(&tv, sizeof(tv), 0.0); +} +/* }}} */ + +#endif + static int php_openssl_load_rand_file(const char * file, int *egdsocket, int *seeded TSRMLS_DC) /* {{{ */ { char buffer[MAXPATHLEN]; @@ -1010,6 +1026,7 @@ static int php_openssl_write_rand_file(const char * file, int egdsocket, int see if (file == NULL) { file = RAND_file_name(buffer, sizeof(buffer)); } + PHP_OPENSSL_RAND_ADD_TIME(); if (file == NULL || !RAND_write_file(file)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to write random state"); return FAILURE; @@ -3399,12 +3416,14 @@ static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request * req if ((req->priv_key = EVP_PKEY_new()) != NULL) { switch(req->priv_key_type) { case OPENSSL_KEYTYPE_RSA: + PHP_OPENSSL_RAND_ADD_TIME(); if (EVP_PKEY_assign_RSA(req->priv_key, RSA_generate_key(req->priv_key_bits, 0x10001, NULL, NULL))) { return_val = req->priv_key; } break; #if !defined(NO_DSA) && defined(HAVE_DSA_DEFAULT_METHOD) case OPENSSL_KEYTYPE_DSA: + PHP_OPENSSL_RAND_ADD_TIME(); { DSA *dsapar = DSA_generate_parameters(req->priv_key_bits, NULL, 0, NULL, NULL, NULL, NULL); if (dsapar) { @@ -3422,6 +3441,7 @@ static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request * req #endif #if !defined(NO_DH) case OPENSSL_KEYTYPE_DH: + PHP_OPENSSL_RAND_ADD_TIME(); { DH *dhpar = DH_generate_parameters(req->priv_key_bits, 2, NULL, NULL); int codes = 0; @@ -3540,6 +3560,7 @@ zend_bool php_openssl_pkey_init_dsa(DSA *dsa) if (dsa->priv_key || dsa->pub_key) { return 1; } + PHP_OPENSSL_RAND_ADD_TIME(); if (!DSA_generate_key(dsa)) { return 0; } @@ -3562,6 +3583,7 @@ zend_bool php_openssl_pkey_init_dh(DH *dh) if (dh->pub_key) { return 1; } + PHP_OPENSSL_RAND_ADD_TIME(); if (!DH_generate_key(dh)) { return 0; } @@ -5461,6 +5483,7 @@ PHP_FUNCTION(openssl_random_pseudo_bytes) RETURN_FALSE; } #else + PHP_OPENSSL_RAND_ADD_TIME(); if (RAND_bytes(buffer, buffer_length) <= 0) { efree(buffer); if (zstrong_result_returned) {

« previous php.cvs (#92361) next »