mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
gpg: Do not allow compressed key packets on import.
* g10/import.c (read_block): Bail out on compressed packets. * g10/options.h (COMPAT_COMPR_KEYS): New. * g10/gpg.c (compatibility_flags): Add "compr-keys". * common/util.h: Remove replacement code not any longer needed. (GPG_ERR_UNEXPECTED_PACKET): Add a new replacement code. -- Compressed key packets do not make much sense but historically they were supported. Thus we also add a compatibility flag. GnuPG-bug-id: 7014
This commit is contained in:
parent
645cf7d8fc
commit
8e529f9221
4 changed files with 11 additions and 6 deletions
|
@ -39,12 +39,11 @@
|
|||
* libgpg-error version. Define them here.
|
||||
* Example: (#if GPG_ERROR_VERSION_NUMBER < 0x011500 // 1.21)
|
||||
*/
|
||||
#if GPG_ERROR_VERSION_NUMBER < 0x012f00 /* 1.47 */
|
||||
# define GPG_ERR_BAD_PUK 320
|
||||
# define GPG_ERR_NO_RESET_CODE 321
|
||||
# define GPG_ERR_BAD_RESET_CODE 322
|
||||
#if GPGRT_VERSION_NUMBER < 0x013800 /* 1.56 */
|
||||
# define GPG_ERR_UNEXPECTED_PACKET 216
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef EXTERN_UNLESS_MAIN_MODULE
|
||||
# if !defined (INCLUDED_BY_MAIN_MODULE)
|
||||
# define EXTERN_UNLESS_MAIN_MODULE extern
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue