aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Mueller <smueller@chronox.de>2014-12-07 17:21:42 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2014-12-22 07:02:37 -0500
commit25fb8638e919bc7431a73f2fb4a9713818ae2c9d (patch)
tree417415438d68774c5bf0dfe8604159870d529013
parent905b42e559fa4952569b3444bc6c054c0103e5a0 (diff)
crypto: af_alg - add setsockopt for auth tag size
Use setsockopt on the tfm FD to provide the authentication tag size for an AEAD cipher. This is achieved by adding a callback function which is intended to be used by the AEAD AF_ALG implementation. The optlen argument of the setsockopt specifies the authentication tag size to be used with the AEAD tfm. Signed-off-by: Stephan Mueller <smueller@chronox.de> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--crypto/af_alg.c7
-rw-r--r--include/crypto/if_alg.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 8ffc174a0154..a8ff3c44e13c 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -215,6 +215,13 @@ static int alg_setsockopt(struct socket *sock, int level, int optname,
215 goto unlock; 215 goto unlock;
216 216
217 err = alg_setkey(sk, optval, optlen); 217 err = alg_setkey(sk, optval, optlen);
218 break;
219 case ALG_SET_AEAD_AUTHSIZE:
220 if (sock->state == SS_CONNECTED)
221 goto unlock;
222 if (!type->setauthsize)
223 goto unlock;
224 err = type->setauthsize(ask->private, optlen);
218 } 225 }
219 226
220unlock: 227unlock:
diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h
index cd62bf4289e9..5c7b6c53e96f 100644
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
@@ -50,6 +50,7 @@ struct af_alg_type {
50 void (*release)(void *private); 50 void (*release)(void *private);
51 int (*setkey)(void *private, const u8 *key, unsigned int keylen); 51 int (*setkey)(void *private, const u8 *key, unsigned int keylen);
52 int (*accept)(void *private, struct sock *sk); 52 int (*accept)(void *private, struct sock *sk);
53 int (*setauthsize)(void *private, unsigned int authsize);
53 54
54 struct proto_ops *ops; 55 struct proto_ops *ops;
55 struct module *owner; 56 struct module *owner;