Skip to content
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

Jump to bottom

feat(pkcs11-tool): testing HMAC #2643

Merged
merged 4 commits into from
Nov 17, 2022
Merged

feat(pkcs11-tool): testing HMAC #2643

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6fe4afd
feat(pkcs11-tool): add CKM_SHA3_XXX_HMAC mechanisms
AlexandreGonzalo Nov 3, 2022
31197f1
feat(pkcs11-tool): --usage-sign is also for secret keys
AlexandreGonzalo Nov 3, 2022
a6b1a86
feat(pkcs11-tool): add MF_GENERIC_HMAC_FLAGS for CKM_MD5_HMAC
AlexandreGonzalo Nov 4, 2022
0b16bda
feat(pkcs11-tool): add MF_GENERIC_HMAC_FLAGS wherever it is required
AlexandreGonzalo Nov 14, 2022
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
50 changes: 34 additions & 16 deletions src/tools/pkcs11-tool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3268,6 +3268,13 @@ gen_key(CK_SLOT_ID slot, CK_SESSION_HANDLE session, CK_OBJECT_HANDLE *hSecretKey
n_attr++;
}

if (opt_key_usage_sign != 0) {
FILL_ATTR(keyTemplate[n_attr], CKA_SIGN, &_true, sizeof(_true));
n_attr++;
FILL_ATTR(keyTemplate[n_attr], CKA_VERIFY, &_true, sizeof(_true));
n_attr++;
}

FILL_ATTR(keyTemplate[n_attr], CKA_VALUE_LEN, &key_length, sizeof(key_length));
n_attr++;

Expand Down Expand Up @@ -4279,6 +4286,13 @@ static int write_object(CK_SESSION_HANDLE session)
n_seckey_attr++;
}

if (opt_key_usage_sign != 0) {
FILL_ATTR(seckey_templ[n_seckey_attr], CKA_SIGN, &_true, sizeof(_true));
n_seckey_attr++;
FILL_ATTR(seckey_templ[n_seckey_attr], CKA_VERIFY, &_true, sizeof(_true));
n_seckey_attr++;
}

if (opt_object_label != NULL) {
FILL_ATTR(seckey_templ[n_seckey_attr], CKA_LABEL, opt_object_label, strlen(opt_object_label));
n_seckey_attr++;
Expand Down Expand Up @@ -6065,7 +6079,7 @@ static EVP_PKEY *get_public_key(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE priv
return NULL;
}
OSSL_PARAM_BLD_free(bld);

if (!(ctx = EVP_PKEY_CTX_new_from_name(NULL, "RSA", NULL)) ||
EVP_PKEY_fromdata_init(ctx) != 1 ||
EVP_PKEY_fromdata(ctx, &pkey, EVP_PKEY_PUBLIC_KEY, params) != 1) {
Expand Down Expand Up @@ -7948,14 +7962,14 @@ static struct mech_info p11_mechanisms[] = {
{ CKM_CDMF_MAC_GENERAL, "CDMF-MAC-GENERAL", NULL, MF_UNKNOWN },
{ CKM_CDMF_CBC_PAD, "CDMF-CBC-PAD", NULL, MF_UNKNOWN },
{ CKM_MD2, "MD2", NULL, MF_UNKNOWN },
{ CKM_MD2_HMAC, "MD2-HMAC", NULL, MF_UNKNOWN },
{ CKM_MD2_HMAC_GENERAL, "MD2-HMAC-GENERAL", NULL, MF_UNKNOWN },
{ CKM_MD2_HMAC, "MD2-HMAC", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_MD2_HMAC_GENERAL, "MD2-HMAC-GENERAL", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_MD5, "MD5", NULL, MF_UNKNOWN },
{ CKM_MD5_HMAC, "MD5-HMAC", NULL, MF_UNKNOWN },
{ CKM_MD5_HMAC_GENERAL, "MD5-HMAC-GENERAL", NULL, MF_UNKNOWN },
{ CKM_MD5_HMAC, "MD5-HMAC", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_MD5_HMAC_GENERAL, "MD5-HMAC-GENERAL", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_SHA_1, "SHA-1", NULL, MF_UNKNOWN },
{ CKM_SHA_1_HMAC, "SHA-1-HMAC", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_SHA_1_HMAC_GENERAL, "SHA-1-HMAC-GENERAL", NULL, MF_UNKNOWN },
{ CKM_SHA_1_HMAC_GENERAL, "SHA-1-HMAC-GENERAL", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_SHA224, "SHA224", NULL, MF_UNKNOWN },
{ CKM_SHA224_HMAC, "SHA224-HMAC", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_SHA256, "SHA256", NULL, MF_UNKNOWN },
Expand All @@ -7965,15 +7979,19 @@ static struct mech_info p11_mechanisms[] = {
{ CKM_SHA512, "SHA512", NULL, MF_UNKNOWN },
{ CKM_SHA512_HMAC, "SHA512-HMAC", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_SHA3_224, "SHA3-224", NULL, MF_UNKNOWN },
{ CKM_SHA3_224_HMAC, "SHA3-224-HMAC", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_SHA3_256, "SHA3-256", NULL, MF_UNKNOWN },
{ CKM_SHA3_256_HMAC, "SHA3-256-HMAC", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_SHA3_384, "SHA3-384", NULL, MF_UNKNOWN },
{ CKM_SHA3_384_HMAC, "SHA3-384-HMAC", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_SHA3_512, "SHA3-512", NULL, MF_UNKNOWN },
{ CKM_RIPEMD128, "RIPEMD128", NULL, MF_UNKNOWN },
{ CKM_RIPEMD128_HMAC, "RIPEMD128-HMAC", NULL, MF_UNKNOWN },
{ CKM_RIPEMD128_HMAC_GENERAL,"RIPEMD128-HMAC-GENERAL", NULL, MF_UNKNOWN },
{ CKM_SHA3_512_HMAC, "SHA3-512-HMAC", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_RIPEMD128, "RIPEMD128", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_RIPEMD128_HMAC, "RIPEMD128-HMAC", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_RIPEMD128_HMAC_GENERAL,"RIPEMD128-HMAC-GENERAL", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_RIPEMD160, "RIPEMD160", NULL, MF_UNKNOWN },
{ CKM_RIPEMD160_HMAC, "RIPEMD160-HMAC", NULL, MF_UNKNOWN },
{ CKM_RIPEMD160_HMAC_GENERAL,"RIPEMD160-HMAC-GENERAL", NULL, MF_UNKNOWN },
{ CKM_RIPEMD160_HMAC, "RIPEMD160-HMAC", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_RIPEMD160_HMAC_GENERAL,"RIPEMD160-HMAC-GENERAL", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_CAST_KEY_GEN, "CAST-KEY-GEN", NULL, MF_UNKNOWN },
{ CKM_CAST_ECB, "CAST-ECB", NULL, MF_UNKNOWN },
{ CKM_CAST_CBC, "CAST-CBC", NULL, MF_UNKNOWN },
Expand Down Expand Up @@ -8036,7 +8054,7 @@ static struct mech_info p11_mechanisms[] = {
{ CKM_PBE_SHA1_RC2_128_CBC,"PBE-SHA1-RC2-128-CBC", NULL, MF_UNKNOWN },
{ CKM_PBE_SHA1_RC2_40_CBC,"PBE-SHA1-RC2-40-CBC", NULL, MF_UNKNOWN },
{ CKM_PKCS5_PBKD2, "PKCS5-PBKD2", NULL, MF_UNKNOWN },
{ CKM_PBA_SHA1_WITH_SHA1_HMAC,"PBA-SHA1-WITH-SHA1-HMAC", NULL, MF_UNKNOWN },
{ CKM_PBA_SHA1_WITH_SHA1_HMAC,"PBA-SHA1-WITH-SHA1-HMAC", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_KEY_WRAP_LYNKS, "KEY-WRAP-LYNKS", NULL, MF_UNKNOWN },
{ CKM_KEY_WRAP_SET_OAEP, "KEY-WRAP-SET-OAEP", NULL, MF_UNKNOWN },
{ CKM_SKIPJACK_KEY_GEN, "SKIPJACK-KEY-GEN", NULL, MF_UNKNOWN },
Expand Down Expand Up @@ -8115,11 +8133,11 @@ static struct mech_info p11_mechanisms[] = {
{ CKM_GOSTR3410_WITH_GOSTR3411_12_256, "GOSTR3410-WITH-GOSTR3411-12-256", NULL, MF_UNKNOWN },
{ CKM_GOSTR3410_WITH_GOSTR3411_12_512, "GOSTR3410-WITH-GOSTR3411-12-512", NULL, MF_UNKNOWN },
{ CKM_GOSTR3411, "GOSTR3411", NULL, MF_UNKNOWN },
{ CKM_GOSTR3411_HMAC, "GOSTR3411-HMAC", NULL, MF_UNKNOWN },
{ CKM_GOSTR3411_HMAC, "GOSTR3411-HMAC", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_GOSTR3411_12_256, "GOSTR3411-12-256", NULL, MF_UNKNOWN },
{ CKM_GOSTR3411_12_512, "GOSTR3411-12-512", NULL, MF_UNKNOWN },
{ CKM_GOSTR3411_12_256_HMAC, "GOSTR3411-12-256-HMAC", NULL, MF_UNKNOWN },
{ CKM_GOSTR3411_12_512_HMAC, "GOSTR3411-12-512-HMAC", NULL, MF_UNKNOWN },
{ CKM_GOSTR3411_12_256_HMAC, "GOSTR3411-12-256-HMAC", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_GOSTR3411_12_512_HMAC, "GOSTR3411-12-512-HMAC", NULL, MF_GENERIC_HMAC_FLAGS },
{ CKM_DSA_PARAMETER_GEN, "DSA-PARAMETER-GEN", NULL, MF_UNKNOWN },
{ CKM_DH_PKCS_PARAMETER_GEN,"DH-PKCS-PARAMETER-GEN", NULL, MF_UNKNOWN },
{ CKM_X9_42_DH_PARAMETER_GEN,"X9-42-DH-PARAMETER-GEN", NULL, MF_UNKNOWN },
Expand All @@ -8137,7 +8155,7 @@ static struct mech_info p11_mgf[] = {
{ CKG_MGF1_SHA3_256, "MGF1-SHA3_256", NULL, MF_MGF },
{ CKG_MGF1_SHA3_384, "MGF1-SHA3_384", NULL, MF_MGF },
{ CKG_MGF1_SHA3_512, "MGF1-SHA3_512", NULL, MF_MGF },

{ 0, NULL, NULL, MF_UNKNOWN }
};

Expand Down