X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gcrypt.c;h=ba8aadc68e6ce7f7faf4822f186c6c5d22d1718c;hb=b4c9282be012ea84f7154684e9b2a469171e5e2b;hp=7c19aeb0c3edc022c5b0f0425a202e37fd38d906;hpb=121015ff5cdbe6af7b84f6245ebe62fe2a52a859;p=paraslash.git

diff --git a/gcrypt.c b/gcrypt.c
index 7c19aeb0..ba8aadc6 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -460,6 +460,7 @@ static int get_private_key(const char *key_file, struct asymmetric_key **result)
 	gcry_sexp_t sexp;
 	struct asymmetric_key *key;
 
+	*result = NULL;
 	ret = decode_key(key_file, PRIVATE_KEY_HEADER, PRIVATE_KEY_FOOTER,
 		&blob);
 	if (ret < 0)
@@ -778,7 +779,7 @@ int priv_decrypt(const char *key_file, unsigned char *outbuf,
 	gcry_sexp_t in, out, priv_key;
 	size_t nbytes;
 
-	ret = check_key_file(key_file, true);
+	ret = check_private_key_file(key_file);
 	if (ret < 0)
 		return ret;
 	PARA_INFO_LOG("decrypting %d byte input\n", inlen);