security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-22 14:57:02 +01:00
Code Activity

gpg: Emit STATUS_FAILURE for --require-compliance errors

Browse Source 
* g10/misc.c (compliance_failure): Do not fallback to CO_GNUPG.  Print
compliance failure error and status for CO_DE_VS.
* g10/mainproc.c (proc_encrypted): Call compliance_failure in the
require-compliance error case.
* g10/encrypt.c (check_encryption_compliance): Ditto.
This commit is contained in:
Werner Koch 2022-08-31 15:27:59 +02:00
parent e1169e8f8a
commit e05fb5ca37
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/encrypt.c
View File

@ -567,10 +567,8 @@ check_encryption_compliance (DEK *dek, pk_list_t pk_list)
&& opt.compliance == CO_DE_VS && opt.compliance == CO_DE_VS
&& !compliant) && !compliant)
{ {
log_error (_("operation forced to fail due to" compliance_failure ();
" unfulfilled compliance rules\n"));
err = gpg_error (GPG_ERR_FORBIDDEN); err = gpg_error (GPG_ERR_FORBIDDEN);
g10_errors_seen = 1;
goto leave; goto leave;
} }

7
g10/mainproc.c
View File

@ -944,9 +944,7 @@ proc_encrypted (CTX c, PACKET *pkt)
&& opt.compliance == CO_DE_VS && opt.compliance == CO_DE_VS
&& compliance_de_vs != (4|2|1)) && compliance_de_vs != (4|2|1))
{ {
log_error (_("operation forced to fail due to" compliance_failure ();
" unfulfilled compliance rules\n"));
g10_errors_seen = 1;
} }
} }
@ -2625,8 +2623,7 @@ check_sig_and_print (CTX c, kbnode_t node)
else if (opt.flags.require_compliance else if (opt.flags.require_compliance
&& opt.compliance == CO_DE_VS) && opt.compliance == CO_DE_VS)
{ {
log_error (_("operation forced to fail due to" compliance_failure ();
" unfulfilled compliance rules\n"));
if (!rc) if (!rc)
rc = gpg_error (GPG_ERR_FORBIDDEN); rc = gpg_error (GPG_ERR_FORBIDDEN);
} }

8
g10/misc.c
View File

@ -1405,8 +1405,12 @@ compliance_failure(void)
break; break;
case CO_DE_VS: case CO_DE_VS:
ver="DE-VS applications"; /* For de-vs we do not allow any kind of fallback. */
break; write_status_failure ("compliance-check", gpg_error (GPG_ERR_FORBIDDEN));
log_error (_("operation forced to fail due to"
" unfulfilled compliance rules\n"));
g10_errors_seen = 1;
return;
} }
log_info(_("this message may not be usable by %s\n"),ver); log_info(_("this message may not be usable by %s\n"),ver);