diff options
| author | Werner Koch <[email protected]> | 2016-05-17 18:21:01 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-05-17 18:23:28 +0000 |
| commit | 315fb73d4a774e2c699ac1804f5377559b4d0027 (patch) | |
| tree | 4194a0bc9390b89686ce42d7e39f6412d225f10b /src/gpgme.h.in | |
| parent | Qt / Cpp: Port auto_ptr to unique_ptr (diff) | |
| download | gpgme-315fb73d4a774e2c699ac1804f5377559b4d0027.tar.gz gpgme-315fb73d4a774e2c699ac1804f5377559b4d0027.zip | |
Return dedicated error code for all subkeys expired or revoked.
* src/gpgme.h.in (GPGME_STATUS_KEY_CONSIDERED): New.
(GPGME_SIGSUM_TOFU_CONFLICT): New.
* src/status-table.c (KEY_CONSIDERED): New.
* src/op-support.c (_gpgme_parse_inv_recp): Add argc KC_FPR and
KC_FLAGS. Use calloc. Detect all expired or revoked subkeys.
(_gpgme_parse_key_considered): New.
* src/sign.c (op_data_t): Add fields KC_FPR and KC_FLAGS.
(release_op_data): Free KC_FPR.
(_gpgme_sign_status_handler): Handle STATUS_KEY_CONSIDERED.
* src/encrypt.c (op_data_t): Add fields KC_FPR and KC_FLAGS.
(release_op_data): Free KC_FPR.
(_gpgme_encrypt_status_handler): Handle STATUS_KEY_CONSIDERED.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'src/gpgme.h.in')
| -rw-r--r-- | src/gpgme.h.in | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/gpgme.h.in b/src/gpgme.h.in index 8264bab9..7a58dedd 100644 --- a/src/gpgme.h.in +++ b/src/gpgme.h.in @@ -532,7 +532,8 @@ typedef enum GPGME_STATUS_BEGIN_SIGNING = 90, GPGME_STATUS_KEY_NOT_CREATED = 91, GPGME_STATUS_INQUIRE_MAXLEN = 92, - GPGME_STATUS_FAILURE = 93 + GPGME_STATUS_FAILURE = 93, + GPGME_STATUS_KEY_CONSIDERED = 94 } gpgme_status_code_t; @@ -861,7 +862,12 @@ typedef struct _gpgme_key *gpgme_key_t; struct _gpgme_invalid_key { struct _gpgme_invalid_key *next; + + /* The string used to request the key. Despite the name this may + * not be a fingerprint. */ char *fpr; + + /* The error code. */ gpgme_error_t reason; }; typedef struct _gpgme_invalid_key *gpgme_invalid_key_t; @@ -1518,7 +1524,8 @@ typedef enum GPGME_SIGSUM_CRL_MISSING = 0x0100, /* CRL not available. */ GPGME_SIGSUM_CRL_TOO_OLD = 0x0200, /* Available CRL is too old. */ GPGME_SIGSUM_BAD_POLICY = 0x0400, /* A policy was not met. */ - GPGME_SIGSUM_SYS_ERROR = 0x0800 /* A system error occurred. */ + GPGME_SIGSUM_SYS_ERROR = 0x0800, /* A system error occurred. */ + GPGME_SIGSUM_TOFU_CONFLICT=0x1000 /* Tofu conflict detected. */ } gpgme_sigsum_t; @@ -1541,7 +1548,7 @@ struct _gpgme_signature /* Signature creation time. */ unsigned long timestamp; - /* Signature exipration time or 0. */ + /* Signature expiration time or 0. */ unsigned long exp_timestamp; /* Key should not have been used for signing. */ |