Remove hacks which are not anymore needed since we now require Libgcrypt 1.4

5 files changed, 13 insertions, 17 deletions

diff --git a/sm/ChangeLog b/sm/ChangeLog
index cc644d753..21e204f01 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-29  Werner Koch  <[email protected]>
+
+	* certcheck.c (MY_GCRY_PK_ECDSA): Remove.  Change users to
+	GCRY_PK_ECDSA.
+	* gpgsm.c (MY_GCRY_PK_ECDSA): Ditto.
+	* sign.c (MY_GCRY_MD_SHA224): Remove change users to GCRY_MD_SHA224.
+
 2008-09-04  Werner Koch  <[email protected]>
 
 	* certdump.c (gpgsm_format_keydesc): Work around a mingw32 bug.
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
diff --git a/sm/certreqgen-ui.c b/sm/certreqgen-ui.c
index f9e9930e5..3dc948f0b 100644
--- a/sm/certreqgen-ui.c
+++ b/sm/certreqgen-ui.c
@@ -300,7 +300,7 @@ gpgsm_gencertreq_tty (ctrl_t ctrl, FILE *output_fp)
 
   goto leave;
  mem_error:
-  log_error (_("resource problem: out or core\n"));
+  log_error (_("resource problem: out of core\n"));
  leave:
   es_fclose (fp);
   xfree (keytype);         
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index dfbe82675..36c1ea6b6 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -500,17 +500,13 @@ static FILE *open_fwrite (const char *filename);
 static estream_t open_es_fwrite (const char *filename);
 static void run_protect_tool (int argc, char **argv);
 
-/* Remove this if libgcrypt 1.3.0 is required. */
-#define MY_GCRY_PK_ECDSA  301
-
-
 static int
 our_pk_test_algo (int algo)
 {
   switch (algo)
     {
     case GCRY_PK_RSA:
-    case MY_GCRY_PK_ECDSA:
+    case GCRY_PK_ECDSA:
       return gcry_pk_test_algo (algo);
     default:
       return 1;
diff --git a/sm/sign.c b/sm/sign.c
index c87382ee8..fadd66469 100644
--- a/sm/sign.c
+++ b/sm/sign.c
@@ -33,9 +33,6 @@
 #include "keydb.h"
 #include "i18n.h"
 
-/* Remove this if libgcrypt 1.4 is required. */
-#define MY_GCRY_MD_SHA224  11
-
 
 static void
 hash_data (int fd, gcry_md_hd_t md)
@@ -411,7 +408,7 @@ gpgsm_sign (ctrl_t ctrl, certlist_t signerlist,
         {
         case GCRY_MD_SHA1:   oid = "1.3.14.3.2.26"; break;
         case GCRY_MD_RMD160: oid = "1.3.36.3.2.1"; break;
-        case MY_GCRY_MD_SHA224: oid = "2.16.840.1.101.3.4.2.4"; break;
+        case GCRY_MD_SHA224: oid = "2.16.840.1.101.3.4.2.4"; break;
         case GCRY_MD_SHA256: oid = "2.16.840.1.101.3.4.2.1"; break;
         case GCRY_MD_SHA384: oid = "2.16.840.1.101.3.4.2.2"; break;
         case GCRY_MD_SHA512: oid = "2.16.840.1.101.3.4.2.3"; break;