s/AES/AES128/ in diagnostics and --list-config

[gnupg.git] / agent / cvt-openpgp.c

diff --git a/agent/cvt-openpgp.c b/agent/cvt-openpgp.c
index 8105ae6..e6a14c4 100644 (file)
--- a/agent/cvt-openpgp.c
+++ b/agent/cvt-openpgp.c
@@ -126,6 +126,7 @@ convert_secret_key (gcry_sexp_t *r_key, int pubkey_algo, gcry_mpi_t *skey)
                              "(private-key(rsa(n%m)(e%m)(d%m)(p%m)(q%m)(u%m)))",
                              skey[0], skey[1], skey[2], skey[3], skey[4],
                              skey[5]);
                              "(private-key(rsa(n%m)(e%m)(d%m)(p%m)(q%m)(u%m)))",
                              skey[0], skey[1], skey[2], skey[3], skey[4],
                              skey[5]);

+      break;

 
     default:
       err = gpg_error (GPG_ERR_PUBKEY_ALGO);
 
     default:
       err = gpg_error (GPG_ERR_PUBKEY_ALGO);


@@ -282,7 +283,7 @@ do_unprotect (const char *passphrase,
          the OpenPGP algorithm numbers map one-to-one to the Libgcrypt
          numbers.  */
       log_info (_("protection algorithm %d (%s) is not supported\n"),
          the OpenPGP algorithm numbers map one-to-one to the Libgcrypt
          numbers.  */
       log_info (_("protection algorithm %d (%s) is not supported\n"),

-                protect_algo, gcry_cipher_algo_name (protect_algo));
+                protect_algo, gnupg_cipher_algo_name (protect_algo));

       return gpg_error (GPG_ERR_CIPHER_ALGO);
     }
 
       return gpg_error (GPG_ERR_CIPHER_ALGO);
     }
 


@@ -779,7 +780,7 @@ convert_from_openpgp (ctrl_t ctrl, gcry_sexp_t s_pgp,
         err = try_do_unprotect_cb (pi);
     }
   if (gpg_err_code (err) == GPG_ERR_BAD_PASSPHRASE)
         err = try_do_unprotect_cb (pi);
     }
   if (gpg_err_code (err) == GPG_ERR_BAD_PASSPHRASE)

-    err = agent_askpin (ctrl, prompt, NULL, NULL, pi, NULL);
+    err = agent_askpin (ctrl, prompt, NULL, NULL, pi);

   skeyidx = pi_arg.skeyidx;
   if (!err)
     {
   skeyidx = pi_arg.skeyidx;
   if (!err)
     {