diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-06-16 01:54:21 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-06-17 03:35:07 -0400 |
commit | 201f28f055917300c3301b19d0e0e674b9cf8cb7 (patch) | |
tree | 40239555d2d3bd173a28568fd1ae3f21f8d25c53 /drivers/crypto/nx/nx.h | |
parent | 0af8fbca8c7149c6c637291ed167badbb011b544 (diff) |
crypto: nx - Convert GCM to new AEAD interface
This patch converts the nx GCM implementations to the new AEAD
interface. This is compile-tested only.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/nx/nx.h')
-rw-r--r-- | drivers/crypto/nx/nx.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/crypto/nx/nx.h b/drivers/crypto/nx/nx.h index 41b87ee03fe2..de3ea8738146 100644 --- a/drivers/crypto/nx/nx.h +++ b/drivers/crypto/nx/nx.h | |||
@@ -143,13 +143,14 @@ struct nx_crypto_ctx { | |||
143 | 143 | ||
144 | /* prototypes */ | 144 | /* prototypes */ |
145 | int nx_crypto_ctx_aes_ccm_init(struct crypto_tfm *tfm); | 145 | int nx_crypto_ctx_aes_ccm_init(struct crypto_tfm *tfm); |
146 | int nx_crypto_ctx_aes_gcm_init(struct crypto_tfm *tfm); | 146 | int nx_crypto_ctx_aes_gcm_init(struct crypto_aead *tfm); |
147 | int nx_crypto_ctx_aes_xcbc_init(struct crypto_tfm *tfm); | 147 | int nx_crypto_ctx_aes_xcbc_init(struct crypto_tfm *tfm); |
148 | int nx_crypto_ctx_aes_ctr_init(struct crypto_tfm *tfm); | 148 | int nx_crypto_ctx_aes_ctr_init(struct crypto_tfm *tfm); |
149 | int nx_crypto_ctx_aes_cbc_init(struct crypto_tfm *tfm); | 149 | int nx_crypto_ctx_aes_cbc_init(struct crypto_tfm *tfm); |
150 | int nx_crypto_ctx_aes_ecb_init(struct crypto_tfm *tfm); | 150 | int nx_crypto_ctx_aes_ecb_init(struct crypto_tfm *tfm); |
151 | int nx_crypto_ctx_sha_init(struct crypto_tfm *tfm); | 151 | int nx_crypto_ctx_sha_init(struct crypto_tfm *tfm); |
152 | void nx_crypto_ctx_exit(struct crypto_tfm *tfm); | 152 | void nx_crypto_ctx_exit(struct crypto_tfm *tfm); |
153 | void nx_crypto_ctx_aead_exit(struct crypto_aead *tfm); | ||
153 | void nx_ctx_init(struct nx_crypto_ctx *nx_ctx, unsigned int function); | 154 | void nx_ctx_init(struct nx_crypto_ctx *nx_ctx, unsigned int function); |
154 | int nx_hcall_sync(struct nx_crypto_ctx *ctx, struct vio_pfo_op *op, | 155 | int nx_hcall_sync(struct nx_crypto_ctx *ctx, struct vio_pfo_op *op, |
155 | u32 may_sleep); | 156 | u32 may_sleep); |
@@ -176,8 +177,8 @@ void nx_debugfs_fini(struct nx_crypto_driver *); | |||
176 | 177 | ||
177 | extern struct crypto_alg nx_cbc_aes_alg; | 178 | extern struct crypto_alg nx_cbc_aes_alg; |
178 | extern struct crypto_alg nx_ecb_aes_alg; | 179 | extern struct crypto_alg nx_ecb_aes_alg; |
179 | extern struct crypto_alg nx_gcm_aes_alg; | 180 | extern struct aead_alg nx_gcm_aes_alg; |
180 | extern struct crypto_alg nx_gcm4106_aes_alg; | 181 | extern struct aead_alg nx_gcm4106_aes_alg; |
181 | extern struct crypto_alg nx_ctr_aes_alg; | 182 | extern struct crypto_alg nx_ctr_aes_alg; |
182 | extern struct crypto_alg nx_ctr3686_aes_alg; | 183 | extern struct crypto_alg nx_ctr3686_aes_alg; |
183 | extern struct crypto_alg nx_ccm_aes_alg; | 184 | extern struct crypto_alg nx_ccm_aes_alg; |