ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Fix ECC algorithms unused constants in PKCS#11 build

Browse Source
This commit is contained in:
Ondřej Surý
2018-12-21 09:29:47 +01:00
parent e402955133
commit c116fb963a
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/pkcs11/pkcs11-keygen.c
+18 -7
View File
@@ -43,7 +43,7 @@
* Create a key in the keystore of an HSM * Create a key in the keystore of an HSM
* *
* The calculation of key tag is left to the script * The calculation of key tag is left to the script
* that converts the key into a DNSKEY RR and inserts * that converts the key into a DNSKEY RR and inserts
* it into a zone file. * it into a zone file.
* *
* usage: * usage:
@@ -432,10 +432,10 @@ main(int argc, char *argv[]) {
break; break;
case key_ecx: case key_ecx:
#ifndef CKM_EDDSA_KEY_PAIR_GEN #if !defined(CKM_EDDSA_KEY_PAIR_GEN)
fprintf(stderr, "CKM_EDDSA_KEY_PAIR_GEN is not defined\n"); fprintf(stderr, "CKM_EDDSA_KEY_PAIR_GEN is not defined\n");
usage(); usage();
#endif #else
op_type = OP_EC; op_type = OP_EC;
if (bits == 0) if (bits == 0)
bits = 256; bits = 256;
@@ -454,16 +454,27 @@ main(int argc, char *argv[]) {
id_offset = ECC_ID; id_offset = ECC_ID;
if (bits == 256) { if (bits == 256) {
#if HAVE_PKCS11_ED25519
public_template[4].pValue = pk11_ecc_ed25519; public_template[4].pValue = pk11_ecc_ed25519;
public_template[4].ulValueLen = public_template[4].ulValueLen =
sizeof(pk11_ecc_ed25519); sizeof(pk11_ecc_ed25519);
#else
fprintf(stderr, "Ed25519 is not supported\n");
usage();
#endif
} else { } else {
#if HAVE_PKCS11_ED448
public_template[4].pValue = pk11_ecc_ed448; public_template[4].pValue = pk11_ecc_ed448;
public_template[4].ulValueLen = public_template[4].ulValueLen =
sizeof(pk11_ecc_ed448); sizeof(pk11_ecc_ed448);
#else
fprintf(stderr, "Ed449 is not supported\n");
usage();
#endif
} }
break; break;
#endif /* !defined(CKM_EDDSA_KEY_PAIR_GEN) */
case key_dsa: case key_dsa:
op_type = OP_DSA; op_type = OP_DSA;
if (bits == 0) if (bits == 0)
@@ -527,7 +538,7 @@ main(int argc, char *argv[]) {
case key_unknown: case key_unknown:
usage(); usage();
} }
search_template[0].pValue = label; search_template[0].pValue = label;
search_template[0].ulValueLen = strlen((char *)label); search_template[0].ulValueLen = strlen((char *)label);
public_template[0].pValue = label; public_template[0].pValue = label;
@@ -584,7 +595,7 @@ main(int argc, char *argv[]) {
hSession = pctx.session; hSession = pctx.session;
/* check if a key with the same id already exists */ /* check if a key with the same id already exists */
rv = pkcs_C_FindObjectsInit(hSession, search_template, 1); rv = pkcs_C_FindObjectsInit(hSession, search_template, 1);
if (rv != CKR_OK) { if (rv != CKR_OK) {
fprintf(stderr, "C_FindObjectsInit: Error = 0x%.8lX\n", rv); fprintf(stderr, "C_FindObjectsInit: Error = 0x%.8lX\n", rv);
error = 1; error = 1;
@@ -714,13 +725,13 @@ main(int argc, char *argv[]) {
public_template, public_attrcnt, public_template, public_attrcnt,
private_template, private_attrcnt, private_template, private_attrcnt,
&publickey, &privatekey); &publickey, &privatekey);
if (rv != CKR_OK) { if (rv != CKR_OK) {
fprintf(stderr, "C_GenerateKeyPair: Error = 0x%.8lX\n", rv); fprintf(stderr, "C_GenerateKeyPair: Error = 0x%.8lX\n", rv);
error = 1; error = 1;
} else if (!quiet) } else if (!quiet)
printf("Key pair generation complete.\n"); printf("Key pair generation complete.\n");
exit_params: exit_params:
/* Free parameter attributes */ /* Free parameter attributes */
if (keyclass == key_dsa || keyclass == key_dh) { if (keyclass == key_dsa || keyclass == key_dh) {
lib/isc/include/pk11/constants.h
+7 -1
View File
@@ -19,19 +19,25 @@
* Static arrays of data used for key template initalization * Static arrays of data used for key template initalization
*/ */
#ifdef WANT_ECC_CURVES #ifdef WANT_ECC_CURVES
#if HAVE_PKCS11_ECDSA
static CK_BYTE pk11_ecc_prime256v1[] = { static CK_BYTE pk11_ecc_prime256v1[] = {
0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07
}; };
static CK_BYTE pk11_ecc_secp384r1[] = { static CK_BYTE pk11_ecc_secp384r1[] = {
0x06, 0x05, 0x2b, 0x81, 0x04, 0x00, 0x22 0x06, 0x05, 0x2b, 0x81, 0x04, 0x00, 0x22
}; };
#endif /* HAVE_PKCS11_ECDSA */
#if HAVE_PKCS11_ED25519
static CK_BYTE pk11_ecc_ed25519[] = { static CK_BYTE pk11_ecc_ed25519[] = {
0x06, 0x03, 0x2b, 0x65, 0x70 0x06, 0x03, 0x2b, 0x65, 0x70
}; };
#endif /* HAVE_PKCS11_ED25519 */
#if HAVE_PKCS11_ED448
static CK_BYTE pk11_ecc_ed448[] = { static CK_BYTE pk11_ecc_ed448[] = {
0x06, 0x03, 0x2b, 0x65, 0x71 0x06, 0x03, 0x2b, 0x65, 0x71
}; };
#endif #endif /* HAVE_PKCS11_ED448 */
#endif /* WANT_ECC_CURVES */
#ifdef WANT_DH_PRIMES #ifdef WANT_DH_PRIMES
static CK_BYTE pk11_dh_bn2[] = { 2 }; static CK_BYTE pk11_dh_bn2[] = { 2 };