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

diff --git a/gcrypt.c b/gcrypt.c
index b4718ec0..2a1a90d3 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -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;