diff options
| author | Werner Koch <[email protected]> | 2014-10-09 18:57:02 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-10-09 18:57:02 +0000 |
| commit | 60e21d8b85888b8c9ea15c70268f98d780fdf5fb (patch) | |
| tree | 1998f37f722752aaf9f5a5a07d0ae3c5499db95e | |
| parent | kbx: Fix handling of overlong keys. (diff) | |
| download | gnupg-60e21d8b85888b8c9ea15c70268f98d780fdf5fb.tar.gz gnupg-60e21d8b85888b8c9ea15c70268f98d780fdf5fb.zip | |
gpg: Sync keylist output and warning messages.
* g10/keylist.c (list_all): Flush stdout before logging.
* g10/misc.c (print_pubkey_algo_note): Ditto.
(print_cipher_algo_note): Ditto.
(print_digest_algo_note): Ditto.
(print_md5_rejected_note): Ditto.
Signed-off-by: Werner Koch <[email protected]>
| -rw-r--r-- | g10/keylist.c | 1 | ||||
| -rw-r--r-- | g10/misc.c | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/g10/keylist.c b/g10/keylist.c index 364947528..4a028205a 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -496,6 +496,7 @@ list_all (int secret, int mark_secret) keyblock = NULL; } while (!(rc = keydb_search_next (hd))); + es_fflush (es_stdout); if (rc && gpg_err_code (rc) != GPG_ERR_NOT_FOUND) log_error ("keydb_search_next failed: %s\n", g10_errstr (rc)); diff --git a/g10/misc.c b/g10/misc.c index 320e8afbf..c47d6dcf0 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -298,12 +298,14 @@ print_pubkey_algo_note (pubkey_algo_t algo) if(!warn) { warn=1; + es_fflush (es_stdout); log_info (_("WARNING: using experimental public key algorithm %s\n"), openpgp_pk_algo_name (algo)); } } else if (algo == PUBKEY_ALGO_ELGAMAL) { + es_fflush (es_stdout); log_info (_("WARNING: Elgamal sign+encrypt keys are deprecated\n")); } } @@ -317,6 +319,7 @@ print_cipher_algo_note (cipher_algo_t algo) if(!warn) { warn=1; + es_fflush (es_stdout); log_info (_("WARNING: using experimental cipher algorithm %s\n"), openpgp_cipher_algo_name (algo)); } @@ -332,13 +335,17 @@ print_digest_algo_note (digest_algo_t algo) if(!warn) { warn=1; + es_fflush (es_stdout); log_info (_("WARNING: using experimental digest algorithm %s\n"), gcry_md_algo_name (algo)); } } else if(algo==DIGEST_ALGO_MD5) - log_info (_("WARNING: digest algorithm %s is deprecated\n"), - gcry_md_algo_name (algo)); + { + es_fflush (es_stdout); + log_info (_("WARNING: digest algorithm %s is deprecated\n"), + gcry_md_algo_name (algo)); + } } @@ -349,6 +356,7 @@ print_md5_rejected_note (void) if (!shown) { + es_fflush (es_stdout); log_info (_("Note: signatures using the %s algorithm are rejected\n"), "MD5"); |