fixed ESP NULL encryption
authorAndreas Steffen <andreas.steffen@strongswan.org>
Thu, 15 Jan 2009 00:34:42 +0000 (00:34 -0000)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Thu, 15 Jan 2009 00:34:42 +0000 (00:34 -0000)
src/charon/sa/keymat.c

index 8866181..b2e646c 100644 (file)
@@ -406,9 +406,9 @@ static bool derive_child_keys(private_keymat_t *this,
                {
                        enc_size = lookup_keylen(keylen_enc, enc_alg);
                }
-               if (!enc_size)
+               if (enc_alg != ENCR_NULL && !enc_size)
                {
-                       DBG1(DBG_CHD, "no keylenth defined for %N",
+                       DBG1(DBG_CHD, "no keylength defined for %N",
                                 encryption_algorithm_names, enc_alg);
                        return FALSE;
                }
@@ -445,7 +445,7 @@ static bool derive_child_keys(private_keymat_t *this,
                }
                if (!int_size)
                {
-                       DBG1(DBG_CHD, "no keylenth defined for %N",
+                       DBG1(DBG_CHD, "no keylength defined for %N",
                                 integrity_algorithm_names, int_alg);
                        return FALSE;
                }