From 1a7bc88ee756df127761c90a4b66d885f0c9de74 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 7 Oct 2024 10:33:13 +0200
Subject: core: New flag fields beta_compliance.

* src/gpgme.h.in (struct _gpgme_subkey): Add field beta_compliance.
(struct _gpgme_op_decrypt_result): Ditto.
(struct _gpgme_signature): Ditto.
* src/util.h (PARSE_COMPLIANCE_FLAGS): Handle the new 2023 value.
* tests/run-decrypt.c: Append a "(beta)" to the vs-de compliance.
* tests/run-keylist.c: Ditto.
* tests/run-verify.c: Ditto.
--

See GnuPG commit b287fb577587655559fefb90f7ed90c9a15dc6a3
---
 tests/run-decrypt.c | 3 ++-
 tests/run-keylist.c | 7 +++++--
 tests/run-verify.c  | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/run-decrypt.c b/tests/run-decrypt.c
index 0e38e0d3..6869f4d5 100644
--- a/tests/run-decrypt.c
+++ b/tests/run-decrypt.c
@@ -57,7 +57,8 @@ print_result (gpgme_decrypt_result_t result)
   printf ("Original file name .: %s\n", nonnull(result->file_name));
   printf ("Wrong key usage ....: %s\n", result->wrong_key_usage? "yes":"no");
   printf ("Legacy w/o MDC ... .: %s\n", result->legacy_cipher_nomdc?"yes":"no");
-  printf ("Compliance de-vs ...: %s\n", result->is_de_vs? "yes":"no");
+  printf ("Compliance de-vs ...: %s%s\n", result->is_de_vs? "yes":"no",
+          result->is_de_vs && result->beta_compliance? "(beta)":"");
   printf ("MIME flag ..........: %s\n", result->is_mime? "yes":"no");
   printf ("Unsupported algo ...: %s\n", nonnull(result->unsupported_algorithm));
   printf ("Session key ........: %s\n", nonnull (result->session_key));
diff --git a/tests/run-keylist.c b/tests/run-keylist.c
index 9ecf380b..8e784451 100644
--- a/tests/run-keylist.c
+++ b/tests/run-keylist.c
@@ -325,7 +325,7 @@ main (int argc, char **argv)
               key->has_sign? "s":"",
               key->has_certify? "c":"",
               key->has_authenticate? "a":"");
-      printf ("flags   :%s%s%s%s%s%s%s%s\n",
+      printf ("flags   :%s%s%s%s%s%s%s%s%s\n",
               key->secret? " secret":"",
               key->revoked? " revoked":"",
               key->expired? " expired":"",
@@ -333,6 +333,8 @@ main (int argc, char **argv)
               key->invalid? " invalid":"",
               key->is_qualified? " qualified":"",
               key->subkeys && key->subkeys->is_de_vs? " de-vs":"",
+              key->subkeys && key->subkeys->is_de_vs
+              && key->subkeys->is_de_vs? "(beta)":"",
               key->subkeys && key->subkeys->is_cardkey? " cardkey":"");
       printf ("upd     : %lu (%u)\n", key->last_update, key->origin);
       if (key->chain_id)
@@ -360,7 +362,7 @@ main (int argc, char **argv)
                   subkey->can_authenticate? "a":"",
                   subkey->can_renc? "r":"",
                   subkey->can_timestamp? "t":"");
-          printf ("flags %2d:%s%s%s%s%s%s%s%s%s\n",
+          printf ("flags %2d:%s%s%s%s%s%s%s%s%s%s\n",
                   nsub,
                   subkey->secret? " secret":"",
                   subkey->revoked? " revoked":"",
@@ -370,6 +372,7 @@ main (int argc, char **argv)
                   subkey->is_group_owned? " group":"",
                   subkey->is_qualified? " qualified":"",
                   subkey->is_de_vs? " de-vs":"",
+                  subkey->is_de_vs && subkey->beta_compliance? "(beta)":"",
                   subkey->is_cardkey? " cardkey":"");
         }
       for (nuids=0, uid=key->uids; uid; uid = uid->next, nuids++)
diff --git a/tests/run-verify.c b/tests/run-verify.c
index 2d53ad19..13efd89f 100644
--- a/tests/run-verify.c
+++ b/tests/run-verify.c
@@ -159,11 +159,11 @@ print_result (gpgme_verify_result_t result)
               sig->pka_trust == 0? "n/a" :
               sig->pka_trust == 1? "bad" :
               sig->pka_trust == 2? "okay": "RFU");
-      printf ("  other flags:%s%s%s\n",
+      printf ("  other flags:%s%s%s%s\n",
               sig->wrong_key_usage? " wrong-key-usage":"",
               sig->chain_model? " chain-model":"",
-              sig->is_de_vs? " de-vs":""
-              );
+              sig->is_de_vs? " de-vs":"",
+              sig->is_de_vs && sig->beta_compliance? "(beta)":"");
       for (nt = sig->notations; nt; nt = nt->next)
         {
           if (nt->name)
-- 
cgit v1.2.3