| 1234567891011121314151617181920212223242526 |
- $OpenBSD: patch-ext_mcrypt_mcrypt_c,v 1.2 2016/06/25 18:54:15 sthen Exp $
- mcrypt IV creation. no /dev/{u,}random? yes, it is using the last hunk.
- --- ext/mcrypt/mcrypt.c.orig.port Tue Jun 21 12:11:59 2016
- +++ ext/mcrypt/mcrypt.c Sat Jun 25 13:41:19 2016
- @@ -1411,6 +1411,10 @@ PHP_FUNCTION(mcrypt_create_iv)
-
- iv = ecalloc(size + 1, 1);
-
- +#if defined(__OpenBSD__)
- + arc4random_buf(iv, (size_t) size);
- + n = size;
- +#else
- if (source == RANDOM || source == URANDOM) {
- #if PHP_WIN32
- /* random/urandom equivalent on Windows */
- @@ -1455,6 +1459,7 @@ PHP_FUNCTION(mcrypt_create_iv)
- iv[--size] = (char) (255.0 * php_rand(TSRMLS_C) / RAND_MAX);
- }
- }
- +#endif /* openbsd */
- RETURN_STRINGL(iv, n, 0);
- }
- /* }}} */
|
