X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gcrypt.c;h=2a1a90d357dc3fd3cc81803bd0a8ce46a2734f71;hb=f6a99f9e27cf84d92fc992677dca9578c5a3b585;hp=a96db362278b1dae70e7aec87a920aac1c402e54;hpb=85a6aec201576a1ec57e78d91f73e45d9d6fae21;p=paraslash.git

diff --git a/gcrypt.c b/gcrypt.c
index a96db362..2a1a90d3 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -758,13 +758,13 @@ static int decode_rsa(gcry_sexp_t sexp, int key_size, unsigned char *outbuf,
 
 	PARA_DEBUG_LOG("decrypted buffer before unpad (%d bytes):\n",
 		key_size);
-	dump_buffer("non-unpadded decrypted buffer", oaep_buf, key_size);;
+	dump_buffer("non-unpadded decrypted buffer", oaep_buf, key_size);
 	ret = unpad_oaep(oaep_buf, key_size, outbuf, nbytes);
 	if (ret < 0)
 		goto out_mpi_release;
 	PARA_DEBUG_LOG("decrypted buffer after unpad (%zu bytes):\n",
 		*nbytes);
-	dump_buffer("unpadded decrypted buffer", outbuf, *nbytes);;
+	dump_buffer("unpadded decrypted buffer", outbuf, *nbytes);
 	ret = 1;
 out_mpi_release:
 	gcry_mpi_release(out_mpi);
@@ -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) {