aboutsummaryrefslogtreecommitdiffstats
path: root/g10/seskey.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2008-09-29 15:02:55 +0000
committerWerner Koch <[email protected]>2008-09-29 15:02:55 +0000
commit7d63aa42e5d2c086810e3d7eca64a01f366b4e88 (patch)
tree7dccaebaa7f86d56fef8beb00eb9c2bc583ede20 /g10/seskey.c
parent2008-09-28 Marcus Brinkmann <[email protected]> (diff)
downloadgnupg-7d63aa42e5d2c086810e3d7eca64a01f366b4e88.tar.gz
gnupg-7d63aa42e5d2c086810e3d7eca64a01f366b4e88.zip
Remove hacks which are not anymore needed since we now require Libgcrypt 1.4
Diffstat (limited to 'g10/seskey.c')
-rw-r--r--g10/seskey.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/g10/seskey.c b/g10/seskey.c
index b843530dc..cc3c32ea7 100644
--- a/g10/seskey.c
+++ b/g10/seskey.c
@@ -265,11 +265,9 @@ encode_md_value (PKT_public_key *pk, PKT_secret_key *sk,
byte *asn;
size_t asnlen;
- rc = gcry_md_test_algo (hash_algo);
- if (!rc)
- rc = gcry_md_algo_info (hash_algo, GCRYCTL_GET_ASNOID, NULL, &asnlen);
+ rc = gcry_md_algo_info (hash_algo, GCRYCTL_GET_ASNOID, NULL, &asnlen);
if (rc)
- log_fatal ("can't get OID of algo %d: %s\n",
+ log_fatal ("can't get OID of digest algorithm %d: %s\n",
hash_algo, gpg_strerror (rc));
asn = xmalloc (asnlen);
if ( gcry_md_algo_info (hash_algo, GCRYCTL_GET_ASNOID, asn, &asnlen) )