X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=openssl.c;h=409807993d405a000fbf50f8a83b6638de6dd700;hb=c2ec86357f3bab152b1aad62cb11a07af023ce50;hp=0808a8b09c22210e53ff6a4cd3b22f337aec7362;hpb=fa9e0afda25c038c0c9d815f7d812f27f5f34ea0;p=paraslash.git

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,