diff options
| author | Ke Zhao <kzhao@redhat.com> | 2019-03-21 11:27:24 -0400 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-03-24 08:31:15 +0100 |
| commit | 23c07c1d2fced27625d0090cf675baf86a749213 (patch) | |
| tree | 49d05a215eda1a43cd985443b7b8efa831a5eae7 /src | |
| parent | 8d2c1c345e1db472ef5d484d6ecc9ddbc794d791 (diff) | |
| download | gnutls-23c07c1d2fced27625d0090cf675baf86a749213.tar.gz | |
gnutls-cli: Fix output with option "--logfile"
The X.509 connection would still print informational message to the
stdout by default. Move that output to logfile and add x509 functionality
test in the test suite.
Signed-off-by: Ke Zhao <kzhao@redhat.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/common.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/common.c b/src/common.c index f0fdf9e00d..01ecef9061 100644 --- a/src/common.c +++ b/src/common.c @@ -168,8 +168,8 @@ print_x509_info(gnutls_session_t session, FILE *out, int flag, int print_cert, i return; } - fprintf(out, "- Certificate type: X.509\n"); - fprintf(out, "- Got a certificate list of %d certificates.\n", + log_msg(out, "- Certificate type: X.509\n"); + log_msg(out, "- Got a certificate list of %d certificates.\n", cert_list_size); for (j = 0; j < cert_list_size; j++) { @@ -190,13 +190,13 @@ print_x509_info(gnutls_session_t session, FILE *out, int flag, int print_cert, i return; } - fprintf(out, "- Certificate[%d] info:\n - ", j); + log_msg(out, "- Certificate[%d] info:\n - ", j); if (flag == GNUTLS_CRT_PRINT_COMPACT && j > 0) flag = GNUTLS_CRT_PRINT_ONELINE; ret = gnutls_x509_crt_print(crt, flag, &cinfo); if (ret == 0) { - fprintf(out, "%s\n", cinfo.data); + log_msg(out, "%s\n", cinfo.data); gnutls_free(cinfo.data); } @@ -212,9 +212,7 @@ print_x509_info(gnutls_session_t session, FILE *out, int flag, int print_cert, i return; } - fputs("\n", out); - fputs((char*)pem.data, out); - fputs("\n", out); + log_msg(out, "\n%s\n", (char*)pem.data); gnutls_free(pem.data); } |