On the '1.3.x-r1909252-group' branch: Merge r1909413 (Remove a couple
of remaining _fp() OpenSSL API usages in the test suite) from trunk,
adjusting to the state of the 1.3.x branch.
* test/server/test_sslserver.c
(err_file_print_cb): New callback for ERR_print_errors_cb().
(ssl_handshake, ssl_socket_read): Replace usages of ERR_print_errors_fp()
with ERR_print_errors_cb(). Pass the new callback.
git-svn-id: https://svn.apache.org/repos/asf/serf/branches/1.3.x-r1909252-group@1909414 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/test/server/test_sslserver.c b/test/server/test_sslserver.c
index 8b299ba..73538a4 100644
--- a/test/server/test_sslserver.c
+++ b/test/server/test_sslserver.c
@@ -43,6 +43,11 @@
} ssl_context_t;
+static int err_file_print_cb(const char *str, size_t len, void *bp)
+{
+ return fwrite(str, 1, len, bp);
+}
+
static int pem_passwd_cb(char *buf, int size, int rwflag, void *userdata)
{
strncpy(buf, "serftest", size);
@@ -372,7 +377,7 @@
return serv_ctx->bio_read_status; /* Usually APR_EAGAIN */
default:
serf__log(TEST_VERBOSE, __FILE__, "SSL Error %d: ", ssl_err);
- ERR_print_errors_fp(stderr);
+ ERR_print_errors_cb(err_file_print_cb, stderr);
serf__log_nopref(TEST_VERBOSE, "\n");
return SERF_ERROR_ISSUE_IN_TESTSUITE;
}
@@ -428,7 +433,7 @@
*len = 0;
serf__log(TEST_VERBOSE, __FILE__,
"ssl_socket_read SSL Error %d: ", ssl_err);
- ERR_print_errors_fp(stderr);
+ ERR_print_errors_cb(err_file_print_cb, stderr);
serf__log_nopref(TEST_VERBOSE, "\n");
return SERF_ERROR_ISSUE_IN_TESTSUITE;
}
