pkcs11-tool.c - fix problem with duplince case statmente

Con in derive_ec_derive wasw rewritten  to work with iOpenSSL 1.1.1 3.+

Author: dengert

src/tools/pkcs11-tool.c

@@ -5179,8 +5179,8 @@ derive_ec_key(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE key, CK_MECHANISM_TYPE
 	unsigned char * der = NULL;
 	unsigned char * derp = NULL;
 	size_t  der_size = 0;
-	EVP_PKEY *pkey = NULL;
-	int key_id = 0; /* nid of peer key */
+	EVP_PKEY *pkey = NULL; /* peer key */
+	int key_id = 0; /* nid of peer key must match nid of key */
 #if OPENSSL_VERSION_NUMBER < 0x30000000L
 	EC_KEY *eckey = NULL;
 	const EC_GROUP *ecgroup = NULL;
@@ -5210,9 +5210,11 @@ derive_ec_key(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE key, CK_MECHANISM_TYPE
 		util_fatal("Cannot read peer EC key from %s", opt_input);
 
 	key_id = EVP_PKEY_id(pkey);
+	if (key_id == 0)
+		util_fatal("Unknown key type of peer key");
 
 	switch (key_id) {
-	case EVP_PKEY_EC: /* CKK_EC*/
+	case EVP_PKEY_EC: /* CKK_EC need to get curves of pkey and key */
 
 #if OPENSSL_VERSION_NUMBER < 0x30000000L
 		eckey = EVP_PKEY_get0_EC_KEY(pkey);
@@ -5230,26 +5232,37 @@ derive_ec_key(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE key, CK_MECHANISM_TYPE
 		key_len = (EC_GROUP_get_degree(ecgroup) + 7) / 8;
 		FILL_ATTR(newkey_template[n_attrs], CKA_VALUE_LEN, &key_len, sizeof(key_len));
 		n_attrs++;
-		break;
-	}
 
-	if (opt_allowed_mechanisms_len > 0) {
-		FILL_ATTR(newkey_template[n_attrs],
-			CKA_ALLOWED_MECHANISMS, opt_allowed_mechanisms,
-			sizeof(CK_MECHANISM_TYPE) * opt_allowed_mechanisms_len);
-		n_attrs++;
-	}
+		if (opt_allowed_mechanisms_len > 0) {
+			FILL_ATTR(newkey_template[n_attrs],
+				CKA_ALLOWED_MECHANISMS, opt_allowed_mechanisms,
+				sizeof(CK_MECHANISM_TYPE) * opt_allowed_mechanisms_len);
+			n_attrs++;
+		}
 
 #if OPENSSL_VERSION_NUMBER < 0x30000000L
-	switch (key_id) {
-	case EVP_PKEY_EC:
-		buf_size = EC_POINT_point2oct(ecgroup, ecpoint, POINT_CONVERSION_UNCOMPRESSED, NULL, 0, NULL);
+		buf_size = EC_POINT_point2oct(ecgroup, ecpoint, POINT_CONVERSION_UNCOMPRESSED, NULL,	    0, NULL);
 		buf = (unsigned char *)malloc(buf_size);
 		if (buf == NULL)
-			util_fatal("malloc() failure\n");
+		util_fatal("malloc() failure\n");
 		buf_size = EC_POINT_point2oct(ecgroup, ecpoint, POINT_CONVERSION_UNCOMPRESSED, buf, buf_size, NULL);
+#else
+		EC_GROUP_free(ecgroup);
+		EVP_PKEY_get_octet_string_param(pkey, OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY, NULL, 0, &buf_size);
+		if ((buf = (unsigned char *)malloc(buf_size)) == NULL)
+		util_fatal("malloc() failure\n");
+
+		if (EVP_PKEY_get_octet_string_param(pkey, OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY, buf, buf_size, NULL) != 1) {
+			free(buf);
+			util_fatal("Failed to parse other EC key from %s", opt_input);
+		}
+#endif
+		if (mech_mech != CKM_ECDH1_DERIVE && mech_mech != CKM_ECDH1_COFACTOR_DERIVE)
+			util_fatal("Peer key %s not usable with %s", "CKK_EC", p11_mechanism_to_name(mech_mech));
 		break;
-	case EVP_PKEY_X25519:
+	
+#if defined(EVP_PKEY_X25519)
+	case EVP_PKEY_X25519: /* "CKK_EC_MONTGOMERY */
 #if defined(EVP_PKEY_X448)
 	case EVP_PKEY_X448:
 #endif
@@ -5260,34 +5273,11 @@ derive_ec_key(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE key, CK_MECHANISM_TYPE
 		if (buf == NULL)
 			util_fatal("malloc() failure\n");
 		EVP_PKEY_get_raw_public_key(pkey, buf, &buf_size);
-		break;
-	default:
-		util_fatal("Unknown EVP_PKEY_id\n");
-	}
-#else
-	EC_GROUP_free(ecgroup);
-	EVP_PKEY_get_octet_string_param(pkey, OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY, NULL, 0, &buf_size);
-	if ((buf = (unsigned char *)malloc(buf_size)) == NULL)
-	    util_fatal("malloc() failure\n");
-
-	if (EVP_PKEY_get_octet_string_param(pkey, OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY, buf, buf_size, NULL) != 1) {
-		free(buf);
-		util_fatal("Failed to parse peer EC key from %s", opt_input);
-	}
-#endif
-
-	switch (key_id) {
-	case EVP_PKEY_EC: /* CKK_EC*/
-		if (mech_mech != CKM_ECDH1_DERIVE && mech_mech != CKM_ECDH1_COFACTOR_DERIVE)
-			util_fatal("Peer key %s not usable with %s", "CKK_EC", p11_mechanism_to_name(mech_mech));
-		break;
-	case EVP_PKEY_X25519: /* "CKK_EC_MONTGOMERY */
-#if defined(EVP_PKEY_X448)
-	case EVP_PKEY_X448:
-#endif
+	
 		if (mech_mech != CKM_ECDH1_DERIVE)
 			util_fatal("Peer key %s not usable with %s", "CKK_EC_MONTGOMERY", p11_mechanism_to_name(mech_mech));
 		break;
+#endif /* defined(EVP_PKEY_X25519) */
 	default:
 		util_fatal("Peer key not usable with derive or unknown %i", key_id);
 		break;