X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gcrypt.c;h=7c19aeb0c3edc022c5b0f0425a202e37fd38d906;hp=62b95defd837e0c035a5611380fed61a54fda1ef;hb=7eaf2faf618705c97c77750371e177108aaa5897;hpb=9b406cbe5d20ba969713ca3d7a8033e697476d75

diff --git a/gcrypt.c b/gcrypt.c
index 62b95def..7c19aeb0 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -15,6 +15,7 @@
 #include "crypt.h"
 #include "crypt_backend.h"
 #include "fd.h"
+#include "base64.h"
 
 //#define GCRYPT_DEBUG 1
 
@@ -87,7 +88,7 @@ void init_random_seed_or_die(void)
 }
 
 /** S-expression for the public part of an RSA key. */
-#define RSA_PUBKEY_SEXP  "(public-key (rsa (n %m) (e %m)))"
+#define RSA_PUBKEY_SEXP "(public-key (rsa (n %m) (e %m)))"
 /** S-expression for a private RSA key. */
 #define RSA_PRIVKEY_SEXP "(private-key (rsa (n %m) (e %m) (d %m) (p %m) (q %m) (u %m)))"
 
@@ -212,7 +213,7 @@ static int decode_key(const char *key_file, const char *header_str,
 
 	ret = mmap_full_file(key_file, O_RDONLY, &map, &map_size, NULL);
 	if (ret < 0)
-		return ret;
+		goto out;
 	ret = -E_KEY_MARKER;
 	if (strncmp(map, header_str, strlen(header_str)))
 		goto unmap;
@@ -239,13 +240,11 @@ static int decode_key(const char *key_file, const char *header_str,
 		key[j++] = begin[i];
 	}
 	key[j] = '\0';
-	//PARA_CRIT_LOG("key: %s\n", key);
-	blob_size = key_size * 2;
-	blob = para_malloc(blob_size);
-	ret = base64_decode(key, blob, blob_size);
+	ret = base64_decode(key, j, (char **)&blob, &blob_size);
 	free(key);
 	if (ret < 0)
 		goto free_unmap;
+	ret = blob_size;
 	goto unmap;
 free_unmap:
 	free(blob);
@@ -258,6 +257,7 @@ unmap:
 		free(blob);
 		blob = NULL;
 	}
+out:
 	*result = blob;
 	return ret;
 }
@@ -275,14 +275,14 @@ enum asn1_types {
 /* bit 6 has value 0 */
 static inline bool is_primitive(unsigned char c)
 {
-	return ((c & (1<<6)) == 0);
+	return (c & (1<<6)) == 0;
 }
 
 static inline bool is_primitive_integer(unsigned char c)
 {
 	if (!is_primitive(c))
 		return false;
-	return ((c & 0x1f) == ASN1_TYPE_INTEGER);
+	return (c & 0x1f) == ASN1_TYPE_INTEGER;
 }
 
 /* Bit 8 is zero (and bits 7-1 give the length) */
@@ -305,7 +305,7 @@ static int find_pubkey_bignum_offset(const unsigned char *data, int len)
 {
 	const unsigned char *p = data, *end = data + len;
 
-	/* the whole thing istarts with one sequence */
+	/* the whole thing starts with one sequence */
 	if (*p != ASN1_TYPE_SEQUENCE)
 		return -E_ASN1_PARSE;
 	p++;
@@ -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",
@@ -429,7 +429,7 @@ static int find_privkey_bignum_offset(const unsigned char *data, int len)
 	if (p >= end)
 		return -E_ASN1_PARSE;
 
-	/* Skip next integer  */
+	/* skip next integer */
 	if (*p != ASN1_TYPE_INTEGER)
 		return -E_ASN1_PARSE;
 	p++;
@@ -583,9 +583,10 @@ static int get_asn_public_key(const char *key_file, struct asymmetric_key **resu
 	}
 	key = para_malloc(sizeof(*key));
 	key->sexp = sexp;
+	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);
@@ -604,14 +605,10 @@ static int get_ssh_public_key(unsigned char *data, int size, gcry_sexp_t *result
 	size_t nr_scanned, erroff, decoded_size;
 	gcry_mpi_t e = NULL, n = NULL;
 
-	PARA_DEBUG_LOG("decoding %d byte  public rsa-ssh key\n", size);
-	if (size > INT_MAX / 4)
-		return -ERRNO_TO_PARA_ERROR(EOVERFLOW);
-	blob = para_malloc(2 * size);
-	ret = uudecode((char *)data, blob, 2 * size);
+	PARA_DEBUG_LOG("decoding %d byte public rsa-ssh key\n", size);
+	ret = uudecode((char *)data, size, (char **)&blob, &decoded_size);
 	if (ret < 0)
 		goto free_blob;
-	decoded_size = ret;
 	end = blob + decoded_size;
 	dump_buffer("decoded key", blob, decoded_size);
 	ret = check_ssh_key_header(blob, decoded_size);
@@ -651,7 +648,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:
@@ -781,6 +778,9 @@ 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);
+	if (ret < 0)
+		return ret;
 	PARA_INFO_LOG("decrypting %d byte input\n", inlen);
 	/* key_file -> asymmetric key priv */
 	ret = get_private_key(key_file, &priv);