summaryrefslogtreecommitdiff
path: root/include/crypto
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2014-04-09 22:11:16 (GMT)
committerScott Wood <scottwood@freescale.com>2014-04-09 22:11:16 (GMT)
commite5feac72dad5475167445de9af564c2d592872bb (patch)
tree5d7128fdbb01ee1cff3f09a73df27e2e97f00dad /include/crypto
parent46864e3149aabfe369f1c469951909b9dc7d53bf (diff)
parent63429b60a99ab3434d0fd79dd332d5f72de07ff8 (diff)
downloadlinux-fsl-qoriq-e5feac72dad5475167445de9af564c2d592872bb.tar.xz
Merge branch 'sdk-kernel-3.12' into sdk-v1.6.x
Diffstat (limited to 'include/crypto')
-rw-r--r--include/crypto/authenc.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/crypto/authenc.h b/include/crypto/authenc.h
index e47b044..6775059 100644
--- a/include/crypto/authenc.h
+++ b/include/crypto/authenc.h
@@ -23,5 +23,15 @@ struct crypto_authenc_key_param {
__be32 enckeylen;
};
-#endif /* _CRYPTO_AUTHENC_H */
+struct crypto_authenc_keys {
+ const u8 *authkey;
+ const u8 *enckey;
+
+ unsigned int authkeylen;
+ unsigned int enckeylen;
+};
+int crypto_authenc_extractkeys(struct crypto_authenc_keys *keys, const u8 *key,
+ unsigned int keylen);
+
+#endif /* _CRYPTO_AUTHENC_H */