R0dn3yS/android_kernel_xiaomi_sm7250
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: DRBG - externalize DRBG functions for LRNG

Browse Source 
This patch allows several DRBG functions to be called by the LRNG kernel
code paths outside the drbg.c file.

CC: Torsten Duwe <duwe@lst.de>
CC: "Eric W. Biederman" <ebiederm@xmission.com>
CC: "Alexander E. Patrakov" <patrakov@gmail.com>
CC: "Ahmed S. Darwish" <darwish.07@gmail.com>
CC: "Theodore Y. Ts'o" <tytso@mit.edu>
CC: Willy Tarreau <w@1wt.eu>
CC: Matthew Garrett <mjg59@srcf.ucam.org>
CC: Vito Caputo <vcaputo@pengaru.com>
CC: Andreas Dilger <adilger.kernel@dilger.ca>
CC: Jan Kara <jack@suse.cz>
CC: Ray Strode <rstrode@redhat.com>
CC: William Jon McCann <mccann@jhu.edu>
CC: zhangjs <zachary@baishancloud.com>
CC: Andy Lutomirski <luto@kernel.org>
CC: Florian Weimer <fweimer@redhat.com>
CC: Lennart Poettering <mzxreary@0pointer.de>
CC: Nicolai Stange <nstange@suse.de>
Reviewed-by: Alexander Lobakin <alobakin@pm.me>
Tested-by: Alexander Lobakin <alobakin@pm.me>
Reviewed-by: Roman Drahtmueller <draht@schaltsekun.de>
Tested-by: Roman Drahtmüller <draht@schaltsekun.de>
Tested-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
Tested-by: Neil Horman <nhorman@redhat.com>
Signed-off-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: UtsavBalar1231 <utsavbalar1231@gmail.com>
This commit is contained in:
Stephan Mueller 2020-09-15 22:17:43 +02:00 committed by spakkkk
parent c67bd24c7c
commit 5e44e49900
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crypto/drbg.c
View File

@ -113,7 +113,7 @@
* the SHA256 / AES 256 over other ciphers. Thus, the favored * the SHA256 / AES 256 over other ciphers. Thus, the favored
* DRBGs are the latest entries in this array. * DRBGs are the latest entries in this array.
*/ */
static const struct drbg_core drbg_cores[] = { const struct drbg_core drbg_cores[] = {
#ifdef CONFIG_CRYPTO_DRBG_CTR #ifdef CONFIG_CRYPTO_DRBG_CTR
{ {
.flags = DRBG_CTR | DRBG_STRENGTH128, .flags = DRBG_CTR | DRBG_STRENGTH128,
@ -190,6 +190,7 @@ static const struct drbg_core drbg_cores[] = {
}, },
#endif /* CONFIG_CRYPTO_DRBG_HMAC */ #endif /* CONFIG_CRYPTO_DRBG_HMAC */
}; };
EXPORT_SYMBOL(drbg_cores);
static int drbg_uninstantiate(struct drbg_state *drbg); static int drbg_uninstantiate(struct drbg_state *drbg);
@ -205,7 +206,7 @@ static int drbg_uninstantiate(struct drbg_state *drbg);
* Return: normalized strength in *bytes* value or 32 as default * Return: normalized strength in *bytes* value or 32 as default
* to counter programming errors * to counter programming errors
*/ */
static inline unsigned short drbg_sec_strength(drbg_flag_t flags) unsigned short drbg_sec_strength(drbg_flag_t flags)
{ {
switch (flags & DRBG_STRENGTH_MASK) { switch (flags & DRBG_STRENGTH_MASK) {
case DRBG_STRENGTH128: case DRBG_STRENGTH128:
@ -218,6 +219,7 @@ static inline unsigned short drbg_sec_strength(drbg_flag_t flags)
return 32; return 32;
} }
} }
EXPORT_SYMBOL(drbg_sec_strength);
/* /*
* FIPS 140-2 continuous self test for the noise source * FIPS 140-2 continuous self test for the noise source
@ -1225,7 +1227,7 @@ out:
} }
/* Free all substructures in a DRBG state without the DRBG state structure */ /* Free all substructures in a DRBG state without the DRBG state structure */
static inline void drbg_dealloc_state(struct drbg_state *drbg) void drbg_dealloc_state(struct drbg_state *drbg)
{ {
if (!drbg) if (!drbg)
return; return;
@ -1246,12 +1248,13 @@ static inline void drbg_dealloc_state(struct drbg_state *drbg)
drbg->fips_primed = false; drbg->fips_primed = false;
} }
} }
EXPORT_SYMBOL(drbg_dealloc_state);
/* /*
* Allocate all sub-structures for a DRBG state. * Allocate all sub-structures for a DRBG state.
* The DRBG state structure must already be allocated. * The DRBG state structure must already be allocated.
*/ */
static inline int drbg_alloc_state(struct drbg_state *drbg) int drbg_alloc_state(struct drbg_state *drbg)
{ {
int ret = -ENOMEM; int ret = -ENOMEM;
unsigned int sb_size = 0; unsigned int sb_size = 0;
@ -1330,6 +1333,7 @@ err:
drbg_dealloc_state(drbg); drbg_dealloc_state(drbg);
return ret; return ret;
} }
EXPORT_SYMBOL(drbg_alloc_state);
/************************************************************************* /*************************************************************************
* DRBG interface functions * DRBG interface functions
@ -1865,8 +1869,7 @@ out:
* *
* return: flags * return: flags
*/ */
static inline void drbg_convert_tfm_core(const char *cra_driver_name, void drbg_convert_tfm_core(const char *cra_driver_name, int *coreref, bool *pr)
int *coreref, bool *pr)
{ {
int i = 0; int i = 0;
size_t start = 0; size_t start = 0;
@ -1893,6 +1896,7 @@ static inline void drbg_convert_tfm_core(const char *cra_driver_name,
} }
} }
} }
EXPORT_SYMBOL(drbg_convert_tfm_core);
static int drbg_kcapi_init(struct crypto_tfm *tfm) static int drbg_kcapi_init(struct crypto_tfm *tfm)
{ {

7
include/crypto/drbg.h
View File

@ -282,4 +282,11 @@ enum drbg_prefixes {
DRBG_PREFIX3 DRBG_PREFIX3
}; };
extern int drbg_alloc_state(struct drbg_state *drbg);
extern void drbg_dealloc_state(struct drbg_state *drbg);
extern void drbg_convert_tfm_core(const char *cra_driver_name, int *coreref,
bool *pr);
extern const struct drbg_core drbg_cores[];
extern unsigned short drbg_sec_strength(drbg_flag_t flags);
#endif /* _DRBG_H */ #endif /* _DRBG_H */