Skip to content

linuxkm: instantiate cts over wolfCrypt cbc(aes) #11613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MarkAtwood wants to merge 1 commit into
base: master
Choose a base branch
from
Open

linuxkm: instantiate cts over wolfCrypt cbc(aes) #11613

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions linuxkm/lkcapi_aes_glue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
#define LINUXKM_LKCAPI_AESGCM_KAT_MISMATCH_E AESGCM_KAT_FIPS_E

#define WOLFKM_AESCBC_NAME "cbc(aes)"
#define WOLFKM_AESCTS_NAME "cts(cbc(aes))"
#define WOLFKM_AESCFB_NAME "cfb(aes)"
#define WOLFKM_AESGCM_NAME "gcm(aes)"
#define WOLFKM_AESGCM_RFC4106_NAME "rfc4106(gcm(aes))"
Expand Down Expand Up @@ -127,6 +128,7 @@
WOLFKM_AES_DRIVER_ISA_EXT WOLFKM_DRIVER_SUFFIX_BASE

#define WOLFKM_AESCBC_DRIVER ("cbc-aes" WOLFKM_AES_DRIVER_SUFFIX)
#define WOLFKM_AESCTS_DRIVER ("cts(cbc-aes" WOLFKM_AES_DRIVER_SUFFIX ")")
#define WOLFKM_AESCFB_DRIVER ("cfb-aes" WOLFKM_AES_DRIVER_SUFFIX)
#define WOLFKM_AESGCM_DRIVER ("gcm-aes" WOLFKM_AES_DRIVER_SUFFIX)
#define WOLFKM_AESGCM_RFC4106_DRIVER ("rfc4106-gcm-aes" WOLFKM_AES_DRIVER_SUFFIX)
Expand Down Expand Up @@ -3301,6 +3303,9 @@ static int linuxkm_test_aescbc(void)
byte dec[sizeof(p_vector)];
u8 * enc2 = NULL;
u8 * dec2 = NULL;
#if IS_ENABLED(CONFIG_CRYPTO_CTS)
struct crypto_skcipher * cts_tfm;
#endif

aes = (Aes *)malloc(sizeof(*aes));
if (aes == NULL)
Expand Down Expand Up @@ -3453,6 +3458,23 @@ static int linuxkm_test_aescbc(void)
goto test_cbc_end;
}

#if IS_ENABLED(CONFIG_CRYPTO_CTS)
/* Instantiate cts over this cbc(aes) now, or cts(cbc(aes)) (krb5 aes-sha2,
* e.g. libceph) resolves to a native driver. The instance outlives this
* tfm, holds no cra_refcnt on cbcAesAlg, and goes when it unregisters.
*/
cts_tfm = crypto_alloc_skcipher(WOLFKM_AESCTS_DRIVER, 0, 0);
if (IS_ERR(cts_tfm)) {
ret = (int)PTR_ERR(cts_tfm);
pr_err("error: allocating %s failed: %d\n", WOLFKM_AESCTS_DRIVER, ret);
goto test_cbc_end;
}
crypto_free_skcipher(cts_tfm);

ret = check_skcipher_driver_masking(NULL, WOLFKM_AESCTS_NAME,
WOLFKM_AESCTS_DRIVER);
#endif /* CONFIG_CRYPTO_CTS */

test_cbc_end:

if (enc2) { free(enc2); }
Expand Down
Loading