diff options
| author | Werner Koch <[email protected]> | 2008-09-29 15:02:55 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2008-09-29 15:02:55 +0000 |
| commit | 7d63aa42e5d2c086810e3d7eca64a01f366b4e88 (patch) | |
| tree | 7dccaebaa7f86d56fef8beb00eb9c2bc583ede20 /sm/certcheck.c | |
| parent | 2008-09-28 Marcus Brinkmann <[email protected]> (diff) | |
| download | gnupg-7d63aa42e5d2c086810e3d7eca64a01f366b4e88.tar.gz gnupg-7d63aa42e5d2c086810e3d7eca64a01f366b4e88.zip | |
Remove hacks which are not anymore needed since we now require Libgcrypt 1.4
Diffstat (limited to 'sm/certcheck.c')
| -rw-r--r-- | sm/certcheck.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sm/certcheck.c b/sm/certcheck.c index 7f26f80dc..51a809b8f 100644 --- a/sm/certcheck.c +++ b/sm/certcheck.c @@ -34,10 +34,6 @@ #include "i18n.h" -/* Remove this if libgcrypt 1.3.0 is required. */ -#define MY_GCRY_PK_ECDSA 301 - - /* Return the number of bits of the Q parameter from the DSA key KEY. */ static unsigned int @@ -75,11 +71,11 @@ do_encode_md (gcry_md_hd_t md, int algo, int pkalgo, unsigned int nbits, size_t nframe; unsigned char *frame; - if (pkalgo == GCRY_PK_DSA || pkalgo == MY_GCRY_PK_ECDSA) + if (pkalgo == GCRY_PK_DSA || pkalgo == GCRY_PK_ECDSA) { unsigned int qbits; - if ( pkalgo == MY_GCRY_PK_ECDSA ) + if ( pkalgo == GCRY_PK_ECDSA ) qbits = gcry_pk_get_nbits (pkey); else qbits = get_dsa_qbits (pkey); @@ -214,7 +210,7 @@ pk_algo_from_sexp (gcry_sexp_t pkey) /* Because this function is called only for verification we can assume that ECC actually means ECDSA. */ else if (n==3 && !memcmp (name, "ecc", 3)) - algo = MY_GCRY_PK_ECDSA; + algo = GCRY_PK_ECDSA; else if (n==13 && !memcmp (name, "ambiguous-rsa", 13)) algo = GCRY_PK_RSA; else |