Messages in this thread Patch in this message | | | Date | Wed, 21 May 2008 17:23:41 -0700 (PDT) | Subject | Re: [PATCH 2.6.26-rc3] xfrm: Installing NULL encryption IPSec SAs fails | From | David Miller <> |
| |
From: Herbert Xu <herbert@gondor.apana.org.au> Date: Thu, 22 May 2008 07:59:22 +0800
> I think we should get rid of the zero check altogether as a > zero-length key will fail on setkey of a real algorithm anyway > because of the min_keysize/max_keysize checks in the crypto API.
Ok, how does this look?
xfrm_user: Remove zero length key checks.
The crypto layer will determine whether that is valid or not.
Suggested by Herbert Xu, based upon a report and patch by Martin Willi.
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index a1b0fbe..b976d9e 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -50,19 +50,8 @@ static int verify_one_alg(struct nlattr **attrs, enum xfrm_attr_type_t type) switch (type) { case XFRMA_ALG_AUTH: - if (!algp->alg_key_len && - strcmp(algp->alg_name, "digest_null") != 0) - return -EINVAL; - break; - case XFRMA_ALG_CRYPT: - if (!algp->alg_key_len && - strcmp(algp->alg_name, "cipher_null") != 0) - return -EINVAL; - break; - case XFRMA_ALG_COMP: - /* Zero length keys are legal. */ break; default:
| |