summaryrefslogtreecommitdiffstats
path: root/include/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2016-01-04 13:35:18 +0900
committerBen Hutchings <ben@decadent.org.uk>2016-02-13 10:34:12 +0000
commit02edec2abebf72c5915c8c3b968e653eb69d9257 (patch)
tree8579c76c22eddeb7d26d19ad600e2533446a4340 /include/crypto
parenta4bbb982ded26deac0d63b5c5a6d7c6a53f6283d (diff)
downloadlinux-stable-02edec2abebf72c5915c8c3b968e653eb69d9257.tar.gz
linux-stable-02edec2abebf72c5915c8c3b968e653eb69d9257.tar.bz2
linux-stable-02edec2abebf72c5915c8c3b968e653eb69d9257.zip
crypto: af_alg - Add nokey compatibility path
commit 37766586c965d63758ad542325a96d5384f4a8c9 upstream. This patch adds a compatibility path to support old applications that do acept(2) before setkey. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'include/crypto')
-rw-r--r--include/crypto/if_alg.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h
index 2f38daaab3d7..9e6a2f38c52f 100644
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
@@ -51,8 +51,10 @@ struct af_alg_type {
void (*release)(void *private);
int (*setkey)(void *private, const u8 *key, unsigned int keylen);
int (*accept)(void *private, struct sock *sk);
+ int (*accept_nokey)(void *private, struct sock *sk);
struct proto_ops *ops;
+ struct proto_ops *ops_nokey;
struct module *owner;
char name[14];
};