mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-25 03:37:45 +03:00
module: icp: fold away all key formats except CRYPTO_KEY_RAW
It's the only one actually used Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes #12901
This commit is contained in:
+7
-23
@@ -242,24 +242,15 @@ aes_check_mech_param(crypto_mechanism_t *mechanism, aes_ctx_t **ctx, int kmflag)
|
||||
static int
|
||||
init_keysched(crypto_key_t *key, void *newbie)
|
||||
{
|
||||
/*
|
||||
* Only keys by value are supported by this module.
|
||||
*/
|
||||
switch (key->ck_format) {
|
||||
case CRYPTO_KEY_RAW:
|
||||
if (key->ck_length < AES_MINBITS ||
|
||||
key->ck_length > AES_MAXBITS) {
|
||||
return (CRYPTO_KEY_SIZE_RANGE);
|
||||
}
|
||||
|
||||
/* key length must be either 128, 192, or 256 */
|
||||
if ((key->ck_length & 63) != 0)
|
||||
return (CRYPTO_KEY_SIZE_RANGE);
|
||||
break;
|
||||
default:
|
||||
return (CRYPTO_KEY_TYPE_INCONSISTENT);
|
||||
if (key->ck_length < AES_MINBITS ||
|
||||
key->ck_length > AES_MAXBITS) {
|
||||
return (CRYPTO_KEY_SIZE_RANGE);
|
||||
}
|
||||
|
||||
/* key length must be either 128, 192, or 256 */
|
||||
if ((key->ck_length & 63) != 0)
|
||||
return (CRYPTO_KEY_SIZE_RANGE);
|
||||
|
||||
aes_init_keysched(key->ck_data, key->ck_length, newbie);
|
||||
return (CRYPTO_SUCCESS);
|
||||
}
|
||||
@@ -294,13 +285,6 @@ aes_common_init(crypto_ctx_t *ctx, crypto_mechanism_t *mechanism,
|
||||
int rv;
|
||||
int kmflag;
|
||||
|
||||
/*
|
||||
* Only keys by value are supported by this module.
|
||||
*/
|
||||
if (key->ck_format != CRYPTO_KEY_RAW) {
|
||||
return (CRYPTO_KEY_TYPE_INCONSISTENT);
|
||||
}
|
||||
|
||||
kmflag = crypto_kmflag(req);
|
||||
if ((rv = aes_check_mech_param(mechanism, &aes_ctx, kmflag))
|
||||
!= CRYPTO_SUCCESS)
|
||||
|
||||
Reference in New Issue
Block a user