X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gcrypt.c;h=ea1e7710d01c53f5fd300444970806715ad14241;hp=775abd764902b53cf60930270fc6fea73a62e9a1;hb=466c9b7ef6663bcda1aeadf324f74187816da32a;hpb=0a0a577bb91b6ec4e26a9432c08974a3f1f611ac

diff --git a/gcrypt.c b/gcrypt.c
index 775abd76..ea1e7710 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 {
@@ -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) {
@@ -587,7 +584,7 @@ static int get_asn_public_key(const char *key_file, struct asymmetric_key **resu
 	key = para_malloc(sizeof(*key));
 	key->sexp = sexp;
 	*result = key;
-	ret = n_size * 8;
+	ret = n_size;
 	PARA_INFO_LOG("successfully read %u bit asn public key\n", n_size * 8);
 
 release_e:
@@ -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)
@@ -763,7 +759,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 +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;
 }