denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xof: Add identifiers for MGF1 XOFs based on SHA-224/384

Browse Source
This commit is contained in:
Tobias Brunner
2017-11-08 16:48:10 +01:00
parent 126fd8af09
commit 720a76c229
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/crypto/xofs/xof.c
+6 -2
View File
@@ -19,7 +19,9 @@
ENUM(ext_out_function_names, XOF_UNDEFINED, XOF_CHACHA20, ENUM(ext_out_function_names, XOF_UNDEFINED, XOF_CHACHA20,
"XOF_UNDEFINED", "XOF_UNDEFINED",
"XOF_MGF1_SHA1", "XOF_MGF1_SHA1",
"XOF_MGF1_SHA224",
"XOF_MGF1_SHA256", "XOF_MGF1_SHA256",
"XOF_MGF1_SHA384",
"XOF_MGF1_SHA512", "XOF_MGF1_SHA512",
"XOF_SHAKE128", "XOF_SHAKE128",
"XOF_SHAKE256", "XOF_SHAKE256",
@@ -35,12 +37,14 @@ ext_out_function_t xof_mgf1_from_hash_algorithm(hash_algorithm_t alg)
{ {
case HASH_SHA1: case HASH_SHA1:
return XOF_MGF1_SHA1; return XOF_MGF1_SHA1;
case HASH_SHA224:
return XOF_MGF1_SHA224;
case HASH_SHA256: case HASH_SHA256:
return XOF_MGF1_SHA256; return XOF_MGF1_SHA256;
case HASH_SHA384:
return XOF_MGF1_SHA384;
case HASH_SHA512: case HASH_SHA512:
return XOF_MGF1_SHA512; return XOF_MGF1_SHA512;
case HASH_SHA224:
case HASH_SHA384:
case HASH_IDENTITY: case HASH_IDENTITY:
case HASH_UNKNOWN: case HASH_UNKNOWN:
case HASH_MD2: case HASH_MD2:
src/libstrongswan/crypto/xofs/xof.h
+7 -3
View File
@@ -32,11 +32,15 @@ typedef struct xof_t xof_t;
*/ */
enum ext_out_function_t { enum ext_out_function_t {
XOF_UNDEFINED, XOF_UNDEFINED,
/** RFC 2437 PKCS#1 */ /** RFC 8017 PKCS#1 */
XOF_MGF1_SHA1, XOF_MGF1_SHA1,
/** RFC 2437 PKCS#1 */ /** RFC 8017 PKCS#1 */
XOF_MGF1_SHA224,
/** RFC 8017 PKCS#1 */
XOF_MGF1_SHA256, XOF_MGF1_SHA256,
/** RFC 2437 PKCS#1 */ /** RFC 8017 PKCS#1 */
XOF_MGF1_SHA384,
/** RFC 8017 PKCS#1 */
XOF_MGF1_SHA512, XOF_MGF1_SHA512,
/** FIPS 202 */ /** FIPS 202 */
XOF_SHAKE_128, XOF_SHAKE_128,