Piteball
/
android_kernel_samsung_msm8226
mirror of https://github.com/S3NEO/android_kernel_samsung_msm8226.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crypto: Allow kernel to compile without CONFIG_CRYPTO_FIPS 

Change-Id: Ia1d316880d4ae656004c8db002a7fe25cc576fef
Signed-off-by: Kevin F. Haggerty <haggertk@lineageos.org>
This commit is contained in:
Kevin F. Haggerty 2019-01-21 16:17:09 -07:00 committed by Francescodario Cuzzocrea
parent 645de15608
commit a927d6d371
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/internal.h
View File

@ -80,7 +80,7 @@ void crypto_init_proc(int *fips_error);
int do_integrity_check(void);
int testmgr_crypto_proc_init(void);
#else
void __init crypto_init_proc(void);
void crypto_init_proc(void);
#endif
void __exit crypto_exit_proc(void);
#else

2
crypto/proc.c
View File

@ -149,7 +149,7 @@ void crypto_init_proc(int *fips_error)
crypto_proc_fips_init();
}
#else
void __init crypto_init_proc(void)
void crypto_init_proc(void)
{
proc_create("crypto", 0, NULL, &proc_crypto_ops);
crypto_proc_fips_init();

4
crypto/tcrypt.c
View File

@ -72,7 +72,7 @@ static char *check[] = {
"lzo", "cts", "zlib", NULL
};
#ifdef CONFIG_CRYPTO_DRBG
#if defined(CONFIG_CRYPTO_DRBG) && defined(CONFIG_CRYPTO_FIPS)
static char *drbg_cores[] = {
#ifdef CONFIG_CRYPTO_DRBG_CTR
"ctr_aes128",
@ -93,7 +93,7 @@ static char *drbg_cores[] = {
#endif /* CONFIG_CRYPTO_DRBG_HMAC */
};
#endif /* CONFIG_CRYPTO_DRBG */
#endif /* CONFIG_CRYPTO_DRBG && CONFIG_CRYPTO_FIPS */
static int test_cipher_jiffies(struct blkcipher_desc *desc, int enc,
struct scatterlist *sg, int blen, int sec)