diff options
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_algo.c | 4 | ||||
| -rw-r--r-- | net/xfrm/xfrm_user.c | 11 |
2 files changed, 2 insertions, 13 deletions
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c index ac765dd9c7f5..23a2cc04b8cd 100644 --- a/net/xfrm/xfrm_algo.c +++ b/net/xfrm/xfrm_algo.c | |||
| @@ -200,8 +200,8 @@ static struct xfrm_algo_desc aalg_list[] = { | |||
| 200 | } | 200 | } |
| 201 | }, | 201 | }, |
| 202 | { | 202 | { |
| 203 | .name = "hmac(ripemd160)", | 203 | .name = "hmac(rmd160)", |
| 204 | .compat = "ripemd160", | 204 | .compat = "rmd160", |
| 205 | 205 | ||
| 206 | .uinfo = { | 206 | .uinfo = { |
| 207 | .auth = { | 207 | .auth = { |
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index a1b0fbe3ea35..b976d9ed10e4 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) | |||
| 50 | 50 | ||
| 51 | switch (type) { | 51 | switch (type) { |
| 52 | case XFRMA_ALG_AUTH: | 52 | case XFRMA_ALG_AUTH: |
| 53 | if (!algp->alg_key_len && | ||
| 54 | strcmp(algp->alg_name, "digest_null") != 0) | ||
| 55 | return -EINVAL; | ||
| 56 | break; | ||
| 57 | |||
| 58 | case XFRMA_ALG_CRYPT: | 53 | case XFRMA_ALG_CRYPT: |
| 59 | if (!algp->alg_key_len && | ||
| 60 | strcmp(algp->alg_name, "cipher_null") != 0) | ||
| 61 | return -EINVAL; | ||
| 62 | break; | ||
| 63 | |||
| 64 | case XFRMA_ALG_COMP: | 54 | case XFRMA_ALG_COMP: |
| 65 | /* Zero length keys are legal. */ | ||
| 66 | break; | 55 | break; |
| 67 | 56 | ||
| 68 | default: | 57 | default: |
