From 6f2e2cc2b171ed4a631d26590eb4ccd4a89347b2 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 9 Feb 2021 16:00:13 +0900 Subject: Imported Upstream version 2.1.15 --- sm/gpgsm.c | 11 ++++------- sm/keylist.c | 1 - sm/server.c | 6 ++---- sm/sign.c | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) (limited to 'sm') diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 9b7dd4b..e3b1e88 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -930,7 +930,7 @@ main ( int argc, char **argv) /* Please note that we may running SUID(ROOT), so be very CAREFUL when adding any stuff between here and the call to secmem_init() somewhere after the option parsing */ - log_set_prefix (GPGSM_NAME, 1); + log_set_prefix (GPGSM_NAME, GPGRT_LOG_WITH_PREFIX); /* Make sure that our subsystems are ready. */ i18n_init (); @@ -938,9 +938,6 @@ main ( int argc, char **argv) /* Check that the libraries are suitable. Do it here because the option parse may need services of the library */ - if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) ) - log_fatal (_("%s is too old (need %s, have %s)\n"), "libgcrypt", - NEED_LIBGCRYPT_VERSION, gcry_check_version (NULL) ); if (!ksba_check_version (NEED_KSBA_VERSION) ) log_fatal (_("%s is too old (need %s, have %s)\n"), "libksba", NEED_KSBA_VERSION, ksba_check_version (NULL) ); @@ -1510,7 +1507,7 @@ main ( int argc, char **argv) if (logfile && cmd == aServer) { log_set_file (logfile); - log_set_prefix (NULL, 1|2|4); + log_set_prefix (NULL, GPGRT_LOG_WITH_PREFIX | GPGRT_LOG_WITH_TIME | GPGRT_LOG_WITH_PID); } if (gnupg_faked_time_p ()) @@ -1681,7 +1678,7 @@ main ( int argc, char **argv) /* Build the recipient list. We first add the regular ones and then the encrypt-to ones because the underlying function will silently - ignore duplicates and we can't allow to keep a duplicate which is + ignore duplicates and we can't allow keeping a duplicate which is flagged as encrypt-to as the actually encrypt function would then complain about no (regular) recipients. */ for (sl = remusr; sl; sl = sl->next) @@ -1785,7 +1782,7 @@ main ( int argc, char **argv) { estream_t fp = open_es_fwrite (opt.outfile?opt.outfile:"-"); - /* Fixme: We should also allow to concatenate multiple files for + /* Fixme: We should also allow concatenation of multiple files for signing because that is what gpg does.*/ set_binary (stdin); if (!argc) /* Create from stdin. */ diff --git a/sm/keylist.c b/sm/keylist.c index dab1295..0d975c3 100644 --- a/sm/keylist.c +++ b/sm/keylist.c @@ -494,7 +494,6 @@ list_cert_colon (ctrl_t ctrl, ksba_cert_t cert, unsigned int validity, es_putc (':', fp); /* Field 12, capabilities: */ print_capabilities (cert, fp); - es_putc (':', fp); /* Field 13, not used: */ es_putc (':', fp); if (have_secret || ctrl->with_secret) diff --git a/sm/server.c b/sm/server.c index 8b4a29c..ce8085d 100644 --- a/sm/server.c +++ b/sm/server.c @@ -1039,7 +1039,7 @@ static const char hlp_getauditlog[] = "If --data is used, the output is send using D-lines and not to the\n" "file descriptor given by an OUTPUT command.\n" "\n" - "If --html is used the output is formated as an XHTML block. This is\n" + "If --html is used the output is formatted as an XHTML block. This is\n" "designed to be incorporated into a HTML document."; static gpg_error_t cmd_getauditlog (assuan_context_t ctx, char *line) @@ -1318,9 +1318,7 @@ gpgsm_server (certlist_t default_recplist) "%s", gnupg_homedir (), opt.config_filename, - (dirmngr_user_socket_name () - ? dirmngr_user_socket_name () - : dirmngr_sys_socket_name ()), + dirmngr_socket_name (), hello) > 0) { assuan_set_hello_line (ctx, tmp); diff --git a/sm/sign.c b/sm/sign.c index 08eebb7..6cb1f86 100644 --- a/sm/sign.c +++ b/sm/sign.c @@ -109,7 +109,7 @@ hash_and_copy_data (int fd, gcry_md_hd_t md, ksba_writer_t writer) es_fclose (fp); if (!any) { - /* We can't allow to sign an empty message because it does not + /* We can't allow signing an empty message because it does not make much sense and more seriously, ksba_cms_build has already written the tag for data and now expects an octet string and an octet string of size 0 is illegal. */ -- cgit v1.2.3