From: Andre Noll <maan@tuebingen.mpg.de>
Date: Tue, 2 May 2023 20:28:56 +0000 (+0200)
Subject: openssl: Unify naming of public key structures.
X-Git-Tag: v0.7.3~9^2~1
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=c2ec86357f3bab152b1aad62cb11a07af023ce50

openssl: Unify naming of public key structures.

The pointers to private key structures are all called "priv", but for
their public counterparts we often use "key" rather than "pub". Fix
that to improve readability.
---

diff --git a/openssl.c b/openssl.c
index 0808a8b0..40980799 100644
--- a/openssl.c
+++ b/openssl.c
@@ -280,34 +280,34 @@ int apc_get_pubkey(const char *key_file, struct asymmetric_key **result)
 	unsigned char *blob;
 	size_t decoded_size;
 	int ret;
-	struct asymmetric_key *key = alloc(sizeof(*key));
+	struct asymmetric_key *pub = alloc(sizeof(*pub));
 
 	ret = decode_public_key(key_file, &blob, &decoded_size);
 	if (ret < 0)
 		goto out;
-	ret = read_public_key(blob + ret, decoded_size - ret, &key->rsa);
+	ret = read_public_key(blob + ret, decoded_size - ret, &pub->rsa);
 	if (ret < 0)
 		goto free_blob;
-	ret = RSA_size(key->rsa);
+	ret = RSA_size(pub->rsa);
 	assert(ret > 0);
-	*result = key;
+	*result = pub;
 free_blob:
 	free(blob);
 out:
 	if (ret < 0) {
-		free(key);
+		free(pub);
 		*result = NULL;
 		PARA_ERROR_LOG("can not load key %s\n", key_file);
 	}
 	return ret;
 }
 
-void apc_free_pubkey(struct asymmetric_key *key)
+void apc_free_pubkey(struct asymmetric_key *pub)
 {
-	if (!key)
+	if (!pub)
 		return;
-	RSA_free(key->rsa);
-	free(key);
+	RSA_free(pub->rsa);
+	free(pub);
 }
 
 int apc_priv_decrypt(const char *key_file, unsigned char *outbuf,