mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
Spelling cleanup.
No functional changes, just fixing minor spelling issues.
---
Most of these were identified from the command line by running:
codespell \
--ignore-words-list fpr,stati,keyserver,keyservers,asign,cas,iff,ifset \
--skip '*.po,ChangeLog*,help.*.txt,*.jpg,*.eps,*.pdf,*.png,*.gpg,*.asc' \
doc g13 g10 kbx agent artwork scd tests tools am common dirmngr sm \
NEWS README README.maint TODO
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
This commit is contained in:
Daniel Kahn Gillmor
parent
0e1cbabc0a
commit
0904b8ef34
6
NEWS
6
NEWS
@ -299,7 +299,7 @@ Noteworthy changes in version 2.3.0 (unreleased)
|
||||
|
||||
Changes also found in 2.2.11:
|
||||
|
||||
* gpgsm: Fix CRL loading when intermediate certicates are not yet
|
||||
* gpgsm: Fix CRL loading when intermediate certificates are not yet
|
||||
trusted.
|
||||
|
||||
* gpgsm: Fix an error message about the digest algo. [#4219]
|
||||
@ -634,7 +634,7 @@ Noteworthy changes in version 2.3.0 (unreleased)
|
||||
|
||||
* gpgsm: Do not expect X.509 keyids to be unique. [#1644]
|
||||
|
||||
* agent: Fix stucked Pinentry when using --max-passphrase-days. [#3190]
|
||||
* agent: Fix stuck Pinentry when using --max-passphrase-days. [#3190]
|
||||
|
||||
* agent: New option --s2k-count. [#3276 (workaround)]
|
||||
|
||||
@ -1910,7 +1910,7 @@ Noteworthy changes in version 2.1.0 (2014-11-06)
|
||||
|
||||
* scdaemon: Rename option --disable-pinpad (was --disable-keypad).
|
||||
|
||||
* scdaemon: Better support fo CCID readers. Now, internal CCID
|
||||
* scdaemon: Better support for CCID readers. Now, internal CCID
|
||||
driver supports readers with no auto configuration feature.
|
||||
|
||||
* dirmngr: Removed support for the original HKP keyserver which is
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
#define MAX_DIGEST_LEN 64
|
||||
|
||||
/* The maximum length of a passphrase (in bytes). Note: this is
|
||||
further contrained by the Assuan line length (and any other text on
|
||||
further constrained by the Assuan line length (and any other text on
|
||||
the same line). However, the Assuan line length is 1k bytes so
|
||||
this shouldn't be a problem in practice. */
|
||||
#define MAX_PASSPHRASE_LEN 255
|
||||
@ -126,7 +126,7 @@ struct
|
||||
int enable_passphrase_history;
|
||||
|
||||
/* If set the extended key format is used for new keys. Note that
|
||||
* this may vave the value 2 in which case
|
||||
* this may have the value 2 in which case
|
||||
* --disable-extended-key-format won't have any effect and thus
|
||||
* effectivley locking it. This is required to support existing
|
||||
* profiles which lock the use of --enable-extended-key-format. */
|
||||
|
||||
@ -205,7 +205,7 @@ housekeeping (void)
|
||||
for (r=thecache; r; r = r->next)
|
||||
{
|
||||
if (r->cache_mode == CACHE_MODE_PIN)
|
||||
; /* Don't let it expire - scdaemon explictly flushes them. */
|
||||
; /* Don't let it expire - scdaemon explicitly flushes them. */
|
||||
else if (r->pw && r->ttl >= 0 && r->accessed + r->ttl < current)
|
||||
{
|
||||
if (DBG_CACHE)
|
||||
|
||||
@ -1508,7 +1508,7 @@ ssh_signature_encoder_dsa (ssh_key_type_spec_t *spec,
|
||||
|
||||
/* DSA specific code. */
|
||||
|
||||
/* FIXME: Why this complicated code? Why collecting boths mpis in a
|
||||
/* FIXME: Why this complicated code? Why collecting both mpis in a
|
||||
buffer instead of writing them out one after the other? */
|
||||
for (i = 0; i < 2; i++)
|
||||
{
|
||||
|
||||
@ -656,7 +656,7 @@ static const char hlp_setkeydesc[] =
|
||||
"Set a description to be used for the next PKSIGN, PKDECRYPT, IMPORT_KEY\n"
|
||||
"or EXPORT_KEY operation if this operation requires a passphrase. If\n"
|
||||
"this command is not used a default text will be used. Note, that\n"
|
||||
"this description implictly selects the label used for the entry\n"
|
||||
"this description implicitly selects the label used for the entry\n"
|
||||
"box; if the string contains the string PIN (which in general will\n"
|
||||
"not be translated), \"PIN\" is used, otherwise the translation of\n"
|
||||
"\"passphrase\" is used. The description string should not contain\n"
|
||||
|
||||
@ -199,8 +199,8 @@ write_extended_private_key (char *fname, estream_t fp, int update,
|
||||
|
||||
/* Write an S-expression formatted key to our key storage. With FORCE
|
||||
* passed as true an existing key with the given GRIP will get
|
||||
* overwritten. If SERIALNO and KEYREF are give an a Token line is added to
|
||||
* th key if the extended format ist used. */
|
||||
* overwritten. If SERIALNO and KEYREF are given a Token line is added to
|
||||
* the key if the extended format is used. */
|
||||
int
|
||||
agent_write_private_key (const unsigned char *grip,
|
||||
const void *buffer, size_t length, int force,
|
||||
|
||||
@ -2030,7 +2030,7 @@ agent_copy_startup_env (ctrl_t ctrl)
|
||||
Fixme: Due to the way the argument parsing works, we create a
|
||||
memory leak here for all string type arguments. There is currently
|
||||
no clean way to tell whether the memory for the argument has been
|
||||
allocated or points into the process' original arguments. Unless
|
||||
allocated or points into the process's original arguments. Unless
|
||||
we have a mechanism to tell this, we need to live on with this. */
|
||||
static void
|
||||
reread_configuration (void)
|
||||
|
||||
@ -349,7 +349,7 @@ agent_pksign_do (ctrl_t ctrl, const char *cache_nonce,
|
||||
|
||||
if (agent_card_serialno (ctrl, &serialno, NULL))
|
||||
{
|
||||
/* No card availabale or error reading the card. */
|
||||
/* No card available or error reading the card. */
|
||||
err = gpg_error (GPG_ERR_NO_SECKEY);
|
||||
goto leave;
|
||||
}
|
||||
|
||||
@ -40,8 +40,8 @@ static HWND glob_hwnd;
|
||||
number of args to reserve before the first one. This code is based
|
||||
on Alexandre Julliard's LGPLed wine-0.9.34/dlls/kernel32/process.c
|
||||
and modified to fit into our framework. The function returns NULL
|
||||
on error; on success an arry with the argiments is returned. This
|
||||
array has been allocaqted using a plain malloc (and not the usual
|
||||
on error; on success an array with the arguments is returned. This
|
||||
array has been allocated using a plain malloc (and not the usual
|
||||
xtrymalloc). */
|
||||
static char **
|
||||
build_argv (char *cmdline_arg, int reserved)
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
/* This file may be used as part of GnuPG or standalone. A GnuPG
|
||||
build is detected by the presence of the macro GNUPG_MAJOR_VERSION.
|
||||
Some feature are only availalbe in the GnuPG build mode.
|
||||
Some feature are only available in the GnuPG build mode.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
static assuan_context_t (*the_assuan_ctx_func)(ctrl_t ctrl);
|
||||
|
||||
|
||||
/* Set FUNC to be used as a mapping fucntion from CTRL to an assuan
|
||||
/* Set FUNC to be used as a mapping function from CTRL to an assuan
|
||||
* context. Pass NULL for FUNC to disable the use of the assuan
|
||||
* context in this module. */
|
||||
void
|
||||
|
||||
@ -80,7 +80,7 @@ static void writeout_rem (audit_ctx_t ctx,
|
||||
|
||||
|
||||
/* Add NAME to the list of help tags. NAME needs to be a const string
|
||||
an this function merly stores this pointer. */
|
||||
an this function merely stores this pointer. */
|
||||
static void
|
||||
add_helptag (audit_ctx_t ctx, const char *name)
|
||||
{
|
||||
|
||||
@ -124,7 +124,7 @@
|
||||
that the handle shall only be used by one thread at a time. This
|
||||
function creates a unique file temporary file (".#lk*") in the same
|
||||
directory as FNAME and returns a handle for further operations.
|
||||
The module keeps track of theses unique files so that they will be
|
||||
The module keeps track of these unique files so that they will be
|
||||
unlinked using the atexit handler. If you don't need the lock file
|
||||
anymore, you may also explicitly remove it with a call to:
|
||||
|
||||
@ -1110,7 +1110,7 @@ dotlock_take_unix (dotlock_t h, long timeout)
|
||||
}
|
||||
else if ( same_node && kill (pid, 0) && errno == ESRCH )
|
||||
{
|
||||
/* Note: It is unlikley that we get a race here unless a pid is
|
||||
/* Note: It is unlikely that we get a race here unless a pid is
|
||||
reused too fast or a new process with the same pid as the one
|
||||
of the stale file tries to lock right at the same time as we. */
|
||||
my_info_1 (_("removing stale lockfile (created by %d)\n"), pid);
|
||||
|
||||
@ -305,7 +305,7 @@ copy_buffer_flush (struct copy_buffer *c, estream_t sink)
|
||||
/* Run the program PGMNAME with the command line arguments given in
|
||||
* the NULL terminates array ARGV. If INPUT is not NULL it will be
|
||||
* fed to stdin of the process. stderr is logged using log_info and
|
||||
* the process' stdout is written to OUTPUT. If OUTPUT is NULL the
|
||||
* the process's stdout is written to OUTPUT. If OUTPUT is NULL the
|
||||
* output is discarded. If INEXTRA is given, an additional input
|
||||
* stream will be passed to the child; to tell the child about this
|
||||
* ARGV is scanned and the first occurrence of an argument
|
||||
@ -582,7 +582,7 @@ nop_free (void *ptr)
|
||||
/* Run the program PGMNAME with the command line arguments given in
|
||||
the NULL terminates array ARGV. If INPUT_STRING is not NULL it
|
||||
will be fed to stdin of the process. stderr is logged using
|
||||
log_info and the process' stdout is returned in a newly malloced
|
||||
log_info and the process's stdout is returned in a newly malloced
|
||||
buffer RESULT with the length stored at RESULTLEN if not given as
|
||||
NULL. A hidden Nul is appended to the output. On error NULL is
|
||||
stored at RESULT, a diagnostic is printed, and an error code
|
||||
|
||||
@ -46,7 +46,7 @@ typedef void (*exec_tool_status_cb_t) (void *opaque,
|
||||
/* Run the program PGMNAME with the command line arguments given in
|
||||
the NULL terminates array ARGV. If INPUT_STRING is not NULL it
|
||||
will be fed to stdin of the process. stderr is logged using
|
||||
log_info and the process' stdout is returned in a newly malloced
|
||||
log_info and the process's stdout is returned in a newly malloced
|
||||
buffer RESULT with the length stored at RESULTLEN if not given as
|
||||
NULL. A hidden Nul is appended to the output. On error NULL is
|
||||
stored at RESULT, a diagnostic is printed, and an error code
|
||||
@ -58,7 +58,7 @@ gpg_error_t gnupg_exec_tool (const char *pgmname, const char *argv[],
|
||||
/* Run the program PGMNAME with the command line arguments given in
|
||||
the NULL terminates array ARGV. If INPUT is not NULL it will be
|
||||
fed to stdin of the process. stderr is logged using log_info and
|
||||
the process' stdout is written to OUTPUT. On error a diagnostic is
|
||||
the process's stdout is written to OUTPUT. On error a diagnostic is
|
||||
printed, and an error code returned. INEXTRA is reserved. */
|
||||
gpg_error_t gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
|
||||
estream_t input, estream_t inextra,
|
||||
|
||||
@ -87,7 +87,7 @@ static byte w32_portable_app;
|
||||
#endif /*HAVE_W32_SYSTEM*/
|
||||
|
||||
#ifdef HAVE_W32_SYSTEM
|
||||
/* This flag is true if this process' binary has been installed under
|
||||
/* This flag is true if this process's binary has been installed under
|
||||
bin and not in the root directory as often used before GnuPG 2.1. */
|
||||
static byte w32_bin_is_bin;
|
||||
#endif /*HAVE_W32_SYSTEM*/
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
* function returns the new string or NULL in case of a malloc
|
||||
* failure.
|
||||
*
|
||||
* Note that this fucntion also escapes the quote character to work
|
||||
* Note that this function also escapes the quote character to work
|
||||
* around a bug in the mingw32 runtime which does not correctly handle
|
||||
* command line quoting. We correctly double the quote mark when
|
||||
* calling a program (i.e. gpg-protect-tool), but the pre-main code
|
||||
|
||||
@ -375,7 +375,7 @@ session_env_getenv_or_default (session_env_t se, const char *name,
|
||||
until it returns NULL. The value is returned at R_VALUE. If
|
||||
R_DEFAULT is not NULL, the default flag is stored on return. The
|
||||
default flag indicates that the value has been taken from the
|
||||
process' environment. The caller must not change the returned
|
||||
process's environment. The caller must not change the returned
|
||||
name or value. */
|
||||
char *
|
||||
session_env_listenv (session_env_t se, int *iterator,
|
||||
|
||||
@ -350,7 +350,7 @@ run_modification_tests (void)
|
||||
assert (!err);
|
||||
e = nvc_lookup (pk, "Key:");
|
||||
assert (e);
|
||||
nvc_delete_named (pk, "Kez:"); /* Delete an inexistant name. */
|
||||
nvc_delete_named (pk, "Kez:"); /* Delete an nonexistent name. */
|
||||
e = nvc_lookup (pk, "Key:");
|
||||
assert (e);
|
||||
nvc_delete_named (pk, "Key:");
|
||||
|
||||
@ -274,7 +274,7 @@ test_get_keyalgo_string (void)
|
||||
int oops = 0;
|
||||
int pass;
|
||||
|
||||
/* We do several passes becuase that is how the function is
|
||||
/* We do several passes because that is how the function is
|
||||
* called. */
|
||||
for (pass=0; pass < 3; pass++)
|
||||
for (idx=0; idx < DIM (samples); idx++)
|
||||
|
||||
@ -222,7 +222,7 @@ test_percent_data_escape (void)
|
||||
{
|
||||
/* Note extra condition above handles the one test case
|
||||
* which reverts a plus to a space due to the use of the
|
||||
* plus-unescape fucntion also for the prefix part. */
|
||||
* plus-unescape function also for the prefix part. */
|
||||
fail (i);
|
||||
}
|
||||
else if (memcmp (buf+prefixlen, tbl[i].data, tbl[i].datalen))
|
||||
|
||||
@ -1614,7 +1614,7 @@ dirmngr_deinit_default_ctrl (ctrl_t ctrl)
|
||||
/* Create a list of LDAP servers from the file FILENAME. Returns the
|
||||
list or NULL in case of errors.
|
||||
|
||||
The format fo such a file is line oriented where empty lines and
|
||||
The format of such a file is line oriented where empty lines and
|
||||
lines starting with a hash mark are ignored. All other lines are
|
||||
assumed to be colon seprated with these fields:
|
||||
|
||||
@ -1821,7 +1821,7 @@ parse_ocsp_signer (const char *string)
|
||||
Fixme: Due to the way the argument parsing works, we create a
|
||||
memory leak here for all string type arguments. There is currently
|
||||
no clean way to tell whether the memory for the argument has been
|
||||
allocated or points into the process' original arguments. Unless
|
||||
allocated or points into the process's original arguments. Unless
|
||||
we have a mechanism to tell this, we need to live on with this. */
|
||||
static void
|
||||
reread_configuration (void)
|
||||
|
||||
@ -7646,7 +7646,7 @@ retry:
|
||||
goto udp_connect_retry;
|
||||
} else if (error == ECONNREFUSED)
|
||||
/* Error for previous socket operation may
|
||||
be reserverd(?) asynchronously. */
|
||||
be reserved(?) asynchronously. */
|
||||
goto udp_connect_retry;
|
||||
|
||||
if (error)
|
||||
@ -8244,7 +8244,7 @@ struct dns_resolver *dns_res_open(struct dns_resolv_conf *resconf, struct dns_ho
|
||||
/*
|
||||
* Don't try to load it ourselves because a NULL object might be an
|
||||
* error from, say, dns_resconf_root(), and loading
|
||||
* dns_resconf_local() by default would create undesirable surpises.
|
||||
* dns_resconf_local() by default would create undesirable surprises.
|
||||
*/
|
||||
if (!resconf || !hosts || !hints) {
|
||||
if (!*_error)
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
- stpcpy is required
|
||||
- fixme: list other requirements.
|
||||
|
||||
- Either HTTP_USE_NTBTLS or HTTP_USE_GNUTLS must be defind to select
|
||||
- Either HTTP_USE_NTBTLS or HTTP_USE_GNUTLS must be defined to select
|
||||
which TLS library to use.
|
||||
|
||||
- With HTTP_NO_WSASTARTUP the socket initialization is not done
|
||||
|
||||
@ -22,9 +22,9 @@
|
||||
* We can't use LDAP directly for these reasons:
|
||||
*
|
||||
* 1. The LDAP library is linked to separate crypto library like
|
||||
* OpenSSL and even if it is linked to the libary we use in dirmngr
|
||||
* OpenSSL and even if it is linked to the library we use in dirmngr
|
||||
* (ntbtls or gnutls) it is sometimes a different version of that
|
||||
* libary with all the surprising failures you may get due to this.
|
||||
* library with all the surprising failures you may get due to this.
|
||||
*
|
||||
* 2. It is huge library in particular if TLS comes into play. So
|
||||
* problems with unfreed memory might turn up and we don't want
|
||||
|
||||
@ -305,7 +305,7 @@ do_ocsp_request (ctrl_t ctrl, ksba_ocsp_t ocsp,
|
||||
if (opt.verbose)
|
||||
log_info (_("OCSP responder at '%s' status: %s\n"), url, t);
|
||||
|
||||
/* Get the signature value now because we can all this fucntion
|
||||
/* Get the signature value now because we can all this function
|
||||
* only once. */
|
||||
*r_sigval = ksba_ocsp_get_sig_val (ocsp, r_produced_at);
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@ struct wqitem_s
|
||||
* task is not associated with a specific session. */
|
||||
unsigned int session_id;
|
||||
|
||||
/* The function to perform the backgrount task. */
|
||||
/* The function to perform the background task. */
|
||||
wqtask_t func;
|
||||
|
||||
/* A string with the string argument for that task. */
|
||||
@ -59,7 +59,7 @@ workqueue_dump_queue (ctrl_t ctrl)
|
||||
wqitem_t item;
|
||||
unsigned int count;
|
||||
|
||||
/* Temporay detach the entiere workqueue so that other threads don't
|
||||
/* Temporarily detach the entiere workqueue so that other threads don't
|
||||
* get into our way. */
|
||||
saved_workqueue = workqueue;
|
||||
workqueue = NULL;
|
||||
|
||||
@ -130,7 +130,7 @@ the colon format if you want to manually debug things.
|
||||
> * How to import a CRL
|
||||
|
||||
CRLs are managed by the dirmngr which is a separate package. The idea
|
||||
is to eventaully turn it into a system daemon, so that on a multi-user
|
||||
is to eventually turn it into a system daemon, so that on a multi-user
|
||||
machine CRLs are handled more efficiently. As of now the dirmngr
|
||||
needs service from gpgsm thus it is best to call it through gpgsm:
|
||||
|
||||
|
||||
@ -1085,7 +1085,7 @@ as a binary blob.
|
||||
@c
|
||||
@c If no certificate was found, the function returns with the error
|
||||
@c GPG_ERR_MISSING_CERT. Now the signature is verified. If this fails,
|
||||
@c the erro is returned. On success the @code{validate_cert_chain} is
|
||||
@c the error is returned. On success the @code{validate_cert_chain} is
|
||||
@c used to verify that the certificate is actually valid.
|
||||
@c
|
||||
@c Here we may encounter a recursive situation:
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
# Reject the usual metavariables. Usual not required because
|
||||
# gpg-agent can be used to reject all passphrases shorter than 8
|
||||
# charactes.
|
||||
# characters.
|
||||
foo
|
||||
bar
|
||||
baz
|
||||
|
||||
@ -56,7 +56,7 @@ same commands as available in the interactive mode are run from the
|
||||
command line. These commands need to be delimited with a double-dash.
|
||||
If a double-dash or a shell specific character is required as part of
|
||||
a command the entire command needs to be put in quotes. If one of
|
||||
those commands returns an error the remaining commands are mot anymore
|
||||
those commands returns an error the remaining commands are not anymore
|
||||
run unless the command was prefixed with a single dash.
|
||||
|
||||
A list of commands is available by using the command @code{help} and a
|
||||
|
||||
@ -3554,7 +3554,7 @@ on the configuration file.
|
||||
@c @opindex use-only-openpgp-card
|
||||
@c Only access OpenPGP card's and no other cards. This is a hidden
|
||||
@c option which could be used in case an old use case required the
|
||||
@c OpenPGP card while several cards are avaiable. This option might be
|
||||
@c OpenPGP card while several cards are available. This option might be
|
||||
@c removed if it turns out that nobody requires it.
|
||||
|
||||
@end table
|
||||
|
||||
@ -83,7 +83,7 @@ or if no such user directory hierarchy exists @file{~/.gnupg/S.log}).
|
||||
|
||||
@item --force
|
||||
@opindex force
|
||||
Delete an already existing socket file. This option is implictly used
|
||||
Delete an already existing socket file. This option is implicitly used
|
||||
if no socket name has been given on the command line.
|
||||
|
||||
@item --homedir @var{DIR}
|
||||
|
||||
@ -757,7 +757,7 @@ https://gnupg.org/faq/whats-new-in-2.1.html
|
||||
──────────────────────────
|
||||
|
||||
Since version 2.1.14 the export and import options have been enhanced
|
||||
to allow the use of /gpg/ to modify a key without first stroing it in
|
||||
to allow the use of /gpg/ to modify a key without first storing it in
|
||||
the keyring. For example:
|
||||
|
||||
┌────
|
||||
|
||||
@ -1091,7 +1091,7 @@ getattr_one_status_cb (void *opaque, const char *line)
|
||||
|
||||
|
||||
/* Simplified version of agent_scd_getattr. This function returns
|
||||
* only the first occurance of the attribute NAME and stores it at
|
||||
* only the first occurrence of the attribute NAME and stores it at
|
||||
* R_VALUE. A nul in the result is silennly replaced by 0xff. On
|
||||
* error NULL is stored at R_VALUE. */
|
||||
gpg_error_t
|
||||
@ -1444,7 +1444,7 @@ agent_scd_readcert (const char *certidstr,
|
||||
}
|
||||
|
||||
|
||||
/* Callback for the agent_scd_readkey fucntion. */
|
||||
/* Callback for the agent_scd_readkey function. */
|
||||
static gpg_error_t
|
||||
readkey_status_cb (void *opaque, const char *line)
|
||||
{
|
||||
|
||||
@ -174,7 +174,7 @@ unsigned long agent_get_s2k_count (void);
|
||||
0 if not available, positive value if the secret key is available. */
|
||||
int agent_probe_secret_key (ctrl_t ctrl, PKT_public_key *pk);
|
||||
|
||||
/* Ask the agent whether a secret key is availabale for any of the
|
||||
/* Ask the agent whether a secret key is available for any of the
|
||||
keys (primary or sub) in KEYBLOCK. Returns 0 if available. */
|
||||
gpg_error_t agent_probe_any_secret_key (ctrl_t ctrl, kbnode_t keyblock);
|
||||
|
||||
|
||||
@ -876,7 +876,7 @@ keydb_insert_keyblock (KEYDB_HANDLE hd, kbnode_t kb)
|
||||
* search yet on this database handle (or called keydb_search_reset),
|
||||
* then this function returns an error.
|
||||
*
|
||||
* Returns 0 on success or an error code, if an error occured. */
|
||||
* Returns 0 on success or an error code, if an error occurred. */
|
||||
gpg_error_t
|
||||
keydb_delete_keyblock (KEYDB_HANDLE hd)
|
||||
{
|
||||
|
||||
@ -556,7 +556,7 @@ match_curve_skey_pk (gcry_sexp_t s_key, PKT_public_key *pk)
|
||||
}
|
||||
|
||||
|
||||
/* Return a canonicalized public key algoithms. This is used to
|
||||
/* Return a canonicalized public key algorithms. This is used to
|
||||
compare different flavors of algorithms (e.g. ELG and ELG_E are
|
||||
considered the same). */
|
||||
static enum gcry_pk_algos
|
||||
|
||||
@ -868,7 +868,7 @@ key_byname (ctrl_t ctrl, GETKEY_CTX *retctx, strlist_t namelist,
|
||||
* considered. Note: the local key ring is
|
||||
* consulted even if local is not in the
|
||||
* auto-key-locate option list!
|
||||
* GET_PUBKEY_NO_LOCAL - Only the auto key locate functionaly is
|
||||
* GET_PUBKEY_NO_LOCAL - Only the auto key locate functionality is
|
||||
* used and no local search is done.
|
||||
*
|
||||
* If RETCTX is not NULL, then the constructed context is returned in
|
||||
@ -1762,7 +1762,7 @@ get_keyblock_byfprint_fast (ctrl_t ctrl,
|
||||
keydb_disable_caching (hd);
|
||||
}
|
||||
|
||||
/* Fo all other errors we return the handle. */
|
||||
/* For all other errors we return the handle. */
|
||||
if (r_hd)
|
||||
*r_hd = hd;
|
||||
|
||||
|
||||
@ -1886,7 +1886,7 @@ import_one_real (ctrl_t ctrl,
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Remove all non-self-sigs if requested. Noe that this is a NOP if
|
||||
/* Remove all non-self-sigs if requested. Note that this is a NOP if
|
||||
* that option has been globally set but we may also be called
|
||||
* latter with the already parsed keyblock and a locally changed
|
||||
* option. This is why we need to remove them here as well. */
|
||||
@ -3129,7 +3129,7 @@ import_secret_one (ctrl_t ctrl, kbnode_t keyblock,
|
||||
|
||||
|
||||
/* Return the recocation reason from signature SIG. If no revocation
|
||||
* reason is availabale 0 is returned, in other cases the reason
|
||||
* reason is available 0 is returned, in other cases the reason
|
||||
* (0..255). If R_REASON is not NULL a malloced textual
|
||||
* representation of the code is stored there. If R_COMMENT is not
|
||||
* NULL the comment from the reason is stored there and its length at
|
||||
|
||||
@ -814,7 +814,7 @@ keydb_dump_stats (void)
|
||||
|
||||
|
||||
/* keydb_new diverts to here in non-keyboxd mode. HD is just the
|
||||
* calloced structure with the handle type intialized. */
|
||||
* calloced structure with the handle type initialized. */
|
||||
gpg_error_t
|
||||
internal_keydb_init (KEYDB_HANDLE hd)
|
||||
{
|
||||
|
||||
@ -3686,7 +3686,7 @@ show_key_with_all_names (ctrl_t ctrl, estream_t fp,
|
||||
* a secret key. This function may be called with KEYBLOCK containing
|
||||
* secret keys and thus the printing of "pub" vs. "sec" does only
|
||||
* depend on the packet type and not by checking with gpg-agent. If
|
||||
* PRINT_SEC ist set "sec" is printed instead of "pub". */
|
||||
* PRINT_SEC is set "sec" is printed instead of "pub". */
|
||||
void
|
||||
show_basic_key_info (ctrl_t ctrl, kbnode_t keyblock, int print_sec)
|
||||
{
|
||||
|
||||
@ -3247,7 +3247,7 @@ generate_user_id (KBNODE keyblock, const char *uidstr)
|
||||
* subkey. If R_KEYVERSION is not NULL it will receive the version of
|
||||
* the key; this is currently 4 but can be changed with the flag "v5"
|
||||
* to create a v5 key. If R_KEYTIME is not NULL and the key has been
|
||||
* taken fron active OpenPGP card, its creation time is stored
|
||||
* taken from active OpenPGP card, its creation time is stored
|
||||
* there. */
|
||||
static gpg_error_t
|
||||
parse_key_parameter_part (ctrl_t ctrl,
|
||||
|
||||
@ -558,7 +558,7 @@ keyid_from_pk (PKT_public_key *pk, u32 *keyid)
|
||||
keyid[0] = pk->keyid[0];
|
||||
keyid[1] = pk->keyid[1];
|
||||
|
||||
return keyid[1]; /*FIXME:shortkeyid ist different for v5*/
|
||||
return keyid[1]; /*FIXME:shortkeyid is different for v5*/
|
||||
}
|
||||
|
||||
|
||||
@ -965,7 +965,7 @@ format_hexfingerprint (const char *fingerprint, char *buffer, size_t buflen)
|
||||
|
||||
|
||||
/* Return the so called KEYGRIP which is the SHA-1 hash of the public
|
||||
key parameters expressed as an canoncial encoded S-Exp. ARRAY must
|
||||
key parameters expressed as an canonical encoded S-Exp. ARRAY must
|
||||
be 20 bytes long. Returns 0 on success or an error code. */
|
||||
gpg_error_t
|
||||
keygrip_from_pk (PKT_public_key *pk, unsigned char *array)
|
||||
|
||||
@ -598,7 +598,7 @@ keyring_insert_keyblock (KEYRING_HANDLE hd, KBNODE kb)
|
||||
|
||||
/* Close this one otherwise we will lose the position for
|
||||
* a next search. Fixme: it would be better to adjust the position
|
||||
* after the write opertions.
|
||||
* after the write operations.
|
||||
*/
|
||||
iobuf_close (hd->current.iobuf);
|
||||
hd->current.iobuf = NULL;
|
||||
@ -638,7 +638,7 @@ keyring_delete_keyblock (KEYRING_HANDLE hd)
|
||||
|
||||
/* close this one otherwise we will lose the position for
|
||||
* a next search. Fixme: it would be better to adjust the position
|
||||
* after the write opertions.
|
||||
* after the write operations.
|
||||
*/
|
||||
iobuf_close (hd->current.iobuf);
|
||||
hd->current.iobuf = NULL;
|
||||
|
||||
@ -369,7 +369,7 @@ key_table_get (PKT_public_key *pk, u32 *keyid)
|
||||
/* Found. We need to check for dups. */
|
||||
for (ki2 = ki->next; ki2; ki2 = ki2->next)
|
||||
if (ki2->keyid[0] == keyid[0] && ki2->keyid[1] == keyid[1])
|
||||
return NULL; /* Duplicated keyid - retrun NULL. */
|
||||
return NULL; /* Duplicated keyid - return NULL. */
|
||||
|
||||
/* This is the only one - return it. */
|
||||
return ki;
|
||||
@ -486,7 +486,7 @@ key_table_put (PKT_public_key *pk, uid_item_t ui)
|
||||
}
|
||||
|
||||
/* Add an item to the bucket. We allocate a whole block of items
|
||||
* for cache performace reasons. */
|
||||
* for cache performance reasons. */
|
||||
if (!key_item_attic)
|
||||
{
|
||||
key_item_t kiblock;
|
||||
|
||||
@ -107,7 +107,7 @@ static char *db_name;
|
||||
|
||||
/* The handle for locking the trustdb file and a counter to record how
|
||||
* often this lock has been taken. That counter is required because
|
||||
* dotlock does not implemen recursive locks. */
|
||||
* dotlock does not implement recursive locks. */
|
||||
static dotlock_t lockhandle;
|
||||
static unsigned int is_locked;
|
||||
|
||||
|
||||
@ -144,7 +144,7 @@ ref_tupledesc (tupledesc_t tupledesc)
|
||||
|
||||
|
||||
/* Return a pointer to the memory used to store the tuples. This is
|
||||
* the data originally provided to create_tupledesc. It is higly
|
||||
* the data originally provided to create_tupledesc. It is highly
|
||||
* recommended that the callers uses ref_tupledesc before calling this
|
||||
* function and unref_tupledesc when the return data will not anymore
|
||||
* be used. */
|
||||
|
||||
@ -422,7 +422,7 @@ static const char hlp_create[] =
|
||||
"CREATE [options] <filename>\n"
|
||||
"\n"
|
||||
"Create a new container. On success the OPEN command is \n"
|
||||
"implictly done for the new container.";
|
||||
"implicitly done for the new container.";
|
||||
static gpg_error_t
|
||||
cmd_create (assuan_context_t ctx, char *line)
|
||||
{
|
||||
|
||||
@ -421,7 +421,7 @@ key_item_unref (key_item_t ki)
|
||||
|
||||
|
||||
/* Given the hash value and the search info, find the key item in the
|
||||
* bucket. Return NULL if not found or the key item if fount. Always
|
||||
* bucket. Return NULL if not found or the key item if found. Always
|
||||
* returns the the number of items searched, which is in the case of a
|
||||
* not-found the length of the chain. Note that FPR may only be NULL
|
||||
* if FPRLEN is 0. */
|
||||
@ -624,7 +624,7 @@ maybe_flush_some_key_buckets (unsigned int hash, unsigned int count)
|
||||
}
|
||||
|
||||
|
||||
/* Thsi is the core of
|
||||
/* This is the core of
|
||||
* key_table_put,
|
||||
* key_table_put_no_fpr,
|
||||
* key_table_put_no_kid.
|
||||
@ -680,7 +680,7 @@ do_key_table_put (u32 kid_h, u32 kid_l,
|
||||
/* If the bucket is full remove a couple of items. */
|
||||
if (maybe_flush_some_key_buckets (hash, count))
|
||||
{
|
||||
/* During the fucntion call another thread might have changed
|
||||
/* During the function call another thread might have changed
|
||||
* the bucket. Thus we need to start over. */
|
||||
do_find_again = 1;
|
||||
}
|
||||
|
||||
@ -117,7 +117,7 @@ create_keybox (const char *filename)
|
||||
|
||||
/* Make sure that at least one record is in a new keybox file, so
|
||||
* that the detection magic will work the next time it is used.
|
||||
* We always set the OpenPGP blobs maybe availabale flag. */
|
||||
* We always set the OpenPGP blobs maybe available flag. */
|
||||
fp = es_fopen (filename, "w+b,mode=-rw-------");
|
||||
if (!fp)
|
||||
{
|
||||
|
||||
@ -107,7 +107,7 @@ static struct
|
||||
/* The actual data; either X.509 certificates or OpenPGP
|
||||
* keyblocks. */
|
||||
{ "CREATE TABLE IF NOT EXISTS pubkey ("
|
||||
/* The 20 octet truncted primary-fpr */
|
||||
/* The 20 octet truncated primary-fpr */
|
||||
"ubid BLOB NOT NULL PRIMARY KEY,"
|
||||
/* The type of the public key: 1 = openpgp, 2 = X.509. */
|
||||
"type INTEGER NOT NULL,"
|
||||
@ -486,7 +486,7 @@ run_sql_statement (const char *sqlstr)
|
||||
}
|
||||
|
||||
|
||||
/* Create and intitialize a new SQL database file if it does not
|
||||
/* Create and initialize a new SQL database file if it does not
|
||||
* exists; else open it and check that all required objects are
|
||||
* available. */
|
||||
static gpg_error_t
|
||||
@ -1085,7 +1085,7 @@ store_into_userid (const unsigned char *ubid, enum pubkey_types pktype,
|
||||
}
|
||||
|
||||
|
||||
/* Store (BLOB,BLOBLEN) into the database. UBID is the UBID macthing
|
||||
/* Store (BLOB,BLOBLEN) into the database. UBID is the UBID matching
|
||||
* that blob. BACKEND_HD is the handle for this backend and REQUEST
|
||||
* is the current database request object. MODE is the store
|
||||
* mode. */
|
||||
|
||||
@ -30,7 +30,7 @@ typedef struct keybox_handle *KEYBOX_HANDLE;
|
||||
/* The types of the backends. */
|
||||
enum database_types
|
||||
{
|
||||
DB_TYPE_NONE, /* No database at all (unitialized etc.). */
|
||||
DB_TYPE_NONE, /* No database at all (uninitialized etc.). */
|
||||
DB_TYPE_CACHE, /* The cache backend (backend-cache.c). */
|
||||
DB_TYPE_KBX, /* Keybox type database (backend-kbx.c). */
|
||||
DB_TYPE_SQLITE /* SQLite type database (backend-sqlite.c).*/
|
||||
|
||||
@ -223,7 +223,7 @@ kbxd_search (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, unsigned int ndesc,
|
||||
}
|
||||
|
||||
/* If requested do a reset. Using the reset flag is faster than
|
||||
* letting the caller do a separate call for an intial reset. */
|
||||
* letting the caller do a separate call for an initial reset. */
|
||||
if (!desc || reset)
|
||||
{
|
||||
switch (the_database.db_type)
|
||||
|
||||
@ -406,7 +406,7 @@ cmd_search (assuan_context_t ctx, char *line)
|
||||
static const char hlp_next[] =
|
||||
"NEXT [--no-data]\n"
|
||||
"\n"
|
||||
"Get the next search result from a previus search.";
|
||||
"Get the next search result from a previous search.";
|
||||
static gpg_error_t
|
||||
cmd_next (assuan_context_t ctx, char *line)
|
||||
{
|
||||
|
||||
@ -759,7 +759,7 @@ _keybox_create_openpgp_blob (KEYBOXBLOB *r_blob,
|
||||
|
||||
|
||||
/* Check whether we need a blob with 32 bit fingerprints. We could
|
||||
* use this always but for backward compatiblity we do this only for
|
||||
* use this always but for backward compatibility we do this only for
|
||||
* v5 keys. */
|
||||
if (info->primary.version == 5)
|
||||
need_fpr32 = 1;
|
||||
|
||||
@ -917,7 +917,7 @@ keybox_search (KEYBOX_HANDLE hd, KEYBOX_SEARCH_DESC *desc, size_t ndesc,
|
||||
if (!hd)
|
||||
return gpg_error (GPG_ERR_INV_VALUE);
|
||||
|
||||
/* Clear last found result but reord the offset of the last found
|
||||
/* Clear last found result but record the offset of the last found
|
||||
* blob which we may need later. */
|
||||
if (hd->found.blob)
|
||||
{
|
||||
|
||||
@ -391,7 +391,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
|
||||
|
||||
case oLogFile:
|
||||
if (!reread)
|
||||
return 0; /* not handeld */
|
||||
return 0; /* not handled */
|
||||
if (!current_logfile || !pargs->r.ret_str
|
||||
|| strcmp (current_logfile, pargs->r.ret_str))
|
||||
{
|
||||
@ -1018,7 +1018,7 @@ kbxd_deinit_default_ctrl (ctrl_t ctrl)
|
||||
* Fixme: Due to the way the argument parsing works, we create a
|
||||
* memory leak here for all string type arguments. There is currently
|
||||
* no clean way to tell whether the memory for the argument has been
|
||||
* allocated or points into the process' original arguments. Unless
|
||||
* allocated or points into the process's original arguments. Unless
|
||||
* we have a mechanism to tell this, we need to live on with this. */
|
||||
static void
|
||||
reread_configuration (void)
|
||||
|
||||
@ -120,7 +120,7 @@ struct card_ctx_s {
|
||||
|
||||
|
||||
/* The object describing a card's applications. A card may have
|
||||
* several applications and it is usuallay required to explicity
|
||||
* several applications and it is usually required to explicitly
|
||||
* switch between applications. */
|
||||
struct app_ctx_s {
|
||||
app_t next;
|
||||
|
||||
@ -255,7 +255,7 @@ keygripstr_from_pk_file (app_t app, int fid, char *r_gripstr)
|
||||
-1 = Error retrieving the data,
|
||||
-2 = No such PIN,
|
||||
-3 = PIN blocked,
|
||||
-4 = NullPIN activ,
|
||||
-4 = NullPIN active,
|
||||
n >= 0 = Number of verification attempts left. */
|
||||
static int
|
||||
get_chv_status (app_t app, int sigg, int pwid)
|
||||
@ -287,7 +287,7 @@ get_chv_status (app_t app, int sigg, int pwid)
|
||||
else if (sw == 0x6983)
|
||||
rc = -3; /* PIN is blocked. */
|
||||
else if (sw == 0x6985)
|
||||
rc = -4; /* NullPIN is activ. */
|
||||
rc = -4; /* NullPIN is active. */
|
||||
else if ((sw & 0xfff0) == 0x63C0)
|
||||
rc = (sw & 0x000f); /* PIN has N tries left. */
|
||||
else
|
||||
|
||||
@ -2057,7 +2057,7 @@ read_ef_aodf (app_t app, unsigned short fid, aodf_object_t *result)
|
||||
}
|
||||
}
|
||||
|
||||
/* Igonore further objects which might be there due to future
|
||||
/* Ignore further objects which might be there due to future
|
||||
extensions of pkcs#15. */
|
||||
|
||||
ready:
|
||||
|
||||
@ -1992,7 +1992,7 @@ ask_and_prepare_chv (app_t app, ctrl_t ctrl,
|
||||
|
||||
|
||||
/* Verify the card holder verification identified by KEYREF. This is
|
||||
* either the Appication PIN or the Global PIN. If FORCE is true a
|
||||
* either the Application PIN or the Global PIN. If FORCE is true a
|
||||
* verification is always done. */
|
||||
static gpg_error_t
|
||||
verify_chv (app_t app, ctrl_t ctrl, int keyref, int force,
|
||||
@ -2587,7 +2587,7 @@ do_decipher (app_t app, ctrl_t ctrl, const char *keyidstr,
|
||||
* lost. Adjust for this. Unfortunately the ciphertext might have
|
||||
* also been prefixed with a leading zero to make it a positive
|
||||
* number; that may be a too long frame and we need to adjust for
|
||||
* this too. Note that for ECC thoses fixes are not reqquired
|
||||
* this too. Note that for ECC those fixes are not reqquired
|
||||
* because the first octet is always '04' to indicate an
|
||||
* uncompressed point. */
|
||||
if (indatalen > framelen)
|
||||
|
||||
@ -491,7 +491,7 @@ app_new_register (int slot, ctrl_t ctrl, const char *name,
|
||||
{
|
||||
/* No version - this is not a Yubikey 5. We now
|
||||
* switch to the OTP app and take the first
|
||||
* three bytes of the reponse as version
|
||||
* three bytes of the response as version
|
||||
* number. */
|
||||
xfree (buf);
|
||||
buf = NULL;
|
||||
@ -1421,7 +1421,7 @@ app_readcert (card_t card, ctrl_t ctrl, const char *certid,
|
||||
* length (for assertions) at PKLEN; the caller must release that
|
||||
* buffer. On error NULL will be stored at PK and PKLEN and an error
|
||||
* code returned. If the key is not required NULL may be passed for
|
||||
* PK; this makse send if the APP_READKEY_FLAG_INFO has also been set.
|
||||
* PK; this makes sense if the APP_READKEY_FLAG_INFO has also been set.
|
||||
*
|
||||
* This function might not be supported by all applications. */
|
||||
gpg_error_t
|
||||
|
||||
@ -100,10 +100,10 @@
|
||||
/* Max length of buffer with out CCID message header of 10-byte
|
||||
Sending: 547 for RSA-4096 key import
|
||||
APDU size = 540 (24+4+256+256)
|
||||
commnd + lc + le = 4 + 3 + 0
|
||||
command + lc + le = 4 + 3 + 0
|
||||
Sending: write data object of cardholder certificate
|
||||
APDU size = 2048
|
||||
commnd + lc + le = 4 + 3 + 0
|
||||
command + lc + le = 4 + 3 + 0
|
||||
Receiving: 2048 for cardholder certificate
|
||||
*/
|
||||
#define CCID_MAX_BUF (2048+7+10)
|
||||
|
||||
@ -226,7 +226,7 @@ open_card (ctrl_t ctrl)
|
||||
}
|
||||
|
||||
/* Explicitly open a card for a specific use of APPTYPE or SERIALNO.
|
||||
* If OPT_ALL ist set also add all possible additional apps. */
|
||||
* If OPT_ALL is set also add all possible additional apps. */
|
||||
static gpg_error_t
|
||||
open_card_with_request (ctrl_t ctrl,
|
||||
const char *apptypestr, const char *serialno,
|
||||
@ -1900,7 +1900,7 @@ static const char hlp_apdu[] =
|
||||
"Send an APDU to the current reader. This command bypasses the high\n"
|
||||
"level functions and sends the data directly to the card. HEXSTRING\n"
|
||||
"is expected to be a proper APDU. If HEXSTRING is not given no\n"
|
||||
"commands are set to the card but the command will implictly check\n"
|
||||
"commands are set to the card but the command will implicitly check\n"
|
||||
"whether the card is ready for use. \n"
|
||||
"\n"
|
||||
"Using the option \"--atr\" returns the ATR of the card as a status\n"
|
||||
@ -2457,7 +2457,7 @@ pincache_put (ctrl_t ctrl, int slot, const char *appname, const char *pinref,
|
||||
|
||||
/* Without an APPNAME etc or without a PIN we clear the cache and
|
||||
* thus there is no need to send the pin - even if the caller
|
||||
* accidentially passed a pin. */
|
||||
* accidentally passed a pin. */
|
||||
if (pin && slot != -1 && appname && pinref)
|
||||
{
|
||||
/* FIXME: Replace this by OCB mode and use the cache key as
|
||||
|
||||
@ -1082,7 +1082,7 @@ handle_signal (int signo)
|
||||
/* Create a name for the socket. We check for valid characters as
|
||||
well as against a maximum allowed length for a unix domain socket
|
||||
is done. The function terminates the process in case of an error.
|
||||
Returns: Pointer to an allcoated string with the absolute name of
|
||||
Returns: Pointer to an allocated string with the absolute name of
|
||||
the socket used. */
|
||||
static char *
|
||||
create_socket_name (char *standard_name)
|
||||
|
||||
@ -558,7 +558,7 @@ find_up_search_by_keyid (ctrl_t ctrl, KEYDB_HANDLE kh,
|
||||
rc = -1;
|
||||
goto leave;
|
||||
}
|
||||
/* Ready. The NE_FOUND_CERT is availabale via keydb_get_cert. */
|
||||
/* Ready. The NE_FOUND_CERT is available via keydb_get_cert. */
|
||||
}
|
||||
|
||||
leave:
|
||||
|
||||
@ -47,7 +47,7 @@ struct duptable_s
|
||||
struct duptable_s *next;
|
||||
|
||||
/* Note that we only need to store 19 bytes because the first byte
|
||||
is implictly given by the table index (we require at least 8
|
||||
is implicitly given by the table index (we require at least 8
|
||||
bits). */
|
||||
unsigned char fpr[19];
|
||||
};
|
||||
|
||||
@ -158,7 +158,7 @@ gpgsm_get_short_fingerprint (ksba_cert_t cert, unsigned long *r_high)
|
||||
|
||||
|
||||
/* Return the so called KEYGRIP which is the SHA-1 hash of the public
|
||||
key parameters expressed as an canoncial encoded S-Exp. ARRAY must
|
||||
key parameters expressed as an canonical encoded S-Exp. ARRAY must
|
||||
be 20 bytes long. Returns ARRAY or a newly allocated buffer if ARRAY was
|
||||
given as NULL. May return NULL on error. */
|
||||
unsigned char *
|
||||
|
||||
@ -333,7 +333,7 @@ add_signed_attribute (ksba_cms_t cms, const char *attrstr)
|
||||
if (!ascii_strcasecmp (fields[1], "u"))
|
||||
{
|
||||
err = 0;
|
||||
goto leave; /* Skip unsigned attruibutes. */
|
||||
goto leave; /* Skip unsigned attributes. */
|
||||
}
|
||||
if (ascii_strcasecmp (fields[1], "s"))
|
||||
{
|
||||
|
||||
@ -29,7 +29,7 @@ and exit codes.
|
||||
|
||||
To inspect the environment in which tests are running, or to quickly
|
||||
create keys for debugging or testing, you can start a shell. There is
|
||||
one test that doese just that:
|
||||
one test that does just that:
|
||||
|
||||
obj $ make -C tests/openpgp check TESTS=shell.scm
|
||||
PASS: tests/openpgp/setup.scm
|
||||
|
||||
@ -90,7 +90,7 @@ fail-if !$trusted
|
||||
send BYE
|
||||
expect-ok
|
||||
|
||||
# We als have tampered version.
|
||||
# We also have tampered version.
|
||||
sig = openfile $srcdir/text-2.osig-bad.pem
|
||||
|
||||
pipeserver $GPGSM
|
||||
|
||||
@ -804,7 +804,7 @@ learn_status_cb (void *opaque, const char *line)
|
||||
|
||||
/* Note that KEY-ATTR returns OpenPGP algorithm numbers but
|
||||
* we want to use the Gcrypt numbers here. A compatible
|
||||
* change would be to add another paramater along with a
|
||||
* change would be to add another parameter along with a
|
||||
* magic algo number to indicate that. */
|
||||
algo = PUBKEY_ALGO_RSA;
|
||||
keyno = n = 0;
|
||||
@ -1215,7 +1215,7 @@ scd_writecert (const char *certidstr,
|
||||
|
||||
/* Send a WRITEKEY command to the agent (so that the agent can fetch
|
||||
* the key to write). KEYGRIP is the hexified keygrip of the source
|
||||
* key which will be written to tye slot KEYREF. FORCE must be true
|
||||
* key which will be written to the slot KEYREF. FORCE must be true
|
||||
* to overwrite an existing key. */
|
||||
gpg_error_t
|
||||
scd_writekey (const char *keyref, int force, const char *keygrip)
|
||||
|
||||
@ -306,7 +306,7 @@ yk_enable_disable (struct ykapps_s *yk, struct iface_s *iface,
|
||||
|
||||
/* Implementation part of cmd_yubikey. ARGV is an array of size ARGc
|
||||
* with the argumets given to the yubikey command. Note that ARGV has
|
||||
* no terminating NULL so that ARGC must be considred. FP is the
|
||||
* no terminating NULL so that ARGC must be considered. FP is the
|
||||
* stream to output information. This function must only be called on
|
||||
* Yubikeys. */
|
||||
gpg_error_t
|
||||
|
||||
@ -458,10 +458,10 @@ get_selection (const char *prompt)
|
||||
|
||||
|
||||
/* Simply prints TEXT to the output. Returns 0 as a convenience.
|
||||
* This is a separate fucntion so that it can be extended to run
|
||||
* This is a separate function so that it can be extended to run
|
||||
* less(1) or so. The extra arguments are int values terminated by a
|
||||
* 0 to indicate card application types supported with this command.
|
||||
* If none are given (just teh final 0), this is a general
|
||||
* If none are given (just the final 0), this is a general
|
||||
* command. */
|
||||
static gpg_error_t
|
||||
print_help (const char *text, ...)
|
||||
@ -1206,7 +1206,7 @@ cmd_authenticate (card_info_t info, char *argstr)
|
||||
if (!info)
|
||||
return print_help
|
||||
("AUTHENTICATE [--setkey] [--raw] [< FILE]|KEY\n\n"
|
||||
"Perform a mutual autentication either by reading the key\n"
|
||||
"Perform a mutual authentication either by reading the key\n"
|
||||
"from FILE or by taking it from the command line. Without\n"
|
||||
"the option --raw the key is expected to be hex encoded.\n"
|
||||
"To install a new administration key --setkey is used; this\n"
|
||||
@ -2015,7 +2015,7 @@ cmd_forcesig (card_info_t info)
|
||||
|
||||
|
||||
|
||||
/* Helper for cmd_generate_openpgp. Nore that either 0 or 1 is stored at
|
||||
/* Helper for cmd_generate_openpgp. Note that either 0 or 1 is stored at
|
||||
* FORCED_CHV1. */
|
||||
static gpg_error_t
|
||||
check_pin_for_key_operation (card_info_t info, int *forced_chv1)
|
||||
|
||||
@ -223,7 +223,7 @@ main (int argc, char **argv )
|
||||
/* Read a file FNAME into a buffer and return that malloced buffer.
|
||||
Caller must free the buffer. On error NULL is returned, on success
|
||||
the valid length of the buffer is stored at R_LENGTH. The returned
|
||||
buffer is guarnteed to be nul terminated. */
|
||||
buffer is guaranteed to be nul terminated. */
|
||||
static char *
|
||||
read_file (const char *fname, size_t *r_length)
|
||||
{
|
||||
|
||||
@ -492,7 +492,7 @@ arithmetic_op (int operator, const char *operands)
|
||||
|
||||
unescape ARGS
|
||||
Remove C-style escapes from string. Note that "\0" and
|
||||
"\x00" terminate the string implictly. Use "\x7d" to
|
||||
"\x00" terminate the string implicitly. Use "\x7d" to
|
||||
represent the closing brace. The args start right after
|
||||
the first space after the function name.
|
||||
|
||||
|
||||
@ -87,7 +87,7 @@
|
||||
* The Responder receives the DHPART2 message and checks that the hash
|
||||
* of the received PKi matches the Hash(PKi) value as received earlier
|
||||
* with the COMMIT message. The Responder now also computes the
|
||||
* shared master secret from its SKr and the recived PKi and derives
|
||||
* shared master secret from its SKr and the received PKi and derives
|
||||
* the keys:
|
||||
*
|
||||
* - HMACi-key using the label "GPG-pa1-HMACi-key".
|
||||
@ -324,7 +324,7 @@ set_status_fd (int fd)
|
||||
}
|
||||
|
||||
|
||||
/* Write a status line with code NO followed by the outout of the
|
||||
/* Write a status line with code NO followed by the output of the
|
||||
* printf style FORMAT. The caller needs to make sure that LFs and
|
||||
* CRs are not printed. */
|
||||
static void
|
||||
@ -876,7 +876,7 @@ send_message (const unsigned char *msg, size_t msglen)
|
||||
* error NULL is stored at R_MSG, a diagnostic printed and an error
|
||||
* code returned. The returned message has a proper message type and
|
||||
* an appropriate length. The message type is stored at R_MSGTYPE and
|
||||
* if a state is availabale it is stored at R_STATE. */
|
||||
* if a state is available it is stored at R_STATE. */
|
||||
static gpg_error_t
|
||||
read_message (unsigned char **r_msg, size_t *r_msglen, int *r_msgtype,
|
||||
nvc_t *r_state)
|
||||
|
||||
@ -1393,9 +1393,9 @@ gc_component_reload (int component)
|
||||
/* More or less Robust version of dgettext. It has the side effect of
|
||||
switching the codeset to utf-8 because this is what we want to
|
||||
output. In theory it is possible to keep the original code set and
|
||||
switch back for regular disgnostic output (redefine "_(" for that)
|
||||
but given the natur of this tool, being something invoked from
|
||||
other pograms, it does not make much sense. */
|
||||
switch back for regular diagnostic output (redefine "_(" for that)
|
||||
but given the nature of this tool, being something invoked from
|
||||
other programs, it does not make much sense. */
|
||||
static const char *
|
||||
my_dgettext (const char *domain, const char *msgid)
|
||||
{
|
||||
|
||||
@ -331,7 +331,7 @@ valid_swdb_name_p (const char *name)
|
||||
* Common codes seen:
|
||||
* GPG_ERR_TOO_OLD :: The SWDB file is to old to be used.
|
||||
* GPG_ERR_ENOENT :: The SWDB file is not available.
|
||||
* GPG_ERR_BAD_SIGNATURE :: Currupted SWDB file.
|
||||
* GPG_ERR_BAD_SIGNATURE :: Corrupted SWDB file.
|
||||
* filedate:: Date of the swdb file (yyyymmddThhmmss)
|
||||
* verified:: Date we checked the validity of the file (yyyyymmddThhmmss)
|
||||
* version :: The version string from the swdb.
|
||||
|
||||
@ -130,7 +130,7 @@ show_message_parser_event (rfc822parse_event_t event)
|
||||
/* Do in-place decoding of quoted-printable data of LENGTH in BUFFER.
|
||||
Returns the new length of the buffer and stores true at R_SLBRK if
|
||||
the line ended with a soft line break; false is stored if not.
|
||||
This function asssumes that a complete line is passed in
|
||||
This function assumes that a complete line is passed in
|
||||
buffer. */
|
||||
static size_t
|
||||
qp_decode (char *buffer, size_t length, int *r_slbrk)
|
||||
@ -196,7 +196,7 @@ parse_message_cb (void *opaque, rfc822parse_event_t event, rfc822parse_t msg)
|
||||
const char *s;
|
||||
int rc = 0;
|
||||
|
||||
/* Make the RFC822 parser context availabale for callbacks. */
|
||||
/* Make the RFC822 parser context available for callbacks. */
|
||||
ctx->msg = msg;
|
||||
|
||||
if (ctx->debug)
|
||||
|
||||
@ -439,7 +439,7 @@ main (int argc, char **argv)
|
||||
{
|
||||
/* No args given - figure out the socket using gpgconf. We also
|
||||
* force overwriting the socket because the constructed name
|
||||
* can't be some accidently given name. */
|
||||
* can't be some accidentally given name. */
|
||||
logname = get_logname (homedir);
|
||||
force = 1;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user