aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
Diffstat (limited to 'g10')
-rw-r--r--g10/decrypt-data.c3
-rw-r--r--g10/encrypt.c5
-rw-r--r--g10/gpg.c31
-rw-r--r--g10/pkclist.c4
-rw-r--r--g10/pubkey-enc.c4
-rw-r--r--g10/sig-check.c6
-rw-r--r--g10/sign.c5
7 files changed, 27 insertions, 31 deletions
diff --git a/g10/decrypt-data.c b/g10/decrypt-data.c
index 12693fe61..736534d75 100644
--- a/g10/decrypt-data.c
+++ b/g10/decrypt-data.c
@@ -102,8 +102,7 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
if (! gnupg_cipher_is_allowed (opt.compliance, 0, dek->algo,
GCRY_CIPHER_MODE_CFB))
{
- log_error (_("you may not use cipher algorithm '%s'"
- " while in %s mode\n"),
+ log_error (_("cipher algorithm '%s' may not be used in %s mode\n"),
openpgp_cipher_algo_name (dek->algo),
gnupg_compliance_option_string (opt.compliance));
rc = gpg_error (GPG_ERR_CIPHER_ALGO);
diff --git a/g10/encrypt.c b/g10/encrypt.c
index c7982d448..c68d6d5d1 100644
--- a/g10/encrypt.c
+++ b/g10/encrypt.c
@@ -628,8 +628,7 @@ encrypt_crypt (ctrl_t ctrl, int filefd, const char *filename,
if (! gnupg_cipher_is_allowed (opt.compliance, 1, cfx.dek->algo,
GCRY_CIPHER_MODE_CFB))
{
- log_error (_("you may not use cipher algorithm '%s'"
- " while in %s mode\n"),
+ log_error (_("cipher algorithm '%s' may not be used in %s mode\n"),
openpgp_cipher_algo_name (cfx.dek->algo),
gnupg_compliance_option_string (opt.compliance));
rc = gpg_error (GPG_ERR_CIPHER_ALGO);
@@ -996,7 +995,7 @@ write_pubkey_enc_from_list (ctrl_t ctrl, PK_LIST pk_list, DEK *dek, iobuf_t out)
{
if (opt.throw_keyids && (PGP6 || PGP7 || PGP8))
{
- log_info(_("you may not use %s while in %s mode\n"),
+ log_info(_("option '%s' may not be used in %s mode\n"),
"--throw-keyids",
gnupg_compliance_option_string (opt.compliance));
compliance_failure();
diff --git a/g10/gpg.c b/g10/gpg.c
index 52b6089e9..d2227b395 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3860,19 +3860,22 @@ main (int argc, char **argv)
switch(badtype)
{
case PREFTYPE_SYM:
- log_info(_("you may not use cipher algorithm '%s'"
- " while in %s mode\n"),
- badalg, gnupg_compliance_option_string (opt.compliance));
+ log_info (_("cipher algorithm '%s'"
+ " may not be used in %s mode\n"),
+ badalg,
+ gnupg_compliance_option_string (opt.compliance));
break;
case PREFTYPE_HASH:
- log_info(_("you may not use digest algorithm '%s'"
- " while in %s mode\n"),
- badalg, gnupg_compliance_option_string (opt.compliance));
+ log_info (_("digest algorithm '%s'"
+ " may not be used in %s mode\n"),
+ badalg,
+ gnupg_compliance_option_string (opt.compliance));
break;
case PREFTYPE_ZIP:
- log_info(_("you may not use compression algorithm '%s'"
- " while in %s mode\n"),
- badalg, gnupg_compliance_option_string (opt.compliance));
+ log_info (_("compression algorithm '%s'"
+ " may not be used in %s mode\n"),
+ badalg,
+ gnupg_compliance_option_string (opt.compliance));
break;
default:
BUG();
@@ -3897,8 +3900,7 @@ main (int argc, char **argv)
|| cmd == aSignEncrSym,
opt.def_cipher_algo,
GCRY_CIPHER_MODE_NONE))
- log_error (_("you may not use cipher algorithm '%s'"
- " while in %s mode\n"),
+ log_error (_("cipher algorithm '%s' may not be used in %s mode\n"),
openpgp_cipher_algo_name (opt.def_cipher_algo),
gnupg_compliance_option_string (opt.compliance));
@@ -3910,8 +3912,7 @@ main (int argc, char **argv)
|| cmd == aSignSym
|| cmd == aClearsign,
opt.def_digest_algo))
- log_error (_("you may not use digest algorithm '%s'"
- " while in %s mode\n"),
+ log_error (_("digest algorithm '%s' may not be used in %s mode\n"),
gcry_md_algo_name (opt.def_digest_algo),
gnupg_compliance_option_string (opt.compliance));
@@ -4128,7 +4129,7 @@ main (int argc, char **argv)
" with --s2k-mode 0\n"));
else if(PGP6 || PGP7)
log_error(_("you cannot use --symmetric --encrypt"
- " while in %s mode\n"),
+ " in %s mode\n"),
gnupg_compliance_option_string (opt.compliance));
else
{
@@ -4189,7 +4190,7 @@ main (int argc, char **argv)
" with --s2k-mode 0\n"));
else if(PGP6 || PGP7)
log_error(_("you cannot use --symmetric --sign --encrypt"
- " while in %s mode\n"),
+ " in %s mode\n"),
gnupg_compliance_option_string (opt.compliance));
else
{
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 48cfe4548..67d932e2a 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -1026,7 +1026,7 @@ build_pk_list (ctrl_t ctrl, strlist_t rcpts, PK_LIST *ret_pk_list)
issue a warning and switch into GnuPG mode. */
if ((rov->flags & PK_LIST_HIDDEN) && (PGP6 || PGP7 || PGP8))
{
- log_info(_("you may not use %s while in %s mode\n"),
+ log_info(_("option '%s' may not be used in %s mode\n"),
"--hidden-recipient",
gnupg_compliance_option_string (opt.compliance));
@@ -1077,7 +1077,7 @@ build_pk_list (ctrl_t ctrl, strlist_t rcpts, PK_LIST *ret_pk_list)
GnuPG mode. */
if ((r->flags&PK_LIST_ENCRYPT_TO) && (PGP6 || PGP7 || PGP8))
{
- log_info(_("you may not use %s while in %s mode\n"),
+ log_info(_("option '%s' may not be used in %s mode\n"),
"--hidden-encrypt-to",
gnupg_compliance_option_string (opt.compliance));
diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c
index 013fd2f1b..272562b18 100644
--- a/g10/pubkey-enc.c
+++ b/g10/pubkey-enc.c
@@ -94,7 +94,7 @@ get_session_key (ctrl_t ctrl, PKT_pubkey_enc * k, DEK * dek)
if (!gnupg_pk_is_compliant (opt.compliance,
sk->pubkey_algo,
sk->pkey, nbits_from_pk (sk), NULL))
- log_info (_("Note: key %s was not suitable for encryption"
+ log_info (_("Note: key %s is not suitable for encryption"
" in %s mode\n"),
keystr_from_pk (sk),
gnupg_compliance_option_string (opt.compliance));
@@ -132,7 +132,7 @@ get_session_key (ctrl_t ctrl, PKT_pubkey_enc * k, DEK * dek)
if (!gnupg_pk_is_compliant (opt.compliance,
sk->pubkey_algo,
sk->pkey, nbits_from_pk (sk), NULL))
- log_info (_("Note: key %s was not suitable for encryption"
+ log_info (_("Note: key %s is not suitable for encryption"
" in %s mode\n"),
keystr_from_pk (sk),
gnupg_compliance_option_string (opt.compliance));
diff --git a/g10/sig-check.c b/g10/sig-check.c
index 2a3acc40b..60e988e60 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -136,8 +136,7 @@ check_signature2 (ctrl_t ctrl,
else if (! gnupg_digest_is_allowed (opt.compliance, 0, sig->digest_algo))
{
/* Compliance failure. */
- log_info (_("you may not use digest algorithm '%s'"
- " while in %s mode\n"),
+ log_info (_("digest algorithm '%s' may not be used in %s mode\n"),
gcry_md_algo_name (sig->digest_algo),
gnupg_compliance_option_string (opt.compliance));
rc = gpg_error (GPG_ERR_DIGEST_ALGO);
@@ -162,8 +161,7 @@ check_signature2 (ctrl_t ctrl,
NULL))
{
/* Compliance failure. */
- log_error (_("key %s is not suitable for signature verification"
- " in %s mode\n"),
+ log_error (_("key %s may not be used for signing in %s mode\n"),
keystr_from_pk (pk),
gnupg_compliance_option_string (opt.compliance));
rc = gpg_error (GPG_ERR_PUBKEY_ALGO);
diff --git a/g10/sign.c b/g10/sign.c
index f7dd974fe..4cf0cd39a 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -281,8 +281,7 @@ do_sign (ctrl_t ctrl, PKT_public_key *pksk, PKT_signature *sig,
/* Check compliance. */
if (! gnupg_digest_is_allowed (opt.compliance, 1, mdalgo))
{
- log_error (_("you may not use digest algorithm '%s'"
- " while in %s mode\n"),
+ log_error (_("digest algorithm '%s' may not be used in %s mode\n"),
gcry_md_algo_name (mdalgo),
gnupg_compliance_option_string (opt.compliance));
err = gpg_error (GPG_ERR_DIGEST_ALGO);
@@ -292,7 +291,7 @@ do_sign (ctrl_t ctrl, PKT_public_key *pksk, PKT_signature *sig,
if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_SIGNING, pksk->pubkey_algo,
pksk->pkey, nbits_from_pk (pksk), NULL))
{
- log_error (_("key %s not suitable for signing while in %s mode\n"),
+ log_error (_("key %s may not be used for signing in %s mode\n"),
keystr_from_pk (pksk),
gnupg_compliance_option_string (opt.compliance));
err = gpg_error (GPG_ERR_PUBKEY_ALGO);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-18 04:49:53 +0000