X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gcrypt.c;h=f9a849067f3ef1084b36e36ccef72cf1826a12a9;hb=2d2637cb4c9ab76fea6bc336b9af88fd00bf5e08;hp=506f0bb84e6c199d065942553935dc27a8833d93;hpb=5d72d5880a6bd319a8ce2bf7dd2e4921938c77c2;p=paraslash.git

diff --git a/gcrypt.c b/gcrypt.c
index 506f0bb8..f9a84906 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -406,7 +406,7 @@ static int get_private_key(const char *key_file, struct asymmetric_key **result)
 		ret = -E_SEXP_BUILD;
 		goto free_params;
 	}
-	key = para_malloc(sizeof(*key));
+	key = alloc(sizeof(*key));
 	key->sexp = sexp;
 	*result = key;
 	ret = bits;
@@ -456,11 +456,11 @@ int apc_get_pubkey(const char *key_file, struct asymmetric_key **result)
 		goto release_n;
 	}
 	PARA_INFO_LOG("successfully read %u bit ssh public key\n", bits);
-	key = para_malloc(sizeof(*key));
+	key = alloc(sizeof(*key));
 	key->num_bytes = ret;
 	key->sexp = sexp;
 	*result = key;
-	ret = bits;
+	ret = bits / 8;
 release_n:
 	gcry_mpi_release(n);
 release_e:
@@ -624,7 +624,7 @@ struct stream_cipher {
 struct stream_cipher *sc_new(const unsigned char *data, int len)
 {
 	gcry_error_t gret;
-	struct stream_cipher *sc = para_malloc(sizeof(*sc));
+	struct stream_cipher *sc = alloc(sizeof(*sc));
 
 	assert(len >= 2 * AES_CRT128_BLOCK_SIZE);
 	gret = gcry_cipher_open(&sc->handle, GCRY_CIPHER_AES128,