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

diff --git a/gcrypt.c b/gcrypt.c
index dbe49008..b46f8f95 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -46,6 +46,22 @@ void hash_function(const char *data, unsigned long len, unsigned char *hash)
 	gcry_md_close(handle);
 }
 
+void hash2_function(const char *data, unsigned long len, unsigned char *hash)
+{
+	gcry_error_t gret;
+	gcry_md_hd_t handle;
+	unsigned char *md;
+
+	gret = gcry_md_open(&handle, GCRY_MD_SHA256, 0);
+	assert(gret == 0);
+	gcry_md_write(handle, data, (size_t)len);
+	gcry_md_final(handle);
+	md = gcry_md_read(handle, GCRY_MD_SHA256);
+	assert(md);
+	memcpy(hash, md, HASH2_SIZE);
+	gcry_md_close(handle);
+}
+
 void get_random_bytes_or_die(unsigned char *buf, int num)
 {
 	gcry_randomize(buf, (size_t)num, GCRY_STRONG_RANDOM);
@@ -98,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)
@@ -390,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;
@@ -440,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:
@@ -548,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)
@@ -608,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,