Got initial API added

php · SammyK · Feb 13, 2015 · Feb 13, 2015 · Feb 20, 2015 · Feb 20, 2015
commit f8d7aec431397e008fb63302e361444b0e0ea737
@@ -1897,6 +1897,20 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO(arginfo_mt_getrandmax, 0)
 ZEND_END_ARG_INFO()
 /* }}} */
+/* {{{ random.c */
+ZEND_BEGIN_ARG_INFO_EX(arginfo_random_bytes, 0, 0, 0)
+	ZEND_ARG_INFO(0, bytes)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_random_hex, 0, 0, 0)
+	ZEND_ARG_INFO(0, bytes)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_random_int, 0, 0, 0)
+	ZEND_ARG_INFO(0, min)
+	ZEND_ARG_INFO(0, max)
+ZEND_END_ARG_INFO()
+/* }}} */
 /* {{{ sha1.c */
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sha1, 0, 0, 1)
 	ZEND_ARG_INFO(0, str)
@@ -2820,6 +2834,10 @@ const zend_function_entry basic_functions[] = { /* {{{ */
 	PHP_FE(mt_srand,														arginfo_mt_srand)
 	PHP_FE(mt_getrandmax,													arginfo_mt_getrandmax)
 
+	PHP_FE(random_bytes,													arginfo_random_bytes)
+	PHP_FE(random_hex,													arginfo_random_hex)
+	PHP_FE(random_int,													arginfo_random_int)
+
 #if HAVE_GETSERVBYNAME
 	PHP_FE(getservbyname,													arginfo_getservbyname)
 #endif

@@ -605,7 +605,8 @@ PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32.
                             incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
                             http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
                             var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
-                            filters.c proc_open.c streamsfuncs.c http.c password.c,,,
+                            filters.c proc_open.c streamsfuncs.c http.c password.c \
+                            random.c,,,
 			    -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 
 PHP_ADD_MAKEFILE_FRAGMENT

@@ -20,7 +20,7 @@ EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \
 	url_scanner_ex.c ftp_fopen_wrapper.c http_fopen_wrapper.c \
 	php_fopen_wrapper.c credits.c css.c var_unserializer.c ftok.c sha1.c \
 	user_filters.c uuencode.c filters.c proc_open.c password.c \
-	streamsfuncs.c http.c flock_compat.c", false /* never shared */,
+	streamsfuncs.c http.c flock_compat.c random.c", false /* never shared */,
 	'/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
 	PHP_INSTALL_HEADERS("", "ext/standard");
 if (PHP_MBREGEX != "no") {

@@ -0,0 +1,34 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 7                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2015 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Sammy Kaye Powers <me@sammyk.me>                            |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef PHP_RANDOM_H
+#define PHP_RANDOM_H
+
+PHP_FUNCTION(random_bytes);
+PHP_FUNCTION(random_hex);
+PHP_FUNCTION(random_int);
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
@@ -59,6 +59,7 @@
 #include "php_ftok.h"
 #include "php_type.h"
 #include "php_password.h"
+#include "php_random.h"
 
 #define phpext_standard_ptr basic_functions_module_ptr
 PHP_MINIT_FUNCTION(standard_filters);

@@ -0,0 +1,158 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 7                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2015 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Sammy Kaye Powers <me@sammyk.me>                            |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#include <stdlib.h>
+
+#include "php.h"
+
+// Copy/pasted from string.c
+static char hexconvtab[] = "0123456789abcdef";
+
+// Copy/pasted from string.c
+static zend_string *php_bin_to_hex(const unsigned char *old, const size_t oldlen)
+{
+	zend_string *result;
+	size_t i, j;
+
+	result = zend_string_safe_alloc(oldlen, 2 * sizeof(char), 0, 0);
+
+	for (i = j = 0; i < oldlen; i++) {
+		result->val[j++] = hexconvtab[old[i] >> 4];
+		result->val[j++] = hexconvtab[old[i] & 15];
+	}
+	result->val[j] = '\0';
+
+	return result;
+}
+
+static int *php_random_bytes(zend_string *bytes, size_t length)
+{
+	FILE *fp;
+
+#ifdef PHP_WIN32
+	// @todo Need to add Windows support
+	fp = NULL;
+#else
+	fp = fopen("/dev/urandom" , "rb");
+#endif
+
+	if (fp == NULL) {
+		php_error_docref(NULL, E_WARNING, "Unable to open /dev/urandom");
+		return FAILURE;
+	}
+
+	// @todo I think this has to be char & int!
+	if (fgets(bytes, 10, fp) == NULL) {
+		fclose(fp);
+		php_error_docref(NULL, E_WARNING, "Unable to read from /dev/urandom");
+		return FAILURE;
+	}
+	fclose(fp);
+
+	return bytes;
+}
+
+/* {{{ proto string random_bytes(int bytes)
+Return an arbitrary length of pseudo-random bytes as binary string */
+PHP_FUNCTION(random_bytes)
+{
+	size_t length;
+	zend_string *bytes;
+
+	int argc = ZEND_NUM_ARGS();
+
+	if (argc != 0) {
+		if (zend_parse_parameters(argc, "l", &length) == FAILURE) {
+			return;
+		} else if (length <= 0) {
+			php_error_docref(NULL, E_WARNING, "length(" ZEND_LONG_FMT ") must be greater than 0", length);
+			RETURN_FALSE;
+		}
+	}
+
+	if (php_random_bytes(bytes, length) == FAILURE) {
+		return;
+	}
+
+	RETURN_STR(bytes);
+}
+/* }}} */
+
+/* {{{ proto string random_hex(int bytes)
+Return an arbitrary length of pseudo-random bytes as hexadecimal string */
+PHP_FUNCTION(random_hex)
+{
+	size_t length;
+	zend_string *bytes;
+	zend_string *hex;
+
+	int argc = ZEND_NUM_ARGS();
+
+	if (argc != 0) {
+		if (zend_parse_parameters(argc, "l", &length) == FAILURE) {
+			return;
+		} else if (length <= 0) {
+			php_error_docref(NULL, E_WARNING, "length(" ZEND_LONG_FMT ") must be greater than 0", length);
+			RETURN_FALSE;
+		}
+	}
+
+	if (php_random_bytes(bytes, length) == FAILURE) {
+		return;
+	}
+
+	hex = php_bin_to_hex(bytes, length);
+
+	RETURN_STR(hex);
+}
+/* }}} */
+
+/* {{{ proto int random_int(int min, int max)
+Return an arbitrary pseudo-random integer */
+PHP_FUNCTION(random_int)
+{
+	zend_long min;
+	zend_long max;
+	zend_long number;
+	int argc = ZEND_NUM_ARGS();
+
+	if (argc != 0) {
+		if (zend_parse_parameters(argc, "ll", &min, &max) == FAILURE) {
+			return;
+		} else if (max < min) {
+			php_error_docref(NULL, E_WARNING, "max(" ZEND_LONG_FMT ") is smaller than min(" ZEND_LONG_FMT ")", max, min);
+			RETURN_FALSE;
+		}
+	}
+
+	number = min + max;
+
+	RETURN_LONG(number);
+}
+/* }}} */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */