X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gcrypt.c;h=dbe4900862fef83a552d9c60d9ac21d4c8253d5e;hb=HEAD;hp=506f0bb84e6c199d065942553935dc27a8833d93;hpb=c20e3e67fc2be1d5f8778b9c482271e023bbdcb8;p=paraslash.git

diff --git a/gcrypt.c b/gcrypt.c
index 506f0bb8..b46f8f95 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -114,7 +114,6 @@ void crypt_shutdown(void)
 
 struct asymmetric_key {
 	gcry_sexp_t sexp;
-	int num_bytes;
 };
 
 static const char *gcrypt_strerror(gcry_error_t gret)
@@ -406,7 +405,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 +455,10 @@ 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->num_bytes = ret;
+	key = alloc(sizeof(*key));
 	key->sexp = sexp;
 	*result = key;
-	ret = bits;
+	ret = bits / 8;
 release_n:
 	gcry_mpi_release(n);
 release_e:
@@ -564,8 +562,6 @@ 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);
-
 	/* get pub key */
 	pub_key = gcry_sexp_find_token(pub->sexp, "public-key", 0);
 	if (!pub_key)
@@ -624,7 +620,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,