diff options
author | Andreas Steffen <andreas.steffen@strongswan.org> | 2009-01-15 00:34:42 +0000 |
---|---|---|
committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2009-01-15 00:34:42 +0000 |
commit | 6f17bf83d5ba0ae2203e148bc26b8b0b0806d6b0 (patch) | |
tree | f59c323bd0938450136c2a5504c0d223e993a044 | |
parent | 67701cfdce402755f635659faaa7cb1eff67953c (diff) | |
download | strongswan-6f17bf83d5ba0ae2203e148bc26b8b0b0806d6b0.tar.bz2 strongswan-6f17bf83d5ba0ae2203e148bc26b8b0b0806d6b0.tar.xz |
fixed ESP NULL encryption
-rw-r--r-- | src/charon/sa/keymat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/charon/sa/keymat.c b/src/charon/sa/keymat.c index 886618163..b2e646c93 100644 --- a/src/charon/sa/keymat.c +++ b/src/charon/sa/keymat.c @@ -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; } |