GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: New flag fields beta_compliance.

Browse Source 
* 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
This commit is contained in:
Werner Koch 2024-10-07 10:33:13 +02:00
parent 3bf1ea97bc
commit 1a7bc88ee7
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
6 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/gpgme.texi
View File

@ -3645,6 +3645,11 @@ information in Germany at the restricted level (VS-NfD). This are
currently RSA keys of at least 2048 bits or ECDH/ECDSA keys using a
Brainpool curve.
@item unsigned int beta_complinance : 1;
@since{1.24.0}
The compliance flags (e.g. is_de_vs) are set but the software has not
yet been approved or is in a beta state.
@item unsigned int secret : 1
This is true if the subkey is a secret key. Note that it will be
false if the key is actually a stub key; i.e., a secret key operation
@ -5900,6 +5905,11 @@ The message claims that the content is a MIME object.
The message was encrypted in a VS-NfD compliant way. This is a
specification in Germany for a restricted communication level.
@item unsigned int beta_complinance : 1;
@since{1.24.0}
The compliance flags (e.g. is_de_vs) are set but the software has not
yet been approved or is in a beta state.
@item gpgme_recipient_t recipients
@since{1.1.0}

15
src/gpgme.h.in
View File

@ -586,8 +586,11 @@ struct _gpgme_subkey
/* True if the private key is possessed by more than one person. */
unsigned int is_group_owned : 1;
/* The compliance mode (is_de_vs) has not yet been approved. */
unsigned int beta_compliance : 1;
/* Internal to GPGME, do not use. */
unsigned int _unused : 17;
unsigned int _unused : 16;
/* Public key algorithm supported by this subkey. */
gpgme_pubkey_algo_t pubkey_algo;
@ -1455,8 +1458,11 @@ struct _gpgme_op_decrypt_result
* protection. This might be an old but legitimate message. */
unsigned int legacy_cipher_nomdc : 1;
/* The compliance mode (is_de_vs) has not yet been approved. */
unsigned int beta_compliance : 1;
/* Internal to GPGME, do not use. */
int _unused : 28;
int _unused : 27;
gpgme_recipient_t recipients;
@ -1645,8 +1651,11 @@ struct _gpgme_signature
/* True if the signature is in compliance to the de-vs mode. */
unsigned int is_de_vs : 1;
/* The compliance mode (is_de_vs) has not yet been approved. */
unsigned int beta_compliance : 1;
/* Internal to GPGME, do not use. */
int _unused : 27;
int _unused : 26;
gpgme_validity_t validity;
gpgme_error_t validity_reason;

1
src/util.h
View File

@ -230,6 +230,7 @@ int _gpgme_assuan_log_cb (assuan_context_t ctx, void *hook,
{ \
switch (comp_ul) \
{ \
case 2023: (result)->beta_compliance = 1; /*fallthru */ \
case 23: (result)->is_de_vs = 1; break; \
} \
} \

3
tests/run-decrypt.c
View File

@ -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));

7
tests/run-keylist.c
View File

@ -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++)

6
tests/run-verify.c
View File

@ -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)