fixed ESP NULL encryption

This commit is contained in:
Andreas Steffen
2009-01-15 00:34:42 +00:00
parent 67701cfdce
commit 6f17bf83d5
+3 -3
View File
@@ -406,9 +406,9 @@ static bool derive_child_keys(private_keymat_t *this,
{ {
enc_size = lookup_keylen(keylen_enc, enc_alg); 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); encryption_algorithm_names, enc_alg);
return FALSE; return FALSE;
} }
@@ -445,7 +445,7 @@ static bool derive_child_keys(private_keymat_t *this,
} }
if (!int_size) if (!int_size)
{ {
DBG1(DBG_CHD, "no keylenth defined for %N", DBG1(DBG_CHD, "no keylength defined for %N",
integrity_algorithm_names, int_alg); integrity_algorithm_names, int_alg);
return FALSE; return FALSE;
} }