Skip to content

Commit d63007e

Browse files
ardbiesheuvelherbertx
ardbiesheuvel
authored and
herbertx
committed
crypto: ablkcipher - remove deprecated and unused ablkcipher support
Now that all users of the deprecated ablkcipher interface have been moved to the skcipher interface, ablkcipher is no longer used and can be removed. Reviewed-by: Eric Biggers <ebiggers@kernel.org> Signed-off-by: Ard Biesheuvel <ardb@kernel.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
1 parent 809abae commit d63007e

File tree

16 files changed

+4
-1150
lines changed

16 files changed

+4
-1150
lines changed

‎Documentation/crypto/api-skcipher.rst

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Block Cipher Algorithm Definitions
55
:doc: Block Cipher Algorithm Definitions
66

77
.. kernel-doc:: include/linux/crypto.h
8-
:functions: crypto_alg ablkcipher_alg cipher_alg compress_alg
8+
:functions: crypto_alg cipher_alg compress_alg
99

1010
Symmetric Key Cipher API
1111
------------------------
@@ -33,21 +33,3 @@ Single Block Cipher API
3333

3434
.. kernel-doc:: include/linux/crypto.h
3535
:functions: crypto_alloc_cipher crypto_free_cipher crypto_has_cipher crypto_cipher_blocksize crypto_cipher_setkey crypto_cipher_encrypt_one crypto_cipher_decrypt_one
36-
37-
Asynchronous Block Cipher API - Deprecated
38-
------------------------------------------
39-
40-
.. kernel-doc:: include/linux/crypto.h
41-
:doc: Asynchronous Block Cipher API
42-
43-
.. kernel-doc:: include/linux/crypto.h
44-
:functions: crypto_free_ablkcipher crypto_ablkcipher_ivsize crypto_ablkcipher_blocksize crypto_ablkcipher_setkey crypto_ablkcipher_reqtfm crypto_ablkcipher_encrypt crypto_ablkcipher_decrypt
45-
46-
Asynchronous Cipher Request Handle - Deprecated
47-
-----------------------------------------------
48-
49-
.. kernel-doc:: include/linux/crypto.h
50-
:doc: Asynchronous Cipher Request Handle
51-
52-
.. kernel-doc:: include/linux/crypto.h
53-
:functions: crypto_ablkcipher_reqsize ablkcipher_request_set_tfm ablkcipher_request_alloc ablkcipher_request_free ablkcipher_request_set_callback ablkcipher_request_set_crypt

‎Documentation/crypto/architecture.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,6 @@ the aforementioned cipher types:
201201
- CRYPTO_ALG_TYPE_AEAD Authenticated Encryption with Associated Data
202202
(MAC)
203203

204-
- CRYPTO_ALG_TYPE_ABLKCIPHER Asynchronous multi-block cipher
205-
206204
- CRYPTO_ALG_TYPE_KPP Key-agreement Protocol Primitive (KPP) such as
207205
an ECDH or DH implementation
208206

‎Documentation/crypto/crypto_engine.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ request by using:
6363
When your driver receives a crypto_request, you must to transfer it to
6464
the crypto engine via one of:
6565

66-
* crypto_transfer_ablkcipher_request_to_engine()
67-
6866
* crypto_transfer_aead_request_to_engine()
6967

7068
* crypto_transfer_akcipher_request_to_engine()
@@ -75,8 +73,6 @@ the crypto engine via one of:
7573

7674
At the end of the request process, a call to one of the following functions is needed:
7775

78-
* crypto_finalize_ablkcipher_request()
79-
8076
* crypto_finalize_aead_request()
8177

8278
* crypto_finalize_akcipher_request()

‎crypto/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ obj-$(CONFIG_CRYPTO_ALGAPI2) += crypto_algapi.o
1616
obj-$(CONFIG_CRYPTO_AEAD2) += aead.o
1717
obj-$(CONFIG_CRYPTO_AEAD2) += geniv.o
1818

19-
crypto_skcipher-y := ablkcipher.o
20-
crypto_skcipher-y += skcipher.o
21-
obj-$(CONFIG_CRYPTO_SKCIPHER2) += crypto_skcipher.o
19+
obj-$(CONFIG_CRYPTO_SKCIPHER2) += skcipher.o
2220
obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o
2321
obj-$(CONFIG_CRYPTO_ECHAINIV) += echainiv.o
2422

0 commit comments

Comments
 (0)