Skip to content

Commit

Permalink
esp: Don't require synchronous crypto fallback on offloading anymore.
Browse files Browse the repository at this point in the history 
We support asynchronous crypto on layer 2 ESP now.
So no need to force synchronous crypto fallback on
offloading anymore.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
  • Loading branch information
Steffen Klassert committed Dec 20, 2017
1 parent 2271d51 commit f58869c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 20 deletions.
12 changes: 2 additions & 10 deletions net/ipv4/esp4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -843,17 +843,13 @@ static int esp_init_aead(struct xfrm_state *x)
char aead_name[CRYPTO_MAX_ALG_NAME];
struct crypto_aead *aead;
int err;
u32 mask = 0;

err = -ENAMETOOLONG;
if (snprintf(aead_name, CRYPTO_MAX_ALG_NAME, "%s(%s)",
x->geniv, x->aead->alg_name) >= CRYPTO_MAX_ALG_NAME)
goto error;

if (x->xso.offload_handle)
mask |= CRYPTO_ALG_ASYNC;

aead = crypto_alloc_aead(aead_name, 0, mask);
aead = crypto_alloc_aead(aead_name, 0, 0);
err = PTR_ERR(aead);
if (IS_ERR(aead))
goto error;
Expand Down Expand Up @@ -883,7 +879,6 @@ static int esp_init_authenc(struct xfrm_state *x)
char authenc_name[CRYPTO_MAX_ALG_NAME];
unsigned int keylen;
int err;
u32 mask = 0;

err = -EINVAL;
if (!x->ealg)
Expand All @@ -909,10 +904,7 @@ static int esp_init_authenc(struct xfrm_state *x)
goto error;
}

if (x->xso.offload_handle)
mask |= CRYPTO_ALG_ASYNC;

aead = crypto_alloc_aead(authenc_name, 0, mask);
aead = crypto_alloc_aead(authenc_name, 0, 0);
err = PTR_ERR(aead);
if (IS_ERR(aead))
goto error;
Expand Down
12 changes: 2 additions & 10 deletions net/ipv6/esp6.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -752,17 +752,13 @@ static int esp_init_aead(struct xfrm_state *x)
char aead_name[CRYPTO_MAX_ALG_NAME];
struct crypto_aead *aead;
int err;
u32 mask = 0;

err = -ENAMETOOLONG;
if (snprintf(aead_name, CRYPTO_MAX_ALG_NAME, "%s(%s)",
x->geniv, x->aead->alg_name) >= CRYPTO_MAX_ALG_NAME)
goto error;

if (x->xso.offload_handle)
mask |= CRYPTO_ALG_ASYNC;

aead = crypto_alloc_aead(aead_name, 0, mask);
aead = crypto_alloc_aead(aead_name, 0, 0);
err = PTR_ERR(aead);
if (IS_ERR(aead))
goto error;
Expand Down Expand Up @@ -792,7 +788,6 @@ static int esp_init_authenc(struct xfrm_state *x)
char authenc_name[CRYPTO_MAX_ALG_NAME];
unsigned int keylen;
int err;
u32 mask = 0;

err = -EINVAL;
if (!x->ealg)
Expand All @@ -818,10 +813,7 @@ static int esp_init_authenc(struct xfrm_state *x)
goto error;
}

if (x->xso.offload_handle)
mask |= CRYPTO_ALG_ASYNC;

aead = crypto_alloc_aead(authenc_name, 0, mask);
aead = crypto_alloc_aead(authenc_name, 0, 0);
err = PTR_ERR(aead);
if (IS_ERR(aead))
goto error;
Expand Down

0 comments on commit f58869c

Please sign in to comment.