X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gcrypt.c;h=b4718ec0f8c7910dbdbb3c451adeaa790e24e0d2;hp=c6365470c736ada796f037403cb3bf837203c996;hb=bc0e339169727c602b3e3939be494fa67b0e5b79;hpb=e9ac00becb2aba5bbbf51b4803b81b10ed4d6788

diff --git a/gcrypt.c b/gcrypt.c
index c6365470..b4718ec0 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2011-2013 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"
@@ -500,7 +499,6 @@ static int get_private_key(const char *key_file, struct asymmetric_key **result)
 	ret = read_bignum(cp, end, &u, NULL);
 	if (ret < 0)
 		goto release_q;
-	cp += ret;
 	/*
 	 * OpenSSL uses slightly different parameters than gcrypt. To use these
 	 * parameters we need to swap the values of p and q and recompute u.
@@ -575,7 +573,6 @@ static int get_asn_public_key(const char *key_file, struct asymmetric_key **resu
 	ret = read_bignum(cp, end, &e, NULL);
 	if (ret < 0)
 		goto release_n;
-	cp += ret;
 
 	gret = gcry_sexp_build(&sexp, &erroff, RSA_PUBKEY_SEXP, n, e);
 	if (gret) {
@@ -698,7 +695,6 @@ int get_asymmetric_key(const char *key_file, int private,
 	key->num_bytes = ret;
 	key->sexp = sexp;
 	*result = key;
-	ret = key->num_bytes;
 unmap:
 	ret2 = para_munmap(map, map_size);
 	if (ret >= 0 && ret2 < 0)
@@ -762,11 +758,13 @@ 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);
+	dump_buffer("non-unpadded decrypted buffer", oaep_buf, key_size);
+	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);;
+	dump_buffer("unpadded decrypted buffer", outbuf, *nbytes);
 	ret = 1;
 out_mpi_release:
 	gcry_mpi_release(out_mpi);
@@ -950,7 +948,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 +969,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);
+}