X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=crypt.c;h=e819e8be3063cbe151634dc037d30e623e27357a;hp=17026cc63525c5527f63fb95c27242dc272add23;hb=b8f17428aeb17ad9230a894b3c3ce150b094594e;hpb=ff12b505b227585daf5aecc822d6b2e8841c2be7

diff --git a/crypt.c b/crypt.c
index 17026cc6..e819e8be 100644
--- a/crypt.c
+++ b/crypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -15,6 +15,7 @@
 #include <openssl/pem.h>
 #include <openssl/sha.h>
 #include <openssl/bn.h>
+#include <openssl/aes.h>
 
 #include "para.h"
 #include "error.h"
@@ -132,23 +133,29 @@ static int read_rsa_bignums(const unsigned char *blob, int blen, RSA **result)
 {
 	int ret;
 	RSA *rsa;
+	BIGNUM *n, *e;
 	const unsigned char *p = blob, *end = blob + blen;
 
 	rsa = RSA_new();
 	if (!rsa)
 		return -E_BIGNUM;
-	ret = read_bignum(p, end - p, &rsa->e);
+	ret = read_bignum(p, end - p, &e);
 	if (ret < 0)
 		goto fail;
 	p += ret;
-	ret = read_bignum(p, end - p, &rsa->n);
+	ret = read_bignum(p, end - p, &n);
 	if (ret < 0)
 		goto fail;
+#ifdef HAVE_RSA_SET0_KEY
+	RSA_set0_key(rsa, n, e, NULL);
+#else
+	rsa->n = n;
+	rsa->e = e;
+#endif
 	*result = rsa;
 	return 1;
 fail:
-	if (rsa)
-		RSA_free(rsa);
+	RSA_free(rsa);
 	return ret;
 }
 
@@ -261,18 +268,35 @@ int pub_encrypt(struct asymmetric_key *pub, unsigned char *inbuf,
 }
 
 struct stream_cipher {
-	RC4_KEY key;
+	bool use_aes;
+	union {
+		RC4_KEY rc4_key;
+		EVP_CIPHER_CTX *aes;
+	} context;
 };
 
-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)
 {
 	struct stream_cipher *sc = para_malloc(sizeof(*sc));
-	RC4_set_key(&sc->key, len, data);
+
+	sc->use_aes = use_aes;
+	if (!use_aes) {
+		RC4_set_key(&sc->context.rc4_key, len, data);
+		return sc;
+	}
+	assert(len >= 2 * AES_CRT128_BLOCK_SIZE);
+	sc->context.aes = EVP_CIPHER_CTX_new();
+	EVP_EncryptInit_ex(sc->context.aes, EVP_aes_128_ctr(), NULL, data,
+		data + AES_CRT128_BLOCK_SIZE);
 	return sc;
 }
 
 void sc_free(struct stream_cipher *sc)
 {
+	if (!sc)
+		return;
+	EVP_CIPHER_CTX_free(sc->context.aes);
 	free(sc);
 }
 
@@ -283,44 +307,9 @@ void sc_free(struct stream_cipher *sc)
  */
 #define RC4_ALIGN 8
 
-int sc_send_bin_buffer(struct stream_cipher_context *scc, char *buf,
-		size_t len)
-{
-	int ret;
-	unsigned char *tmp;
-	static unsigned char remainder[RC4_ALIGN];
-	size_t l1 = ROUND_DOWN(len, RC4_ALIGN), l2 = ROUND_UP(len, RC4_ALIGN);
-
-	assert(len);
-	tmp = para_malloc(l2);
-	RC4(&scc->send->key, l1, (const unsigned char *)buf, tmp);
-	if (len > l1) {
-		memcpy(remainder, buf + l1, len - l1);
-		RC4(&scc->send->key, len - l1, remainder, tmp + l1);
-	}
-	ret = xwrite(scc->fd, (char *)tmp, len);
-	free(tmp);
-	return ret;
-}
-
-int sc_recv_bin_buffer(struct stream_cipher_context *scc, char *buf,
-		size_t size)
-{
-	unsigned char *tmp = para_malloc(ROUND_UP(size, RC4_ALIGN));
-	ssize_t ret = recv(scc->fd, tmp, size, 0);
-
-	if (ret > 0)
-		RC4(&scc->recv->key, ret, tmp, (unsigned char *)buf);
-	else if (ret < 0)
-		ret = -ERRNO_TO_PARA_ERROR(errno);
-	free(tmp);
-	return ret;
-}
-
-void sc_crypt(struct stream_cipher *sc, struct iovec *src, struct iovec *dst)
+static void rc4_crypt(RC4_KEY *key, struct iovec *src, struct iovec *dst)
 {
 	size_t len = src->iov_len, l1, l2;
-	RC4_KEY *key = &sc->key;
 
 	assert(len > 0);
 	assert(len < ((typeof(src->iov_len))-1) / 2);
@@ -341,6 +330,32 @@ void sc_crypt(struct stream_cipher *sc, struct iovec *src, struct iovec *dst)
 	((char *)dst->iov_base)[len] = '\0';
 }
 
+static void aes_ctr128_crypt(EVP_CIPHER_CTX *ctx, struct iovec *src,
+		struct iovec *dst)
+{
+	int ret, inlen = src->iov_len, outlen, tmplen;
+
+	*dst = (typeof(*dst)) {
+		/* Add one for the terminating zero byte. */
+		.iov_base = para_malloc(inlen + 1),
+		.iov_len = inlen
+	};
+	ret = EVP_EncryptUpdate(ctx, dst->iov_base, &outlen, src->iov_base, inlen);
+	assert(ret != 0);
+	ret = EVP_EncryptFinal_ex(ctx, dst->iov_base + outlen, &tmplen);
+	assert(ret != 0);
+	outlen += tmplen;
+	((char *)dst->iov_base)[outlen] = '\0';
+	dst->iov_len = outlen;
+}
+
+void sc_crypt(struct stream_cipher *sc, struct iovec *src, struct iovec *dst)
+{
+	if (sc->use_aes)
+		return aes_ctr128_crypt(sc->context.aes, src, dst);
+	return rc4_crypt(&sc->context.rc4_key, src, dst);
+}
+
 void hash_function(const char *data, unsigned long len, unsigned char *hash)
 {
 	SHA_CTX c;