aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2006-08-12 18:50:00 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2006-09-20 21:46:14 -0400
commit04ff12609445c7b462d7fc7f2d30dad442c922f3 (patch)
treef19aff48d2e6a4c7e4bf25044c1b30ea428f4318 /net
parentd1806f6a97a536b043fe50e6d8a25b061755cf50 (diff)
[IPSEC]: Add compatibility algorithm name support
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>
Diffstat (limited to 'net')
-rw-r--r--net/xfrm/xfrm_algo.c3
-rw-r--r--net/xfrm/xfrm_user.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
index 04e1aea58bc9..b68974b38741 100644
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@@ -359,7 +359,8 @@ static struct xfrm_algo_desc *xfrm_get_byname(struct xfrm_algo_desc *list,
359 return NULL; 359 return NULL;
360 360
361 for (i = 0; i < entries; i++) { 361 for (i = 0; i < entries; i++) {
362 if (strcmp(name, list[i].name)) 362 if (strcmp(name, list[i].name) &&
363 (!list[i].compat || strcmp(name, list[i].compat)))
363 continue; 364 continue;
364 365
365 if (list[i].available) 366 if (list[i].available)
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 7d18ca03c80d..fa79ddc4239e 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -213,6 +213,7 @@ static int attach_one_algo(struct xfrm_algo **algpp, u8 *props,
213 return -ENOMEM; 213 return -ENOMEM;
214 214
215 memcpy(p, ualg, len); 215 memcpy(p, ualg, len);
216 strcpy(p->alg_name, algo->name);
216 *algpp = p; 217 *algpp = p;
217 return 0; 218 return 0;
218} 219}