Minor fixes

4 files changed, 10 insertions, 38 deletions

diff --git a/g10/ChangeLog b/g10/ChangeLog
index f91bc6bcc..f8120230f 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-27  Werner Koch  <[email protected]>
+
+	* sign.c (do_sign): Removed disabled testcode.
+
 2003-09-26  Timo Schulz  <[email protected]>
 
 	* card_status (card_status): Do not use fputs since the fp
diff --git a/g10/sign.c b/g10/sign.c
index 640e36fe0..cd7615c00 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -307,43 +307,7 @@ do_sign( PKT_secret_key *sk, PKT_signature *sig,
   sig->digest_algo = digest_algo;
   sig->digest_start[0] = dp[0];
   sig->digest_start[1] = dp[1];
-#if 0
-  if (sk->is_protected && sk->protect.s2k.mode == 1002 && !sk->is_primary)
-    {  /* Temporary hack  to test tey auth command. */
-      char *rbuf;
-      size_t rbuflen;
-      char *snbuf;
-      char *tmpbuf;
-      size_t tmp_n;
-
-      frame = encode_md_value( sk->pubkey_algo, md,
-                               digest_algo, mpi_get_nbits(sk->skey[0]), 0 );
-      if (!frame)
-        return GPG_ERR_GENERAL;
-
-      if (gcry_mpi_aprint (GCRYMPI_FMT_USG, (void **)&tmpbuf, &tmp_n, frame ))
-        BUG ();
-      for (; tmp_n && *tmpbuf; tmp_n--, tmpbuf++)
-        ;
-      assert (tmp_n);
-      tmp_n--;
-      tmpbuf++;
-
-      snbuf = serialno_and_fpr_from_sk (sk->protect.iv, sk->protect.ivlen, sk);
-      rc = agent_scd_pksign (snbuf, 0,
-                             tmpbuf, tmp_n,
-                             &rbuf, &rbuflen);
-      xfree (snbuf);
-      if (!rc)
-        {
-          if (gcry_mpi_scan (&sig->data[0], GCRYMPI_FMT_USG,
-                             rbuf, rbuflen, NULL ))
-            BUG ();
-        }
-    }
-  else
-#endif 
-      if (sk->is_protected && sk->protect.s2k.mode == 1002)
+  if (sk->is_protected && sk->protect.s2k.mode == 1002)
     { /* FIXME: Note that we do only support RSA for now. */
       char *rbuf;
       size_t rbuflen;
diff --git a/scd/ChangeLog b/scd/ChangeLog
index e8c4cc88b..a55707ad2 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-28  Werner Koch  <[email protected]>
+
+	* app-openpgp.c (dump_all_do): Use gpg_err_code and not gpg_error.
+
 2003-09-19  Werner Koch  <[email protected]>
 
 	* ccid-driver.c (parse_ccid_descriptor): New.
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 7f6114292..7a49edfe5 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -228,7 +228,7 @@ dump_all_do (int slot)
         continue;
 
       rc = iso7816_get_data (slot, data_objects[i].tag, &buffer, &buflen);
-      if (gpg_error (rc) == GPG_ERR_NO_OBJ)
+      if (gpg_err_code (rc) == GPG_ERR_NO_OBJ)
         ;
       else if (rc) 
         log_info ("DO `%s' not available: %s\n",