X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=openssl.c;h=13550e7a9f34e1771932d05ef7fea5fed8c109d6;hb=6a04bd8addf503f0689f2dd10bedd20020992725;hp=bc287905c2f4036bfac69c42938d8f5b44a47a16;hpb=be7c18842422e6fbf95dc726f8cfb9b13b09be0b;p=paraslash.git

diff --git a/openssl.c b/openssl.c
index bc287905..13550e7a 100644
--- a/openssl.c
+++ b/openssl.c
@@ -54,9 +54,6 @@ void crypt_init(void)
 
 void crypt_shutdown(void)
 {
-#ifdef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA
-	CRYPTO_cleanup_all_ex_data();
-#endif
 #ifdef HAVE_OPENSSL_THREAD_STOP /* openssl-1.1 or later */
 	OPENSSL_thread_stop();
 #else /* openssl-1.0 */
@@ -97,7 +94,7 @@ static int read_bignum(const unsigned char *buf, size_t len, BIGNUM **result)
 	return bnsize + 4;
 }
 
-static int read_rsa_bignums(const unsigned char *blob, int blen, RSA **result)
+static int read_public_key(const unsigned char *blob, int blen, RSA **result)
 {
 	int ret;
 	RSA *rsa;
@@ -149,7 +146,7 @@ bio_free:
 	return *rsa? RSA_size(*rsa) : -E_PRIVATE_KEY;
 }
 
-static int read_private_rsa_params(const unsigned char *blob,
+static int read_openssh_private_key(const unsigned char *blob,
 		const unsigned char *end, RSA **result)
 {
 	int ret;
@@ -216,11 +213,11 @@ static int read_private_rsa_params(const unsigned char *blob,
 	rsa->n = n;
 	rsa->e = e;
 	rsa->d = d;
+	rsa->iqmp = iqmp;
 	rsa->p = p;
 	rsa->q = q;
 	rsa->dmp1 = dmp1;
 	rsa->dmq1 = dmq1;
-	rsa->iqmp = iqmp;
 #endif
 	*result = rsa;
 	ret = 1;
@@ -267,7 +264,7 @@ static int get_private_key(const char *path, RSA **rsa)
 		if (ret < 0)
 			goto free_blob;
 		PARA_INFO_LOG("reading RSA params at offset %d\n", ret);
-		ret = read_private_rsa_params(blob + ret, end, rsa);
+		ret = read_openssh_private_key(blob + ret, end, rsa);
 	} else
 		ret = read_pem_private_key(path, rsa);
 free_blob:
@@ -280,34 +277,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_rsa_bignums(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,