X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gcrypt.c;h=926eb15f41ae479b167a0b9a694b972c6f88fcfd;hp=b40b7b6e818ad387da3f2dffa96c06615eae5c10;hb=32ffc06c0706f51c3f1dc436911836f1f9aa326e;hpb=c13f9045d75565f517a4e73cade098da7cc46fcc

diff --git a/gcrypt.c b/gcrypt.c
index b40b7b6e..926eb15f 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2011-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file gcrypt.c Libgrcypt-based encryption/decryption routines. */
 
 #include <regex.h>
-#include <stdbool.h>
 #include <gcrypt.h>
 
 #include "para.h"
@@ -164,7 +163,7 @@ static void pad_oaep(unsigned char *in, size_t in_len, unsigned char *out,
 /* rfc 3447, section 7.1.2 */
 static int unpad_oaep(unsigned char *in, size_t in_len, unsigned char *out,
 		size_t *out_len)
-{	int ret;
+{
 	unsigned char *masked_seed = in + 1;
 	unsigned char *db = in + 1 + HASH_SIZE;
 	unsigned char seed[HASH_SIZE], seed_mask[HASH_SIZE];
@@ -189,7 +188,7 @@ static int unpad_oaep(unsigned char *in, size_t in_len, unsigned char *out,
 	p++;
 	*out_len = in + in_len - p;
 	memcpy(out, p, *out_len);
-	return ret;
+	return 1;
 }
 
 struct asymmetric_key {
@@ -763,7 +762,9 @@ 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);;
-	unpad_oaep(oaep_buf, key_size, outbuf, nbytes);
+	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);;
@@ -950,7 +951,7 @@ int sc_send_bin_buffer(struct stream_cipher_context *scc, char *buf,
 	gret = gcry_cipher_encrypt(scc->send->handle, tmp, size,
 		(unsigned char *)buf, size);
 	assert(gret == 0);
-	ret = write_all(scc->fd, (char *)tmp, &size);
+	ret = xwrite(scc->fd, (char *)tmp, size);
 	free(tmp);
 	return ret;
 }
@@ -971,3 +972,15 @@ int sc_recv_bin_buffer(struct stream_cipher_context *scc, char *buf,
 	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;
+	gcry_error_t gret;
+
+	/* perform in-place encryption */
+	*dst = *src;
+	gret = gcry_cipher_encrypt(handle, src->iov_base, src->iov_len,
+		NULL, 0);
+	assert(gret == 0);
+}