mgf1: Add support for SHA-224/384 based MGF1

diff --git a/src/libstrongswan/plugins/mgf1/mgf1_plugin.c b/src/libstrongswan/plugins/mgf1/mgf1_plugin.c
index 8df3ac261667bb9238088916b4d607efddd620ce..a78d2f25411f142357cf7b3e7799d8184dc80666 100644 (file)
--- a/src/libstrongswan/plugins/mgf1/mgf1_plugin.c
+++ b/src/libstrongswan/plugins/mgf1/mgf1_plugin.c
@@ -44,8 +44,12 @@ METHOD(plugin_t, get_features, int,
                PLUGIN_REGISTER(XOF, mgf1_xof_create),
                        PLUGIN_PROVIDE(XOF, XOF_MGF1_SHA1),
                                PLUGIN_DEPENDS(HASHER, HASH_SHA1),
+                       PLUGIN_PROVIDE(XOF, XOF_MGF1_SHA224),
+                               PLUGIN_DEPENDS(HASHER, HASH_SHA224),
                        PLUGIN_PROVIDE(XOF, XOF_MGF1_SHA256),
                                PLUGIN_DEPENDS(HASHER, HASH_SHA256),
+                       PLUGIN_PROVIDE(XOF, XOF_MGF1_SHA384),
+                               PLUGIN_DEPENDS(HASHER, HASH_SHA384),
                        PLUGIN_PROVIDE(XOF, XOF_MGF1_SHA512),
                                PLUGIN_DEPENDS(HASHER, HASH_SHA512),
        };

diff --git a/src/libstrongswan/plugins/mgf1/mgf1_xof.c b/src/libstrongswan/plugins/mgf1/mgf1_xof.c
index 0f5fda952fff4eb3f690a4179e83cd5fa48de0ee..8f5a18f8786e5c8b2d22c670713743768650cb73 100644 (file)
--- a/src/libstrongswan/plugins/mgf1/mgf1_xof.c
+++ b/src/libstrongswan/plugins/mgf1/mgf1_xof.c
@@ -244,9 +244,15 @@ mgf1_xof_t *mgf1_xof_create(ext_out_function_t algorithm)
                case XOF_MGF1_SHA1:
                        hash_alg = HASH_SHA1;
                        break;
+               case XOF_MGF1_SHA224:
+                       hash_alg = HASH_SHA224;
+                       break;
                case XOF_MGF1_SHA256:
                        hash_alg = HASH_SHA256;
                        break;
+               case XOF_MGF1_SHA384:
+                       hash_alg = HASH_SHA384;
+                       break;
                case XOF_MGF1_SHA512:
                        hash_alg = HASH_SHA512;
                        break;
@@ -261,7 +267,7 @@ mgf1_xof_t *mgf1_xof_create(ext_out_function_t algorithm)
                         hash_algorithm_names, hash_alg);
                return NULL;
        }
-       
+
        INIT(this,
                .public = {
                        .mgf1_interface = {