X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gcrypt.c;h=763fa6de3252d2f5f188fc3f447f2029d0f5775a;hb=be5daec66f163725489f42d512659a8af5c3fd59;hp=dbe4900862fef83a552d9c60d9ac21d4c8253d5e;hpb=c75c35b176cdacf157d27617e954961c88f33975;p=paraslash.git

diff --git a/gcrypt.c b/gcrypt.c
index dbe49008..763fa6de 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);
@@ -390,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;
@@ -440,7 +456,7 @@ 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;
@@ -608,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,