X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gcrypt.c;h=f4d4cc6f9d20678ef5a6fa5b41672db108ea2345;hp=2736a6c769835823b39820b0291069f1ca80a534;hb=4939f46c7b4c334356c6820a7b57d094ad20c40a;hpb=650e5374914c1eb725ce7d2a720611bec22112bc

diff --git a/gcrypt.c b/gcrypt.c
index 2736a6c7..f4d4cc6f 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2011-2014 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");
@@ -97,7 +97,7 @@ static void mgf1(unsigned char *seed, size_t seed_len, unsigned result_len,
 {
 	gcry_error_t gret;
 	gcry_md_hd_t handle;
-	size_t n;;
+	size_t n;
 	unsigned char *md;
 	unsigned char octet_string[4], *rp = result, *end = rp + result_len;
 
@@ -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) {