X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gcrypt.c;h=751c1a4a65d4d0b3b9e5a90242462a83d3fc6cf1;hp=b4718ec0f8c7910dbdbb3c451adeaa790e24e0d2;hb=d1e6b28f66e243516d01916f9125baee75dd98d6;hpb=4d1c0335fbdb9b429c506eeec291c229b10aa2b8

diff --git a/gcrypt.c b/gcrypt.c
index b4718ec0..751c1a4a 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@systemlinux.org>
  *
  * 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) {
@@ -937,39 +951,6 @@ void sc_free(struct stream_cipher *sc)
 	free(sc);
 }
 
-int sc_send_bin_buffer(struct stream_cipher_context *scc, char *buf,
-		size_t size)
-{
-	gcry_error_t gret;
-	int ret;
-	unsigned char *tmp = para_malloc(size);
-
-	assert(size);
-	gret = gcry_cipher_encrypt(scc->send->handle, tmp, size,
-		(unsigned char *)buf, size);
-	assert(gret == 0);
-	ret = xwrite(scc->fd, (char *)tmp, size);
-	free(tmp);
-	return ret;
-}
-
-int sc_recv_bin_buffer(struct stream_cipher_context *scc, char *buf,
-		size_t size)
-{
-	gcry_error_t gret;
-	ssize_t ret = recv(scc->fd, buf, size, 0);
-
-	if (ret < 0)
-		ret = -ERRNO_TO_PARA_ERROR(errno);
-	if (ret <= 0)
-		return ret;
-	/* perform in-place encryption */
-	gret = gcry_cipher_encrypt(scc->recv->handle, (unsigned char *)buf, ret,
-		NULL, 0);
-	assert(gret == 0);
-	return ret;
-}
-
 void sc_crypt(struct stream_cipher *sc, struct iovec *src, struct iovec *dst)
 {
 	gcry_cipher_hd_t handle = sc->handle;