mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-03 12:11:33 +01:00
More cleanup of "allow to".
* README, agent/command.c, agent/keyformat.txt, common/i18n.c, common/iobuf.c, common/keyserver.h, dirmngr/cdblib.c, dirmngr/ldap-wrapper.c, doc/DETAILS, doc/TRANSLATE, doc/announce-2.1.txt, doc/gpg.texi, doc/gpgsm.texi, doc/scdaemon.texi, doc/tools.texi, doc/whats-new-in-2.1.txt, g10/export.c, g10/getkey.c, g10/import.c, g10/keyedit.c, m4/ksba.m4, m4/libgcrypt.m4, m4/ntbtls.m4, po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/fi.po, po/fr.po, po/gl.po, po/hu.po, po/id.po, po/it.po, po/ja.po, po/nb.po, po/pl.po, po/pt.po, po/ro.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po, scd/app-p15.c, scd/ccid-driver.c, scd/command.c, sm/gpgsm.c, sm/sign.c, tools/gpgconf-comp.c, tools/gpgtar.h: replace "Allow to" with clearer text. In standard English, the normal construction is "${XXX} allows ${YYY} to" -- that is, the subject (${XXX}) of the sentence is allowing the object (${YYY}) to do something. When the object is missing, the phrasing sounds awkward, even if the object is implied by context. There's almost always a better construction that isn't as awkward. These changes should make the language a bit clearer. Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
This commit is contained in:
parent
436b28c231
commit
dc107b7850
13
README
13
README
@ -9,15 +9,16 @@
|
|||||||
* INTRODUCTION
|
* INTRODUCTION
|
||||||
|
|
||||||
GnuPG is a complete and free implementation of the OpenPGP standard
|
GnuPG is a complete and free implementation of the OpenPGP standard
|
||||||
as defined by RFC4880 (also known as PGP). GnuPG allows to encrypt
|
as defined by RFC4880 (also known as PGP). GnuPG enables encryption
|
||||||
and sign data and communication, features a versatile key management
|
and signing of data and communication, and features a versatile key
|
||||||
system as well as access modules for public key directories.
|
management system as well as access modules for public key
|
||||||
|
directories.
|
||||||
|
|
||||||
GnuPG, also known as GPG, is a command line tool with features for
|
GnuPG, also known as GPG, is a command line tool with features for
|
||||||
easy integration with other applications. A wealth of frontend
|
easy integration with other applications. A wealth of frontend
|
||||||
applications and libraries making use of GnuPG are available. Since
|
applications and libraries are available that make use of GnuPG.
|
||||||
version 2 GnuPG provides support for S/MIME and Secure Shell in
|
Since version 2 GnuPG provides support for S/MIME and Secure Shell
|
||||||
addition to OpenPGP.
|
in addition to OpenPGP.
|
||||||
|
|
||||||
GnuPG is Free Software (meaning that it respects your freedom). It
|
GnuPG is Free Software (meaning that it respects your freedom). It
|
||||||
can be freely used, modified and distributed under the terms of the
|
can be freely used, modified and distributed under the terms of the
|
||||||
|
@ -3043,7 +3043,7 @@ io_monitor (assuan_context_t ctx, void *hook, int direction,
|
|||||||
|
|
||||||
(void) hook;
|
(void) hook;
|
||||||
|
|
||||||
/* Note that we only check for the uppercase name. This allows to
|
/* Note that we only check for the uppercase name. This allows the user to
|
||||||
see the logging for debugging if using a non-upercase command
|
see the logging for debugging if using a non-upercase command
|
||||||
name. */
|
name. */
|
||||||
if (ctx && direction == ASSUAN_IO_FROM_PEER
|
if (ctx && direction == ASSUAN_IO_FROM_PEER
|
||||||
|
@ -324,7 +324,7 @@ similar to the private-key storage format. This is a master
|
|||||||
passphrase format where each file may protect several secrets under
|
passphrase format where each file may protect several secrets under
|
||||||
one master passphrase. It is possible to have several of those files
|
one master passphrase. It is possible to have several of those files
|
||||||
each protected by a dedicated master passphrase. Clear text keywords
|
each protected by a dedicated master passphrase. Clear text keywords
|
||||||
allow to list the available protected passphrases.
|
allow listing the available protected passphrases.
|
||||||
|
|
||||||
The name of the files with these protected secrets have this form:
|
The name of the files with these protected secrets have this form:
|
||||||
pw-<string>.dat. STRING may be an arbitrary string, as a default name
|
pw-<string>.dat. STRING may be an arbitrary string, as a default name
|
||||||
|
@ -156,9 +156,9 @@ i18n_utf8 (const char *string)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* A variant of gettext which allows to specify the local to use for
|
/* A variant of gettext which allows the programmer to specify the
|
||||||
translating the message. The function assumes that utf-8 is used
|
locale to use for translating the message. The function assumes
|
||||||
for the encoding. */
|
that utf-8 is used for the encoding. */
|
||||||
const char *
|
const char *
|
||||||
i18n_localegettext (const char *lc_messages, const char *string)
|
i18n_localegettext (const char *lc_messages, const char *string)
|
||||||
{
|
{
|
||||||
|
@ -1198,7 +1198,7 @@ iobuf_cancel (iobuf_t a)
|
|||||||
#if defined(HAVE_W32_SYSTEM) || defined(__riscos__)
|
#if defined(HAVE_W32_SYSTEM) || defined(__riscos__)
|
||||||
if (remove_name)
|
if (remove_name)
|
||||||
{
|
{
|
||||||
/* Argg, MSDOS does not allow to remove open files. So
|
/* Argg, MSDOS does not allow removing open files. So
|
||||||
* we have to do it here */
|
* we have to do it here */
|
||||||
#ifdef HAVE_W32CE_SYSTEM
|
#ifdef HAVE_W32CE_SYSTEM
|
||||||
wchar_t *wtmp = utf8_to_wchar (remove_name);
|
wchar_t *wtmp = utf8_to_wchar (remove_name);
|
||||||
|
@ -48,8 +48,8 @@
|
|||||||
/* Must be 127 due to shell internal magic. */
|
/* Must be 127 due to shell internal magic. */
|
||||||
#define KEYSERVER_SCHEME_NOT_FOUND 127
|
#define KEYSERVER_SCHEME_NOT_FOUND 127
|
||||||
|
|
||||||
/* Object to hold information pertaining to a keyserver; it further
|
/* Object to hold information pertaining to a keyserver; it also
|
||||||
allows to build a list of keyservers. Note that g10/options.h has
|
allows building a list of keyservers. Note that g10/options.h has
|
||||||
a typedef for this. FIXME: We should make use of the
|
a typedef for this. FIXME: We should make use of the
|
||||||
parse_uri_t. */
|
parse_uri_t. */
|
||||||
struct keyserver_spec
|
struct keyserver_spec
|
||||||
|
@ -296,7 +296,7 @@ cdb_find(struct cdb *cdbp, const void *key, cdbi_t klen)
|
|||||||
|
|
||||||
/* Sequential-find routines that used separate structure. It is
|
/* Sequential-find routines that used separate structure. It is
|
||||||
possible to have many than one record with the same key in a
|
possible to have many than one record with the same key in a
|
||||||
database, and these routines allows to enumerate all them.
|
database, and these routines allow enumeration of all of them.
|
||||||
cdb_findinit() initializes search structure pointed to by cdbfp.
|
cdb_findinit() initializes search structure pointed to by cdbfp.
|
||||||
It will return negative value on error or 0 on success. cdb_find
|
It will return negative value on error or 0 on success. cdb_find
|
||||||
next() attempts to find next matching key, setting value position
|
next() attempts to find next matching key, setting value position
|
||||||
|
@ -545,8 +545,8 @@ reader_callback (void *cb_value, char *buffer, size_t count, size_t *nread)
|
|||||||
if (!buffer && !count && !nread)
|
if (!buffer && !count && !nread)
|
||||||
return -1; /* Rewind is not supported. */
|
return -1; /* Rewind is not supported. */
|
||||||
|
|
||||||
/* If we ever encountered a read error don't allow to continue and
|
/* If we ever encountered a read error, don't continue (we don't want to
|
||||||
possible overwrite the last error cause. Bail out also if the
|
possibly overwrite the last error cause). Bail out also if the
|
||||||
file descriptor has been closed. */
|
file descriptor has been closed. */
|
||||||
if (ctx->fd_error || ctx->fd == -1)
|
if (ctx->fd_error || ctx->fd == -1)
|
||||||
{
|
{
|
||||||
|
@ -913,8 +913,8 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
|
|||||||
|
|
||||||
*** FAILURE <location> <error_code>
|
*** FAILURE <location> <error_code>
|
||||||
This is the counterpart to SUCCESS and used to indicate a program
|
This is the counterpart to SUCCESS and used to indicate a program
|
||||||
failure. It is used similar to ISO-C's EXIT_FAILURE but allows to
|
failure. It is used similar to ISO-C's EXIT_FAILURE but allows
|
||||||
convey more information, in particular an gpg-error error code.
|
conveying more information, in particular a gpg-error error code.
|
||||||
That numerical error code may optionally have a suffix made of an
|
That numerical error code may optionally have a suffix made of an
|
||||||
underscore and a string with an error symbol like "151011327_EOF".
|
underscore and a string with an error symbol like "151011327_EOF".
|
||||||
A dash may be used instead of <location>.
|
A dash may be used instead of <location>.
|
||||||
|
@ -23,8 +23,8 @@ Help files
|
|||||||
|
|
||||||
GnuPG provides a little help feature (entering a ? on a prompt). This
|
GnuPG provides a little help feature (entering a ? on a prompt). This
|
||||||
help used to be translated the usual way with gettext but it turned
|
help used to be translated the usual way with gettext but it turned
|
||||||
out that this is too inflexible and does for example not allow to
|
out that this is too inflexible and does for example not allow
|
||||||
correct little mistakes in the English text. For some newer features
|
correcting little mistakes in the English text. For some newer features
|
||||||
we require editable help files anyway and thus the existing help
|
we require editable help files anyway and thus the existing help
|
||||||
strings have been moved to plain text files names "help.LL.txt". We
|
strings have been moved to plain text files names "help.LL.txt". We
|
||||||
distribute these files and allow overriding them by files of that name
|
distribute these files and allow overriding them by files of that name
|
||||||
|
@ -6,13 +6,13 @@ new release: Version 2.1.0.
|
|||||||
The GNU Privacy Guard (GnuPG) is a complete and free implementation of
|
The GNU Privacy Guard (GnuPG) is a complete and free implementation of
|
||||||
the OpenPGP standard as defined by RFC-4880 and better known as PGP.
|
the OpenPGP standard as defined by RFC-4880 and better known as PGP.
|
||||||
|
|
||||||
GnuPG, also known as GPG, allows to encrypt and sign data and
|
GnuPG, also known as GPG, enables encryption and signing of data and
|
||||||
communication, features a versatile key management system as well as
|
communication, features a versatile key management system as well as
|
||||||
access modules for public key directories. GnuPG itself is a command
|
access modules for public key directories. GnuPG itself is a command
|
||||||
line tool with features for easy integration with other applications.
|
line tool with features for easy integration with other applications.
|
||||||
A wealth of frontend applications and libraries making use of GnuPG
|
A wealth of frontend applications and libraries are available that
|
||||||
are available. Since version 2 GnuPG provides support for S/MIME and
|
make use of GnuPG. Since version 2 GnuPG provides support for S/MIME
|
||||||
Secure Shell in addition to OpenPGP.
|
and Secure Shell in addition to OpenPGP.
|
||||||
|
|
||||||
GnuPG is Free Software (meaning that it respects your freedom). It can
|
GnuPG is Free Software (meaning that it respects your freedom). It can
|
||||||
be freely used, modified and distributed under the terms of the GNU
|
be freely used, modified and distributed under the terms of the GNU
|
||||||
|
@ -2357,7 +2357,7 @@ obsolete; it does not harm to use it though.
|
|||||||
Revert to the pre-2.1 public key list mode. This only affects the
|
Revert to the pre-2.1 public key list mode. This only affects the
|
||||||
human readable output and not the machine interface
|
human readable output and not the machine interface
|
||||||
(i.e. @code{--with-colons}). Note that the legacy format does not
|
(i.e. @code{--with-colons}). Note that the legacy format does not
|
||||||
allow to convey suitable information for elliptic curves.
|
convey suitable information for elliptic curves.
|
||||||
|
|
||||||
@item --with-fingerprint
|
@item --with-fingerprint
|
||||||
@opindex with-fingerprint
|
@opindex with-fingerprint
|
||||||
|
@ -636,7 +636,7 @@ algorithm than actually used. @command{gpgsm} uses a one-pass data
|
|||||||
processing model and thus needs to rely on the announced digest
|
processing model and thus needs to rely on the announced digest
|
||||||
algorithms to properly hash the data. As a workaround this option may
|
algorithms to properly hash the data. As a workaround this option may
|
||||||
be used to tell gpg to also hash the data using the algorithm
|
be used to tell gpg to also hash the data using the algorithm
|
||||||
@var{name}; this slows processing down a little bit but allows to verify
|
@var{name}; this slows processing down a little bit but allows verification of
|
||||||
such broken signatures. If @command{gpgsm} prints an error like
|
such broken signatures. If @command{gpgsm} prints an error like
|
||||||
``digest algo 8 has not been enabled'' you may want to try this option,
|
``digest algo 8 has not been enabled'' you may want to try this option,
|
||||||
with @samp{SHA256} for @var{name}.
|
with @samp{SHA256} for @var{name}.
|
||||||
@ -1479,7 +1479,7 @@ GETAUDITLOG [--data] [--html]
|
|||||||
|
|
||||||
If @option{--data} is used, the audit log is send using D-lines
|
If @option{--data} is used, the audit log is send using D-lines
|
||||||
instead of being sent to the file descriptor given by an OUTPUT
|
instead of being sent to the file descriptor given by an OUTPUT
|
||||||
command. If @option{--html} is used, the output is formated as an
|
command. If @option{--html} is used, the output is formatted as an
|
||||||
XHTML block. This is designed to be incorporated into a HTML
|
XHTML block. This is designed to be incorporated into a HTML
|
||||||
document.
|
document.
|
||||||
|
|
||||||
|
@ -258,7 +258,7 @@ deprecated; it may be removed in future releases.
|
|||||||
@item --disable-ccid
|
@item --disable-ccid
|
||||||
@opindex disable-ccid
|
@opindex disable-ccid
|
||||||
Disable the integrated support for CCID compliant readers. This
|
Disable the integrated support for CCID compliant readers. This
|
||||||
allows to fall back to one of the other drivers even if the internal
|
allows falling back to one of the other drivers even if the internal
|
||||||
CCID driver can handle the reader. Note, that CCID support is only
|
CCID driver can handle the reader. Note, that CCID support is only
|
||||||
available if libusb was available at build time.
|
available if libusb was available at build time.
|
||||||
|
|
||||||
@ -284,10 +284,10 @@ To get a list of available CCID readers you may use this command:
|
|||||||
If @var{n} is not 0 and no client is actively using the card, the card
|
If @var{n} is not 0 and no client is actively using the card, the card
|
||||||
will be powered down after @var{n} seconds. Powering down the card
|
will be powered down after @var{n} seconds. Powering down the card
|
||||||
avoids a potential risk of damaging a card when used with certain
|
avoids a potential risk of damaging a card when used with certain
|
||||||
cheap readers. This also allows non Scdaemon aware applications to
|
cheap readers. This also allows applications that are not aware of
|
||||||
access the card. The disadvantage of using a card timeout is that
|
Scdaemon to access the card. The disadvantage of using a card timeout
|
||||||
accessing the card takes longer and that the user needs to enter the
|
is that accessing the card takes longer and that the user needs to
|
||||||
PIN again after the next power up.
|
enter the PIN again after the next power up.
|
||||||
|
|
||||||
Note that with the current version of Scdaemon the card is powered
|
Note that with the current version of Scdaemon the card is powered
|
||||||
down immediately at the next timer tick for any value of @var{n} other
|
down immediately at the next timer tick for any value of @var{n} other
|
||||||
|
@ -234,7 +234,7 @@ commit the changes.
|
|||||||
|
|
||||||
@command{gpgconf} provides the backend of a configuration editor. The
|
@command{gpgconf} provides the backend of a configuration editor. The
|
||||||
configuration editor would usually be a graphical user interface
|
configuration editor would usually be a graphical user interface
|
||||||
program, that allows to display the current options, their default
|
program that displays the current options, their default
|
||||||
values, and allows the user to make changes to the options. These
|
values, and allows the user to make changes to the options. These
|
||||||
changes can then be made active with @command{gpgconf} again. Such a
|
changes can then be made active with @command{gpgconf} again. Such a
|
||||||
program that uses @command{gpgconf} in this way will be called GUI
|
program that uses @command{gpgconf} in this way will be called GUI
|
||||||
@ -999,9 +999,9 @@ This script is a wrapper around @command{gpgconf} to run it with the
|
|||||||
command @code{--apply-defaults} for all real users with an existing
|
command @code{--apply-defaults} for all real users with an existing
|
||||||
GnuPG home directory. Admins might want to use this script to update he
|
GnuPG home directory. Admins might want to use this script to update he
|
||||||
GnuPG configuration files for all users after
|
GnuPG configuration files for all users after
|
||||||
@file{/etc/gnupg/gpgconf.conf} has been changed. This allows to enforce
|
@file{/etc/gnupg/gpgconf.conf} has been changed. This allows enforcing
|
||||||
certain policies for all users. Note, that this is not a bulletproof of
|
certain policies for all users. Note, that this is not a bulletproof way to
|
||||||
forcing a user to use certain options. A user may always directly edit
|
force a user to use certain options. A user may always directly edit
|
||||||
the configuration files and bypass gpgconf.
|
the configuration files and bypass gpgconf.
|
||||||
|
|
||||||
@noindent
|
@noindent
|
||||||
|
@ -540,7 +540,7 @@ https://gnupg.org/faq/whats-new-in-2.1.html
|
|||||||
key id matching the key id of another key. Importing a key with a
|
key id matching the key id of another key. Importing a key with a
|
||||||
long key id already used by another key in gpg’s local key store was
|
long key id already used by another key in gpg’s local key store was
|
||||||
not possible due to checks done on import. Now, if the “wrong” key
|
not possible due to checks done on import. Now, if the “wrong” key
|
||||||
has been imported first /gpg/ would not allow to later import the
|
has been imported first /gpg/ would not allow later import of the
|
||||||
second “correct” key. This problem has been fixed in 2.1 by allowing
|
second “correct” key. This problem has been fixed in 2.1 by allowing
|
||||||
the import and by doing trial verification against all matching keys.
|
the import and by doing trial verification against all matching keys.
|
||||||
|
|
||||||
|
@ -1925,7 +1925,7 @@ do_export_stream (ctrl_t ctrl, iobuf_t out, strlist_t users, int secret,
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The agent does not yet allow to export v3 packets. It is
|
/* The agent does not yet allow export of v3 packets. It is
|
||||||
actually questionable whether we should allow them at
|
actually questionable whether we should allow them at
|
||||||
all. */
|
all. */
|
||||||
if (pk->version == 3)
|
if (pk->version == 3)
|
||||||
|
@ -2514,7 +2514,7 @@ merge_selfsigs_main (KBNODE keyblock, int *r_revoked,
|
|||||||
else if ((IS_UID_SIG (sig) || IS_UID_REV (sig))
|
else if ((IS_UID_SIG (sig) || IS_UID_REV (sig))
|
||||||
&& sig->timestamp >= sigdate)
|
&& sig->timestamp >= sigdate)
|
||||||
{
|
{
|
||||||
/* Note: we allow to invalidate cert revocations
|
/* Note: we allow invalidation of cert revocations
|
||||||
* by a newer signature. An attacker can't use this
|
* by a newer signature. An attacker can't use this
|
||||||
* because a key should be revoked with a key revocation.
|
* because a key should be revoked with a key revocation.
|
||||||
* The reason why we have to allow for that is that at
|
* The reason why we have to allow for that is that at
|
||||||
|
@ -2020,7 +2020,7 @@ import_secret_one (ctrl_t ctrl, kbnode_t keyblock,
|
|||||||
#ifdef ENABLE_SELINUX_HACKS
|
#ifdef ENABLE_SELINUX_HACKS
|
||||||
if (1)
|
if (1)
|
||||||
{
|
{
|
||||||
/* We don't allow to import secret keys because that may be used
|
/* We don't allow importing secret keys because that may be used
|
||||||
to put a secret key into the keyring and the user might later
|
to put a secret key into the keyring and the user might later
|
||||||
be tricked into signing stuff with that key. */
|
be tricked into signing stuff with that key. */
|
||||||
log_error (_("importing secret keys not allowed\n"));
|
log_error (_("importing secret keys not allowed\n"));
|
||||||
|
@ -1338,7 +1338,7 @@ sign_uids (ctrl_t ctrl, estream_t fp,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Fixme: see whether there is a revocation in which
|
/* Fixme: see whether there is a revocation in which
|
||||||
* case we should allow to sign it again. */
|
* case we should allow signing it again. */
|
||||||
if (!node->pkt->pkt.signature->flags.exportable && local)
|
if (!node->pkt->pkt.signature->flags.exportable && local)
|
||||||
tty_fprintf ( fp,
|
tty_fprintf ( fp,
|
||||||
_("\"%s\" was already locally signed by key %s\n"),
|
_("\"%s\" was already locally signed by key %s\n"),
|
||||||
|
@ -13,11 +13,11 @@
|
|||||||
dnl AM_PATH_KSBA([MINIMUM-VERSION,
|
dnl AM_PATH_KSBA([MINIMUM-VERSION,
|
||||||
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
||||||
dnl Test for libksba and define KSBA_CFLAGS and KSBA_LIBS
|
dnl Test for libksba and define KSBA_CFLAGS and KSBA_LIBS
|
||||||
dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
|
dnl MINIMUM-VERSION is a string with the version number optionalliy prefixed
|
||||||
dnl with the API version to also check the API compatibility. Example:
|
dnl with the API version to also check the API compatibility. Example:
|
||||||
dnl a MINIMUN-VERSION of 1:1.0.7 won't pass the test unless the installed
|
dnl a MINIMUM-VERSION of 1:1.0.7 won't pass the test unless the installed
|
||||||
dnl version of libksba is at least 1.0.7 *and* the API number is 1. Using
|
dnl version of libksba is at least 1.0.7 *and* the API number is 1. Using
|
||||||
dnl this features allows to prevent build against newer versions of libksba
|
dnl this feature prevents building against newer versions of libksba
|
||||||
dnl with a changed API.
|
dnl with a changed API.
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN([AM_PATH_KSBA],
|
AC_DEFUN([AM_PATH_KSBA],
|
||||||
|
@ -15,11 +15,11 @@
|
|||||||
dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
|
dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
|
||||||
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
||||||
dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
|
dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
|
||||||
dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
|
dnl MINIMUM-VERSION is a string with the version number optionalliy prefixed
|
||||||
dnl with the API version to also check the API compatibility. Example:
|
dnl with the API version to also check the API compatibility. Example:
|
||||||
dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
|
dnl a MINIMUM-VERSION of 1:1.2.5 won't pass the test unless the installed
|
||||||
dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
|
dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
|
||||||
dnl this features allows to prevent build against newer versions of libgcrypt
|
dnl this feature prevents building against newer versions of libgcrypt
|
||||||
dnl with a changed API.
|
dnl with a changed API.
|
||||||
dnl
|
dnl
|
||||||
dnl If a prefix option is not used, the config script is first
|
dnl If a prefix option is not used, the config script is first
|
||||||
|
@ -14,11 +14,11 @@ dnl AM_PATH_NTBTLS([MINIMUM-VERSION,
|
|||||||
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
||||||
dnl
|
dnl
|
||||||
dnl Test for NTBTLS and define NTBTLS_CFLAGS and NTBTLS_LIBS.
|
dnl Test for NTBTLS and define NTBTLS_CFLAGS and NTBTLS_LIBS.
|
||||||
dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
|
dnl MINIMUM-VERSION is a string with the version number optionalliy prefixed
|
||||||
dnl with the API version to also check the API compatibility. Example:
|
dnl with the API version to also check the API compatibility. Example:
|
||||||
dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
|
dnl a MINIMUM-VERSION of 1:1.2.5 won't pass the test unless the installed
|
||||||
dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
|
dnl version of ntbtls is at least 1.2.5 *and* the API number is 1. Using
|
||||||
dnl this features allows to prevent build against newer versions of libgcrypt
|
dnl this feature prevents building against newer versions of ntbtls
|
||||||
dnl with a changed API.
|
dnl with a changed API.
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN([AM_PATH_NTBTLS],
|
AC_DEFUN([AM_PATH_NTBTLS],
|
||||||
|
2
po/ca.po
2
po/ca.po
@ -8756,7 +8756,7 @@ msgstr ""
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/cs.po
2
po/cs.po
@ -8257,7 +8257,7 @@ msgstr "|N| nastavit maximální životnost klíčů SSH na N sekund"
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr "Volby vynucující politiku hesel"
|
msgstr "Volby vynucující politiku hesel"
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr "nedovolit obejít politiku hesel"
|
msgstr "nedovolit obejít politiku hesel"
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/da.po
2
po/da.po
@ -8774,7 +8774,7 @@ msgstr "|N|angive maksimal livsforløb for SSH-nøgle til N sekunder"
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr "Tilvalg der fremtvinger en adgangsfrasepolitik"
|
msgstr "Tilvalg der fremtvinger en adgangsfrasepolitik"
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr "tillad ikke omgåelse af adgangsfrasepolitikken"
|
msgstr "tillad ikke omgåelse af adgangsfrasepolitikken"
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/de.po
2
po/de.po
@ -8322,7 +8322,7 @@ msgstr "|N|setze die maximale Lebenszeit von SSH Schlüsseln auf N Sekunden"
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr "Optionen für eine Passphrase-Policy"
|
msgstr "Optionen für eine Passphrase-Policy"
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr "Einhaltung der Passphrase-Policy erzwingen"
|
msgstr "Einhaltung der Passphrase-Policy erzwingen"
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/el.po
2
po/el.po
@ -8572,7 +8572,7 @@ msgstr ""
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/eo.po
2
po/eo.po
@ -8515,7 +8515,7 @@ msgstr ""
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/es.po
2
po/es.po
@ -8801,7 +8801,7 @@ msgstr "|N|establecer vida m
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr "Opciones que fuerzan una política de frases contraseña"
|
msgstr "Opciones que fuerzan una política de frases contraseña"
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr "no permitir evitar la política de frases contraseña"
|
msgstr "no permitir evitar la política de frases contraseña"
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/et.po
2
po/et.po
@ -8489,7 +8489,7 @@ msgstr ""
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/fi.po
2
po/fi.po
@ -8552,7 +8552,7 @@ msgstr ""
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/fr.po
2
po/fr.po
@ -8490,7 +8490,7 @@ msgstr "|N|définir la durée maximale du cache de clef SSH à N secondes"
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr "Options d'application d'une politique de phrase secrète"
|
msgstr "Options d'application d'une politique de phrase secrète"
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr "pas de contournement de politique de phrase secrète"
|
msgstr "pas de contournement de politique de phrase secrète"
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/gl.po
2
po/gl.po
@ -8576,7 +8576,7 @@ msgstr ""
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/hu.po
2
po/hu.po
@ -8522,7 +8522,7 @@ msgstr ""
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/id.po
2
po/id.po
@ -8511,7 +8511,7 @@ msgstr ""
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/it.po
2
po/it.po
@ -8555,7 +8555,7 @@ msgstr ""
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/ja.po
2
po/ja.po
@ -7974,7 +7974,7 @@ msgstr "|N|最大SSH鍵存続時間をN秒とする"
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr "パスワード・ポリシーの強制オプション"
|
msgstr "パスワード・ポリシーの強制オプション"
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr "パスワード・ポリシーを迂回することを認めない"
|
msgstr "パスワード・ポリシーを迂回することを認めない"
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/nb.po
2
po/nb.po
@ -8090,7 +8090,7 @@ msgstr "|N|endre maksimal livstid for SSH-nøkler til N antall sekunder"
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr "Valg som håndhever passordfrase-regler"
|
msgstr "Valg som håndhever passordfrase-regler"
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr "ikke tillat overstyring av passordfrase-regler"
|
msgstr "ikke tillat overstyring av passordfrase-regler"
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/pl.po
2
po/pl.po
@ -8837,7 +8837,7 @@ msgstr "|N|ustawienie maksymalnego czasu
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr "Opcje wymuszające politykę haseł"
|
msgstr "Opcje wymuszające politykę haseł"
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr "nie zezwalanie na pominięcie polityki haseł"
|
msgstr "nie zezwalanie na pominięcie polityki haseł"
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/pt.po
2
po/pt.po
@ -8524,7 +8524,7 @@ msgstr ""
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/ro.po
2
po/ro.po
@ -8586,7 +8586,7 @@ msgstr ""
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/ru.po
2
po/ru.po
@ -8195,7 +8195,7 @@ msgstr "|N|установить максимальный срок действи
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr "Параметры, обеспечивающие правила для фраз-паролей"
|
msgstr "Параметры, обеспечивающие правила для фраз-паролей"
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr "не позволять обходить правила для фраз-паролей"
|
msgstr "не позволять обходить правила для фраз-паролей"
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/sk.po
2
po/sk.po
@ -8541,7 +8541,7 @@ msgstr ""
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/sv.po
2
po/sv.po
@ -8917,7 +8917,7 @@ msgstr "|N|ställ in maximal livstid för SSH-nyckel till N sekunder"
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr "Flaggor som tvingar igenom en lösenfraspolicy"
|
msgstr "Flaggor som tvingar igenom en lösenfraspolicy"
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr "tillåt inte att gå förbi lösenfraspolicyn"
|
msgstr "tillåt inte att gå förbi lösenfraspolicyn"
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/tr.po
2
po/tr.po
@ -8819,7 +8819,7 @@ msgstr "|N|azami SSH anahtarı ömrü N saniyeye ayarlanır"
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr "Bir anahtar parolası kuralını zorlayan seçenekler"
|
msgstr "Bir anahtar parolası kuralını zorlayan seçenekler"
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr "anahtar parolası kuralının atlanmasına izin verilmez"
|
msgstr "anahtar parolası kuralının atlanmasına izin verilmez"
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
2
po/uk.po
2
po/uk.po
@ -8299,7 +8299,7 @@ msgstr "|N|встановити максимальний строк дії кл
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr "Параметри примусового використання правил паролів"
|
msgstr "Параметри примусового використання правил паролів"
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr "не дозволяти обхід правил паролів"
|
msgstr "не дозволяти обхід правил паролів"
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
@ -8410,7 +8410,7 @@ msgstr ""
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
@ -8039,7 +8039,7 @@ msgstr "|N|把 SSH 金鑰最大生存時間設成 N 秒"
|
|||||||
msgid "Options enforcing a passphrase policy"
|
msgid "Options enforcing a passphrase policy"
|
||||||
msgstr "強制執行密語原則的選項"
|
msgstr "強制執行密語原則的選項"
|
||||||
|
|
||||||
msgid "do not allow to bypass the passphrase policy"
|
msgid "do not allow bypassing the passphrase policy"
|
||||||
msgstr "不允許略過密語原則"
|
msgstr "不允許略過密語原則"
|
||||||
|
|
||||||
msgid "|N|set minimal required length for new passphrases to N"
|
msgid "|N|set minimal required length for new passphrases to N"
|
||||||
|
@ -2935,8 +2935,8 @@ do_sign (app_t app, const char *keyidstr, int hashalgo,
|
|||||||
|
|
||||||
/* Due to the fact that the non-repudiation signature on a BELPIC
|
/* Due to the fact that the non-repudiation signature on a BELPIC
|
||||||
card requires a verify immediately before the DSO we set the
|
card requires a verify immediately before the DSO we set the
|
||||||
MSE before we do the verification. Other cards might allow to do
|
MSE before we do the verification. Other cards might also allow
|
||||||
this also but I don't want to break anything, thus we do it only
|
this but I don't want to break anything, thus we do it only
|
||||||
for the BELPIC card here. */
|
for the BELPIC card here. */
|
||||||
if (app->app_local->card_type == CARD_TYPE_BELPIC)
|
if (app->app_local->card_type == CARD_TYPE_BELPIC)
|
||||||
{
|
{
|
||||||
|
@ -2980,7 +2980,7 @@ ccid_transceive (ccid_driver_t handle,
|
|||||||
nresp = &dummy_nresp;
|
nresp = &dummy_nresp;
|
||||||
*nresp = 0;
|
*nresp = 0;
|
||||||
|
|
||||||
/* Smarter readers allow to send APDUs directly; divert here. */
|
/* Smarter readers allow sending APDUs directly; divert here. */
|
||||||
if (handle->apdu_level)
|
if (handle->apdu_level)
|
||||||
{
|
{
|
||||||
/* We employ a hack for Omnikey readers which are able to send
|
/* We employ a hack for Omnikey readers which are able to send
|
||||||
|
@ -499,7 +499,7 @@ static const char hlp_serialno[] =
|
|||||||
"error is returned if the application is not supported or available.\n"
|
"error is returned if the application is not supported or available.\n"
|
||||||
"The default is to auto-select the application using a hardwired\n"
|
"The default is to auto-select the application using a hardwired\n"
|
||||||
"preference system. Note, that a future extension to this function\n"
|
"preference system. Note, that a future extension to this function\n"
|
||||||
"may allow to specify a list and order of applications to try.\n"
|
"may enable specifying a list and order of applications to try.\n"
|
||||||
"\n"
|
"\n"
|
||||||
"This function is special in that it can be used to reset the card.\n"
|
"This function is special in that it can be used to reset the card.\n"
|
||||||
"Most other functions will return an error when a card change has\n"
|
"Most other functions will return an error when a card change has\n"
|
||||||
|
@ -1681,7 +1681,7 @@ main ( int argc, char **argv)
|
|||||||
|
|
||||||
/* Build the recipient list. We first add the regular ones and then
|
/* Build the recipient list. We first add the regular ones and then
|
||||||
the encrypt-to ones because the underlying function will silently
|
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
|
flagged as encrypt-to as the actually encrypt function would then
|
||||||
complain about no (regular) recipients. */
|
complain about no (regular) recipients. */
|
||||||
for (sl = remusr; sl; sl = sl->next)
|
for (sl = remusr; sl; sl = sl->next)
|
||||||
@ -1785,7 +1785,7 @@ main ( int argc, char **argv)
|
|||||||
{
|
{
|
||||||
estream_t fp = open_es_fwrite (opt.outfile?opt.outfile:"-");
|
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.*/
|
signing because that is what gpg does.*/
|
||||||
set_binary (stdin);
|
set_binary (stdin);
|
||||||
if (!argc) /* Create from stdin. */
|
if (!argc) /* Create from stdin. */
|
||||||
|
@ -109,7 +109,7 @@ hash_and_copy_data (int fd, gcry_md_hd_t md, ksba_writer_t writer)
|
|||||||
es_fclose (fp);
|
es_fclose (fp);
|
||||||
if (!any)
|
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
|
make much sense and more seriously, ksba_cms_build has
|
||||||
already written the tag for data and now expects an octet
|
already written the tag for data and now expects an octet
|
||||||
string and an octet string of size 0 is illegal. */
|
string and an octet string of size 0 is illegal. */
|
||||||
|
@ -560,7 +560,7 @@ static gc_option_t gc_options_gpg_agent[] =
|
|||||||
"gnupg", N_("Options enforcing a passphrase policy") },
|
"gnupg", N_("Options enforcing a passphrase policy") },
|
||||||
{ "enforce-passphrase-constraints", GC_OPT_FLAG_RUNTIME,
|
{ "enforce-passphrase-constraints", GC_OPT_FLAG_RUNTIME,
|
||||||
GC_LEVEL_EXPERT, "gnupg",
|
GC_LEVEL_EXPERT, "gnupg",
|
||||||
N_("do not allow to bypass the passphrase policy"),
|
N_("do not allow bypassing the passphrase policy"),
|
||||||
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
|
GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
|
||||||
{ "min-passphrase-len", GC_OPT_FLAG_RUNTIME,
|
{ "min-passphrase-len", GC_OPT_FLAG_RUNTIME,
|
||||||
GC_LEVEL_ADVANCED, "gnupg",
|
GC_LEVEL_ADVANCED, "gnupg",
|
||||||
@ -3736,7 +3736,7 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
|
|||||||
|
|
||||||
if (defaults)
|
if (defaults)
|
||||||
{
|
{
|
||||||
/* Here we explicitly allow to update the value again. */
|
/* Here we explicitly allow updating the value again. */
|
||||||
if (newflags)
|
if (newflags)
|
||||||
{
|
{
|
||||||
option_info->new_flags = 0;
|
option_info->new_flags = 0;
|
||||||
|
@ -103,7 +103,7 @@ struct tar_header_s
|
|||||||
unsigned long long mtime; /* Modification time since Epoch. Note
|
unsigned long long mtime; /* Modification time since Epoch. Note
|
||||||
that we don't use time_t here but a
|
that we don't use time_t here but a
|
||||||
type which is more likely to be larger
|
type which is more likely to be larger
|
||||||
that 32 bit and thus allows to track
|
that 32 bit and thus allows tracking
|
||||||
times beyond 2106. */
|
times beyond 2106. */
|
||||||
typeflag_t typeflag; /* The type of the file. */
|
typeflag_t typeflag; /* The type of the file. */
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user