X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gcrypt.c;h=45a1c67d20da0b6d229180de92be10644a63d082;hp=1cfd10964c20e9ab30d77cff432405106cdb6836;hb=a8786a08cf7cd65db89ee9ffa495e5282720082a;hpb=0cd41722a596730f06f40e4f7e94a03ff53fb08e

diff --git a/gcrypt.c b/gcrypt.c
index 1cfd1096..45a1c67d 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.
  */
@@ -26,7 +26,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 +87,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)))"
 
@@ -239,7 +239,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);
@@ -275,14 +274,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 +304,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 +428,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 +582,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 +604,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);
@@ -912,11 +912,25 @@ struct stream_cipher {
 	gcry_cipher_hd_t handle;
 };
 
-struct stream_cipher *sc_new(const unsigned char *data, int len)
+struct stream_cipher *sc_new(const unsigned char *data, int len,
+		bool use_aes)
 {
 	gcry_error_t gret;
-
 	struct stream_cipher *sc = para_malloc(sizeof(*sc));
+
+	if (use_aes) {
+		assert(len >= 2 * AES_CRT128_BLOCK_SIZE);
+		gret = gcry_cipher_open(&sc->handle, GCRY_CIPHER_AES128,
+			GCRY_CIPHER_MODE_CTR, 0);
+		assert(gret == 0);
+		gret = gcry_cipher_setkey(sc->handle, data,
+			AES_CRT128_BLOCK_SIZE);
+		assert(gret == 0);
+		gret = gcry_cipher_setctr(sc->handle,
+			data + AES_CRT128_BLOCK_SIZE, AES_CRT128_BLOCK_SIZE);
+		assert(gret == 0);
+		return sc;
+	}
 	gret = gcry_cipher_open(&sc->handle, GCRY_CIPHER_ARCFOUR,
 		GCRY_CIPHER_MODE_STREAM, 0);
 	if (gret) {