mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
gpg: Add option --assert-pubkey_algo.
* g10/keyid.c (parse_one_algo_string): New. (compare_pubkey_string_part): New. (compare_pubkey_string): New. * g10/verify.c (check_assert_signer_list): New. * g10/mainproc.c (check_sig_and_print): Call check_assert_pubkey_algo. * g10/options.h (opt): Add field assert_pubkey_algos. * g10/gpg.c (oAssertPubkeyAlgo): New. (opts): Add "--assert-pubkey_algo". (assert_pubkey_algo_false): New. (main): Parse option. (g10_exit): Reorder RC modifications. Check assert_pubkey_algo_false. * common/status.h (ASSERT_PUBKEY_ALGOS): new. * common/t-support.h (LEAN_T_SUPPORT): Use a simplified version if this macro is set. * g10/gpgv.c (oAssertPubkeyAlgo): New. (opts): Add "--assert-pubkey_algo". (assert_pubkey_algo_false): New. (main): Parse option. (g10_exit): Check assert_pubkey_algo_false. * g10/t-keyid.c: New. * g10/Makefile.am: Add t-keyid. * g10/test-stubs.c: Add assert_pubkey_algos and assert_signer_list and remove from other tests. (check_assert_signer_list): Ditto. (check_assert_pubkey_algo): Ditto. -- GnuPG-bug-id: 6946
This commit is contained in:
parent
5842eee805
commit
302afcb6f6
20 changed files with 424 additions and 58 deletions
|
@ -54,6 +54,7 @@ enum
|
|||
STATUS_NEED_PASSPHRASE,
|
||||
STATUS_VALIDSIG,
|
||||
STATUS_ASSERT_SIGNER,
|
||||
STATUS_ASSERT_PUBKEY_ALGO,
|
||||
STATUS_SIG_ID,
|
||||
STATUS_ENC_TO,
|
||||
STATUS_NODATA,
|
||||
|
|
|
@ -31,6 +31,8 @@
|
|||
#ifndef GNUPG_COMMON_T_SUPPORT_H
|
||||
#define GNUPG_COMMON_T_SUPPORT_H 1
|
||||
|
||||
#ifndef LEAN_T_SUPPORT
|
||||
|
||||
#ifdef GCRYPT_VERSION
|
||||
#error The regression tests should not include with gcrypt.h
|
||||
#endif
|
||||
|
@ -45,11 +47,6 @@
|
|||
# define getenv(a) (NULL)
|
||||
#endif
|
||||
|
||||
#ifndef DIM
|
||||
# define DIM(v) (sizeof(v)/sizeof((v)[0]))
|
||||
# define DIMof(type,member) DIM(((type *)0)->member)
|
||||
#endif
|
||||
|
||||
|
||||
/* Replacement prototypes. */
|
||||
void *gcry_xmalloc (size_t n);
|
||||
|
@ -65,6 +62,12 @@ void gcry_free (void *a);
|
|||
#define xstrdup(a) gcry_xstrdup ( (a) )
|
||||
#define xfree(a) gcry_free ( (a) )
|
||||
|
||||
#endif /* LEAN_T_SUPPORT */
|
||||
|
||||
#ifndef DIM
|
||||
# define DIM(v) (sizeof(v)/sizeof((v)[0]))
|
||||
# define DIMof(type,member) DIM(((type *)0)->member)
|
||||
#endif
|
||||
|
||||
/* Macros to print the result of a test. */
|
||||
#define pass() do { ; } while(0)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue