X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gcrypt.c;h=1e997fb45c0bd6a753a79bfcff1db5ede4546782;hb=98c13e11d5efd8e49fe3c31386f3abf6979902d6;hp=2f38f1a6cab16e606e3a5704cef61b7cad252b50;hpb=9de1287d67c9562e9140c6dc7deb0c01c4e10cc0;p=paraslash.git

diff --git a/gcrypt.c b/gcrypt.c
index 2f38f1a6..1e997fb4 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -499,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.
@@ -574,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) {
@@ -951,7 +949,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;
 }