security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

indent,i18n: Make some new strings translatable. Wrap too long lines.

Browse Source 
--
This commit is contained in:
Werner Koch 2017-06-20 08:31:07 +02:00
parent a68a98233a
commit e0877a98a0
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
7 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/decrypt-data.c
View File

@ -99,7 +99,8 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
} }
/* Check compliance. */ /* Check compliance. */
if (! gnupg_cipher_is_allowed (opt.compliance, 0, dek->algo, GCRY_CIPHER_MODE_CFB)) if (! gnupg_cipher_is_allowed (opt.compliance, 0, dek->algo,
GCRY_CIPHER_MODE_CFB))
{ {
log_error (_("you may not use cipher algorithm '%s'" log_error (_("you may not use cipher algorithm '%s'"
" while in %s mode\n"), " while in %s mode\n"),

7
g10/encrypt.c
View File

@ -630,10 +630,13 @@ encrypt_crypt (ctrl_t ctrl, int filefd, const char *filename,
for (pkr = pk_list; pkr; pkr = pkr->next) for (pkr = pk_list; pkr; pkr = pkr->next)
{ {
PKT_public_key *pk = pkr->pk; PKT_public_key *pk = pkr->pk;
if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_ENCRYPTION, pk->pubkey_algo,
if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_ENCRYPTION,
pk->pubkey_algo,
pk->pkey, nbits_from_pk (pk), NULL)) pk->pkey, nbits_from_pk (pk), NULL))
{ {
log_error ("key %s not suitable for encryption while in %s mode\n", log_error (_("key %s not suitable for encryption"
" while in %s mode\n"),
keystr_from_pk (pk), keystr_from_pk (pk),
gnupg_compliance_option_string (opt.compliance)); gnupg_compliance_option_string (opt.compliance));
rc = gpg_error (GPG_ERR_PUBKEY_ALGO); rc = gpg_error (GPG_ERR_PUBKEY_ALGO);

21
g10/pubkey-enc.c
View File

@ -95,13 +95,14 @@ get_session_key (ctrl_t ctrl, PKT_pubkey_enc * k, DEK * dek)
sk->pubkey_algo, sk->pubkey_algo,
sk->pkey, nbits_from_pk (sk), NULL)) sk->pkey, nbits_from_pk (sk), NULL))
{ {
log_info ("key %s not suitable for decryption while in %s mode\n", log_info (_("key %s not suitable for decryption"
keystr_from_pk (sk), gnupg_compliance_option_string (opt.compliance)); " while in %s mode\n"),
free_public_key (sk); keystr_from_pk (sk),
return gpg_error (GPG_ERR_PUBKEY_ALGO); gnupg_compliance_option_string (opt.compliance));
rc = gpg_error (GPG_ERR_PUBKEY_ALGO);
} }
else
rc = get_it (ctrl, k, dek, sk, k->keyid); rc = get_it (ctrl, k, dek, sk, k->keyid);
} }
} }
else if (opt.skip_hidden_recipients) else if (opt.skip_hidden_recipients)
@ -135,8 +136,10 @@ get_session_key (ctrl_t ctrl, PKT_pubkey_enc * k, DEK * dek)
sk->pubkey_algo, sk->pubkey_algo,
sk->pkey, nbits_from_pk (sk), NULL)) sk->pkey, nbits_from_pk (sk), NULL))
{ {
log_info ("key %s not suitable for decryption while in %s mode\n", log_info (_("key %s not suitable for decryption"
keystr_from_pk (sk), gnupg_compliance_option_string (opt.compliance)); " while in %s mode\n"),
keystr_from_pk (sk),
gnupg_compliance_option_string (opt.compliance));
continue; continue;
} }
@ -153,7 +156,7 @@ get_session_key (ctrl_t ctrl, PKT_pubkey_enc * k, DEK * dek)
enum_secret_keys (ctrl, &enum_context, NULL); /* free context */ enum_secret_keys (ctrl, &enum_context, NULL); /* free context */
} }
leave: leave:
free_public_key (sk); free_public_key (sk);
if (DBG_CLOCK) if (DBG_CLOCK)
log_clock ("get_session_key leave"); log_clock ("get_session_key leave");

2
g10/sign.c
View File

@ -292,7 +292,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, if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_SIGNING, pksk->pubkey_algo,
pksk->pkey, nbits_from_pk (pksk), NULL)) pksk->pkey, nbits_from_pk (pksk), NULL))
{ {
log_error ("key %s not suitable for signing while in %s mode\n", log_error (_("key %s not suitable for signing while in %s mode\n"),
keystr_from_pk (pksk), keystr_from_pk (pksk),
gnupg_compliance_option_string (opt.compliance)); gnupg_compliance_option_string (opt.compliance));
err = gpg_error (GPG_ERR_PUBKEY_ALGO); err = gpg_error (GPG_ERR_PUBKEY_ALGO);

3
sm/decrypt.c
View File

@ -481,7 +481,8 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp)
int pk_algo = gpgsm_get_key_algo_info (cert, &nbits); int pk_algo = gpgsm_get_key_algo_info (cert, &nbits);
/* Check compliance. */ /* Check compliance. */
if (! gnupg_pk_is_allowed (opt.compliance, PK_USE_DECRYPTION, if (! gnupg_pk_is_allowed (opt.compliance,
PK_USE_DECRYPTION,
pk_algo, NULL, nbits, NULL)) pk_algo, NULL, nbits, NULL))
{ {
log_error ("certificate ID 0x%08lX not suitable for " log_error ("certificate ID 0x%08lX not suitable for "

6
sm/encrypt.c
View File

@ -407,9 +407,9 @@ gpgsm_encrypt (ctrl_t ctrl, certlist_t recplist, int data_fd, estream_t out_fp)
} }
/* Check compliance. */ /* Check compliance. */
if (! gnupg_cipher_is_allowed (opt.compliance, 1, if (!gnupg_cipher_is_allowed
gcry_cipher_map_name (opt.def_cipher_algoid), (opt.compliance, 1, gcry_cipher_map_name (opt.def_cipher_algoid),
gcry_cipher_mode_from_oid (opt.def_cipher_algoid))) gcry_cipher_mode_from_oid (opt.def_cipher_algoid)))
{ {
log_error (_("you may not use cipher algorithm '%s'" log_error (_("you may not use cipher algorithm '%s'"
" while in %s mode\n"), " while in %s mode\n"),

12
sm/gpgsm.c
View File

@ -1625,11 +1625,13 @@ main ( int argc, char **argv)
GCRY_CIPHER_MODE_NONE) GCRY_CIPHER_MODE_NONE)
&& ! gnupg_cipher_is_allowed (opt.compliance, && ! gnupg_cipher_is_allowed (opt.compliance,
cmd == aEncr || cmd == aSignEncr, cmd == aEncr || cmd == aSignEncr,
gcry_cipher_mode_from_oid (opt.def_cipher_algoid), gcry_cipher_mode_from_oid
(opt.def_cipher_algoid),
GCRY_CIPHER_MODE_NONE)) GCRY_CIPHER_MODE_NONE))
log_error (_("you may not use cipher algorithm '%s'" log_error (_("you may not use cipher algorithm '%s'"
" while in %s mode\n"), " while in %s mode\n"),
opt.def_cipher_algoid, gnupg_compliance_option_string (opt.compliance)); opt.def_cipher_algoid,
gnupg_compliance_option_string (opt.compliance));
if (forced_digest_algo if (forced_digest_algo
&& ! gnupg_digest_is_allowed (opt.compliance, && ! gnupg_digest_is_allowed (opt.compliance,
@ -1639,7 +1641,8 @@ main ( int argc, char **argv)
opt.forced_digest_algo)) opt.forced_digest_algo))
log_error (_("you may not use digest algorithm '%s'" log_error (_("you may not use digest algorithm '%s'"
" while in %s mode\n"), " while in %s mode\n"),
forced_digest_algo, gnupg_compliance_option_string (opt.compliance)); forced_digest_algo,
gnupg_compliance_option_string (opt.compliance));
if (extra_digest_algo if (extra_digest_algo
&& ! gnupg_digest_is_allowed (opt.compliance, && ! gnupg_digest_is_allowed (opt.compliance,
@ -1649,7 +1652,8 @@ main ( int argc, char **argv)
opt.extra_digest_algo)) opt.extra_digest_algo))
log_error (_("you may not use digest algorithm '%s'" log_error (_("you may not use digest algorithm '%s'"
" while in %s mode\n"), " while in %s mode\n"),
forced_digest_algo, gnupg_compliance_option_string (opt.compliance)); forced_digest_algo,
gnupg_compliance_option_string (opt.compliance));
if (log_get_errorcount(0)) if (log_get_errorcount(0))
gpgsm_exit(2); gpgsm_exit(2);