Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f58869c4 authored by Steffen Klassert's avatar Steffen Klassert
Browse files

esp: Don't require synchronous crypto fallback on offloading anymore. 



We support asynchronous crypto on layer 2 ESP now.
So no need to force synchronous crypto fallback on
offloading anymore.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 2271d519

net/ipv4/esp4.c

+2 −10
Original line number Diff line number Diff line
@@ -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;
@@ -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)
@@ -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;

net/ipv6/esp6.c

+2 −10
Original line number Diff line number Diff line
@@ -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;
@@ -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)
@@ -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;