aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-01-22 10:09:02 +0000
committerWerner Koch <[email protected]>2015-01-22 10:09:02 +0000
commit524d5bdee2954337e748428469972957663d497d (patch)
treec211160481b48024853533ee4abd53d5e7606e59
parentAvoid false warning about uninitialized var. (diff)
downloadlibgpg-error-524d5bdee2954337e748428469972957663d497d.tar.gz
libgpg-error-524d5bdee2954337e748428469972957663d497d.zip
Add GPG_ERR_LEGACY_KEY.
-rw-r--r--NEWS1
-rw-r--r--doc/errorref.txt13
-rw-r--r--src/err-codes.h.in3
3 files changed, 11 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 65083f5..e5733e4 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ Noteworthy changes in version 1.18 (unreleased) [C13/A13/R_]
GPG_ERR_OBJ_TERM_STATE NEW.
GPG_ERR_REQUEST_TOO_SHORT NEW.
GPG_ERR_REQUEST_TOO_LONG NEW.
+ GPG_ERR_LEGACY_KEY NEW.
Noteworthy changes in version 1.17 (2014-10-15) [C13/A13/R0]
diff --git a/doc/errorref.txt b/doc/errorref.txt
index 0657f53..2e4a6bd 100644
--- a/doc/errorref.txt
+++ b/doc/errorref.txt
@@ -2,15 +2,14 @@
# -name '*.[ch]' -print0 | xargs -0 grep -n GPG_ERR_
-GPG_ERR_UNKNOWN_PACKET Unknown packet
+GPG_ERR_UNKNOWN_PACKET (1) Unknown packet
GNUPG: - Redefined to G10ERR_UNKNOWN_PACKET in gpg.
-GPG_ERR_UNKNOWN_VERSION Unknown version in packet
+GPG_ERR_UNKNOWN_VERSION (2) Unknown version in packet
- Not used. Fixme: We might want to use it in gpg instead of some
- of the INV_PACKET in gpg. The error string does not make sense
- otherwise.
+ Used by GnuPG 2.1 to identify valid OpenPGP packets with an
+ unknown version.
GPG_ERR_PUBKEY_ALGO Invalid public key algorithm
@@ -610,6 +609,10 @@ GPG_ERR_MAC_ALGO
212 GPG_ERR_SEXP_ODD_HEX_NUMBERS Odd hexadecimal numbers in S-expression
213 GPG_ERR_SEXP_BAD_OCT_CHAR Bad octal character in S-expression
+GPG_ERR_LEGACY_KEY (222) Legacy key
+
+ Used by GnuPG to identify version 2 and 3 OpenPGP key packets.
+
GPG_ERR_REQUEST_TOO_SHORT Request too short
A received request is too short to continue processing.
diff --git a/src/err-codes.h.in b/src/err-codes.h.in
index 866380d..9e1924d 100644
--- a/src/err-codes.h.in
+++ b/src/err-codes.h.in
@@ -247,8 +247,9 @@
212 GPG_ERR_SEXP_ODD_HEX_NUMBERS Odd hexadecimal numbers in S-expression
213 GPG_ERR_SEXP_BAD_OCT_CHAR Bad octal character in S-expression
-# 214 to 222 are free to be used.
+# 214 to 221 are free to be used.
+222 GPG_ERR_LEGACY_KEY Legacy key
223 GPG_ERR_REQUEST_TOO_SHORT Request too short
224 GPG_ERR_REQUEST_TOO_LONG Request too long
225 GPG_ERR_OBJ_TERM_STATE Object is in termination state