mirror of
git://git.gnupg.org/gnupg.git
synced 2024-09-22 15:11:41 +02:00
d73e83c3b6
* common/status.h (STATUS_TOFU_USER, STATUS_TOFU_STATS)
(STATUS_TOFU_STATS_SHORT, STATUS_TOFU_STATS_LONG): New.
* g10/tofu.c (NO_WARNING_THRESHOLD): New.
(record_binding, tofu_register): Take care of --dry-run.
(show_statistics): Print STATUS_TOFU_USER. Reformat some messages.
Fix the ngettext/strcmp thing. Use log_string instead of log_info.
Use NO_WARNING_THRESHOLD constant.
(get_trust): Use format_text and print a compact fingerprint.
--
The use of log_string makes long messages better readable; instead of
gpg: Warning: if you think you've seen more[...]
key, then this key might be a forgery! Car[...]
address for small variations. If the key i[...]
we now have
gpg: Warning: if you think you've seen more[...]
key, then this key might be a forgery![...]
address for small variations. If the [...]
We also put the key information after the message and not between the
user id and the last used info like here:
gpg: Verified 7 messages signed by "Werner Koch <werner@eifzilla.de>"
in the past 4 days, 16 hours.
The most recent message was verified 3 days, 13 hours ago.
(key: 8061 5870 F5BA D690 3336 [...] 1E42 B367, policy: auto)
This also makes the key info a separate translatable string.
Further a compact version of the fingerprint (hex w/o spaces) is
printed in some messages.
Signed-off-by: Werner Koch <wk@gnupg.org>
162 lines
3.4 KiB
C
162 lines
3.4 KiB
C
/* status.h - Status codes
|
|
* Copyright (C) 2007 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* This file is free software; you can redistribute it and/or modify
|
|
* it under the terms of either
|
|
*
|
|
* - the GNU Lesser General Public License as published by the Free
|
|
* Software Foundation; either version 3 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* or
|
|
*
|
|
* - the GNU General Public License as published by the Free
|
|
* Software Foundation; either version 2 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* or both in parallel, as here.
|
|
*
|
|
* This file is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef GNUPG_COMMON_STATUS_H
|
|
#define GNUPG_COMMON_STATUS_H
|
|
|
|
enum
|
|
{
|
|
STATUS_ENTER,
|
|
STATUS_LEAVE,
|
|
STATUS_ABORT,
|
|
|
|
STATUS_GOODSIG,
|
|
STATUS_BADSIG,
|
|
STATUS_ERRSIG,
|
|
|
|
STATUS_BADARMOR,
|
|
|
|
STATUS_TRUST_UNDEFINED,
|
|
STATUS_TRUST_NEVER,
|
|
STATUS_TRUST_MARGINAL,
|
|
STATUS_TRUST_FULLY,
|
|
STATUS_TRUST_ULTIMATE,
|
|
|
|
STATUS_NEED_PASSPHRASE,
|
|
STATUS_VALIDSIG,
|
|
STATUS_SIG_ID,
|
|
STATUS_ENC_TO,
|
|
STATUS_NODATA,
|
|
STATUS_BAD_PASSPHRASE,
|
|
STATUS_NO_PUBKEY,
|
|
STATUS_NO_SECKEY,
|
|
STATUS_NEED_PASSPHRASE_SYM,
|
|
STATUS_DECRYPTION_INFO,
|
|
STATUS_DECRYPTION_FAILED,
|
|
STATUS_DECRYPTION_OKAY,
|
|
STATUS_MISSING_PASSPHRASE,
|
|
STATUS_GOOD_PASSPHRASE,
|
|
STATUS_GOODMDC,
|
|
STATUS_BADMDC,
|
|
STATUS_ERRMDC,
|
|
|
|
STATUS_IMPORTED,
|
|
STATUS_IMPORT_OK,
|
|
STATUS_IMPORT_PROBLEM,
|
|
STATUS_IMPORT_RES,
|
|
STATUS_IMPORT_CHECK,
|
|
|
|
STATUS_EXPORTED,
|
|
STATUS_EXPORT_RES,
|
|
|
|
STATUS_FILE_START,
|
|
STATUS_FILE_DONE,
|
|
STATUS_FILE_ERROR,
|
|
|
|
STATUS_BEGIN_DECRYPTION,
|
|
STATUS_END_DECRYPTION,
|
|
STATUS_BEGIN_ENCRYPTION,
|
|
STATUS_END_ENCRYPTION,
|
|
STATUS_BEGIN_SIGNING,
|
|
|
|
STATUS_DELETE_PROBLEM,
|
|
|
|
STATUS_GET_BOOL,
|
|
STATUS_GET_LINE,
|
|
STATUS_GET_HIDDEN,
|
|
STATUS_GOT_IT,
|
|
|
|
STATUS_PROGRESS,
|
|
STATUS_SIG_CREATED,
|
|
STATUS_SESSION_KEY,
|
|
STATUS_NOTATION_NAME,
|
|
STATUS_NOTATION_DATA,
|
|
STATUS_POLICY_URL,
|
|
STATUS_KEY_CREATED,
|
|
STATUS_USERID_HINT,
|
|
STATUS_UNEXPECTED,
|
|
STATUS_INV_RECP,
|
|
STATUS_INV_SGNR,
|
|
STATUS_NO_RECP,
|
|
STATUS_NO_SGNR,
|
|
|
|
STATUS_ALREADY_SIGNED,
|
|
STATUS_KEYEXPIRED,
|
|
STATUS_KEYREVOKED,
|
|
STATUS_EXPSIG,
|
|
STATUS_EXPKEYSIG,
|
|
|
|
STATUS_ATTRIBUTE,
|
|
|
|
STATUS_REVKEYSIG,
|
|
|
|
STATUS_NEWSIG,
|
|
STATUS_SIG_SUBPACKET,
|
|
|
|
STATUS_PLAINTEXT,
|
|
STATUS_PLAINTEXT_LENGTH,
|
|
STATUS_KEY_NOT_CREATED,
|
|
STATUS_NEED_PASSPHRASE_PIN,
|
|
|
|
STATUS_CARDCTRL,
|
|
STATUS_SC_OP_FAILURE,
|
|
STATUS_SC_OP_SUCCESS,
|
|
|
|
STATUS_BACKUP_KEY_CREATED,
|
|
|
|
STATUS_PKA_TRUST_BAD,
|
|
STATUS_PKA_TRUST_GOOD,
|
|
|
|
STATUS_TOFU_USER,
|
|
STATUS_TOFU_STATS,
|
|
STATUS_TOFU_STATS_SHORT,
|
|
STATUS_TOFU_STATS_LONG,
|
|
|
|
STATUS_TRUNCATED,
|
|
STATUS_MOUNTPOINT,
|
|
|
|
STATUS_PINENTRY_LAUNCHED,
|
|
|
|
STATUS_PLAINTEXT_FOLLOWS, /* Used by g13-syshelp */
|
|
|
|
STATUS_ERROR,
|
|
STATUS_WARNING,
|
|
STATUS_SUCCESS,
|
|
STATUS_FAILURE,
|
|
|
|
STATUS_INQUIRE_MAXLEN
|
|
};
|
|
|
|
|
|
const char *get_status_string (int code);
|
|
const char *get_inv_recpsgnr_code (gpg_error_t err);
|
|
|
|
|
|
#endif /*GNUPG_COMMON_STATUS_H*/
|