diff options
| author | Werner Koch <[email protected]> | 2003-06-04 07:32:18 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2003-06-04 07:32:18 +0000 |
| commit | 876fc4f792c0047ddc88f1adb11e02fcca850962 (patch) | |
| tree | 6962bc00e411335826b23b09d98c5186bbe7f9e0 | |
| parent | 2003-06-04 Marcus Brinkmann <[email protected]> (diff) | |
| download | libgpg-error-876fc4f792c0047ddc88f1adb11e02fcca850962.tar.gz libgpg-error-876fc4f792c0047ddc88f1adb11e02fcca850962.zip | |
solved conflicts
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/err-codes.h.in | 5 | ||||
| -rw-r--r-- | src/err-sources.h.in | 1 | ||||
| -rw-r--r-- | src/gpg-error.h | 12 |
4 files changed, 21 insertions, 4 deletions
@@ -31,6 +31,13 @@ GPG_ERR_CARD_ERROR to GPG_ERR_CARD, GPG_ERR_CONFIGURATION_ERROR to GPG_ERR_CONFIGURATION, GPG_ERR_SCDAEMON_ERROR to GPG_ERR_SCDAEMON. +2003-06-03 Werner Koch <[email protected]> + + * src/gpg-error.h, src/err-codes.h.in: Add codes for TIMEOUT, + INV_HANDLE, NOTHING_FOUND, WRONG_BLOB_TYPE and MISSING_VALUE. + * src/gpg-error.h, src/err-sources.h.in: Add KEYBOX which is the + keybox subsystem of GnuPG. + 2003-06-02 Moritz Schulte <[email protected]> * src/gpg-error.h: Fix description of gpg_err_code_to_errno diff --git a/src/err-codes.h.in b/src/err-codes.h.in index 1243828..1925fdb 100644 --- a/src/err-codes.h.in +++ b/src/err-codes.h.in @@ -80,6 +80,7 @@ 59 Bug 60 Not supported 61 Invalid operation code +62 Timeout 63 Internal error 64 EOF (gcrypt) 65 Invalid object @@ -90,6 +91,7 @@ 70 Conflicting use 71 Invalid cipher mode 72 Invalid flag +73 Invalid handle 75 Incomplete line 76 Invalid response 77 No agent running @@ -140,6 +142,9 @@ 123 Card not initialized 124 Unsupported operation 125 Wrong key usage +126 Nothing found +127 Wrong blob type +128 Missing value 150 Invalid crypto engine 151 Public key not trusted 152 Decryption failed diff --git a/src/err-sources.h.in b/src/err-sources.h.in index 3f85d3a..e07be47 100644 --- a/src/err-sources.h.in +++ b/src/err-sources.h.in @@ -35,6 +35,7 @@ 5 Pinentry 6 SCD 7 GPGME +8 Keybox 32 User defined source 1 33 User defined source 2 34 User defined source 3 diff --git a/src/gpg-error.h b/src/gpg-error.h index 2d126c8..1db1263 100644 --- a/src/gpg-error.h +++ b/src/gpg-error.h @@ -59,6 +59,7 @@ typedef enum GPG_ERR_SOURCE_PINENTRY = 5, GPG_ERR_SOURCE_SCD = 6, GPG_ERR_SOURCE_GPGME = 7, + GPG_ERR_SOURCE_KEYBOX = 8, /* Free for use by non-GnuPG components. */ GPG_ERR_SOURCE_USER_1 = 32, @@ -133,9 +134,7 @@ typedef enum GPG_ERR_BUG = 59, GPG_ERR_NOT_SUPPORTED = 60, GPG_ERR_INV_OP = 61, /* Invalid operation code. */ - - /* Code 62 is free. */ - + GPG_ERR_TIMEOUT = 62, /* Something timed out. */ GPG_ERR_INTERNAL = 63, /* Internal error. */ GPG_ERR_EOF_GCRYPT = 64, /* Compatibility for gcrypt. */ GPG_ERR_INV_OBJ = 65, /* An object is not valid. */ @@ -146,8 +145,9 @@ typedef enum GPG_ERR_CONFLICT = 70, /* Conflicting use. */ GPG_ERR_INV_CIPHER_MODE = 71, /* Invalid cipher mode. */ GPG_ERR_INV_FLAG = 72, /* Invalid flag. */ + GPG_ERR_INV_HANDLE = 73, /* Invalid handle. */ - /* Codes 73 and 74 are unused. */ + /* Code 74 ise unused. */ GPG_ERR_INCOMPLETE_LINE = 75, GPG_ERR_INV_RESPONSE = 76, @@ -202,6 +202,10 @@ typedef enum GPG_ERR_CARD_NOT_INITIALIZED = 123, GPG_ERR_UNSUPPORTED_OPERATION = 124, GPG_ERR_WRONG_KEY_USAGE = 125, + GPG_ERR_NOTHING_FOUND = 126, /* Operation failed due to an + unsuccessful find operation. */ + GPG_ERR_WRONG_BLOB_TYPE = 127, /* Keybox BLOB of wrong type. */ + GPG_ERR_MISSING_VALUE = 128, /* A required value is missing. */ GPG_ERR_INV_ENGINE = 150, GPG_ERR_PUBKEY_NOT_TRUSTED = 151, |