com php-src: Add missing NEWS entry, copyright notice, and vim settings: NEWS ext/hash/hash_sha3.c ext/hash/php_hash_sha3 .h
| From: | Sara Golemon | Date: | Fri, 16 Oct 2015 07:19:00 +0000 |
| Subject: | com php-src: Add missing NEWS entry, copyright notice, and vim settings: NEWS ext/hash/hash_sha3.c ext/hash/php_hash_sha3 .h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89412@lists.php.net to get a copy of this message | ||
Commit: e800da99204e55e48eb3dfe2421e62ab6fd3cd4c
Author: Sara Golemon <pollita@php.net> Fri, 16 Oct 2015 00:17:59 -0700
Committer: Sara Golemon <sgolemon@fb.com> Fri, 16 Oct 2015 00:19:00 -0700
Parents: d244b54c67cc2725283b78d4bb128501ae7910d3
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e800da99204e55e48eb3dfe2421e62ab6fd3cd4c
Log:
Add missing NEWS entry, copyright notice, and vim settings
Should have gone with d244b54c67cc2725283b78d4bb128501ae7910d3
Changed paths:
M NEWS
M ext/hash/hash_sha3..c
M ext/hash/php_hash_sha3.h
Diff:
diff --git a/NEWS b/NEWS
index a0f4fb2..b27adf6 100644
--- a/NEWS
+++ b/NEWS
@@ -6,4 +6,7 @@ Standard
. Implemented FR #55716 (Add an option to pass a custom stream context to
get_headers()). (Ferenc)
+Hash
+ . Added SHA3 fixed mode algorithms (224, 256, 384, and 512 bit). (Sara)
+
<<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
diff --git a/ext/hash/hash_sha3.c b/ext/hash/hash_sha3.c
index 2fb24b3...e82bd24 100644
--- a/ext/hash/hash_sha3.c
+++ b/ext/hash/hash_sha3.c
@@ -1,3 +1,21 @@
+/*
+ +----------------------------------------------------------------------+
+ | 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. |
+ +----------------------------------------------------------------------+
+ | Author: Sara Golemon <pollita@php.net> |
+ +----------------------------------------------------------------------+
+*/
+
#include "php_hash_sha3.h"
#if (defined(__APPLE__) || defined(__APPLE_CC__)) && \
diff --git a/ext/hash/php_hash_sha3.h b/ext/hash/php_hash_sha3.h
index 65196ab..c95efc9 100644
--- a/ext/hash/php_hash_sha3.h
+++ b/ext/hash/php_hash_sha3.h
@@ -49,3 +49,11 @@ PHP_HASH_API void PHP_SHA3512Update(PHP_SHA3_512_CTX*, const unsigned char*, uns
PHP_HASH_API void PHP_SAH3512Final(unsigned char[32], PHP_SHA3_512_CTX*);
#endif
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */