X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gcrypt.c;h=1fde479e1be97656bd01002a2071a3d6f1b4b026;hp=0ba8d526a3dd224135a73991e5b149c4a4eef1fb;hb=a826152ba51fd4813f715e5fa30e7d70407dc846;hpb=9090ef9c56f488ea019b8cb8a40f22112bc3311a

diff --git a/gcrypt.c b/gcrypt.c
index 0ba8d526..1fde479e 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -617,33 +617,20 @@ struct stream_cipher {
 	gcry_cipher_hd_t handle;
 };
 
-struct stream_cipher *sc_new(const unsigned char *data, int len,
-		bool use_aes)
+struct stream_cipher *sc_new(const unsigned char *data, int len)
 {
 	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) {
-		PARA_ERROR_LOG("%s\n", gcrypt_strerror(gret));
-		free(sc);
-		return NULL;
-	}
-	gret = gcry_cipher_setkey(sc->handle, data, (size_t)len);
+	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;
 }