X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gcrypt.c;h=8e73b3b2696f0aee501c6a317280067b885e3011;hp=751c1a4a65d4d0b3b9e5a90242462a83d3fc6cf1;hb=3ea5399aeec092dcdb9f039288f1e146aadbb2f7;hpb=0879c9de4eaf8c78131c243d8e9fec013df0d14a

diff --git a/gcrypt.c b/gcrypt.c
index 751c1a4a..8e73b3b2 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2011 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -15,6 +15,7 @@
 #include "crypt.h"
 #include "crypt_backend.h"
 #include "fd.h"
+#include "base64.h"
 
 //#define GCRYPT_DEBUG 1
 
@@ -26,7 +27,7 @@ static void dump_buffer(const char *msg, unsigned char *buf, int len)
 {
 	int i;
 
-	fprintf(stderr, "%s (%u bytes): ", msg, len);
+	fprintf(stderr, "%s (%d bytes): ", msg, len);
 	for (i = 0; i < len; i++)
 		fprintf(stderr, "%02x ", buf[i]);
 	fprintf(stderr, "\n");
@@ -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,7 +240,6 @@ 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);
@@ -258,6 +258,7 @@ unmap:
 		free(blob);
 		blob = NULL;
 	}
+out:
 	*result = blob;
 	return ret;
 }
@@ -275,14 +276,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 +306,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++;
@@ -429,7 +430,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,6 +584,7 @@ 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);
@@ -604,7 +606,7 @@ 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);
+	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);
@@ -781,6 +783,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);