[git] GPG-ERROR - branch, master, updated. libgpg-error-1.10-23-ge6bda00
by Werner Koch
cvs at cvs.gnupg.org
Tue Aug 23 16:18:47 CEST 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Error codes used by GnuPG et al.".
The branch, master has been updated
via e6bda00b966010934150b0c2134b24ff07b7c9fc (commit)
via b128b8b1d60a615a41d2a4d717358f2bcce26c67 (commit)
from 2a9687fced289571f19c95e0c759ac9eac41940c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e6bda00b966010934150b0c2134b24ff07b7c9fc
Author: Werner Koch <wk at gnupg.org>
Date: Tue Aug 23 15:37:27 2011 +0200
Add GPG_ERR_DUP_KEY
diff --git a/ChangeLog b/ChangeLog
index a96f402..887758e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-23 Werner Koch <wk at g10code.com>
+
+ * src/err-codes.h.in: Add GPG_ERR_DUP_KEY.
+
2011-04-06 Werner Koch <wk at 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
commit b128b8b1d60a615a41d2a4d717358f2bcce26c67
Author: Werner Koch <wk at gnupg.org>
Date: Wed Apr 6 16:13:02 2011 +0200
Prepare for a W64 target.
diff --git a/ChangeLog b/ChangeLog
index 9334c75..a96f402 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2011-04-06 Werner Koch <wk at g10code.com>
+ * autogen.sh: Support option --build-w64.
+ * configure.ac (HAVE_W64_SYSTEM): New.
+
* src/gpg-error.m4: Test whether gpg-error-config exists.
2011-02-23 Werner Koch <wk at g10code.com>
@@ -1179,7 +1182,7 @@
* Initial check-in.
- Copyright 2003, 2004, 2005, 2006, 2007, 2010 g10 Code GmbH
+ Copyright 2003, 2004, 2005, 2006, 2007, 2010, 2011 g10 Code GmbH
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
diff --git a/autogen.sh b/autogen.sh
index dbc5080..596565b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -64,6 +64,10 @@ case "$1" in
myhost="w32"
myhostsub="ce"
;;
+ --build-w64)
+ myhost="w32"
+ myhostsub="64"
+ ;;
--build*)
echo "**Error**: invalid build option $1" >&2
exit 1
@@ -92,6 +96,11 @@ if [ "$myhost" = "w32" ]; then
[ -z "$w32root" ] && w32root="$HOME/w32ce_root"
toolprefixes="arm-mingw32ce"
;;
+ 64)
+ w32root="$w64root"
+ [ -z "$w32root" ] && w32root="$HOME/w64root"
+ toolprefixes="amd64-mingw32msvc"
+ ;;
*)
[ -z "$w32root" ] && w32root="$HOME/w32root"
toolprefixes="i586-mingw32msvc i386-mingw32msvc"
@@ -110,7 +119,7 @@ if [ "$myhost" = "w32" ]; then
done
if [ -z "$crossbindir" ]; then
echo "Cross compiler kit not installed" >&2
- if [ -z "$sub" ]; then
+ if [ -z "$myhostsub" ]; then
echo "Under Debian GNU/Linux, you may install it using" >&2
echo " apt-get install mingw32 mingw32-runtime mingw32-binutils" >&2
fi
diff --git a/configure.ac b/configure.ac
index 5ae5b16..a2ad1dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,8 +88,13 @@ AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])
# Set some internal variables depending on the platform for later use.
have_w32_system=no
+have_w64_system=no
have_w32ce_system=no
case "${host}" in
+ x86_64-*mingw32*)
+ have_w32_system=yes
+ have_w64_system=yes
+ ;;
*-mingw32ce*)
have_w32_system=yes
have_w32ce_system=yes
@@ -151,6 +156,9 @@ AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config])
# Special defines for certain platforms
if test "$have_w32_system" = yes; then
AC_DEFINE(HAVE_W32_SYSTEM,1,[Defined if we run on a W32 API based system])
+ if test "$have_w64_system" = yes; then
+ AC_DEFINE(HAVE_W64_SYSTEM,1,[Defined if we run on 64 bit W32 API system])
+ fi
if test "$have_w32ce_system" = yes; then
AC_DEFINE(HAVE_W32CE_SYSTEM,1,[Defined if we run on WindowsCE])
GPG_ERROR_CONFIG_ISUBDIRAFTER="gpg-extra"
@@ -170,6 +178,7 @@ fi
AC_SUBST(BUILD_TIMESTAMP)
AC_SUBST(BUILD_FILEVERSION)
AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
+AM_CONDITIONAL(HAVE_W64_SYSTEM, test "$have_w64_system" = yes)
AM_CONDITIONAL(HAVE_W32CE_SYSTEM, test "$have_w32ce_system" = yes)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 ++++++++-
NEWS | 1 +
autogen.sh | 11 ++++++++++-
configure.ac | 9 +++++++++
doc/errorref.txt | 22 +++++++++++++++++++++-
src/err-codes.h.in | 3 ++-
6 files changed, 51 insertions(+), 4 deletions(-)
hooks/post-receive
--
Error codes used by GnuPG et al.
http://git.gnupg.org
More information about the Gnupg-commits
mailing list