mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-04 00:25:29 +00:00
Code Issues Releases Wiki Activity

Merge branch '984-remove-dead-code-in-pkcs11-keygen-c' into 'master'

Browse Source 
Resolve "Remove dead code in pkcs11-keygen.c"

Closes #984

See merge request isc-projects/bind9!1814
This commit is contained in:
Mark Andrews
2019-05-12 21:38:58 -04:00
parent 3ee94d7845 2e4986e2c4
commit 9150e432aa
1 changed files with 4 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
bin/pkcs11/pkcs11-keygen.c
View File

@@ -185,13 +185,13 @@ main(int argc, char *argv[]) {
isc_result_t result; isc_result_t result;
CK_RV rv; CK_RV rv;
CK_SLOT_ID slot = 0; CK_SLOT_ID slot = 0;
CK_MECHANISM mech, dpmech; CK_MECHANISM mech;
CK_SESSION_HANDLE hSession; CK_SESSION_HANDLE hSession;
char *lib_name = NULL; char *lib_name = NULL;
char *pin = NULL; char *pin = NULL;
CK_ULONG bits = 0; CK_ULONG bits = 0;
CK_CHAR *label = NULL; CK_CHAR *label = NULL;
CK_OBJECT_HANDLE privatekey, publickey, domainparams; CK_OBJECT_HANDLE privatekey, publickey;
CK_BYTE exponent[5]; CK_BYTE exponent[5];
CK_ULONG expsize = 0; CK_ULONG expsize = 0;
pk11_context_t pctx; pk11_context_t pctx;
@@ -199,7 +199,6 @@ main(int argc, char *argv[]) {
int c, errflg = 0; int c, errflg = 0;
int hide = 1, quiet = 0; int hide = 1, quiet = 0;
int idlen = 0, id_offset = 0; int idlen = 0, id_offset = 0;
unsigned int i;
unsigned long id = 0; unsigned long id = 0;
CK_BYTE idbuf[4]; CK_BYTE idbuf[4];
CK_ULONG ulObjectCount; CK_ULONG ulObjectCount;
@@ -207,10 +206,7 @@ main(int argc, char *argv[]) {
{CKA_LABEL, NULL_PTR, 0} {CKA_LABEL, NULL_PTR, 0}
}; };
CK_ATTRIBUTE *public_template = NULL; CK_ATTRIBUTE *public_template = NULL;
CK_ATTRIBUTE *domain_template = NULL;
CK_ATTRIBUTE *param_template = NULL;
CK_ULONG public_attrcnt = 0, private_attrcnt = PRIVATE_ATTRS; CK_ULONG public_attrcnt = 0, private_attrcnt = PRIVATE_ATTRS;
CK_ULONG domain_attrcnt = 0, param_attrcnt = 0;
key_class_t keyclass = key_rsa; key_class_t keyclass = key_rsa;
pk11_optype_t op_type = OP_ANY; pk11_optype_t op_type = OP_ANY;
@@ -455,46 +451,6 @@ main(int argc, char *argv[]) {
private_template[5].pValue = &truevalue; private_template[5].pValue = &truevalue;
} }
if (keyclass == key_rsa || keyclass == key_ecc || keyclass == key_ecx)
goto generate_keys;
/* Generate Domain parameters */
rv = pkcs_C_GenerateKey(hSession, &dpmech, domain_template,
domain_attrcnt, &domainparams);
if (rv != CKR_OK) {
fprintf(stderr,
"C_GenerateKey: Error = 0x%.8lX\n", rv);
error = 1;
goto exit_search;
}
/* Get Domain parameters */
rv = pkcs_C_GetAttributeValue(hSession, domainparams,
param_template, param_attrcnt);
if (rv != CKR_OK) {
fprintf(stderr,
"C_GetAttributeValue0: Error = 0x%.8lX\n", rv);
error = 1;
goto exit_search;
}
/* Allocate space for parameter attributes */
for (i = 0; i < param_attrcnt; i++) {
param_template[i].pValue = NULL;
}
for (i = 0; i < param_attrcnt; i++) {
param_template[i].pValue = malloc(param_template[i].ulValueLen);
if (param_template[i].pValue == NULL) {
fprintf(stderr, "malloc failed\n");
error = 1;
goto exit_search;
}
}
generate_keys:
/* Generate Key pair for signing/verifying */ /* Generate Key pair for signing/verifying */
rv = pkcs_C_GenerateKeyPair(hSession, &mech, rv = pkcs_C_GenerateKeyPair(hSession, &mech,
public_template, public_attrcnt, public_template, public_attrcnt,
@@ -504,8 +460,9 @@ main(int argc, char *argv[]) {
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_search: exit_search:
rv = pkcs_C_FindObjectsFinal(hSession); rv = pkcs_C_FindObjectsFinal(hSession);