proposal: Make sure non-AEAD IKE proposals contain integrity algorithms

diff --git a/src/libstrongswan/crypto/proposal/proposal.c b/src/libstrongswan/crypto/proposal/proposal.c
index 39630a168851a7ca55ab7cd61161a09695a318f3..52520640cd3b69e21f077c596fe3725792c48f28 100644 (file)
--- a/src/libstrongswan/crypto/proposal/proposal.c
+++ b/src/libstrongswan/crypto/proposal/proposal.c
@@ -710,6 +710,14 @@ static bool check_proposal(private_proposal_t *this)
                         * we MUST NOT propose any integrity algorithms */
                        remove_transform(this, INTEGRITY_ALGORITHM);
                }
+               else if (this->protocol == PROTO_IKE &&
+                                !get_algorithm(this, INTEGRITY_ALGORITHM, NULL, NULL))
+               {
+                       DBG1(DBG_CFG, "an integrity algorithm is mandatory in %N proposals "
+                                "with classic (non-AEAD) encryption algorithms",
+                                protocol_id_names, this->protocol);
+                       return FALSE;
+               }
        }
        else
        {       /* AES-GMAC is parsed as encryption algorithm, so we map that to the

diff --git a/src/libstrongswan/tests/suites/test_proposal.c b/src/libstrongswan/tests/suites/test_proposal.c
index 4e235861c0e7dc50c5c66dd4464d329b71a00871..29621a8d915debc13f08a76146f036001a592fd5 100644 (file)
--- a/src/libstrongswan/tests/suites/test_proposal.c
+++ b/src/libstrongswan/tests/suites/test_proposal.c
@@ -29,6 +29,8 @@ static struct {
        { PROTO_IKE, "aes128", NULL },
        { PROTO_IKE, "aes128-sha256", NULL },
        { PROTO_IKE, "aes128-sha256-modpnone", NULL },
+       { PROTO_IKE, "aes128-prfsha256", NULL },
+       { PROTO_IKE, "aes128-prfsha256-modp2048", NULL },
        { PROTO_IKE, "aes128-sha256-modp3072", "IKE:AES_CBC_128/HMAC_SHA2_256_128/PRF_HMAC_SHA2_256/MODP_3072" },
        { PROTO_IKE, "aes128-sha256-prfsha384-modp3072", "IKE:AES_CBC_128/HMAC_SHA2_256_128/PRF_HMAC_SHA2_384/MODP_3072" },
        { PROTO_IKE, "aes128gcm16-modp3072", NULL },