security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-06 12:33:23 +01:00
Code Activity

common: Add missing error code GPG_ERR_WRONG_NAME.

Browse Source 
* configure.ac: Require libgpg-error 1.25.
* common/util.h: Define some extra error codes.
--

This actually defines a few more error ocdes in case they are used by
backported code.  The requirement chnaged to 1.25 because erro codes
from there are also required.

GnuPG-bug-id: 4965
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2020-06-03 10:29:18 +02:00
parent 4e3a7aa060
commit 381c54179c
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/util.h
View File

@ -35,10 +35,19 @@
#include <errno.h> /* We need errno. */ #include <errno.h> /* We need errno. */
#include <gpg-error.h> /* We need gpg_error_t and estream. */ #include <gpg-error.h> /* We need gpg_error_t and estream. */
/* These error codes are used but not defined in the required /* These error codes might be used but not defined in the required
* libgpg-error version. Define them here. * libgpg-error version. Define them here.
* Example: (#if GPG_ERROR_VERSION_NUMBER < 0x011500 // 1.21) * Example: (#if GPG_ERROR_VERSION_NUMBER < 0x011500 // 1.21)
*/ */
#if GPG_ERROR_VERSION_NUMBER < 0x012400 /* 1.36 */
# define GPG_ERR_NO_AUTH 314
# define GPG_ERR_BAD_AUTH 315
#endif
#if GPG_ERROR_VERSION_NUMBER < 0x011b00 /* 1.27 */
# define GPG_ERR_WRONG_NAME 313
#endif
#if GPG_ERROR_VERSION_NUMBER < 0x011a00 /* 1.26 */ #if GPG_ERROR_VERSION_NUMBER < 0x011a00 /* 1.26 */
# define GPG_ERR_UNKNOWN_FLAG 309 # define GPG_ERR_UNKNOWN_FLAG 309
# define GPG_ERR_INV_ORDER 310 # define GPG_ERR_INV_ORDER 310

2
configure.ac
View File

@ -54,7 +54,7 @@ AC_INIT([mym4_package],[mym4_version], [https://bugs.gnupg.org])
# build-aux/speedo.mk and Makefile.am # build-aux/speedo.mk and Makefile.am
AC_DEFINE_UNQUOTED(GNUPG_SWDB_TAG, "gnupg22", [swdb tag for this branch]) AC_DEFINE_UNQUOTED(GNUPG_SWDB_TAG, "gnupg22", [swdb tag for this branch])
NEED_GPG_ERROR_VERSION=1.24 NEED_GPG_ERROR_VERSION=1.25
NEED_LIBGCRYPT_API=1 NEED_LIBGCRYPT_API=1
NEED_LIBGCRYPT_VERSION=1.7.0 NEED_LIBGCRYPT_VERSION=1.7.0