summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2011-08-23 15:37:27 +0200
committerWerner Koch <wk@gnupg.org>2011-08-23 15:37:27 +0200
commite6bda00b966010934150b0c2134b24ff07b7c9fc (patch)
tree54e721d65f0ae9f46d036f94893eca528ec37f11
parentb128b8b1d60a615a41d2a4d717358f2bcce26c67 (diff)
downloadlibgpg-error-e6bda00b966010934150b0c2134b24ff07b7c9fc.tar.gz
Add GPG_ERR_DUP_KEY
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--doc/errorref.txt22
-rw-r--r--src/err-codes.h.in3
4 files changed, 28 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a96f402..887758e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-23 Werner Koch <wk@g10code.com>
+
+ * src/err-codes.h.in: Add GPG_ERR_DUP_KEY.
+
2011-04-06 Werner Koch <wk@g10code.com>
* autogen.sh: Support option --build-w64.
diff --git a/NEWS b/NEWS
index 972f61c..856fda0 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ Noteworthy changes in version 1.11 (unreleased)
GPG_ERR_NO_KEYSERVER NEW.
GPG_ERR_INV_CURVE NEW.
GPG_ERR_UNKNOWN_CURVE NEW.
+ GPG_ERR_DUP_KEY NEW.
Noteworthy changes in version 1.10 (2010-10-26)
diff --git a/doc/errorref.txt b/doc/errorref.txt
index 7c6627a..afabb0b 100644
--- a/doc/errorref.txt
+++ b/doc/errorref.txt
@@ -130,7 +130,13 @@ GPG_ERR_NO_VALUE No value
27 GPG_ERR_NOT_FOUND Not found
-28 GPG_ERR_VALUE_NOT_FOUND Value not found
+
+GPG_ERR_VALUE_NOT_FOUND Value not found
+
+ GNUPG: - A keyblock or a cert object was requested but not
+ found. This might indicate an internal error here.
+
+
29 GPG_ERR_SYNTAX Syntax error
30 GPG_ERR_BAD_MPI Bad MPI value
31 GPG_ERR_INV_PASSPHRASE Invalid passphrase
@@ -169,6 +175,8 @@ GPG_ERR_INV_ARG Invalid argument
GCRYPT: - Unsupported length of input data in encrypt or decrypt
cipher functions. For example not matching the block
lengths of the algorithm.
+ - Incompatible args given; e.g. two or none if exactly one
+ is required.
[more to come]
@@ -315,6 +323,7 @@ GPG_ERR_INV_LENGTH Invalid length
modes.
- Bad length of input data; e.g. not a multiple of the
block length.
+ - A length does not match the size of the digest algorithm.
[more to come]
GNUPG: - Invalid hash length for a pubkey
[more to come]
@@ -336,7 +345,12 @@ GPG_ERR_UNSUPPORTED_ENCODING Unsupported encoding
148 GPG_ERR_UNSUPPORTED_CMS_VERSION Unsupported CMS version
+
+
149 GPG_ERR_UNKNOWN_ALGORITHM Unknown algorithm
+
+ GCRYPT: gcry_kdf_proc for an unknown kdf algorithm
+
150 GPG_ERR_INV_ENGINE Invalid crypto engine
151 GPG_ERR_PUBKEY_NOT_TRUSTED Public key not trusted
152 GPG_ERR_DECRYPT_FAILED Decryption failed
@@ -418,5 +432,11 @@ GPG_ERR_LIMIT_REACHED Limit reached
many of directories with a similar name are already existing.
+GPG_ERR_DUP_KEY Duplicated key
+
+ A duplicated key was detected. For example a unique key in a
+ database occurred more than once.
+
+
199 GPG_ERR_UNFINISHED Operation not yet finished
200 GPG_ERR_BUFFER_TOO_SHORT Buffer too short
diff --git a/src/err-codes.h.in b/src/err-codes.h.in
index 8bf8d87..e722688 100644
--- a/src/err-codes.h.in
+++ b/src/err-codes.h.in
@@ -218,7 +218,8 @@
186 GPG_ERR_NO_KEYSERVER No keyserver available
187 GPG_ERR_INV_CURVE Invalid elliptic curve
188 GPG_ERR_UNKNOWN_CURVE Unknown elliptic curve
-# 189 to 197 are free to be used.
+189 GPG_ERR_DUP_KEY Duplicated key
+# 190 to 197 are free to be used.
198 GPG_ERR_FULLY_CANCELED Operation fully cancelled
199 GPG_ERR_UNFINISHED Operation not yet finished