From 2e4986e2c4f03aba08125abb927c186c1cf39a1a Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 17 Apr 2019 10:56:36 +1000
Subject: [PATCH] remove dead code and unnecessary call to
 pkcs_C_GetAttributeValue

---
 bin/pkcs11/pkcs11-keygen.c | 51 +++-----------------------------------
 1 file changed, 4 insertions(+), 47 deletions(-)

diff --git a/bin/pkcs11/pkcs11-keygen.c b/bin/pkcs11/pkcs11-keygen.c
index 02fa341687..f7cb295d8e 100644
--- a/bin/pkcs11/pkcs11-keygen.c
+++ b/bin/pkcs11/pkcs11-keygen.c
@@ -185,13 +185,13 @@ main(int argc, char *argv[]) {
 	isc_result_t result;
 	CK_RV rv;
 	CK_SLOT_ID slot = 0;
-	CK_MECHANISM mech, dpmech;
+	CK_MECHANISM mech;
 	CK_SESSION_HANDLE hSession;
 	char *lib_name = NULL;
 	char *pin = NULL;
 	CK_ULONG bits = 0;
 	CK_CHAR *label = NULL;
-	CK_OBJECT_HANDLE privatekey, publickey, domainparams;
+	CK_OBJECT_HANDLE privatekey, publickey;
 	CK_BYTE exponent[5];
 	CK_ULONG expsize = 0;
 	pk11_context_t pctx;
@@ -199,7 +199,6 @@ main(int argc, char *argv[]) {
 	int c, errflg = 0;
 	int hide = 1, quiet = 0;
 	int idlen = 0, id_offset = 0;
-	unsigned int i;
 	unsigned long id = 0;
 	CK_BYTE idbuf[4];
 	CK_ULONG ulObjectCount;
@@ -207,10 +206,7 @@ main(int argc, char *argv[]) {
 		{CKA_LABEL, NULL_PTR, 0}
 	};
 	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 domain_attrcnt = 0, param_attrcnt = 0;
 	key_class_t keyclass = key_rsa;
 	pk11_optype_t op_type = OP_ANY;
 
@@ -455,46 +451,6 @@ main(int argc, char *argv[]) {
 		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 */
 	rv = pkcs_C_GenerateKeyPair(hSession, &mech,
 			       public_template, public_attrcnt,
@@ -504,8 +460,9 @@ main(int argc, char *argv[]) {
 	if (rv != CKR_OK) {
 		fprintf(stderr, "C_GenerateKeyPair: Error = 0x%.8lX\n", rv);
 		error = 1;
-	 } else if (!quiet)
+	} else if (!quiet) {
 		printf("Key pair generation complete.\n");
+	}
 
  exit_search:
 	rv = pkcs_C_FindObjectsFinal(hSession);