diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-06-11 22:42:42 +0300 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2019-07-22 17:24:56 +0300 |
| commit | 56c3a135b239f4c8ccfdbbb1668880d4c39d5b87 (patch) | |
| tree | 22bf3958a3b0046ae690e57dd5eaad90c6fcf25a /crypto/bio/bss_conn.c | |
| parent | 1372560f64c9a7cfad1979fa8c41bee335a04373 (diff) | |
Add ERR_put_func_error, and use it.
Change SYSerr to have the function name; remove SYS_F_xxx defines
Add a test and documentation.
Use get_last_socket_err, which removes some ifdef's in OpenSSL code.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9072)
Diffstat (limited to 'crypto/bio/bss_conn.c')
| -rw-r--r-- | crypto/bio/bss_conn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c index 818b2ee94e..6909601f99 100644 --- a/crypto/bio/bss_conn.c +++ b/crypto/bio/bss_conn.c @@ -138,7 +138,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c) BIO_ADDRINFO_socktype(c->addr_iter), BIO_ADDRINFO_protocol(c->addr_iter), 0); if (ret == (int)INVALID_SOCKET) { - SYSerr(SYS_F_SOCKET, get_last_socket_error()); + SYSerr("socket", get_last_socket_error()); ERR_add_error_data(4, "hostname=", c->param_hostname, " service=", c->param_service); @@ -170,7 +170,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c) ERR_clear_error(); break; } else { - SYSerr(SYS_F_CONNECT, get_last_socket_error()); + SYSerr("connect", get_last_socket_error()); ERR_add_error_data(4, "hostname=", c->param_hostname, " service=", c->param_service); @@ -186,7 +186,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c) i = BIO_sock_error(b->num); if (i) { BIO_clear_retry_flags(b); - SYSerr(SYS_F_CONNECT, i); + SYSerr("connect", i); ERR_add_error_data(4, "hostname=", c->param_hostname, " service=", c->param_service); |