xfrm: Custom truncation lengths for authentication algorithms
Subsystems (4)
cover xfrm: Custom truncation lengths for authentication algorithms
The following patchset adds support for defining truncation lengths for authentication algorithms in userspace. The main purpose for this is to support SHA256 in IPsec using the standardized 128 bit instead of the currently used 96 bit truncation.
Martin Willi (3):
xfrm: Define new XFRM netlink auth attribute with specified
truncation bits
xfrm: Store aalg in xfrm_state with a user specified truncation
length
xfrm: Use the user specified truncation length in ESP and AH
include/linux/xfrm.h | 8 +++ include/net/xfrm.h | 12 ++++- net/ipv4/ah4.c | 2 +- net/ipv4/esp4.c | 2 +- net/ipv6/ah6.c | 2 +- net/ipv6/esp6.c | 2 +- net/xfrm/xfrm_state.c | 2 +- net/xfrm/xfrm_user.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++--- 8 files changed, 145 insertions(+), 14 deletions(-)
PATCH 1/3 xfrm: Define new XFRM netlink auth attribute with specified truncation bits
The new XFRMA_ALG_AUTH_TRUNC attribute taking a xfrm_algo_auth as argument allows the installation of authentication algorithms with a truncation length specified in userspace, i.e. SHA256 with 128 bit instead of 96 bit truncation.
--- include/linux/xfrm.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
include/linux/xfrm.h +8 -0
@@ -96,6 +96,13 @@ struct xfrm_algo {char alg_key[0 ]; }; +struct xfrm_algo_auth { +char alg_name[64 ]; +unsigned int alg_key_len;/* in bits */ +unsigned int alg_trunc_len;/* in bits */ +char alg_key[0 ]; +}; +struct xfrm_algo_aead {char alg_name[64 ];unsigned int alg_key_len;/* in bits */
@@ -283,6 +290,7 @@ enum xfrm_attr_type_t {XFRMA_MIGRATE ,XFRMA_ALG_AEAD ,/* struct xfrm_algo_aead */ XFRMA_KMADDRESS ,/* struct xfrm_user_kmaddress */ +XFRMA_ALG_AUTH_TRUNC ,/* struct xfrm_algo_auth */ __XFRMA_MAX#define XFRMA_MAX (__XFRMA_MAX - 1)
Signature · 1 line
1.6.3.3
PATCH 2/3 xfrm: Store aalg in xfrm_state with a user specified truncation length
In reply to Martin WilliAdding a xfrm_state requires an authentication algorithm specified either as xfrm_algo or as xfrm_algo_auth with a specific truncation length. For compatibility, both attributes are dumped to userspace, and we also accept both attributes, but prefer the new syntax.
If no truncation length is specified, or the authentication algorithm is specified using xfrm_algo, the truncation length from the algorithm description in the kernel is used.
--- include/net/xfrm.h | 12 ++++- net/xfrm/xfrm_state.c | 2 +- net/xfrm/xfrm_user.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 133 insertions(+), 10 deletions(-)
include/net/xfrm.h +11 -1
@@ -160,7 +160,7 @@ struct xfrm_statestruct xfrm_lifetime_cfg lft;/* Data for transformer */ -struct xfrm_algo *aalg; +struct xfrm_algo_auth *aalg;struct xfrm_algo *ealg;struct xfrm_algo *calg;struct xfrm_algo_aead *aead;
@@ -1541,12 +1541,22 @@ static inline int xfrm_alg_len(struct xfrm_algo *alg)return sizeof (*alg) + ((alg->alg_key_len +7 ) /8 ); } +static inline int xfrm_alg_auth_len (struct xfrm_algo_auth *alg) +{ +return sizeof (*alg) + ((alg->alg_key_len +7 ) /8 ); +} +#ifdef CONFIG_XFRM_MIGRATE static inline struct xfrm_algo *xfrm_algo_clone (struct xfrm_algo *orig) {return kmemdup (orig,xfrm_alg_len (orig),GFP_KERNEL ); } +static inline struct xfrm_algo_auth *xfrm_algo_auth_clone (struct xfrm_algo_auth *orig) +{ +return kmemdup (orig,xfrm_alg_auth_len (orig),GFP_KERNEL ); +} +static inline void xfrm_states_put (struct xfrm_state **states,int n) {int i;
net/xfrm/xfrm_state.c +1 -1
@@ -1110,7 +1110,7 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, int *errp) x->props.saddr = orig->props.saddr;if (orig->aalg) { - x->aalg =xfrm_algo_clone (orig->aalg); + x->aalg =xfrm_algo_auth_clone (orig->aalg);if (!x->aalg) goto error; }
net/xfrm/xfrm_user.c +121 -8
200 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH 3/3 xfrm: Use the user specified truncation length in ESP and AH
In reply to Martin WilliInstead of using the hardcoded truncation for authentication algorithms, use the truncation length specified on xfrm_state.
--- net/ipv4/ah4.c | 2 +- net/ipv4/esp4.c | 2 +- net/ipv6/ah6.c | 2 +- net/ipv6/esp6.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
net/ipv4/ah4.c +1 -1
@@ -261,7 +261,7 @@ static int ah_init_state(struct xfrm_state *x) } ahp->icv_full_len = aalg_desc->uinfo.auth.icv_fullbits/8 ; - ahp->icv_trunc_len = aalg_desc->uinfo.auth.icv_truncbits/8 ; + ahp->icv_trunc_len = x->aalg->alg_trunc_len/8 ;BUG_ON (ahp->icv_trunc_len >MAX_AH_AUTH_LEN );
net/ipv4/esp4.c +1 -1
@@ -530,7 +530,7 @@ static int esp_init_authenc(struct xfrm_state *x) } err =crypto_aead_setauthsize ( - aead, aalg_desc->uinfo.auth.icv_truncbits /8 ); + aead, x->aalg->alg_trunc_len /8 );if (err) goto free_key; }
net/ipv6/ah6.c +1 -1
@@ -469,7 +469,7 @@ static int ah6_init_state(struct xfrm_state *x) } ahp->icv_full_len = aalg_desc->uinfo.auth.icv_fullbits/8 ; - ahp->icv_trunc_len = aalg_desc->uinfo.auth.icv_truncbits/8 ; + ahp->icv_trunc_len = x->aalg->alg_trunc_len/8 ;BUG_ON (ahp->icv_trunc_len >MAX_AH_AUTH_LEN );
net/ipv6/esp6.c +1 -1
@@ -473,7 +473,7 @@ static int esp_init_authenc(struct xfrm_state *x) } err =crypto_aead_setauthsize ( - aead, aalg_desc->uinfo.auth.icv_truncbits /8 ); + aead, x->aalg->alg_trunc_len /8 );if (err) goto free_key; }
Signature · 1 line
1.6.3.3
Herbert Xu
maintainerQuoted 11 lines · Martin Willi
The following patchset adds support for defining truncation lengths for authentication algorithms in userspace. The main purpose for this is to support SHA256 in IPsec using the standardized 128 bit instead of the currently used 96 bit truncation.
Martin Willi (3):
xfrm: Define new XFRM netlink auth attribute with specified
truncation bits
xfrm: Store aalg inxfrm_statewith a user specified truncation
length
xfrm: Use the user specified truncation length in ESP and AH
Looks great to me. Thanks Martin!
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txtDavid Miller
maintainerFrom: Martin Willi <[email protected]>
Date: Wed, 25 Nov 2009 11:29:50 +0100
Quoted 11 lines
The following patchset adds support for defining truncation lengths for authentication algorithms in userspace. The main purpose for this is to support SHA256 in IPsec using the standardized 128 bit instead of the currently used 96 bit truncation.
Martin Willi (3):
xfrm: Define new XFRM netlink auth attribute with specified
truncation bits
xfrm: Store aalg inxfrm_statewith a user specified truncation
length
xfrm: Use the user specified truncation length in ESP and AH
All applied to net-next-2.6, thanks!