X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=openssl.c;h=a27e0ca3f81e28aeb6edfef13ecca65e3b0decd3;hb=74f74cde7afdba9cfe316998aba9286764bb5d34;hp=7d5bb25d53cf73009803fe0e62ca15d0167a05cb;hpb=e2167286448ce2ed9a01a548e7e9832563035088;p=paraslash.git

diff --git a/openssl.c b/openssl.c
index 7d5bb25d..a27e0ca3 100644
--- a/openssl.c
+++ b/openssl.c
@@ -124,11 +124,11 @@ static int read_rsa_bignums(const unsigned char *blob, int blen, RSA **result)
 		return -E_BIGNUM;
 	ret = read_bignum(p, end - p, &e);
 	if (ret < 0)
-		goto fail;
+		goto free_rsa;
 	p += ret;
 	ret = read_bignum(p, end - p, &n);
 	if (ret < 0)
-		goto fail;
+		goto free_e;
 #ifdef HAVE_RSA_SET0_KEY
 	RSA_set0_key(rsa, n, e, NULL);
 #else
@@ -137,7 +137,9 @@ static int read_rsa_bignums(const unsigned char *blob, int blen, RSA **result)
 #endif
 	*result = rsa;
 	return 1;
-fail:
+free_e:
+	BN_free(e);
+free_rsa:
 	RSA_free(rsa);
 	return ret;
 }
@@ -149,7 +151,7 @@ int apc_get_pubkey(const char *key_file, struct asymmetric_key **result)
 	int ret;
 	struct asymmetric_key *key = para_malloc(sizeof(*key));
 
-	ret = decode_ssh_key(key_file, &blob, &decoded_size);
+	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);