mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* gpgsm.c (main): Use the log file only in server mode.
* import.c (print_imported_summary): New. (check_and_store): Update the counters, take new argument. (import_one): Factored out core of gpgsm_import. (gpgsm_import): Print counters. (gpgsm_import_files): New. * gpgsm.c (main): Use the new function for import.
This commit is contained in:
parent
12fb1e6d55
commit
e18e3875b7
6 changed files with 156 additions and 32 deletions
|
@ -327,12 +327,15 @@ gpgsm_decrypt (CTRL ctrl, int in_fd, FILE *out_fp)
|
|||
mode = gcry_cipher_mode_from_oid (algoid);
|
||||
if (!algo || !mode)
|
||||
{
|
||||
rc = GNUPG_Unsupported_Algorithm;
|
||||
log_error ("unsupported algorithm `%s'\n", algoid? algoid:"?");
|
||||
if (algoid && !strcmp (algoid, "1.2.840.113549.3.2"))
|
||||
log_info (_("(this is the RC2 algorithm)\n"));
|
||||
else if (!algoid)
|
||||
log_info (_("(this does not seem to be an encrypted"
|
||||
" message)\n"));
|
||||
gpgsm_status2 (ctrl, STATUS_ERROR, "decrypt.algorithm",
|
||||
gnupg_error_token (rc), algoid, NULL);
|
||||
rc = GNUPG_Unsupported_Algorithm;
|
||||
gnupg_error_token (rc), algoid?algoid:"?", NULL);
|
||||
goto leave;
|
||||
}
|
||||
dfparm.algo = algo;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue