diff options
| author | Jakub Jelen <jjelen@redhat.com> | 2022-04-01 18:31:05 +0200 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2022-05-06 09:23:57 +0900 |
| commit | 9c55ba3bc1ce72307886f6d88f37d908e3fad39a (patch) | |
| tree | 9b08272073003d9d00a73c6bafd593add59ff3dc | |
| parent | d8a13d97ccb62c8f7564192f0c8dcdc0b4d9745a (diff) | |
| download | libgcrypt-9c55ba3bc1ce72307886f6d88f37d908e3fad39a.tar.gz | |
tests: Replace custom bit with more generic flags
* tests/basic.c (global): New flag FLAG_SPECIAL
(check_pubkey_crypt): Change to use bitfield flags
--
Applied the master commit of:
299e2f93415984919181e0ee651719bbf83bdd2f
GnuPG-bug-id: 5918
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
| -rw-r--r-- | tests/basic.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/tests/basic.c b/tests/basic.c index a0ad33eb..1c6cb40b 100644 --- a/tests/basic.c +++ b/tests/basic.c @@ -55,11 +55,12 @@ typedef struct test_spec_pubkey } test_spec_pubkey_t; -#define FLAG_CRYPT (1 << 0) -#define FLAG_SIGN (1 << 1) -#define FLAG_GRIP (1 << 2) -#define FLAG_NOFIPS (1 << 3) -#define FLAG_CFB8 (1 << 4) +#define FLAG_CRYPT (1 << 0) +#define FLAG_SIGN (1 << 1) +#define FLAG_GRIP (1 << 2) +#define FLAG_NOFIPS (1 << 3) +#define FLAG_CFB8 (1 << 4) +#define FLAG_SPECIAL (1 << 5) static int in_fips_mode; @@ -15558,7 +15559,7 @@ check_pubkey_crypt (int n, gcry_sexp_t skey, gcry_sexp_t pkey, int algo, int unpadded; int encrypt_expected_rc; int decrypt_expected_rc; - int special; + int flags; } datas[] = { { GCRY_PK_RSA, @@ -15642,14 +15643,14 @@ check_pubkey_crypt (int n, gcry_sexp_t skey, gcry_sexp_t pkey, int algo, "(flags oaep)", 1, 0, - GPG_ERR_ENCODING_PROBLEM, 1 }, + GPG_ERR_ENCODING_PROBLEM, FLAG_SPECIAL }, { GCRY_PK_RSA, "(data\n (flags oaep)\n" " (value #11223344556677889900AA#))\n", "(flags pkcs1)", 1, 0, - GPG_ERR_ENCODING_PROBLEM, 1 }, + GPG_ERR_ENCODING_PROBLEM, FLAG_SPECIAL }, { 0, "(data\n (flags pss)\n" " (value #11223344556677889900AA#))\n", @@ -15725,7 +15726,7 @@ check_pubkey_crypt (int n, gcry_sexp_t skey, gcry_sexp_t pkey, int algo, ciph = list; } rc = gcry_pk_decrypt (&plain, ciph, skey); - if (!rc && datas[dataidx].special == 1) + if (!rc && (datas[dataidx].flags & FLAG_SPECIAL)) { /* It may happen that OAEP formatted data which is decrypted as pkcs#1 data returns a valid pkcs#1 |