Skip to content

Commit

Permalink
[IPSEC]: Add compatibility algorithm name support
Browse files Browse the repository at this point in the history
This patch adds a compatibility name field for each IPsec algorithm.  This
is needed when parameterised algorithms are used.  For example, "md5" will
become "hmac(md5)", and "aes" will become "cbc(aes)".

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Herbert Xu committed Sep 21, 2006
1 parent d1806f6 commit 04ff126
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions include/net/xfrm.h
Original file line number Diff line number Diff line change
Expand Up @@ -854,6 +854,7 @@ struct xfrm_algo_comp_info {

struct xfrm_algo_desc {
char *name;
char *compat;
u8 available:1;
union {
struct xfrm_algo_auth_info auth;
Expand Down
3 changes: 2 additions & 1 deletion net/xfrm/xfrm_algo.c
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,8 @@ static struct xfrm_algo_desc *xfrm_get_byname(struct xfrm_algo_desc *list,
return NULL;

for (i = 0; i < entries; i++) {
if (strcmp(name, list[i].name))
if (strcmp(name, list[i].name) &&
(!list[i].compat || strcmp(name, list[i].compat)))
continue;

if (list[i].available)
Expand Down
1 change: 1 addition & 0 deletions net/xfrm/xfrm_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ static int attach_one_algo(struct xfrm_algo **algpp, u8 *props,
return -ENOMEM;

memcpy(p, ualg, len);
strcpy(p->alg_name, algo->name);
*algpp = p;
return 0;
}
Expand Down

0 comments on commit 04ff126

Please sign in to comment.