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

diff --git a/openssl.c b/openssl.c
index 7d5bb25d..bda5791f 100644
--- a/openssl.c
+++ b/openssl.c
@@ -60,26 +60,6 @@ void crypt_shutdown(void)
 	CRYPTO_cleanup_all_ex_data();
 }
 
-static int get_private_key(const char *path, RSA **rsa)
-{
-	EVP_PKEY *pkey;
-	BIO *bio = BIO_new(BIO_s_file());
-
-	*rsa = NULL;
-	if (!bio)
-		return -E_PRIVATE_KEY;
-	if (BIO_read_filename(bio, path) <= 0)
-		goto bio_free;
-	pkey = PEM_read_bio_PrivateKey(bio, NULL, NULL, NULL);
-	if (!pkey)
-		goto bio_free;
-	*rsa = EVP_PKEY_get1_RSA(pkey);
-	EVP_PKEY_free(pkey);
-bio_free:
-	BIO_free(bio);
-	return *rsa? RSA_size(*rsa) : -E_PRIVATE_KEY;
-}
-
 /*
  * The public key loading functions below were inspired by corresponding code
  * of openssh-5.2p1, Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo,
@@ -124,11 +104,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,11 +117,33 @@ 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;
 }
 
+static int get_private_key(const char *path, RSA **rsa)
+{
+	EVP_PKEY *pkey;
+	BIO *bio = BIO_new(BIO_s_file());
+
+	*rsa = NULL;
+	if (!bio)
+		return -E_PRIVATE_KEY;
+	if (BIO_read_filename(bio, path) <= 0)
+		goto bio_free;
+	pkey = PEM_read_bio_PrivateKey(bio, NULL, NULL, NULL);
+	if (!pkey)
+		goto bio_free;
+	*rsa = EVP_PKEY_get1_RSA(pkey);
+	EVP_PKEY_free(pkey);
+bio_free:
+	BIO_free(bio);
+	return *rsa? RSA_size(*rsa) : -E_PRIVATE_KEY;
+}
+
 int apc_get_pubkey(const char *key_file, struct asymmetric_key **result)
 {
 	unsigned char *blob;
@@ -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);