iliaa Tue Nov 28 00:22:05 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mcrypt mcrypt.c
/php-src/ext/soap php_http.c
Log:
Replace non-threadsafe rand() with php_rand_r()
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.91.2.3.2.5&r2=1.91.2.3.2.6&diff_format=u
Index: php-src/ext/mcrypt/mcrypt.c
diff -u php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.5
php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.6
--- php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.5 Mon Jun 26 16:33:38 2006
+++ php-src/ext/mcrypt/mcrypt.c Tue Nov 28 00:22:04 2006
@@ -16,7 +16,7 @@
| Derick Rethans <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mcrypt.c,v 1.91.2.3.2.5 2006/06/26 16:33:38 bjori Exp $ */
+/* $Id: mcrypt.c,v 1.91.2.3.2.6 2006/11/28 00:22:04 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1274,9 +1274,10 @@
RETURN_FALSE;
}
} else {
+ unsigned int ctx;
n = size;
while (size) {
- iv[--size] = 255.0 * rand() / RAND_MAX;
+ iv[--size] = 255.0 * php_rand_r(&ctx) / RAND_MAX;
}
}
RETURN_STRINGL(iv, n, 0);
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.77.2.11.2.3&r2=1.77.2.11.2.4&diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.77.2.11.2.3
php-src/ext/soap/php_http.c:1.77.2.11.2.4
--- php-src/ext/soap/php_http.c:1.77.2.11.2.3 Wed Sep 6 11:03:45 2006
+++ php-src/ext/soap/php_http.c Tue Nov 28 00:22:05 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_http.c,v 1.77.2.11.2.3 2006/09/06 11:03:45 dmitry Exp $ */
+/* $Id: php_http.c,v 1.77.2.11.2.4 2006/11/28 00:22:05 iliaa Exp $ */
#include "php_soap.h"
#include "ext/standard/base64.h"
@@ -469,9 +469,10 @@
char HA1[33], HA2[33],
response[33], cnonce[33], nc[9];
PHP_MD5_CTX md5ctx;
unsigned char hash[16];
+ unsigned int ctx;
PHP_MD5Init(&md5ctx);
- sprintf(cnonce, "%d", rand());
+ sprintf(cnonce, "%d", php_rand_r(&ctx));
PHP_MD5Update(&md5ctx, (unsigned
char*)cnonce, strlen(cnonce));
PHP_MD5Final(hash, &md5ctx);
make_digest(cnonce, hash);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
