Commit 0eb76ba2 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

crypto: remove cipher routines from public crypto API 



The cipher routines in the crypto API are mostly intended for templates
implementing skcipher modes generically in software, and shouldn't be
used outside of the crypto subsystem. So move the prototypes and all
related definitions to a new header file under include/crypto/internal.
Also, let's use the new module namespace feature to move the symbol
exports into a new namespace CRYPTO_INTERNAL.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Acked-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent a3b01ffd

Documentation/crypto/api-skcipher.rst

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ Symmetric Key Cipher Request Handle 
Single Block Cipher API

-----------------------



.. kernel-doc:: include/linux/crypto.h

.. kernel-doc:: include/crypto/internal/cipher.h

   :doc: Single Block Cipher API



.. kernel-doc:: include/linux/crypto.h

.. kernel-doc:: include/crypto/internal/cipher.h

   :functions: crypto_alloc_cipher crypto_free_cipher crypto_has_cipher crypto_cipher_blocksize crypto_cipher_setkey crypto_cipher_encrypt_one crypto_cipher_decrypt_one

arch/arm/crypto/aes-neonbs-glue.c

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <asm/simd.h>

#include <crypto/aes.h>

#include <crypto/ctr.h>

#include <crypto/internal/cipher.h>

#include <crypto/internal/simd.h>

#include <crypto/internal/skcipher.h>

#include <crypto/scatterwalk.h>
@@ -23,6 +24,8 @@ MODULE_ALIAS_CRYPTO("cbc(aes)-all"); 
MODULE_ALIAS_CRYPTO("ctr(aes)");

MODULE_ALIAS_CRYPTO("xts(aes)");



MODULE_IMPORT_NS(CRYPTO_INTERNAL);



asmlinkage void aesbs_convert_key(u8 out[], u32 const rk[], int rounds);



asmlinkage void aesbs_ecb_encrypt(u8 out[], u8 const in[], u8 const rk[],

arch/s390/crypto/aes_s390.c

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <crypto/algapi.h>

#include <crypto/ghash.h>

#include <crypto/internal/aead.h>

#include <crypto/internal/cipher.h>

#include <crypto/internal/skcipher.h>

#include <crypto/scatterwalk.h>

#include <linux/err.h>
@@ -1055,3 +1056,4 @@ MODULE_ALIAS_CRYPTO("aes-all"); 


MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");

MODULE_LICENSE("GPL");

MODULE_IMPORT_NS(CRYPTO_INTERNAL);

crypto/adiantum.c

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


#include <crypto/b128ops.h>

#include <crypto/chacha.h>

#include <crypto/internal/cipher.h>

#include <crypto/internal/hash.h>

#include <crypto/internal/poly1305.h>

#include <crypto/internal/skcipher.h>
@@ -616,3 +617,4 @@ MODULE_DESCRIPTION("Adiantum length-preserving encryption mode"); 
MODULE_LICENSE("GPL v2");

MODULE_AUTHOR("Eric Biggers <ebiggers@google.com>");

MODULE_ALIAS_CRYPTO("adiantum");

MODULE_IMPORT_NS(CRYPTO_INTERNAL);

crypto/ansi_cprng.c

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 *  (C) Neil Horman <nhorman@tuxdriver.com>

 */



#include <crypto/internal/cipher.h>

#include <crypto/internal/rng.h>

#include <linux/err.h>

#include <linux/init.h>
@@ -470,3 +471,4 @@ subsys_initcall(prng_mod_init); 
module_exit(prng_mod_fini);

MODULE_ALIAS_CRYPTO("stdrng");

MODULE_ALIAS_CRYPTO("ansi_cprng");

MODULE_IMPORT_NS(CRYPTO_INTERNAL);