X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gcrypt.c;h=dbe4900862fef83a552d9c60d9ac21d4c8253d5e;hp=f9a849067f3ef1084b36e36ccef72cf1826a12a9;hb=refs%2Fheads%2Fpu;hpb=420a1f30cc06482f36371d096635846f8800e198

diff --git a/gcrypt.c b/gcrypt.c
index f9a84906..e5f64688 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -114,7 +114,7 @@ void crypt_shutdown(void)
 
 struct asymmetric_key {
 	gcry_sexp_t sexp;
-	int num_bytes;
+	int bits;
 };
 
 static const char *gcrypt_strerror(gcry_error_t gret)
@@ -457,8 +457,8 @@ int apc_get_pubkey(const char *key_file, struct asymmetric_key **result)
 	}
 	PARA_INFO_LOG("successfully read %u bit ssh public key\n", bits);
 	key = alloc(sizeof(*key));
-	key->num_bytes = ret;
 	key->sexp = sexp;
+	key->bits = bits;
 	*result = key;
 	ret = bits / 8;
 release_n:
@@ -478,17 +478,20 @@ void apc_free_pubkey(struct asymmetric_key *key)
 	free(key);
 }
 
-static int decode_rsa(gcry_sexp_t sexp, unsigned char *outbuf, size_t *nbytes)
+static int decode_rsa(gcry_sexp_t sexp, unsigned char **outbuf, size_t *nbytes)
 {
 	const char *p = gcry_sexp_nth_data(sexp, 1, nbytes);
 
-	if (!p)
+	if (!p) {
+		*outbuf = NULL;
 		return -E_RSA_DECODE;
-	memcpy(outbuf, p, *nbytes);
+	}
+	*outbuf = alloc(*nbytes);
+	memcpy(*outbuf, p, *nbytes);
 	return 1;
 }
 
-int apc_priv_decrypt(const char *key_file, unsigned char *outbuf,
+int apc_priv_decrypt(const char *key_file, unsigned char **outbuf,
 		unsigned char *inbuf, int inlen)
 {
 	gcry_error_t gret;
@@ -498,6 +501,7 @@ int apc_priv_decrypt(const char *key_file, unsigned char *outbuf,
 	gcry_sexp_t in, out, priv_key;
 	size_t nbytes;
 
+	*outbuf = NULL;
 	ret = check_private_key_file(key_file);
 	if (ret < 0)
 		return ret;
@@ -556,7 +560,7 @@ free_key:
 }
 
 int apc_pub_encrypt(struct asymmetric_key *pub, unsigned char *inbuf,
-		unsigned len, unsigned char *outbuf)
+		unsigned len, unsigned char **outbuf)
 {
 	gcry_error_t gret;
 	gcry_sexp_t pub_key, in, out, out_a;
@@ -564,8 +568,7 @@ int apc_pub_encrypt(struct asymmetric_key *pub, unsigned char *inbuf,
 	size_t nbytes;
 	int ret;
 
-	PARA_INFO_LOG("encrypting %u byte input with %d-byte key\n", len, pub->num_bytes);
-
+	*outbuf = NULL;
 	/* get pub key */
 	pub_key = gcry_sexp_find_token(pub->sexp, "public-key", 0);
 	if (!pub_key)
@@ -594,14 +597,18 @@ int apc_pub_encrypt(struct asymmetric_key *pub, unsigned char *inbuf,
 		ret = -E_SEXP_FIND;
 		goto out_a_release;
 	}
-	gret = gcry_mpi_print(GCRYMPI_FMT_USG, outbuf, 512 /* FIXME */, &nbytes, out_mpi);
+	*outbuf = alloc(pub->bits);
+	gret = gcry_mpi_print(GCRYMPI_FMT_USG, *outbuf, pub->bits, &nbytes,
+		out_mpi);
 	if (gret) {
+		free(*outbuf);
+		*outbuf = NULL;
 		PARA_ERROR_LOG("%s\n", gcrypt_strerror(gret));
 		ret = -E_SEXP_ENCRYPT;
 		goto out_mpi_release;
 	}
 	PARA_INFO_LOG("encrypted buffer is %zu bytes\n", nbytes);
-	dump_buffer("enc buf", outbuf, nbytes);
+	dump_buffer("enc buf", *outbuf, nbytes);
 	ret = nbytes;
 
 out_mpi_release: