From 606fae5a8ec45679ea87e07346cd7bee20ee5058 Mon Sep 17 00:00:00 2001
From: alex-nitrokey <alex@nitrokey.com>
Date: Wed, 9 Oct 2019 15:02:36 +0200
Subject: [PATCH] Use ecpointQ for better code readability

---
 src/libopensc/card-openpgp.c    | 10 +++++-----
 src/libopensc/cardctl.h         |  4 ++--
 src/pkcs15init/pkcs15-openpgp.c |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/libopensc/card-openpgp.c b/src/libopensc/card-openpgp.c
index 54a62135..8b68e8b2 100644
--- a/src/libopensc/card-openpgp.c
+++ b/src/libopensc/card-openpgp.c
@@ -3056,8 +3056,8 @@ pgp_build_extended_header_list(sc_card_t *card, sc_cardctl_openpgp_keystore_info
 		/* TODO ECC import with public key, if necessary as denoted in algorithm caps*/
 
 		/* validate */
-		if ((key_info->u.ec.ecpoint == NULL || key_info->u.ec.ecpoint_len == 0)){
-			sc_log(ctx, "Error: ecpoint required!");
+		if ((key_info->u.ec.ecpointQ == NULL || key_info->u.ec.ecpointQ_len == 0)){
+			sc_log(ctx, "Error: ecpointQ required!");
 			LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_ARGUMENTS);
 		}
 
@@ -3204,9 +3204,9 @@ pgp_store_key(sc_card_t *card, sc_cardctl_openpgp_keystore_info_t *key_info)
 		memset(&pubkey, 0, sizeof(pubkey));
 		pubkey.key_id = key_info->key_id;
 		pubkey.algorithm = key_info->algorithm;
-		if (key_info->u.ec.ecpoint && key_info->u.ec.ecpoint_len){
-			pubkey.u.ec.ecpoint = key_info->u.ec.ecpoint;
-			pubkey.u.ec.ecpoint_len = key_info->u.ec.ecpoint_len;
+		if (key_info->u.ec.ecpointQ && key_info->u.ec.ecpointQ_len){
+			pubkey.u.ec.ecpoint = key_info->u.ec.ecpointQ;
+			pubkey.u.ec.ecpoint_len = key_info->u.ec.ecpointQ_len;
 			pubkey.u.ec.oid = key_info->u.ec.oid;
 			pubkey.u.ec.oid_len = key_info->u.ec.oid_len;
 		}
diff --git a/src/libopensc/cardctl.h b/src/libopensc/cardctl.h
index dedbc2df..9bce594b 100644
--- a/src/libopensc/cardctl.h
+++ b/src/libopensc/cardctl.h
@@ -993,8 +993,8 @@ typedef struct sc_cardctl_openpgp_keystore_info {
 		struct {
 			u8 *privateD;
 			size_t privateD_len;
-			u8 *ecpoint;
-			size_t ecpoint_len;
+			u8 *ecpointQ;
+			size_t ecpointQ_len;
 			struct sc_object_id oid;
 			u8 oid_len;
 		} ec;
diff --git a/src/pkcs15init/pkcs15-openpgp.c b/src/pkcs15init/pkcs15-openpgp.c
index 5f301602..3740e2bb 100644
--- a/src/pkcs15init/pkcs15-openpgp.c
+++ b/src/pkcs15init/pkcs15-openpgp.c
@@ -151,8 +151,8 @@ static int openpgp_store_key(sc_profile_t *profile, sc_pkcs15_card_t *p15card,
 		key_info.key_id = kinfo->id.value[0];
 		key_info.u.ec.privateD = key->u.ec.privateD.data;
 		key_info.u.ec.privateD_len = key->u.ec.privateD.len;
-		key_info.u.ec.ecpoint = key->u.ec.ecpointQ.value;
-		key_info.u.ec.ecpoint_len = key->u.ec.ecpointQ.len;
+		key_info.u.ec.ecpointQ = key->u.ec.ecpointQ.value;
+		key_info.u.ec.ecpointQ_len = key->u.ec.ecpointQ.len;
 		/* extract oid the way we need to import it to OpenPGP Card */
 		if (key->u.ec.params.der.len > 2)
 			key_info.u.ec.oid_len = key->u.ec.params.der.value[1];