X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=gcrypt.c;h=8bbc82f3595c5da93c37bb44e72c09080d6f27db;hb=f553ab861efaa14f3a07ffb074c9e640b9fc776a;hp=289748e84d16dbca133b9280dc2027e5d9c2ec67;hpb=35fcd604e2ec04f8667c85fa1552932b1a0e6efb;p=paraslash.git

diff --git a/gcrypt.c b/gcrypt.c
index 289748e8..8bbc82f3 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -388,7 +388,7 @@ static int read_bignum(unsigned char *start, unsigned char *end, gcry_mpi_t *bn,
 		for (i = 0; i < num_bytes; i++, cp++)
 			bn_size = (bn_size << 8) + *cp;
 	}
-	PARA_DEBUG_LOG("bn_size %d (0x%x)\n", bn_size, bn_size);
+	PARA_DEBUG_LOG("bn_size %d (0x%x)\n", bn_size, (unsigned)bn_size);
 	gret = gcry_mpi_scan(bn, GCRYMPI_FMT_STD, cp, bn_size, NULL);
 	if (gret) {
 		PARA_ERROR_LOG("%s while scanning n\n",
@@ -460,6 +460,7 @@ static int get_private_key(const char *key_file, struct asymmetric_key **result)
 	gcry_sexp_t sexp;
 	struct asymmetric_key *key;
 
+	*result = NULL;
 	ret = decode_key(key_file, PRIVATE_KEY_HEADER, PRIVATE_KEY_FOOTER,
 		&blob);
 	if (ret < 0)
@@ -586,7 +587,7 @@ static int get_asn_public_key(const char *key_file, struct asymmetric_key **resu
 	key->num_bytes = n_size;
 	*result = key;
 	ret = n_size;
-	PARA_INFO_LOG("successfully read %u bit asn public key\n", n_size * 8);
+	PARA_INFO_LOG("successfully read %d bit asn public key\n", n_size * 8);
 
 release_e:
 	gcry_mpi_release(e);
@@ -648,7 +649,7 @@ static int get_ssh_public_key(unsigned char *data, int size, gcry_sexp_t *result
 		goto release_n;
 	}
 	ret = nr_scanned / 32 * 32;
-	PARA_INFO_LOG("successfully read %u bit ssh public key\n", ret * 8);
+	PARA_INFO_LOG("successfully read %d bit ssh public key\n", ret * 8);
 release_n:
 	gcry_mpi_release(n);
 release_e:
@@ -658,8 +659,7 @@ free_blob:
 	return ret;
 }
 
-int get_asymmetric_key(const char *key_file, int private,
-		struct asymmetric_key **result)
+int get_public_key(const char *key_file, struct asymmetric_key **result)
 {
 	int ret, ret2;
 	void *map;
@@ -668,8 +668,6 @@ int get_asymmetric_key(const char *key_file, int private,
 	gcry_sexp_t sexp;
 	struct asymmetric_key *key;
 
-	if (private)
-		return get_private_key(key_file, result);
 	ret = mmap_full_file(key_file, O_RDONLY, &map, &map_size, NULL);
 	if (ret < 0)
 		return ret;
@@ -699,7 +697,7 @@ unmap:
 	return ret;
 }
 
-void free_asymmetric_key(struct asymmetric_key *key)
+void free_public_key(struct asymmetric_key *key)
 {
 	if (!key)
 		return;
@@ -778,7 +776,7 @@ int priv_decrypt(const char *key_file, unsigned char *outbuf,
 	gcry_sexp_t in, out, priv_key;
 	size_t nbytes;
 
-	ret = check_key_file(key_file, true);
+	ret = check_private_key_file(key_file);
 	if (ret < 0)
 		return ret;
 	PARA_INFO_LOG("decrypting %d byte input\n", inlen);
@@ -831,7 +829,8 @@ in_mpi_release:
 key_release:
 	gcry_sexp_release(priv_key);
 free_key:
-	free_asymmetric_key(priv);
+	gcry_sexp_release(priv->sexp);
+	free(priv);
 	return ret;
 }