2 files changed, 10 insertions, 10 deletions

diff --git a/scd/card.c b/scd/card.c
index c3c563cb0..574867a58 100644
--- a/scd/card.c
+++ b/scd/card.c
@@ -52,7 +52,7 @@ map_sc_err (int rc)
 #endif
     default: e = GPG_ERR_CARD; break;
     }
-  return gpg_make_error (GPG_ERR_SOURCE_UNKNOWN, e);
+  return gpg_err_make (GPG_ERR_SOURCE_UNKNOWN, e);
 }
 
 /* Get the keygrip from CERT, return 0 on success */
@@ -443,7 +443,7 @@ card_enum_keypairs (CARD card, int idx,
   rc = card->fnc.enum_keypairs (card, idx, keygrip, keyid);
   if (opt.verbose)
     log_info ("card operation enum_keypairs result: %s\n",
-              gnupg_strerror (rc));
+              gpg_strerror (rc));
   return rc;
 }
 
@@ -475,7 +475,7 @@ card_enum_certs (CARD card, int idx, char **certid, int *certtype)
   rc = card->fnc.enum_certs (card, idx, certid, certtype);
   if (opt.verbose)
     log_info ("card operation enum_certs result: %s\n",
-              gnupg_strerror (rc));
+              gpg_strerror (rc));
   return rc;
 }
 
@@ -499,7 +499,7 @@ card_read_cert (CARD card, const char *certidstr,
     return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
   rc = card->fnc.read_cert (card, certidstr, cert, ncert);
   if (opt.verbose)
-    log_info ("card operation read_cert result: %s\n", gnupg_strerror (rc));
+    log_info ("card operation read_cert result: %s\n", gpg_strerror (rc));
   return rc;
 }
 
@@ -527,7 +527,7 @@ card_sign (CARD card, const char *keyidstr, int hashalgo,
                         indata, indatalen,
                         outdata, outdatalen);
   if (opt.verbose)
-    log_info ("card operation sign result: %s\n", gnupg_strerror (rc));
+    log_info ("card operation sign result: %s\n", gpg_strerror (rc));
   return rc;
 }
 
@@ -555,6 +555,6 @@ card_decipher (CARD card, const char *keyidstr,
                             indata, indatalen,
                             outdata, outdatalen);
   if (opt.verbose)
-    log_info ("card operation decipher result: %s\n", gnupg_strerror (rc));
+    log_info ("card operation decipher result: %s\n", gpg_strerror (rc));
   return rc;
 }
diff --git a/scd/command.c b/scd/command.c
index 6c30d3de7..8267c13ab 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -317,7 +317,7 @@ cmd_readcert (ASSUAN_CONTEXT ctx, char *line)
   rc = card_read_cert (ctrl->card_ctx, line, &cert, &ncert);
   if (rc)
     {
-      log_error ("card_read_cert failed: %s\n", gnupg_strerror (rc));
+      log_error ("card_read_cert failed: %s\n", gpg_strerror (rc));
     }
   if (!rc)
     {
@@ -351,7 +351,7 @@ cmd_readkey (ASSUAN_CONTEXT ctx, char *line)
   rc = card_read_cert (ctrl->card_ctx, line, &cert, &ncert);
   if (rc)
     {
-      log_error ("card_read_cert failed: %s\n", gnupg_strerror (rc));
+      log_error ("card_read_cert failed: %s\n", gpg_strerror (rc));
       goto leave;
     }
       
@@ -488,7 +488,7 @@ cmd_pksign (ASSUAN_CONTEXT ctx, char *line)
   free (keyidstr);
   if (rc)
     {
-      log_error ("card_sign failed: %s\n", gnupg_strerror (rc));
+      log_error ("card_sign failed: %s\n", gpg_strerror (rc));
     }
   else
     {
@@ -527,7 +527,7 @@ cmd_pkdecrypt (ASSUAN_CONTEXT ctx, char *line)
   free (keyidstr);
   if (rc)
     {
-      log_error ("card_create_signature failed: %s\n", gnupg_strerror (rc));
+      log_error ("card_create_signature failed: %s\n", gpg_strerror (rc));
     }
   else
     {