X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gcrypt.c;h=af7f2af1131e1132009fec7e1cb50b160bbca928;hp=0183dc389675cb3ed5b32e70d5b6d99821eff586;hb=c685233a75d7c592ce0574382bc876d88def2a5b;hpb=027f2c1237051d2d569d6be7f381c886f659bac3

diff --git a/gcrypt.c b/gcrypt.c
index 0183dc38..af7f2af1 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2014 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.
  */
@@ -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) {