+2021-09-15 Werner Koch <wk@gnupg.org>
+
+ Release 2.2.31.
+ + commit ecf4c2f611238799a3af6369a64e418a77ab9dd6
+
+
+2021-09-14 Werner Koch <wk@gnupg.org>
+
+ scd: Remove context reference counting from pc/sc.
+ + commit 67e1834ad402e86906429ba0e2bf7ebd72de2450
+ * scd/apdu.c (pcsc): Add flag context_valid, remove count.
+ (close_pcsc_reader): Use new flag instead of looking at magic context
+ value.
+ (pcsc_init): Set new flag.
+ (open_pcsc_reader): Use new flag.
+ (apdu_init): Clear new flag.
+
+ * scd/apdu.c: Remove assert.h. Replace all assert by log_assert.
+
+2021-09-13 Werner Koch <wk@gnupg.org>
+
+ common: New envvar GNUPG_EXEC_DEBUG_FLAGS.
+ + commit 117afec018911a3b0187f15c8559f811a72ddb79
+ * common/exechelp-w32.c (gnupg_spawn_process_detached): Silence
+ breakaway messages and turn them again into debug messages.
+
+2021-09-08 Werner Koch <wk@gnupg.org>
+
+ scd: Support PC/SC for "getinfo reader_list".
+ + commit f32994b0bf07d62bf596cc8bb6ec3c3a5f133ac4
+ * scd/apdu.c: Include membuf.h.
+ (pcsc): Add reader_list field.
+ (open_pcsc_reader): Fill that field.
+ (apdu_get_reader_list): New.
+ * scd/command.c: Remove header ccid-driver.h.
+ (pretty_assuan_send_data): New.
+ (cmd_getinfo): Print all reader names.
+
+2021-09-07 Werner Koch <wk@gnupg.org>
+
+ scd: Fix possible assertion in close_pcsc_reader.
+ + commit 192113552faa98f40cc91fe014ec55861474626c
+ * scd/apdu.c (close_pcsc_reader): Don't ref-count if the context is
+ invalid.
+ (open_pcsc_reader): Compare the context against -1 which is our
+ indicator for an invalid context.
+
+ agent: Fix segv in GET_PASSPHRASE (regression)
+ + commit 4b2cfec2dc2fd524a4fed6c17bb11e6a7baf15f2
+ * agent/command.c (cmd_get_passphrase): Do not deref PI. PI is always
+ NULL.
+
+2021-08-27 NIIBE Yutaka <gniibe@fsij.org>
+
+ common: Fix put_membuf.
+ + commit 7e431e009e479e63f0996a612e12fb9d8b209ab9
+ * common/membuf.c (put_membuf): Allow NULL for the second arg.
+
+ build: Fix removal of AC_TYPE_SIGNAL.
+ + commit 0ca84cbdf0a5a956f4de80f874f8a3b495cfab20
+ * configure.ac: AC_TYPE_SIGNAL is still needed.
+
+ common: Fix get_signal_name for GNU/Linux.
+ + commit d5f9481186eaf2ff28d7ab04fd36f0bbd1c9714d
+ * common/signal.c (get_signal_name): Use sigdescr_np if available.
+ * configure.ac: Check the function.
+
2021-08-26 Werner Koch <wk@gnupg.org>
Release 2.2.30.
+Noteworthy changes in version 2.2.31 (2021-09-15)
+-------------------------------------------------
+
+ * agent: Fix a regression in GET_PASSPHRASE. [#5577]
+
+ * scd: Fix an assertion failure in close_pcsc_reader. [67e1834ad4]
+
+ * scd: Add support for PC/SC in "GETINFO reader_list".
+
+ Release-info: https://dev.gnupg.org/T5571
+ See-also: gnupg-announce/2021q3/000464.html
+
+
Noteworthy changes in version 2.2.30 (2021-08-26)
-------------------------------------------------
* Under Windows use LOCAL_APPDATA for the socket directory. [#5537]
Release-info: https://dev.gnupg.org/T5519
- See-also: gnupg-announce/2021q3/000462.html
+ See-also: gnupg-announce/2021q3/000463.html
Noteworthy changes in version 2.2.29 (2021-07-04)
opt_qualbar, cacheid, CACHE_MODE_USER, NULL);
xfree (entry_errtext);
entry_errtext = NULL;
- is_generated = !!(pi->status & PINENTRY_STATUS_PASSWORD_GENERATED);
+ is_generated = 0;
if (!rc)
{
BOOL in_job = FALSE;
gpg_err_code_t ec;
int rc;
+ int jobdebug;
/* We don't use ENVP. */
(void)envp;
+ cmdline = getenv ("GNUPG_EXEC_DEBUG_FLAGS");
+ jobdebug = (cmdline && (atoi (cmdline) & 1));
+
if ((ec = gnupg_access (pgmname, X_OK)))
return gpg_err_make (default_errsource, ec);
else if ((info.BasicLimitInformation.LimitFlags &
JOB_OBJECT_LIMIT_BREAKAWAY_OK))
{
- log_info ("Using CREATE_BREAKAWAY_FROM_JOB flag\n");
+ if (jobdebug)
+ log_debug ("Using CREATE_BREAKAWAY_FROM_JOB flag\n");
cr_flags |= CREATE_BREAKAWAY_FROM_JOB;
}
else if ((info.BasicLimitInformation.LimitFlags &
JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK))
{
/* The child process should automatically detach from the job. */
- log_info ("Not using CREATE_BREAKAWAY_FROM_JOB flag; "
- "JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK is set\n");
+ if (jobdebug)
+ log_debug ("Not using CREATE_BREAKAWAY_FROM_JOB flag; "
+ "JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK is set\n");
}
else
{
/* It seems that the child process must remain in the job.
* This is not necessarily an error, although it can cause premature
* termination of the child process when the job is closed. */
- log_info ("Not using CREATE_BREAKAWAY_FROM_JOB flag\n");
+ if (jobdebug)
+ log_debug ("Not using CREATE_BREAKAWAY_FROM_JOB flag\n");
}
}
+ else
+ {
+ if (jobdebug)
+ log_debug ("Process is not in a Job\n");
+ }
/* log_debug ("CreateProcess(detached), path='%s' cmdline='%s'\n", */
/* pgmname, cmdline); */
}
mb->buf = p;
}
- memcpy (mb->buf + mb->len, buf, len);
+ if (buf)
+ memcpy (mb->buf + mb->len, buf, len);
+ else
+ memset (mb->buf + mb->len, 0, len);
mb->len += len;
}
{
/* Note that we can't use strsignal(), because it is not
reentrant. */
-#if HAVE_DECL_SYS_SIGLIST && defined(NSIG)
+#if HAVE_SIGDESCR_NP
+ return sigdescr_np (signum);
+#elif HAVE_DECL_SYS_SIGLIST && defined(NSIG)
return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?";
#else
return NULL;
/* Define to 1 if you have the `sigaction' function. */
#undef HAVE_SIGACTION
+/* Define to 1 if you have the `sigdescr_np' function. */
+#undef HAVE_SIGDESCR_NP
+
/* Define to 1 if you have the <signal.h> header file. */
#undef HAVE_SIGNAL_H
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gnupg 2.2.30.
+# Generated by GNU Autoconf 2.69 for gnupg 2.2.31.
#
# Report bugs to <https://bugs.gnupg.org>.
#
# Identity of this package.
PACKAGE_NAME='gnupg'
PACKAGE_TARNAME='gnupg'
-PACKAGE_VERSION='2.2.30'
-PACKAGE_STRING='gnupg 2.2.30'
+PACKAGE_VERSION='2.2.31'
+PACKAGE_STRING='gnupg 2.2.31'
PACKAGE_BUGREPORT='https://bugs.gnupg.org'
PACKAGE_URL=''
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gnupg 2.2.30 to adapt to many kinds of systems.
+\`configure' configures gnupg 2.2.31 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gnupg 2.2.30:";;
+ short | recursive ) echo "Configuration of gnupg 2.2.31:";;
esac
cat <<\_ACEOF
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gnupg configure 2.2.30
+gnupg configure 2.2.31
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gnupg $as_me 2.2.30, which was
+It was created by gnupg $as_me 2.2.31, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
# Define the identity of the package.
PACKAGE='gnupg'
- VERSION='2.2.30'
+ VERSION='2.2.31'
cat >>confdefs.h <<_ACEOF
_ACEOF
+for ac_func in sigdescr_np
+do :
+ ac_fn_c_check_func "$LINENO" "sigdescr_np" "ac_cv_func_sigdescr_np"
+if test "x$ac_cv_func_sigdescr_np" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGDESCR_NP 1
+_ACEOF
+
+fi
+done
+
ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "#include <signal.h>
/* NetBSD declares sys_siglist in unistd.h. */
#ifdef HAVE_UNISTD_H
#
# Provide information about the build.
#
-BUILD_REVISION="d583e750a"
+BUILD_REVISION="ecf4c2f61"
cat >>confdefs.h <<_ACEOF
BUILD_VERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./'`
-BUILD_VERSION="${BUILD_VERSION}54659"
+BUILD_VERSION="${BUILD_VERSION}60660"
BUILD_FILEVERSION=`echo "${BUILD_VERSION}" | tr . ,`
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gnupg $as_me 2.2.30, which was
+This file was extended by gnupg $as_me 2.2.31, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gnupg config.status 2.2.30
+gnupg config.status 2.2.31
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
echo "
GnuPG v${VERSION} has been configured as follows:
- Revision: d583e750a (54659)
+ Revision: ecf4c2f61 (60660)
Platform: $PRINTABLE_OS_NAME ($host)
OpenPGP: $build_gpg
m4_define([mym4_package],[gnupg])
m4_define([mym4_major], [2])
m4_define([mym4_minor], [2])
-m4_define([mym4_micro], [30])
+m4_define([mym4_micro], [31])
# To start a new development series, i.e a new major or minor number
# you need to mark an arbitrary commit before the first beta release
AC_TYPE_SIZE_T
AC_TYPE_MODE_T
AC_TYPE_SIGNAL
+AC_CHECK_FUNCS([sigdescr_np])
AC_DECL_SYS_SIGLIST
gl_HEADER_SYS_SOCKET
17 0 obj
<<
/Title (þÿ\0g\0n\0u\0p\0g\0-\0m\0o\0d\0u\0l\0e\0-\0o\0v\0e\0r\0v\0i\0e\0w\0\0)
-/CreationDate (D:20210826182250)
-/ModDate (D:20210826182250)
+/CreationDate (D:20210915165557)
+/ModDate (D:20210915165557)
/Producer (https://imagemagick.org)
>>
endobj
This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
-This is the 'The GNU Privacy Guard Manual' (version 2.2.30-beta2, August
-2021).
+This is the 'The GNU Privacy Guard Manual' (version 2.2.31-beta7,
+September 2021).
(C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
(C) 2013, 2014, 2015 Werner Koch.
\1f
Indirect:
-gnupg.info-1: 989
-gnupg.info-2: 303649
+gnupg.info-1: 992
+gnupg.info-2: 301013
\1f
Tag Table:
(Indirect)
-Node: Top\7f989
-Node: Installation\7f2915
-Node: Invoking GPG-AGENT\7f5264
+Node: Top\7f992
+Node: Installation\7f2921
+Node: Invoking GPG-AGENT\7f5270
Node: Agent Commands\7f7030
Node: Agent Options\7f8834
Ref: option --options\7f9114
Ref: option --homedir\7f9440
-Ref: option --log-file\7f14481
-Ref: option --no-allow-mark-trusted\7f14854
-Ref: option --allow-preset-passphrase\7f15058
-Ref: option --no-allow-loopback-pinentry\7f15211
-Ref: option --extra-socket\7f23564
-Ref: option --enable-ssh-support\7f25030
-Ref: option --ssh-fingerprint-digest\7f27367
-Node: Agent Configuration\7f29024
-Node: Agent Signals\7f34422
-Node: Agent Examples\7f35882
-Node: Agent Protocol\7f36449
-Node: Agent PKDECRYPT\7f38603
-Node: Agent PKSIGN\7f40515
-Node: Agent GENKEY\7f42819
-Node: Agent IMPORT\7f44716
-Node: Agent EXPORT\7f45160
-Node: Agent ISTRUSTED\7f45375
-Node: Agent GET_PASSPHRASE\7f47750
-Node: Agent CLEAR_PASSPHRASE\7f50191
-Node: Agent PRESET_PASSPHRASE\7f50582
-Node: Agent GET_CONFIRMATION\7f51420
-Node: Agent HAVEKEY\7f52092
-Node: Agent LEARN\7f52724
-Node: Agent PASSWD\7f53022
-Node: Agent UPDATESTARTUPTTY\7f53488
-Node: Agent GETEVENTCOUNTER\7f53966
-Node: Agent GETINFO\7f54768
-Node: Agent OPTION\7f55472
-Node: Invoking DIRMNGR\7f58530
-Node: Dirmngr Commands\7f59428
-Node: Dirmngr Options\7f61881
-Ref: Dirmngr Options-Footnote-1\7f79036
-Node: Dirmngr Configuration\7f79171
-Node: Dirmngr Signals\7f82301
-Node: Dirmngr Examples\7f83329
-Node: Dirmngr Protocol\7f84011
-Node: Dirmngr LOOKUP\7f84661
-Node: Dirmngr ISVALID\7f86032
-Node: Dirmngr CHECKCRL\7f88605
-Node: Dirmngr CHECKOCSP\7f89662
-Node: Dirmngr CACHECERT\7f90968
-Node: Dirmngr VALIDATE\7f91807
-Node: Invoking GPG\7f92375
-Node: GPG Commands\7f93605
-Node: General GPG Commands\7f94499
-Node: Operational GPG Commands\7f95188
-Ref: option --export-ownertrust\7f112490
-Node: OpenPGP Key Management\7f114603
-Node: GPG Options\7f136564
-Node: GPG Configuration Options\7f137897
-Ref: gpg-option --options\7f151398
-Ref: trust-model-tofu\7f155966
-Node: GPG Key related Options\7f176146
-Node: GPG Input and Output\7f181342
-Node: OpenPGP Options\7f195046
-Node: Compliance Options\7f199774
-Node: GPG Esoteric Options\7f202925
-Ref: GPG Esoteric Options-Footnote-1\7f230034
-Node: Deprecated Options\7f230188
-Node: GPG Configuration\7f231691
-Node: GPG Examples\7f237161
-Node: Unattended Usage of GPG\7f245971
-Node: Programmatic use of GnuPG\7f246602
-Node: Ephemeral home directories\7f247153
-Node: The quick key manipulation interface\7f248460
-Node: Unattended GPG key generation\7f249047
-Node: Invoking GPGSM\7f258366
-Node: GPGSM Commands\7f259235
-Node: General GPGSM Commands\7f259673
-Node: Operational GPGSM Commands\7f260361
-Node: Certificate Management\7f262395
-Node: GPGSM Options\7f267371
-Node: Configuration Options\7f267945
-Ref: gpgsm-option --options\7f268214
-Node: Certificate Options\7f271494
-Ref: gpgsm-option --validation-model\7f275098
-Node: Input and Output\7f276078
-Ref: option --p12-charset\7f276661
-Ref: gpgsm-option --with-key-data\7f277905
-Ref: gpgsm-option --with-validation\7f278179
-Node: CMS Options\7f279057
-Node: Esoteric Options\7f280077
-Node: GPGSM Configuration\7f285504
-Node: GPGSM Examples\7f291172
-Node: Unattended Usage\7f291369
-Node: Automated signature checking\7f291960
-Node: CSR and certificate creation\7f293783
-Node: GPGSM Protocol\7f298729
-Node: GPGSM ENCRYPT\7f299985
-Node: GPGSM DECRYPT\7f303649
-Node: GPGSM SIGN\7f304485
-Node: GPGSM VERIFY\7f305941
-Node: GPGSM GENKEY\7f306457
-Node: GPGSM LISTKEYS\7f307472
-Ref: gpgsm-cmd listkeys\7f307631
-Node: GPGSM EXPORT\7f308384
-Node: GPGSM IMPORT\7f309348
-Node: GPGSM DELETE\7f310089
-Node: GPGSM GETAUDITLOG\7f310596
-Ref: gpgsm-cmd getauditlog\7f310765
-Node: GPGSM GETINFO\7f311109
-Node: GPGSM OPTION\7f311958
-Node: Invoking SCDAEMON\7f315311
-Node: Scdaemon Commands\7f315985
-Node: Scdaemon Options\7f317113
-Node: Card applications\7f326463
-Node: OpenPGP Card\7f327128
-Node: NKS Card\7f327601
-Node: DINSIG Card\7f327927
-Node: PKCS#15 Card\7f328303
-Node: Geldkarte Card\7f328573
-Node: SmartCard-HSM\7f328964
-Node: Undefined Card\7f329560
-Node: Scdaemon Configuration\7f329973
-Node: Scdaemon Examples\7f331011
-Node: Scdaemon Protocol\7f331194
-Node: Scdaemon SERIALNO\7f332713
-Node: Scdaemon LEARN\7f333559
-Node: Scdaemon READCERT\7f334406
-Node: Scdaemon READKEY\7f334808
-Node: Scdaemon PKSIGN\7f335094
-Node: Scdaemon PKDECRYPT\7f335820
-Node: Scdaemon GETATTR\7f336570
-Node: Scdaemon SETATTR\7f336772
-Node: Scdaemon WRITEKEY\7f336977
-Node: Scdaemon GENKEY\7f337679
-Node: Scdaemon RANDOM\7f337882
-Node: Scdaemon PASSWD\7f338105
-Node: Scdaemon CHECKPIN\7f338496
-Node: Scdaemon RESTART\7f339499
-Node: Scdaemon APDU\7f340032
-Node: Specify a User ID\7f341005
-Ref: how-to-specify-a-user-id\7f341163
-Node: Trust Values\7f346021
-Ref: trust-values\7f346150
-Node: Helper Tools\7f346755
-Node: watchgnupg\7f347607
-Ref: option watchgnupg --tcp\7f348429
-Node: gpgv\7f350007
-Node: addgnupghome\7f355206
-Node: gpgconf\7f355902
-Ref: gpgconf-Footnote-1\7f358089
-Node: Invoking gpgconf\7f358387
-Node: Format conventions\7f364972
-Node: Listing components\7f370303
-Node: Checking programs\7f372386
-Node: Listing options\7f375124
-Node: Changing options\7f382620
-Node: Listing global options\7f384322
-Node: Querying versions\7f386093
-Node: Files used by gpgconf\7f388791
-Node: applygnupgdefaults\7f389267
-Node: gpg-preset-passphrase\7f390011
-Node: Invoking gpg-preset-passphrase\7f391046
-Node: gpg-connect-agent\7f392448
-Node: Invoking gpg-connect-agent\7f393162
-Node: Controlling gpg-connect-agent\7f396708
-Node: dirmngr-client\7f403181
-Node: gpgparsemail\7f406532
-Node: gpgtar\7f406845
-Node: gpg-check-pattern\7f410804
-Node: Web Key Service\7f413106
-Node: gpg-wks-client\7f413419
-Node: gpg-wks-server\7f418584
-Node: Howtos\7f423941
-Node: Howto Create a Server Cert\7f424213
-Node: System Notes\7f432626
-Node: W32 Notes\7f433837
-Node: Debugging\7f434259
-Node: Debugging Tools\7f435087
-Node: kbxutil\7f435367
-Node: Debugging Hints\7f436898
-Node: Common Problems\7f438029
-Node: Architecture Details\7f443266
-Node: Component interaction\7f443576
-Ref: fig:moduleoverview\7f443762
-Node: GnuPG-1 and GnuPG-2\7f443869
-Ref: fig:cardarchitecture\7f444159
-Node: Copying\7f444274
-Node: Contributors\7f481798
-Node: Glossary\7f488053
-Node: Option Index\7f490572
-Node: Environment Index\7f570427
-Node: Index\7f575874
+Ref: option --log-file\7f14478
+Ref: option --no-allow-mark-trusted\7f14851
+Ref: option --allow-preset-passphrase\7f15055
+Ref: option --no-allow-loopback-pinentry\7f15208
+Ref: option --extra-socket\7f23572
+Ref: option --enable-ssh-support\7f25038
+Ref: option --ssh-fingerprint-digest\7f27375
+Node: Agent Configuration\7f29032
+Node: Agent Signals\7f34457
+Node: Agent Examples\7f35917
+Node: Agent Protocol\7f36484
+Node: Agent PKDECRYPT\7f38638
+Node: Agent PKSIGN\7f40550
+Node: Agent GENKEY\7f42854
+Node: Agent IMPORT\7f44751
+Node: Agent EXPORT\7f45195
+Node: Agent ISTRUSTED\7f45410
+Node: Agent GET_PASSPHRASE\7f47785
+Node: Agent CLEAR_PASSPHRASE\7f50226
+Node: Agent PRESET_PASSPHRASE\7f50617
+Node: Agent GET_CONFIRMATION\7f51455
+Node: Agent HAVEKEY\7f52127
+Node: Agent LEARN\7f52759
+Node: Agent PASSWD\7f53057
+Node: Agent UPDATESTARTUPTTY\7f53523
+Node: Agent GETEVENTCOUNTER\7f54001
+Node: Agent GETINFO\7f54803
+Node: Agent OPTION\7f55507
+Node: Invoking DIRMNGR\7f58565
+Node: Dirmngr Commands\7f59463
+Node: Dirmngr Options\7f61916
+Ref: Dirmngr Options-Footnote-1\7f79071
+Node: Dirmngr Configuration\7f79206
+Node: Dirmngr Signals\7f82336
+Node: Dirmngr Examples\7f83364
+Node: Dirmngr Protocol\7f84046
+Node: Dirmngr LOOKUP\7f84696
+Node: Dirmngr ISVALID\7f86067
+Node: Dirmngr CHECKCRL\7f88640
+Node: Dirmngr CHECKOCSP\7f89697
+Node: Dirmngr CACHECERT\7f91003
+Node: Dirmngr VALIDATE\7f91842
+Node: Invoking GPG\7f92410
+Node: GPG Commands\7f93640
+Node: General GPG Commands\7f94534
+Node: Operational GPG Commands\7f95223
+Ref: option --export-ownertrust\7f112524
+Node: OpenPGP Key Management\7f114637
+Node: GPG Options\7f136596
+Node: GPG Configuration Options\7f137929
+Ref: gpg-option --options\7f151464
+Ref: trust-model-tofu\7f156032
+Node: GPG Key related Options\7f176209
+Node: GPG Input and Output\7f181405
+Node: OpenPGP Options\7f195109
+Node: Compliance Options\7f199837
+Node: GPG Esoteric Options\7f202988
+Ref: GPG Esoteric Options-Footnote-1\7f230058
+Node: Deprecated Options\7f230212
+Node: GPG Configuration\7f231715
+Node: GPG Examples\7f237196
+Node: Unattended Usage of GPG\7f246006
+Node: Programmatic use of GnuPG\7f246637
+Node: Ephemeral home directories\7f247188
+Node: The quick key manipulation interface\7f248495
+Node: Unattended GPG key generation\7f249082
+Node: Invoking GPGSM\7f258401
+Node: GPGSM Commands\7f259270
+Node: General GPGSM Commands\7f259708
+Node: Operational GPGSM Commands\7f260396
+Node: Certificate Management\7f262430
+Node: GPGSM Options\7f267406
+Node: Configuration Options\7f267980
+Ref: gpgsm-option --options\7f268249
+Node: Certificate Options\7f271523
+Ref: gpgsm-option --validation-model\7f275127
+Node: Input and Output\7f276107
+Ref: option --p12-charset\7f276690
+Ref: gpgsm-option --with-key-data\7f277934
+Ref: gpgsm-option --with-validation\7f278208
+Node: CMS Options\7f279086
+Node: Esoteric Options\7f280106
+Node: GPGSM Configuration\7f285533
+Node: GPGSM Examples\7f291208
+Node: Unattended Usage\7f291405
+Node: Automated signature checking\7f291996
+Node: CSR and certificate creation\7f293819
+Node: GPGSM Protocol\7f298765
+Node: GPGSM ENCRYPT\7f301013
+Node: GPGSM DECRYPT\7f303688
+Node: GPGSM SIGN\7f304524
+Node: GPGSM VERIFY\7f305980
+Node: GPGSM GENKEY\7f306496
+Node: GPGSM LISTKEYS\7f307511
+Ref: gpgsm-cmd listkeys\7f307670
+Node: GPGSM EXPORT\7f308423
+Node: GPGSM IMPORT\7f309387
+Node: GPGSM DELETE\7f310128
+Node: GPGSM GETAUDITLOG\7f310635
+Ref: gpgsm-cmd getauditlog\7f310804
+Node: GPGSM GETINFO\7f311148
+Node: GPGSM OPTION\7f311997
+Node: Invoking SCDAEMON\7f315350
+Node: Scdaemon Commands\7f316024
+Node: Scdaemon Options\7f317152
+Node: Card applications\7f326499
+Node: OpenPGP Card\7f327164
+Node: NKS Card\7f327637
+Node: DINSIG Card\7f327963
+Node: PKCS#15 Card\7f328339
+Node: Geldkarte Card\7f328609
+Node: SmartCard-HSM\7f329000
+Node: Undefined Card\7f329596
+Node: Scdaemon Configuration\7f330009
+Node: Scdaemon Examples\7f331047
+Node: Scdaemon Protocol\7f331230
+Node: Scdaemon SERIALNO\7f332757
+Node: Scdaemon LEARN\7f333603
+Node: Scdaemon READCERT\7f334450
+Node: Scdaemon READKEY\7f334852
+Node: Scdaemon PKSIGN\7f335138
+Node: Scdaemon PKDECRYPT\7f335864
+Node: Scdaemon GETATTR\7f336614
+Node: Scdaemon SETATTR\7f336816
+Node: Scdaemon WRITEKEY\7f337021
+Node: Scdaemon GENKEY\7f337723
+Node: Scdaemon RANDOM\7f337926
+Node: Scdaemon PASSWD\7f338149
+Node: Scdaemon CHECKPIN\7f338540
+Node: Scdaemon RESTART\7f339543
+Node: Scdaemon APDU\7f340076
+Node: Specify a User ID\7f341049
+Ref: how-to-specify-a-user-id\7f341207
+Node: Trust Values\7f346065
+Ref: trust-values\7f346194
+Node: Helper Tools\7f346799
+Node: watchgnupg\7f347651
+Ref: option watchgnupg --tcp\7f348473
+Node: gpgv\7f350051
+Node: addgnupghome\7f355247
+Node: gpgconf\7f355943
+Ref: gpgconf-Footnote-1\7f358130
+Node: Invoking gpgconf\7f358428
+Node: Format conventions\7f365010
+Node: Listing components\7f370341
+Node: Checking programs\7f372424
+Node: Listing options\7f375162
+Node: Changing options\7f382658
+Node: Listing global options\7f384360
+Node: Querying versions\7f386131
+Node: Files used by gpgconf\7f388829
+Node: applygnupgdefaults\7f389305
+Node: gpg-preset-passphrase\7f390049
+Node: Invoking gpg-preset-passphrase\7f391084
+Node: gpg-connect-agent\7f392486
+Node: Invoking gpg-connect-agent\7f393200
+Node: Controlling gpg-connect-agent\7f396743
+Node: dirmngr-client\7f403216
+Node: gpgparsemail\7f406567
+Node: gpgtar\7f406880
+Node: gpg-check-pattern\7f410839
+Node: Web Key Service\7f413141
+Node: gpg-wks-client\7f413454
+Node: gpg-wks-server\7f418619
+Node: Howtos\7f423976
+Node: Howto Create a Server Cert\7f424248
+Node: System Notes\7f432661
+Node: W32 Notes\7f433872
+Node: Debugging\7f434294
+Node: Debugging Tools\7f435122
+Node: kbxutil\7f435402
+Node: Debugging Hints\7f436933
+Node: Common Problems\7f438064
+Node: Architecture Details\7f443287
+Node: Component interaction\7f443597
+Ref: fig:moduleoverview\7f443783
+Node: GnuPG-1 and GnuPG-2\7f443890
+Ref: fig:cardarchitecture\7f444180
+Node: Copying\7f444295
+Node: Contributors\7f481819
+Node: Glossary\7f488074
+Node: Option Index\7f490593
+Node: Environment Index\7f570448
+Node: Index\7f575895
\1f
End Tag Table
This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
-This is the 'The GNU Privacy Guard Manual' (version 2.2.30-beta2, August
-2021).
+This is the 'The GNU Privacy Guard Manual' (version 2.2.31-beta7,
+September 2021).
(C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
(C) 2013, 2014, 2015 Werner Koch.
Using the GNU Privacy Guard
***************************
-This is the 'The GNU Privacy Guard Manual' (version 2.2.30-beta2, August
-2021).
+This is the 'The GNU Privacy Guard Manual' (version 2.2.31-beta7,
+September 2021).
(C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
(C) 2013, 2014, 2015 Werner Koch.
under the default filename (which is system dependent) or use the option
'pinentry-program' to specify the full name of that program. It is
often useful to install a symbolic link from the actual used pinentry
-(e.g. '/usr/local/bin/pinentry-gtk') to the expected one (e.g.
-'/usr/local/bin/pinentry').
+(e.g. 'INSTDIR/bin/pinentry-gtk') to the expected one (e.g.
+'INSTDIR/bin/pinentry').
*Note Option Index::, for an index to 'GPG-AGENT''s commands and
options.
directory; or, if 'gpgconf.exe' has been installed directly below a
directory named 'bin', its parent directory. You also need to make
sure that the following directories exist and are writable:
- 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ 'ROOT/home' for the GnuPG home and 'ROOTAPPDATA/GNU/cache/gnupg'
for internal cache files.
'-v'
entering a new passphrase matching one of these pattern a warning
will be displayed. If FILE does not contain any slashes and does
not start with "~/" it is searched in the system configuration
- directory ('/etc/gnupg'). The default is not to use any pattern
- file. The second version of this option is only used when creating
- a new symmetric key to allow the use of different patterns for such
- passphrases.
+ directory ('APPDATA/GNU/etc/gnupg'). The default is not to use any
+ pattern file. The second version of this option is only used when
+ creating a new symmetric key to allow the use of different patterns
+ for such passphrases.
Security note: It is known that checking a passphrase against a
list of pattern or even against a complete dictionary is not very
changed inadvertently.
As a special feature a line 'include-default' will include a global
- list of trusted certificates (e.g. '/etc/gnupg/trustlist.txt').
- This global list is also used if the local list is not available.
+ list of trusted certificates (e.g.
+ 'APPDATA/GNU/etc/gnupg/trustlist.txt'). This global list is also
+ used if the local list is not available.
It is possible to add further flags after the 'S' for use by the
caller:
directory and take great care to keep this backup closed away.
Note that on larger installations, it is useful to put predefined
-files into the directory '/etc/skel/.gnupg' so that newly created users
-start up with a working configuration. For existing users the a small
-helper script is provided to create these files (*note addgnupghome::).
+files into the directory 'APPDATA/GNU/etc/skel/.gnupg' so that newly
+created users start up with a working configuration. For existing users
+the a small helper script is provided to create these files (*note
+addgnupghome::).
\1f
File: gnupg.info, Node: Agent Signals, Next: Agent Examples, Prev: Agent Configuration, Up: Invoking GPG-AGENT
not to request a confirmation.
'--export'
- Either export all keys from all keyrings (default keyrings and
- those registered via option '--keyring'), or if at least one name
- is given, those of the given name. The exported keys are written
- to STDOUT or to the file given with option '--output'. Use
- together with '--armor' to mail those keys.
+ Either export all keys from all keyrings (default keyring and those
+ registered via option '--keyring'), or if at least one name is
+ given, those of the given name. The exported keys are written to
+ STDOUT or to the file given with option '--output'. Use together
+ with '--armor' to mail those keys.
'--send-keys KEYIDS'
Similar to '--export' but sends the keys to a keyserver.
bring older keys up to date.
save
- Save all changes to the keyrings and quit.
+ Save all changes to the keyring and quit.
quit
- Quit the program without updating the keyrings.
+ Quit the program without updating the keyring.
The listing shows you the key with its secondary keys and all user
IDs. The primary user ID is indicated by a dot, and selected keys
Add FILE to the current list of keyrings. If FILE begins with a
tilde and a slash, these are replaced by the $HOME directory. If
the filename does not contain a slash, it is assumed to be in the
- GnuPG home directory ("~/.gnupg" if '--homedir' or $GNUPGHOME is
- not used).
+ GnuPG home directory ("~/.gnupg" unless '--homedir' or $GNUPGHOME
+ is used).
Note that this adds a keyring to the current list. If the intent
is to use the specified keyring alone, use '--keyring' along with
If the option '--no-keyring' has been used no keyrings will be used
at all.
+'--primary-keyring FILE'
+ This is a varian of '--keyring' and designates FILE as the primary
+ public keyring. This means that newly imported keys (via
+ '--import' or keyserver '--recv-from') will go to this keyring.
+
'--secret-keyring FILE'
This is an obsolete option and ignored. All secret keys are stored
in the 'private-keys-v1.d' directory below the GnuPG home
directory.
-'--primary-keyring FILE'
- Designate FILE as the primary public keyring. This means that
- newly imported keys (via '--import' or keyserver '--recv-from')
- will go to this keyring.
-
'--trustdb-name FILE'
Use FILE instead of the default trustdb. If FILE begins with a
tilde and a slash, these are replaced by the $HOME directory. If
directory; or, if 'gpgconf.exe' has been installed directly below a
directory named 'bin', its parent directory. You also need to make
sure that the following directories exist and are writable:
- 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ 'ROOT/home' for the GnuPG home and 'ROOTAPPDATA/GNU/cache/gnupg'
for internal cache files.
'--display-charset NAME'
'--dirmngr-program FILE'
Specify a dirmngr program to be used for keyserver access. The
- default value is '/usr/local/bin/dirmngr'.
+ default value is 'INSTDIR/bin/dirmngr'.
'--disable-dirmngr'
Entirely disable the use of the Dirmngr.
invalid. This options allows to override this restriction.
'--no-default-keyring'
- Do not add the default keyrings to the list of keyrings. Note that
- GnuPG will not operate without any keyrings, so if you use this
- option and do not provide alternate keyrings via '--keyring' or
- '--secret-keyring', then GnuPG will still use the default public or
- secret keyrings.
+ Do not add the default keyring to the list of keyrings. Note that
+ GnuPG needs for almost all operations a keyring. Thus if you use
+ this option and do not provide alternate keyrings via '--keyring',
+ then GnuPG will still use the default keyring.
'--no-keyring'
Do not use any keyring at all. This overrides the default and all
--options::). You should backup this file.
Note that on larger installations, it is useful to put predefined
-files into the directory '/etc/skel/.gnupg' so that newly created users
-start up with a working configuration. For existing users a small
-helper script is provided to create these files (*note addgnupghome::).
+files into the directory 'APPDATA/GNU/etc/skel/.gnupg' so that newly
+created users start up with a working configuration. For existing users
+a small helper script is provided to create these files (*note
+addgnupghome::).
For internal purposes 'gpg' creates and maintains a few other files;
They all live in the current home directory (*note option --homedir::).
directory; or, if 'gpgconf.exe' has been installed directly below a
directory named 'bin', its parent directory. You also need to make
sure that the following directories exist and are writable:
- 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ 'ROOT/home' for the GnuPG home and 'ROOTAPPDATA/GNU/cache/gnupg'
for internal cache files.
'-v'
'--dirmngr-program FILE'
Specify a dirmngr program to be used for CRL checks. The default
- value is '/usr/local/bin/dirmngr'.
+ value is 'INSTDIR/bin/dirmngr'.
'--prefer-system-dirmngr'
This option is obsolete and ignored.
'trustlist.txt'.
This is a global file an installed in the data directory (e.g.
- '/usr/local/share/gnupg/qualified.txt'). GnuPG installs a suitable
+ 'INSTDIR/share/gnupg/qualified.txt'). GnuPG installs a suitable
file with root certificates as used in Germany. As new Root-CA
certificates may be issued over time, these entries may need to be
updated; new distributions of this software should come with an
localized versions use filenames like 'help.LL.txt' with LL
denoting the locale. GnuPG comes with a set of predefined help
files in the data directory (e.g.
- '/usr/local/share/gnupg/gnupg/help.de.txt') and allows overriding
- of any help item by help files stored in the system configuration
- directory (e.g. '/etc/gnupg/help.de.txt'). For a reference of the
- help file's syntax, please see the installed 'help.txt' file.
+ 'INSTDIR/share/gnupg/gnupg/help.de.txt') and allows overriding of
+ any help item by help files stored in the system configuration
+ directory (e.g. 'APPDATA/GNU/etc/gnupg/help.de.txt'). For a
+ reference of the help file's syntax, please see the installed
+ 'help.txt' file.
'com-certs.pem'
This file is a collection of common certificates used to populated
a newly created 'pubring.kbx'. An administrator may replace this
file with a custom one. The format is a concatenation of PEM
encoded X.509 certificates. This global file is installed in the
- data directory (e.g. '/usr/local/share/gnupg/com-certs.pem').
+ data directory (e.g. 'INSTDIR/share/gnupg/com-certs.pem').
Note that on larger installations, it is useful to put predefined
files into the directory '/etc/skel/.gnupg/' so that newly created users
* GPGSM GETINFO:: Information about the process
* GPGSM OPTION:: Session options.
-\1f
-File: gnupg.info, Node: GPGSM ENCRYPT, Next: GPGSM DECRYPT, Up: GPGSM Protocol
-
-5.6.1 Encrypting a Message
---------------------------
-
-Before encryption can be done the recipient must be set using the
-command:
-
- RECIPIENT USERID
-
- Set the recipient for the encryption. USERID should be the internal
-representation of the key; the server may accept any other way of
-specification. If this is a valid and trusted recipient the server does
-respond with OK, otherwise the return is an ERR with the reason why the
-recipient cannot be used, the encryption will then not be done for this
-recipient. If the policy is not to encrypt at all if not all recipients
-are valid, the client has to take care of this. All 'RECIPIENT'
-commands are cumulative until a 'RESET' or an successful 'ENCRYPT'
-command.
-
- INPUT FD[=N] [--armor|--base64|--binary]
-
- Set the file descriptor for the message to be encrypted to N.
-Obviously the pipe must be open at that point, the server establishes
-its own end. If the server returns an error the client should consider
-this session failed. If N is not given, this commands uses the last
-file descriptor passed to the application. *Note the assuan_sendfd
-function: (assuan)fun-assuan_sendfd, on how to do descriptor passing.
-
- The '--armor' option may be used to advise the server that the input
-data is in PEM format, '--base64' advises that a raw base-64 encoding is
-used, '--binary' advises of raw binary input (BER). If none of these
-options is used, the server tries to figure out the used encoding, but
-this may not always be correct.
-
- OUTPUT FD[=N] [--armor|--base64]
-
- Set the file descriptor to be used for the output (i.e. the
-encrypted message). Obviously the pipe must be open at that point, the
-server establishes its own end. If the server returns an error the
-client should consider this session failed.
-
- The option '--armor' encodes the output in PEM format, the '--base64'
-option applies just a base-64 encoding. No option creates binary output
-(BER).
-
- The actual encryption is done using the command
-
- ENCRYPT
-
- It takes the plaintext from the 'INPUT' command, writes to the
-ciphertext to the file descriptor set with the 'OUTPUT' command, take
-the recipients from all the recipients set so far. If this command
-fails the clients should try to delete all output currently done or
-otherwise mark it as invalid. 'GPGSM' does ensure that there will not
-be any security problem with leftover data on the output in this case.
-
- This command should in general not fail, as all necessary checks have
-been done while setting the recipients. The input and output pipes are
-closed.
-
This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
-This is the 'The GNU Privacy Guard Manual' (version 2.2.30-beta2, August
-2021).
+This is the 'The GNU Privacy Guard Manual' (version 2.2.31-beta7,
+September 2021).
(C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
(C) 2013, 2014, 2015 Werner Koch.
END-INFO-DIR-ENTRY
\1f
+File: gnupg.info, Node: GPGSM ENCRYPT, Next: GPGSM DECRYPT, Up: GPGSM Protocol
+
+5.6.1 Encrypting a Message
+--------------------------
+
+Before encryption can be done the recipient must be set using the
+command:
+
+ RECIPIENT USERID
+
+ Set the recipient for the encryption. USERID should be the internal
+representation of the key; the server may accept any other way of
+specification. If this is a valid and trusted recipient the server does
+respond with OK, otherwise the return is an ERR with the reason why the
+recipient cannot be used, the encryption will then not be done for this
+recipient. If the policy is not to encrypt at all if not all recipients
+are valid, the client has to take care of this. All 'RECIPIENT'
+commands are cumulative until a 'RESET' or an successful 'ENCRYPT'
+command.
+
+ INPUT FD[=N] [--armor|--base64|--binary]
+
+ Set the file descriptor for the message to be encrypted to N.
+Obviously the pipe must be open at that point, the server establishes
+its own end. If the server returns an error the client should consider
+this session failed. If N is not given, this commands uses the last
+file descriptor passed to the application. *Note the assuan_sendfd
+function: (assuan)fun-assuan_sendfd, on how to do descriptor passing.
+
+ The '--armor' option may be used to advise the server that the input
+data is in PEM format, '--base64' advises that a raw base-64 encoding is
+used, '--binary' advises of raw binary input (BER). If none of these
+options is used, the server tries to figure out the used encoding, but
+this may not always be correct.
+
+ OUTPUT FD[=N] [--armor|--base64]
+
+ Set the file descriptor to be used for the output (i.e. the
+encrypted message). Obviously the pipe must be open at that point, the
+server establishes its own end. If the server returns an error the
+client should consider this session failed.
+
+ The option '--armor' encodes the output in PEM format, the '--base64'
+option applies just a base-64 encoding. No option creates binary output
+(BER).
+
+ The actual encryption is done using the command
+
+ ENCRYPT
+
+ It takes the plaintext from the 'INPUT' command, writes to the
+ciphertext to the file descriptor set with the 'OUTPUT' command, take
+the recipients from all the recipients set so far. If this command
+fails the clients should try to delete all output currently done or
+otherwise mark it as invalid. 'GPGSM' does ensure that there will not
+be any security problem with leftover data on the output in this case.
+
+ This command should in general not fail, as all necessary checks have
+been done while setting the recipients. The input and output pipes are
+closed.
+
+\1f
File: gnupg.info, Node: GPGSM DECRYPT, Next: GPGSM SIGN, Prev: GPGSM ENCRYPT, Up: GPGSM Protocol
5.6.2 Decrypting a message
directory; or, if 'gpgconf.exe' has been installed directly below a
directory named 'bin', its parent directory. You also need to make
sure that the following directories exist and are writable:
- 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ 'ROOT/home' for the GnuPG home and 'ROOTAPPDATA/GNU/cache/gnupg'
for internal cache files.
'-v'
accounts are hosted on the machine.
A client connects to the SC-Daemon by connecting to the socket named
-'/usr/local/var/run/gnupg/scdaemon/socket', configuration information is
-read from /ETC/GNUPG/SCDAEMON.CONF
+'APPDATA/GNU/run/gnupg/scdaemon/socket', configuration information is
+read from APPDATA/GNU/ETC/GNUPG/SCDAEMON.CONF
Each connection acts as one session, SC-Daemon takes care of
synchronizing access to a token between sessions.
directory; or, if 'gpgconf.exe' has been installed directly below a
directory named 'bin', its parent directory. You also need to make
sure that the following directories exist and are writable:
- 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ 'ROOT/home' for the GnuPG home and 'ROOTAPPDATA/GNU/cache/gnupg'
for internal cache files.
'--weak-digest name'
directory; or, if 'gpgconf.exe' has been installed directly below a
directory named 'bin', its parent directory. You also need to make
sure that the following directories exist and are writable:
- 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ 'ROOT/home' for the GnuPG home and 'ROOTAPPDATA/GNU/cache/gnupg'
for internal cache files.
'-n'
directory; or, if 'gpgconf.exe' has been installed directly below a
directory named 'bin', its parent directory. You also need to make
sure that the following directories exist and are writable:
- 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ 'ROOT/home' for the GnuPG home and 'ROOTAPPDATA/GNU/cache/gnupg'
for internal cache files.
'--agent-program FILE'
Pick the key which best matches the creation time and run the
command
- /usr/local/libexec/gpg-protect-tool --p12-export \
+ INSTDIR/bin/gpg-protect-tool --p12-export \
~/.gnupg/private-keys-v1.d/FOO >FOO.p12
(Please adjust the path to 'gpg-protect-tool' to the appropriate
To import the created file on the machine you use this command:
- /usr/local/libexec/gpg-protect-tool --p12-import --store FOO.p12
+ INSTDIR/bin/gpg-protect-tool --p12-import --store FOO.p12
You will be asked for the pkcs#12 passphrase and a new passphrase
to protect the imported private key at its new location.
(line 367)
* allow-loopback-pinentry: Agent Options. (line 169)
* allow-multiple-messages: GPG Esoteric Options.
- (line 548)
+ (line 547)
* allow-non-selfsigned-uid: GPG Esoteric Options.
(line 362)
* allow-ocsp: Dirmngr Options. (line 327)
* allow-preset-passphrase: Agent Options. (line 164)
* allow-secret-key-import: GPG Esoteric Options.
- (line 544)
+ (line 543)
* allow-version-check: Dirmngr Options. (line 138)
* allow-weak-digest-algos: GPG Esoteric Options.
(line 403)
(line 8)
* armor <1>: Input and Output. (line 8)
* ask-cert-expire: GPG Esoteric Options.
- (line 514)
+ (line 513)
* ask-cert-level: GPG Configuration Options.
(line 360)
* ask-sig-expire: GPG Esoteric Options.
- (line 500)
+ (line 499)
* assume-armor: Input and Output. (line 14)
* assume-base64: Input and Output. (line 18)
* assume-binary: Input and Output. (line 21)
* default-cache-ttl: Agent Options. (line 198)
* default-cache-ttl <1>: Agent Options. (line 207)
* default-cert-expire: GPG Esoteric Options.
- (line 520)
+ (line 519)
* default-cert-level: GPG Configuration Options.
(line 368)
* default-key: GPG Configuration Options.
(line 10)
* default-key <1>: Input and Output. (line 34)
* default-keyserver-url: GPG Esoteric Options.
- (line 577)
+ (line 576)
* default-new-key-algo STRING: GPG Esoteric Options.
- (line 527)
+ (line 526)
* default-preference-list: GPG Esoteric Options.
- (line 572)
+ (line 571)
* default-recipient: GPG Configuration Options.
(line 19)
* default-recipient-self: GPG Configuration Options.
(line 23)
* default-sig-expire: GPG Esoteric Options.
- (line 506)
+ (line 505)
* delete-keys: Operational GPG Commands.
(line 224)
* delete-keys <1>: Certificate Management.
(line 69)
* enable-putty-support: Agent Options. (line 383)
* enable-special-filenames: GPG Esoteric Options.
- (line 559)
+ (line 558)
* enable-special-filenames <1>: gpgv. (line 97)
* enable-ssh-support: Agent Options. (line 383)
* enable-trusted-cert-crl-check: Certificate Options. (line 24)
(line 60)
* faked-system-time <2>: Esoteric Options. (line 18)
* fast-list-mode: GPG Esoteric Options.
- (line 455)
+ (line 454)
* fetch-crl: Dirmngr Commands. (line 52)
* fetch-keys: Operational GPG Commands.
(line 333)
* force-default-responder: dirmngr-client. (line 64)
* force-mdc: OpenPGP Options. (line 25)
* force-sign-key: GPG Esoteric Options.
- (line 538)
+ (line 537)
* forget: Invoking gpg-preset-passphrase.
(line 26)
* from: gpg-wks-server. (line 54)
(line 750)
* gpg-args: gpgtar. (line 113)
* gpgconf-list: GPG Esoteric Options.
- (line 593)
+ (line 592)
* gpgconf-test: GPG Esoteric Options.
- (line 597)
+ (line 596)
* grab: Agent Options. (line 145)
* group: GPG Key related Options.
(line 55)
* list-chain: Certificate Management.
(line 32)
* list-config: GPG Esoteric Options.
- (line 582)
+ (line 581)
* list-crls: Dirmngr Commands. (line 40)
* list-gcrypt-config: GPG Esoteric Options.
- (line 590)
+ (line 589)
* list-keys: Operational GPG Commands.
(line 119)
* list-keys <1>: Certificate Management.
* list-secret-keys <1>: Certificate Management.
(line 24)
* list-signatures: GPG Esoteric Options.
- (line 443)
+ (line 442)
* list-sigs: GPG Esoteric Options.
- (line 444)
+ (line 443)
* listen-backlog: Agent Options. (line 351)
* listen-backlog <1>: Dirmngr Options. (line 134)
* listen-backlog <2>: Scdaemon Options. (line 135)
* no-encrypt-to: GPG Key related Options.
(line 51)
* no-expensive-trust-checks: GPG Esoteric Options.
- (line 564)
+ (line 563)
* no-ext-connect: Invoking gpg-connect-agent.
(line 72)
* no-grab: Agent Options. (line 145)
* no-groups: GPG Key related Options.
(line 73)
* no-keyring: GPG Esoteric Options.
- (line 431)
+ (line 430)
* no-literal: GPG Esoteric Options.
- (line 463)
+ (line 462)
* no-mangle-dos-filenames: GPG Configuration Options.
(line 352)
* no-options: GPG Configuration Options.
* output <4>: gpg-wks-client. (line 104)
* output <5>: gpg-wks-server. (line 65)
* override-session-key: GPG Esoteric Options.
- (line 487)
+ (line 486)
* p12-charset: Input and Output. (line 24)
* passphrase: GPG Esoteric Options.
(line 312)
* prefer-system-dirmngr: Configuration Options.
(line 65)
* preserve-permissions: GPG Esoteric Options.
- (line 567)
+ (line 566)
* preset: Invoking gpg-preset-passphrase.
(line 22)
* primary-keyring: GPG Configuration Options.
- (line 248)
+ (line 243)
* print-md: Operational GPG Commands.
(line 386)
* q: Invoking gpg-connect-agent.
* search-keys: Operational GPG Commands.
(line 323)
* secret-keyring: GPG Configuration Options.
- (line 243)
+ (line 248)
* send: gpg-wks-client. (line 65)
* send <1>: gpg-wks-server. (line 60)
* send-keys: Operational GPG Commands.
(line 178)
* set-filename <1>: gpgtar. (line 104)
* set-filesize: GPG Esoteric Options.
- (line 467)
+ (line 466)
* set-notation: GPG Esoteric Options.
(line 124)
* set-policy-url: GPG Esoteric Options.
* show-photos: Deprecated Options. (line 8)
* show-policy-url: Deprecated Options. (line 33)
* show-session-key: GPG Esoteric Options.
- (line 471)
+ (line 470)
* shutdown: Dirmngr Commands. (line 58)
* sig-keyserver-url: GPG Esoteric Options.
(line 170)
* skip-hidden-recipients: GPG Key related Options.
(line 108)
* skip-verify: GPG Esoteric Options.
- (line 435)
+ (line 434)
* squid-mode: dirmngr-client. (line 101)
* ssh-fingerprint-digest: Agent Options. (line 431)
* standard-resolver: Dirmngr Options. (line 110)
* with-icao-spelling: GPG Input and Output.
(line 307)
* with-key-data: GPG Esoteric Options.
- (line 439)
+ (line 438)
* with-key-data <1>: Input and Output. (line 54)
* with-key-origin: GPG Input and Output.
(line 315)
\0\b[index\0\b]
* Menu:
-* .gpg-v21-migrated: GPG Configuration. (line 77)
-* ~/.gnupg: GPG Configuration. (line 27)
+* .gpg-v21-migrated: GPG Configuration. (line 78)
+* ~/.gnupg: GPG Configuration. (line 28)
* ASSUAN_DEBUG: Scdaemon Options. (line 122)
-* COLUMNS: GPG Configuration. (line 118)
-* com-certs.pem: GPGSM Configuration. (line 84)
+* COLUMNS: GPG Configuration. (line 119)
+* com-certs.pem: GPGSM Configuration. (line 85)
* dirmngr.conf: Dirmngr Configuration.
(line 12)
* DISPLAY: GPGSM OPTION. (line 21)
* GNUPGHOME: Agent Options. (line 17)
* GNUPGHOME <1>: GPG Configuration Options.
(line 260)
-* GNUPGHOME <2>: GPG Configuration. (line 106)
+* GNUPGHOME <2>: GPG Configuration. (line 107)
* GNUPGHOME <3>: Configuration Options.
(line 16)
* GNUPGHOME <4>: Scdaemon Options. (line 13)
* HKCU\Software\GNU\GnuPG:HomeDir <5>: Invoking gpgconf. (line 115)
* HKCU\Software\GNU\GnuPG:HomeDir <6>: Invoking gpg-connect-agent.
(line 21)
-* HOME: GPG Configuration. (line 103)
+* HOME: GPG Configuration. (line 104)
* http_proxy: Dirmngr Options. (line 240)
-* LANGUAGE: GPG Configuration. (line 121)
+* LANGUAGE: GPG Configuration. (line 122)
* LC_CTYPE: GPGSM OPTION. (line 27)
* LC_MESSAGES: GPGSM OPTION. (line 29)
-* LINES: GPG Configuration. (line 118)
-* openpgp-revocs.d: GPG Configuration. (line 91)
+* LINES: GPG Configuration. (line 119)
+* openpgp-revocs.d: GPG Configuration. (line 92)
* PATH: GPG Configuration Options.
(line 225)
-* PINENTRY_USER_DATA: GPG Configuration. (line 113)
+* PINENTRY_USER_DATA: GPG Configuration. (line 114)
* PINENTRY_USER_DATA <1>: GPGSM OPTION. (line 33)
* policies.txt: GPGSM Configuration. (line 18)
-* private-keys-v1.d: Agent Configuration. (line 104)
-* pubring.gpg: GPG Configuration. (line 32)
-* pubring.kbx: GPG Configuration. (line 50)
-* pubring.kbx <1>: GPGSM Configuration. (line 100)
+* private-keys-v1.d: Agent Configuration. (line 105)
+* pubring.gpg: GPG Configuration. (line 33)
+* pubring.kbx: GPG Configuration. (line 51)
+* pubring.kbx <1>: GPGSM Configuration. (line 101)
* qualified.txt: GPGSM Configuration. (line 33)
-* random_seed: GPG Configuration. (line 88)
-* random_seed <1>: GPGSM Configuration. (line 106)
-* S.gpg-agent: GPGSM Configuration. (line 111)
-* secring.gpg: GPG Configuration. (line 69)
+* random_seed: GPG Configuration. (line 89)
+* random_seed <1>: GPGSM Configuration. (line 107)
+* S.gpg-agent: GPGSM Configuration. (line 112)
+* secring.gpg: GPG Configuration. (line 70)
* SHELL: Agent Options. (line 138)
-* sshcontrol: Agent Configuration. (line 74)
+* sshcontrol: Agent Configuration. (line 75)
* TERM: GPGSM OPTION. (line 25)
-* trustdb.gpg: GPG Configuration. (line 80)
+* trustdb.gpg: GPG Configuration. (line 81)
* trustlist.txt: Agent Configuration. (line 20)
* XAUTHORITY: GPGSM OPTION. (line 31)
* options, GPG-AGENT command: Invoking GPG-AGENT. (line 6)
* options, GPGSM command: Invoking GPGSM. (line 6)
* options, SCDAEMON command: Invoking SCDAEMON. (line 6)
-* relax: Agent Configuration. (line 62)
+* relax: Agent Configuration. (line 63)
* scd-event: Scdaemon Configuration.
(line 18)
* SCDAEMON command options: Invoking SCDAEMON. (line 6)
@item --export
@opindex export
-Either export all keys from all keyrings (default keyrings and those
+Either export all keys from all keyrings (default keyring and those
registered via option @option{--keyring}), or if at least one name is given,
those of the given name. The exported keys are written to STDOUT or to the
file given with option @option{--output}. Use together with
@item save
@opindex keyedit:save
- Save all changes to the keyrings and quit.
+ Save all changes to the keyring and quit.
@item quit
@opindex keyedit:quit
Quit the program without updating the
- keyrings.
+ keyring.
@end table
@c man:.RS
Add @var{file} to the current list of keyrings. If @var{file} begins
with a tilde and a slash, these are replaced by the $HOME directory. If
the filename does not contain a slash, it is assumed to be in the GnuPG
-home directory ("~/.gnupg" if @option{--homedir} or $GNUPGHOME is not
+home directory ("~/.gnupg" unless @option{--homedir} or $GNUPGHOME is
used).
Note that this adds a keyring to the current list. If the intent is to
If the option @option{--no-keyring} has been used no keyrings will
be used at all.
+@item --primary-keyring @var{file}
+@opindex primary-keyring
+This is a varian of @option{--keyring} and designates @var{file} as
+the primary public keyring. This means that newly imported keys (via
+@option{--import} or keyserver @option{--recv-from}) will go to this
+keyring.
+
@item --secret-keyring @var{file}
@opindex secret-keyring
This is an obsolete option and ignored. All secret keys are stored in
the @file{private-keys-v1.d} directory below the GnuPG home directory.
-@item --primary-keyring @var{file}
-@opindex primary-keyring
-Designate @var{file} as the primary public keyring. This means that
-newly imported keys (via @option{--import} or keyserver
-@option{--recv-from}) will go to this keyring.
-
@item --trustdb-name @var{file}
@opindex trustdb-name
Use @var{file} instead of the default trustdb. If @var{file} begins
@item --no-default-keyring
@opindex no-default-keyring
-Do not add the default keyrings to the list of keyrings. Note that
-GnuPG will not operate without any keyrings, so if you use this option
-and do not provide alternate keyrings via @option{--keyring} or
-@option{--secret-keyring}, then GnuPG will still use the default public or
-secret keyrings.
+Do not add the default keyring to the list of keyrings. Note that
+GnuPG needs for almost all operations a keyring. Thus if you use this
+option and do not provide alternate keyrings via @option{--keyring},
+then GnuPG will still use the default keyring.
@item --no-keyring
@opindex no-keyring
break;
case oSecretKeyring:
- /* Ignore this old option. */
+ obsolete_option (configname, pargs.lineno, "secret-keyring");
break;
case oNoArmor: opt.no_armor=1; opt.armor=0; break;
msgstr ""
"Project-Id-Version: gnupg 1.4.0\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2005-02-04 02:04+0100\n"
"Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
msgstr ""
"Project-Id-Version: gnupg2 2.2.22\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2020-08-31 18:53+02:00\n"
"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
"Language-Team: Czech <gnupg-i18n@gnupg.org>\n"
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2017-11-02 17:39+0100\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
msgstr ""
"Project-Id-Version: gnupg-2.1.0\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
-"PO-Revision-Date: 2021-08-26 18:07+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
+"PO-Revision-Date: 2021-09-15 16:04+0200\n"
"Last-Translator: Werner Koch <wk@gnupg.org>\n"
"Language-Team: German <de@li.org>\n"
"Language: de\n"
msgid_plural ""
"A passphrase should contain at least %u digits or%%0Aspecial characters."
msgstr[0] ""
-"Ein Passwort sollte mindestens %u Sonderzeichen oder%%0Aeine Ziffer "
-"enthalten."
+"Ein Passwort sollte mindestens %u Sonderzeichen oder eine Ziffer enthalten."
msgstr[1] ""
-"Ein Passwort sollte mindestens %u Sonderzeichen oder%%0AZiffern enthalten."
+"Ein Passwort sollte mindestens %u Sonderzeichen oder Ziffern enthalten."
#: agent/genkey.c:323
#, c-format
msgid "A passphrase may not be a known term or match%%0Acertain pattern."
msgstr ""
-"Ein Passwort sollte kein bekanntes Wort sein oder%%0Anach bekannten Regeln "
+"Ein Passwort sollte kein bekanntes Wort sein oder nach bekannten Regeln "
"aufgebaut sein."
#: agent/genkey.c:338
msgid "Warning: You have entered an insecure passphrase."
-msgstr ""
-"WARNUNG: Sie haben ein offensichtlich unsicheres%0APasswort eingegeben."
+msgstr "WARNUNG: Sie haben ein offensichtlich unsicheres Passwort eingegeben."
#: agent/genkey.c:527
#, c-format
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
-"Hinweis: Dieses Passwort wurde noch nie geändert/%0ABitte ändern Sie sie "
+"Hinweis: Dieses Passwort wurde noch nie geändert.%0ABitte ändern Sie es "
"jetzt."
#: agent/findkey.c:317
msgstr ""
"Project-Id-Version: gnupg-1.1.92\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2017-09-14 21:14+0300\n"
"Last-Translator: Dimitris Maroulidis <dmaroulidis@dimitrismaroulidis.com>\n"
"Language-Team: team@gnome.gr\n"
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gnupg 2.2.30\n"
+"Project-Id-Version: GNU gnupg 2.2.31\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
-"PO-Revision-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
+"PO-Revision-Date: 2021-09-15 16:55+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: en\n"
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gnupg 2.2.30\n"
+"Project-Id-Version: GNU gnupg 2.2.31\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
-"PO-Revision-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
+"PO-Revision-Date: 2021-09-15 16:55+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: en\n"
msgstr ""
"Project-Id-Version: gnupg 1.0.6d\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2002-04-14 14:33+0100\n"
"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
msgstr ""
"Project-Id-Version: gnupg 2.0.9\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2018-05-25 15:44+0000\n"
"Last-Translator: emma peel <emma.peel@riseup.net>\n"
"Language-Team: Spanish <es@li.org>\n"
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2004-06-17 11:04+0300\n"
"Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2004-06-16 22:40+0300\n"
"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
msgstr ""
"Project-Id-Version: gnupg 2.1\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2021-05-19 00:01+0200\n"
"Last-Translator: David Prévot <david@tilapin.org>\n"
"Language-Team: French <traduc@traduc.org>\n"
msgstr ""
"Project-Id-Version: gnupg 1.2.4\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2003-12-04 11:39+0100\n"
"Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: GNU gnupg 2.2.30\n"
+"Project-Id-Version: GNU gnupg 2.2.31\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr ""
"Project-Id-Version: gnupg 2.2.20\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2020-06-09 23:10+0200\n"
"Last-Translator: Nagy Ferenc László <nfl@nfllab.com>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
msgstr ""
"Project-Id-Version: gnupg-id\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2004-06-17 16:32+0700\n"
"Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
msgstr ""
"Project-Id-Version: GNU gnupg 2.2.23\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2021-05-19 00:03+0200\n"
"Last-Translator: Denis <student@alice.it>\n"
"Language-Team: \n"
#
msgid ""
msgstr ""
-"Project-Id-Version: gnupg 2.2.28\n"
+"Project-Id-Version: gnupg 2.2.30\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
-"PO-Revision-Date: 2021-06-09 09:28+0900\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
+"PO-Revision-Date: 2021-08-27 08:56+0900\n"
"Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
"Language-Team: none\n"
"Language: ja\n"
#. for generating a passphrase.
#: agent/call-pinentry.c:1007
msgid "Suggest"
-msgstr ""
+msgstr "提示"
#. TRANSLATORS: This string is a tooltip, shown by pinentry when
#. hovering over the generate button. Please use an appropriate
#. will be used. The strcmp thingy is there to detect a
#. non-translated string.
#: agent/call-pinentry.c:1029
-#, fuzzy
-#| msgid "pinentry.qualitybar.tooltip"
msgid "pinentry.genpin.tooltip"
-msgstr "pinentry.qualitybar.tooltip"
+msgstr "パスフレーズを生成して提示"
#: agent/call-pinentry.c:1057
msgid "Note: The blanks are not part of the passphrase."
-msgstr ""
+msgstr "注意: ブランクはパスフレーズの一部ではありません。"
#. TRANSLATORS: This is a text shown by pinentry as title of a dialog
#. telling the user that the entered new passphrase does not satisfy
#. the passphrase constraints. Please keep it short.
#: agent/call-pinentry.c:1116
-#, fuzzy
-#| msgid "Passphrase too long"
msgid "Passphrase Not Allowed"
-msgstr "パスフレーズが長すぎます"
+msgstr "パスフレーズが認められません"
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
#. will be used.
#: agent/call-pinentry.c:1204
msgid "pinentry.qualitybar.tooltip"
-msgstr "pinentry.qualitybar.tooltip"
+msgstr "パスフレーズの品質"
#: agent/call-pinentry.c:1367
msgid ""
msgstr ""
"Project-Id-Version: GNU gnupg 2.1\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2017-11-02 17:40+0100\n"
"Last-Translator: Åka Sikrom <a4@hush.com>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
msgstr ""
"Project-Id-Version: gnupg-2.2.24\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2020-11-18 17:35+0100\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2015-02-11 19:17+0100\n"
"Last-Translator: Pedro Morais <morais@kde.org>\n"
"Language-Team: pt <morais@kde.org>\n"
msgstr ""
"Project-Id-Version: gnupg 1.4.2rc1\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2017-12-19 12:30+0100\n"
"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
msgstr ""
"Project-Id-Version: GnuPG 2.2.0\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2021-05-20 08:13+0200\n"
"Last-Translator: Ineiev <ineiev@gnu.org>\n"
"Language-Team: Russian <gnupg-ru@gnupg.org>\n"
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2004-07-20 15:52+0200\n"
"Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
msgstr ""
"Project-Id-Version: gnupg trunk\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2017-11-02 17:41+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
msgstr ""
"Project-Id-Version: gnupg 2.0.10rc1\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2015-02-11 19:18+0100\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
"Language-Team: Turkish\n"
msgstr ""
"Project-Id-Version: GNU gnupg 2.1.0\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2020-08-31 11:54+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
msgstr ""
"Project-Id-Version: GNU gnupg 2.2.28\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2021-06-17 11:52+0900\n"
"Last-Translator: bobwxc <bobwxc@yeah.net>\n"
"Language-Team: None\n"
msgstr ""
"Project-Id-Version: GNU gnupg 2.1.0\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-08-26 18:22+0200\n"
+"POT-Creation-Date: 2021-09-15 16:55+0200\n"
"PO-Revision-Date: 2019-11-04 09:49+0100\n"
"Last-Translator: Jedi Lin <Jedi@Jedi.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <assert.h>
#include <signal.h>
#ifdef USE_NPTH
# include <unistd.h>
#include "../common/exechelp.h"
#endif /* GNUPG_MAJOR_VERSION != 1 */
#include "../common/host2net.h"
+#include "../common/membuf.h"
#include "iso7816.h"
#include "apdu.h"
/* PC/SC context to access readers. Shared among all readers. */
static struct pcsc {
- int count;
+ unsigned int context_valid:1;
long context;
+ char *reader_list; /* List of detected readers. */
} pcsc;
/* A structure to collect information pertaining to one reader
close_pcsc_reader (int slot)
{
(void)slot;
- log_assert (pcsc.count > 0);
- if (--pcsc.count == 0)
+
+ if (pcsc.context_valid)
{
pcsc_release_context (pcsc.context);
- pcsc.context = -1;
+ pcsc.context_valid = 0;
}
return 0;
}
{
long err;
- assert (slot >= 0 && slot < MAX_READER);
+ log_assert (slot >= 0 && slot < MAX_READER);
if (reader_table[slot].pcsc.card)
return SW_HOST_ALREADY_CONNECTED;
{
long err;
- assert (slot >= 0 && slot < MAX_READER);
+ log_assert (slot >= 0 && slot < MAX_READER);
if (!reader_table[slot].pcsc.card)
return 0;
pcsc_api_loaded = 1;
}
+ pcsc.context_valid = 0;
err = pcsc_establish_context (PCSC_SCOPE_SYSTEM, NULL, NULL, &pcsc.context);
if (err)
{
pcsc_error_string (err), err);
return -1;
}
- pcsc.count++;
+ pcsc.context_valid = 1;
return 0;
}
pcsc_dword_t nreader;
char *p;
size_t n;
+ membuf_t reader_mb;
+
+ xfree (pcsc.reader_list);
+ pcsc.reader_list = NULL;
- if (pcsc.context < 0)
+ if (!pcsc.context_valid)
if (pcsc_init () < 0)
return -1;
if (DBG_READER)
log_debug ("open_pcsc_reader(portstr=%s)\n", portstr);
+
slot = new_reader_slot ();
if (slot == -1)
return -1; /* No need to cleanup here. */
goto leave;
}
+ init_membuf (&reader_mb, 256);
+
p = list;
while (nreader > 0)
{
}
log_info ("detected reader '%s'\n", p);
+ put_membuf_str (&reader_mb, p);
+ put_membuf (&reader_mb, "\n", 1);
if (!rdrname && portstr && !strncmp (p, portstr, strlen (portstr)))
rdrname = p;
nreader -= n + 1;
p += n + 1;
}
+ put_membuf (&reader_mb, "", 1);
+ pcsc.reader_list = get_membuf (&reader_mb, NULL);
+ if (!pcsc.reader_list)
+ log_error ("error allocating memory for reader list\n");
if (!rdrname)
rdrname = list;
if (err)
return err;
/* If the reset was successful, update the ATR. */
- assert (sizeof slotp->atr >= sizeof atr);
+ log_assert (sizeof slotp->atr >= sizeof atr);
slotp->atrlen = atrlen;
memcpy (slotp->atr, atr, atrlen);
dump_reader_status (slot);
if (use_chaining && lc > 255)
{
apdu[apdulen] |= 0x10;
- assert (use_chaining < 256);
+ log_assert (use_chaining < 256);
lc_chunk = use_chaining;
lc -= use_chaining;
}
exact_length_hack:
/* As a safeguard don't pass any garbage to the driver. */
- assert (apdulen <= apdu_buffer_size);
+ log_assert (apdulen <= apdu_buffer_size);
memset (apdu+apdulen, 0, apdu_buffer_size - apdulen);
resultlen = result_buffer_size;
rc = send_apdu (slot, apdu, apdulen, result, &resultlen, pininfo);
xfree (result_buffer);
return SW_HOST_OUT_OF_CORE;
}
- assert (resultlen < bufsize);
+ log_assert (resultlen < bufsize);
memcpy (p, result, resultlen);
p += resultlen;
}
apdu[apdulen++] = 0;
apdu[apdulen++] = 0;
apdu[apdulen++] = len;
- assert (apdulen <= apdu_buffer_size);
+ log_assert (apdulen <= apdu_buffer_size);
memset (apdu+apdulen, 0, apdu_buffer_size - apdulen);
resultlen = result_buffer_size;
rc = send_apdu (slot, apdu, apdulen, result, &resultlen, NULL);
xfree (result_buffer);
return SW_HOST_OUT_OF_CORE;
}
- assert (resultlen < bufsize);
+ log_assert (resultlen < bufsize);
memcpy (p, result, resultlen);
p += resultlen;
}
return reader_table[slot].rdrname;
}
+
+/* Return the list of currently known readers. Caller must free the
+ * returned value. Might return NULL. */
+char *
+apdu_get_reader_list (void)
+{
+ membuf_t mb;
+ char *ccidlist = NULL;
+
+ init_membuf (&mb, 256);
+#ifdef HAVE_LIBUSB
+ ccidlist = ccid_get_reader_list ();
+#endif
+
+ if (ccidlist && *ccidlist)
+ put_membuf_str (&mb, ccidlist);
+ if (pcsc.reader_list && *pcsc.reader_list)
+ {
+ if (ccidlist && *ccidlist)
+ put_membuf (&mb, "\n", 1);
+ put_membuf_str (&mb, pcsc.reader_list);
+ }
+ xfree (ccidlist);
+ put_membuf (&mb, "", 1);
+
+ return get_membuf (&mb, NULL);
+}
+
+
gpg_error_t
apdu_init (void)
{
gpg_error_t err;
int i;
- pcsc.count = 0;
pcsc.context = -1;
+ pcsc.context_valid = 0;
+ pcsc.reader_list = NULL;
if (npth_mutex_init (&reader_table_lock, NULL))
goto leave;
int handle_more, unsigned int *r_sw,
unsigned char **retbuf, size_t *retbuflen);
const char *apdu_get_reader_name (int slot);
+char *apdu_get_reader_list (void);
#endif /*APDU_H*/
#include "iso7816.h"
#include "apdu.h" /* Required for apdu_*_reader (). */
#include "atr.h"
-#ifdef HAVE_LIBUSB
-#include "ccid-driver.h"
-#endif
#include "../common/asshelp.h"
#include "../common/server-help.h"
}
+/* Ease reading of Assuan data ;ines by sending a physical line after
+ * each LF. */
+static gpg_error_t
+pretty_assuan_send_data (assuan_context_t ctx,
+ const void *buffer_arg, size_t size)
+{
+ const char *buffer = buffer_arg;
+ const char *p;
+ size_t n, nbytes;
+ gpg_error_t err;
+
+ nbytes = size;
+ do
+ {
+ p = memchr (buffer, '\n', nbytes);
+ n = p ? (p - buffer) + 1 : nbytes;
+ err = assuan_send_data (ctx, buffer, n);
+ if (err)
+ {
+ /* We also set ERRNO in case this function is used by a
+ * custom estream I/O handler. */
+ gpg_err_set_errno (EIO);
+ goto leave;
+ }
+ buffer += n;
+ nbytes -= n;
+ if (nbytes && (err=assuan_send_data (ctx, NULL, 0))) /* Flush line. */
+ {
+ gpg_err_set_errno (EIO);
+ goto leave;
+ }
+ }
+ while (nbytes);
+
+ leave:
+ return err;
+}
+
+
static const char hlp_getinfo[] =
"GETINFO <what>\n"
"\n"
" 'u' Usable card present.\n"
" 'r' Card removed. A reset is necessary.\n"
" These flags are exclusive.\n"
- " reader_list - Return a list of detected card readers. Does\n"
- " currently only work with the internal CCID driver.\n"
+ " reader_list - Return a list of detected card readers.\n"
" deny_admin - Returns OK if admin commands are not allowed or\n"
" GPG_ERR_GENERAL if admin commands are allowed.\n"
" app_list - Return a list of supported applications. One\n"
}
else if (!strcmp (line, "reader_list"))
{
-#ifdef HAVE_LIBUSB
- char *s = ccid_get_reader_list ();
-#else
- char *s = NULL;
-#endif
-
+ char *s = apdu_get_reader_list ();
if (s)
- rc = assuan_send_data (ctx, s, strlen (s));
+ rc = pretty_assuan_send_data (ctx, s, strlen (s));
else
rc = gpg_error (GPG_ERR_NO_DATA);
xfree (s);
projects / platform / upstream / gpg2.git / commitdiff
