Send the function codes from the error functions to the bit bucket,

as was done earlier in libssl. Thanks inoguchi@ for noticing
libssl had more reacharounds into this.
ok jsing@ inoguchi@

10 files changed, 75 insertions, 115 deletions

diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c
index db8a30538c..0cc570b66f 100644
--- a/src/lib/libcrypto/bio/b_sock.c
+++ b/src/lib/libcrypto/bio/b_sock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: b_sock.c,v 1.62 2016/12/20 23:14:37 beck Exp $ */
+/* $OpenBSD: b_sock.c,v 1.63 2017/01/29 17:49:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -89,13 +89,12 @@ BIO_get_host_ip(const char *str, unsigned char *ip)
         CRYPTO_w_lock(CRYPTO_LOCK_GETHOSTBYNAME);
         he = BIO_gethostbyname(str);
         if (he == NULL) {
-                BIOerr(BIO_F_BIO_GET_HOST_IP, BIO_R_BAD_HOSTNAME_LOOKUP);
+                BIOerror(BIO_R_BAD_HOSTNAME_LOOKUP);
                 goto err;
         }
 
         if (he->h_addrtype != AF_INET) {
-                BIOerr(BIO_F_BIO_GET_HOST_IP,
-                    BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET);
+                BIOerror(BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET);
                 goto err;
         }
         for (i = 0; i < 4; i++)
@@ -123,7 +122,7 @@ BIO_get_port(const char *str, unsigned short *port_ptr)
         int error;
 
         if (str == NULL) {
-                BIOerr(BIO_F_BIO_GET_PORT, BIO_R_NO_PORT_SPECIFIED);
+                BIOerror(BIO_R_NO_PORT_SPECIFIED);
                 return (0);
         }
 
@@ -162,7 +161,7 @@ BIO_socket_ioctl(int fd, long type, void *arg)
 
         ret = ioctl(fd, type, arg);
         if (ret < 0)
-                SYSerr(SYS_F_IOCTLSOCKET, errno);
+                SYSerror(errno);
         return (ret);
 }
 
@@ -258,10 +257,9 @@ BIO_get_accept_socket(char *host, int bind_mode)
 again:
         s = socket(server.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
         if (s == -1) {
-                SYSerr(SYS_F_SOCKET, errno);
+                SYSerror(errno);
                 ERR_asprintf_error_data("port='%s'", host);
-                BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET,
-                    BIO_R_UNABLE_TO_CREATE_SOCKET);
+                BIOerror(BIO_R_UNABLE_TO_CREATE_SOCKET);
                 goto err;
         }
 
@@ -301,17 +299,15 @@ again:
                         }
                         /* else error */
                 }
-                SYSerr(SYS_F_BIND, err_num);
+                SYSerror(err_num);
                 ERR_asprintf_error_data("port='%s'", host);
-                BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET,
-                    BIO_R_UNABLE_TO_BIND_SOCKET);
+                BIOerror(BIO_R_UNABLE_TO_BIND_SOCKET);
                 goto err;
         }
         if (listen(s, SOMAXCONN) == -1) {
-                SYSerr(SYS_F_BIND, errno);
+                SYSerror(errno);
                 ERR_asprintf_error_data("port='%s'", host);
-                BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET,
-                    BIO_R_UNABLE_TO_LISTEN_SOCKET);
+                BIOerror(BIO_R_UNABLE_TO_LISTEN_SOCKET);
                 goto err;
         }
         ret = 1;
@@ -347,8 +343,8 @@ BIO_accept(int sock, char **addr)
         if (ret == -1) {
                 if (BIO_sock_should_retry(ret))
                         return -2;
-                SYSerr(SYS_F_ACCEPT, errno);
-                BIOerr(BIO_F_BIO_ACCEPT, BIO_R_ACCEPT_ERROR);
+                SYSerror(errno);
+                BIOerror(BIO_R_ACCEPT_ERROR);
                 goto end;
         }
 
@@ -371,7 +367,7 @@ BIO_accept(int sock, char **addr)
                         ret = -1;
                         free(p);
                         *addr = NULL;
-                        BIOerr(BIO_F_BIO_ACCEPT, ERR_R_MALLOC_FAILURE);
+                        BIOerror(ERR_R_MALLOC_FAILURE);
                         goto end;
                 }
                 p = tmp;
@@ -387,7 +383,7 @@ BIO_accept(int sock, char **addr)
                 if ((p = malloc(24)) == NULL) {
                         close(ret);
                         ret = -1;
-                        BIOerr(BIO_F_BIO_ACCEPT, ERR_R_MALLOC_FAILURE);
+                        BIOerror(ERR_R_MALLOC_FAILURE);
                         goto end;
                 }
                 *addr = p;
diff --git a/src/lib/libcrypto/bio/bf_buff.c b/src/lib/libcrypto/bio/bf_buff.c
index 588cc48a28..30765b03ca 100644
--- a/src/lib/libcrypto/bio/bf_buff.c
+++ b/src/lib/libcrypto/bio/bf_buff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bf_buff.c,v 1.23 2015/07/19 18:29:31 miod Exp $ */
+/* $OpenBSD: bf_buff.c,v 1.24 2017/01/29 17:49:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -445,7 +445,7 @@ buffer_ctrl(BIO *b, int cmd, long num, void *ptr)
         }
         return (ret);
 malloc_error:
-        BIOerr(BIO_F_BUFFER_CTRL, ERR_R_MALLOC_FAILURE);
+        BIOerror(ERR_R_MALLOC_FAILURE);
         return (0);
 }
 
diff --git a/src/lib/libcrypto/bio/bf_lbuf.c b/src/lib/libcrypto/bio/bf_lbuf.c
index 7978fdb347..5d9ec0f025 100644
--- a/src/lib/libcrypto/bio/bf_lbuf.c
+++ b/src/lib/libcrypto/bio/bf_lbuf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bf_lbuf.c,v 1.13 2015/07/19 18:29:31 miod Exp $ */
+/* $OpenBSD: bf_lbuf.c,v 1.14 2017/01/29 17:49:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -343,7 +343,7 @@ linebuffer_ctrl(BIO *b, int cmd, long num, void *ptr)
         }
         return (ret);
 malloc_error:
-        BIOerr(BIO_F_LINEBUFFER_CTRL, ERR_R_MALLOC_FAILURE);
+        BIOerror(ERR_R_MALLOC_FAILURE);
         return (0);
 }
 
diff --git a/src/lib/libcrypto/bio/bio_err.c b/src/lib/libcrypto/bio/bio_err.c
index 80788585ba..2920e32103 100644
--- a/src/lib/libcrypto/bio/bio_err.c
+++ b/src/lib/libcrypto/bio/bio_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio_err.c,v 1.16 2014/07/10 22:45:56 jsing Exp $ */
+/* $OpenBSD: bio_err.c,v 1.17 2017/01/29 17:49:22 beck Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -72,39 +72,7 @@
 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_BIO,0,reason)
 
 static ERR_STRING_DATA BIO_str_functs[] = {
-        {ERR_FUNC(BIO_F_ACPT_STATE),    "ACPT_STATE"},
-        {ERR_FUNC(BIO_F_BIO_ACCEPT),    "BIO_accept"},
-        {ERR_FUNC(BIO_F_BIO_BER_GET_HEADER),    "BIO_BER_GET_HEADER"},
-        {ERR_FUNC(BIO_F_BIO_CALLBACK_CTRL),     "BIO_callback_ctrl"},
-        {ERR_FUNC(BIO_F_BIO_CTRL),      "BIO_ctrl"},
-        {ERR_FUNC(BIO_F_BIO_GETHOSTBYNAME),     "BIO_gethostbyname"},
-        {ERR_FUNC(BIO_F_BIO_GETS),      "BIO_gets"},
-        {ERR_FUNC(BIO_F_BIO_GET_ACCEPT_SOCKET), "BIO_get_accept_socket"},
-        {ERR_FUNC(BIO_F_BIO_GET_HOST_IP),       "BIO_get_host_ip"},
-        {ERR_FUNC(BIO_F_BIO_GET_PORT),  "BIO_get_port"},
-        {ERR_FUNC(BIO_F_BIO_MAKE_PAIR), "BIO_MAKE_PAIR"},
-        {ERR_FUNC(BIO_F_BIO_NEW),       "BIO_new"},
-        {ERR_FUNC(BIO_F_BIO_NEW_FILE),  "BIO_new_file"},
-        {ERR_FUNC(BIO_F_BIO_NEW_MEM_BUF),       "BIO_new_mem_buf"},
-        {ERR_FUNC(BIO_F_BIO_NREAD),     "BIO_nread"},
-        {ERR_FUNC(BIO_F_BIO_NREAD0),    "BIO_nread0"},
-        {ERR_FUNC(BIO_F_BIO_NWRITE),    "BIO_nwrite"},
-        {ERR_FUNC(BIO_F_BIO_NWRITE0),   "BIO_nwrite0"},
-        {ERR_FUNC(BIO_F_BIO_PUTS),      "BIO_puts"},
-        {ERR_FUNC(BIO_F_BIO_READ),      "BIO_read"},
-        {ERR_FUNC(BIO_F_BIO_SOCK_INIT), "BIO_sock_init"},
-        {ERR_FUNC(BIO_F_BIO_WRITE),     "BIO_write"},
-        {ERR_FUNC(BIO_F_BUFFER_CTRL),   "BUFFER_CTRL"},
-        {ERR_FUNC(BIO_F_CONN_CTRL),     "CONN_CTRL"},
-        {ERR_FUNC(BIO_F_CONN_STATE),    "CONN_STATE"},
-        {ERR_FUNC(BIO_F_DGRAM_SCTP_READ),       "DGRAM_SCTP_READ"},
-        {ERR_FUNC(BIO_F_FILE_CTRL),     "FILE_CTRL"},
-        {ERR_FUNC(BIO_F_FILE_READ),     "FILE_READ"},
-        {ERR_FUNC(BIO_F_LINEBUFFER_CTRL),       "LINEBUFFER_CTRL"},
-        {ERR_FUNC(BIO_F_MEM_READ),      "MEM_READ"},
-        {ERR_FUNC(BIO_F_MEM_WRITE),     "MEM_WRITE"},
-        {ERR_FUNC(BIO_F_SSL_NEW),       "SSL_new"},
-        {ERR_FUNC(BIO_F_WSASTARTUP),    "WSASTARTUP"},
+        {ERR_FUNC(0xfff), "CRYPTO_internal"},
         {0, NULL}
 };
 
diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c
index 0be56aacde..86ccbdc202 100644
--- a/src/lib/libcrypto/bio/bio_lib.c
+++ b/src/lib/libcrypto/bio/bio_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio_lib.c,v 1.22 2015/02/10 11:22:21 jsing Exp $ */
+/* $OpenBSD: bio_lib.c,v 1.23 2017/01/29 17:49:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -71,7 +71,7 @@ BIO_new(BIO_METHOD *method)
 
         ret = malloc(sizeof(BIO));
         if (ret == NULL) {
-                BIOerr(BIO_F_BIO_NEW, ERR_R_MALLOC_FAILURE);
+                BIOerror(ERR_R_MALLOC_FAILURE);
                 return (NULL);
         }
         if (!BIO_set(ret, method)) {
@@ -200,7 +200,7 @@ BIO_read(BIO *b, void *out, int outl)
         long (*cb)(BIO *, int, const char *, int, long, long);
 
         if ((b == NULL) || (b->method == NULL) || (b->method->bread == NULL)) {
-                BIOerr(BIO_F_BIO_READ, BIO_R_UNSUPPORTED_METHOD);
+                BIOerror(BIO_R_UNSUPPORTED_METHOD);
                 return (-2);
         }
 
@@ -210,7 +210,7 @@ BIO_read(BIO *b, void *out, int outl)
                 return (i);
 
         if (!b->init) {
-                BIOerr(BIO_F_BIO_READ, BIO_R_UNINITIALIZED);
+                BIOerror(BIO_R_UNINITIALIZED);
                 return (-2);
         }
 
@@ -236,7 +236,7 @@ BIO_write(BIO *b, const void *in, int inl)
 
         cb = b->callback;
         if ((b->method == NULL) || (b->method->bwrite == NULL)) {
-                BIOerr(BIO_F_BIO_WRITE, BIO_R_UNSUPPORTED_METHOD);
+                BIOerror(BIO_R_UNSUPPORTED_METHOD);
                 return (-2);
         }
 
@@ -245,7 +245,7 @@ BIO_write(BIO *b, const void *in, int inl)
                 return (i);
 
         if (!b->init) {
-                BIOerr(BIO_F_BIO_WRITE, BIO_R_UNINITIALIZED);
+                BIOerror(BIO_R_UNINITIALIZED);
                 return (-2);
         }
 
@@ -267,7 +267,7 @@ BIO_puts(BIO *b, const char *in)
         long (*cb)(BIO *, int, const char *, int, long, long);
 
         if ((b == NULL) || (b->method == NULL) || (b->method->bputs == NULL)) {
-                BIOerr(BIO_F_BIO_PUTS, BIO_R_UNSUPPORTED_METHOD);
+                BIOerror(BIO_R_UNSUPPORTED_METHOD);
                 return (-2);
         }
 
@@ -278,7 +278,7 @@ BIO_puts(BIO *b, const char *in)
                 return (i);
 
         if (!b->init) {
-                BIOerr(BIO_F_BIO_PUTS, BIO_R_UNINITIALIZED);
+                BIOerror(BIO_R_UNINITIALIZED);
                 return (-2);
         }
 
@@ -299,7 +299,7 @@ BIO_gets(BIO *b, char *in, int inl)
         long (*cb)(BIO *, int, const char *, int, long, long);
 
         if ((b == NULL) || (b->method == NULL) || (b->method->bgets == NULL)) {
-                BIOerr(BIO_F_BIO_GETS, BIO_R_UNSUPPORTED_METHOD);
+                BIOerror(BIO_R_UNSUPPORTED_METHOD);
                 return (-2);
         }
 
@@ -310,7 +310,7 @@ BIO_gets(BIO *b, char *in, int inl)
                 return (i);
 
         if (!b->init) {
-                BIOerr(BIO_F_BIO_GETS, BIO_R_UNINITIALIZED);
+                BIOerror(BIO_R_UNINITIALIZED);
                 return (-2);
         }
 
@@ -364,7 +364,7 @@ BIO_ctrl(BIO *b, int cmd, long larg, void *parg)
                 return (0);
 
         if ((b->method == NULL) || (b->method->ctrl == NULL)) {
-                BIOerr(BIO_F_BIO_CTRL, BIO_R_UNSUPPORTED_METHOD);
+                BIOerror(BIO_R_UNSUPPORTED_METHOD);
                 return (-2);
         }
 
@@ -392,7 +392,7 @@ BIO_callback_ctrl(BIO *b, int cmd,
                 return (0);
 
         if ((b->method == NULL) || (b->method->callback_ctrl == NULL)) {
-                BIOerr(BIO_F_BIO_CALLBACK_CTRL, BIO_R_UNSUPPORTED_METHOD);
+                BIOerror(BIO_R_UNSUPPORTED_METHOD);
                 return (-2);
         }
 
diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c
index 4e3c982c2d..20508a7d5e 100644
--- a/src/lib/libcrypto/bio/bss_acpt.c
+++ b/src/lib/libcrypto/bio/bss_acpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bss_acpt.c,v 1.26 2015/07/18 22:09:30 beck Exp $ */
+/* $OpenBSD: bss_acpt.c,v 1.27 2017/01/29 17:49:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -201,7 +201,7 @@ again:
         switch (c->state) {
         case ACPT_S_BEFORE:
                 if (c->param_addr == NULL) {
-                        BIOerr(BIO_F_ACPT_STATE, BIO_R_NO_ACCEPT_PORT_SPECIFIED);
+                        BIOerror(BIO_R_NO_ACCEPT_PORT_SPECIFIED);
                         return (-1);
                 }
                 s = BIO_get_accept_socket(c->param_addr, c->bind_mode);
@@ -211,7 +211,7 @@ again:
                 if (c->accept_nbio) {
                         if (!BIO_socket_nbio(s, 1)) {
                                 close(s);
-                                BIOerr(BIO_F_ACPT_STATE, BIO_R_ERROR_SETTING_NBIO_ON_ACCEPT_SOCKET);
+                                BIOerror(BIO_R_ERROR_SETTING_NBIO_ON_ACCEPT_SOCKET);
                                 return (-1);
                         }
                 }
@@ -248,7 +248,7 @@ again:
 
                 if (c->nbio) {
                         if (!BIO_socket_nbio(i, 1)) {
-                                BIOerr(BIO_F_ACPT_STATE, BIO_R_ERROR_SETTING_NBIO_ON_ACCEPTED_SOCKET);
+                                BIOerror(BIO_R_ERROR_SETTING_NBIO_ON_ACCEPTED_SOCKET);
                                 goto err;
                         }
                 }
diff --git a/src/lib/libcrypto/bio/bss_bio.c b/src/lib/libcrypto/bio/bss_bio.c
index c817910d93..20eb9a9829 100644
--- a/src/lib/libcrypto/bio/bss_bio.c
+++ b/src/lib/libcrypto/bio/bss_bio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bss_bio.c,v 1.22 2015/12/23 20:37:23 mmcc Exp $ */
+/* $OpenBSD: bss_bio.c,v 1.23 2017/01/29 17:49:22 beck Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
  *
@@ -348,7 +348,7 @@ bio_write(BIO *bio, const char *buf, int num_)
         b->request = 0;
         if (b->closed) {
                 /* we already closed */
-                BIOerr(BIO_F_BIO_WRITE, BIO_R_BROKEN_PIPE);
+                BIOerror(BIO_R_BROKEN_PIPE);
                 return -1;
         }
 
@@ -425,7 +425,7 @@ bio_nwrite0(BIO *bio, char **buf)
 
         b->request = 0;
         if (b->closed) {
-                BIOerr(BIO_F_BIO_NWRITE0, BIO_R_BROKEN_PIPE);
+                BIOerror(BIO_R_BROKEN_PIPE);
                 return -1;
         }
 
@@ -491,10 +491,10 @@ bio_ctrl(BIO *bio, int cmd, long num, void *ptr)
 
         case BIO_C_SET_WRITE_BUF_SIZE:
                 if (b->peer) {
-                        BIOerr(BIO_F_BIO_CTRL, BIO_R_IN_USE);
+                        BIOerror(BIO_R_IN_USE);
                         ret = 0;
                 } else if (num == 0) {
-                        BIOerr(BIO_F_BIO_CTRL, BIO_R_INVALID_ARGUMENT);
+                        BIOerror(BIO_R_INVALID_ARGUMENT);
                         ret = 0;
                 } else {
                         size_t new_size = num;
@@ -679,14 +679,14 @@ bio_make_pair(BIO *bio1, BIO *bio2)
         b2 = bio2->ptr;
 
         if (b1->peer != NULL || b2->peer != NULL) {
-                BIOerr(BIO_F_BIO_MAKE_PAIR, BIO_R_IN_USE);
+                BIOerror(BIO_R_IN_USE);
                 return 0;
         }
 
         if (b1->buf == NULL) {
                 b1->buf = malloc(b1->size);
                 if (b1->buf == NULL) {
-                        BIOerr(BIO_F_BIO_MAKE_PAIR, ERR_R_MALLOC_FAILURE);
+                        BIOerror(ERR_R_MALLOC_FAILURE);
                         return 0;
                 }
                 b1->len = 0;
@@ -696,7 +696,7 @@ bio_make_pair(BIO *bio1, BIO *bio2)
         if (b2->buf == NULL) {
                 b2->buf = malloc(b2->size);
                 if (b2->buf == NULL) {
-                        BIOerr(BIO_F_BIO_MAKE_PAIR, ERR_R_MALLOC_FAILURE);
+                        BIOerror(ERR_R_MALLOC_FAILURE);
                         return 0;
                 }
                 b2->len = 0;
@@ -822,7 +822,7 @@ BIO_nread0(BIO *bio, char **buf)
         long ret;
 
         if (!bio->init) {
-                BIOerr(BIO_F_BIO_NREAD0, BIO_R_UNINITIALIZED);
+                BIOerror(BIO_R_UNINITIALIZED);
                 return -2;
         }
 
@@ -839,7 +839,7 @@ BIO_nread(BIO *bio, char **buf, int num)
         int ret;
 
         if (!bio->init) {
-                BIOerr(BIO_F_BIO_NREAD, BIO_R_UNINITIALIZED);
+                BIOerror(BIO_R_UNINITIALIZED);
                 return -2;
         }
 
@@ -855,7 +855,7 @@ BIO_nwrite0(BIO *bio, char **buf)
         long ret;
 
         if (!bio->init) {
-                BIOerr(BIO_F_BIO_NWRITE0, BIO_R_UNINITIALIZED);
+                BIOerror(BIO_R_UNINITIALIZED);
                 return -2;
         }
 
@@ -872,7 +872,7 @@ BIO_nwrite(BIO *bio, char **buf, int num)
         int ret;
 
         if (!bio->init) {
-                BIOerr(BIO_F_BIO_NWRITE, BIO_R_UNINITIALIZED);
+                BIOerror(BIO_R_UNINITIALIZED);
                 return -2;
         }
 
diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c
index 7f50936677..555273882c 100644
--- a/src/lib/libcrypto/bio/bss_conn.c
+++ b/src/lib/libcrypto/bio/bss_conn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bss_conn.c,v 1.32 2014/11/26 05:37:26 bcook Exp $ */
+/* $OpenBSD: bss_conn.c,v 1.33 2017/01/29 17:49:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -134,7 +134,7 @@ conn_state(BIO *b, BIO_CONNECT *c)
                 case BIO_CONN_S_BEFORE:
                         p = c->param_hostname;
                         if (p == NULL) {
-                                BIOerr(BIO_F_CONN_STATE, BIO_R_NO_HOSTNAME_SPECIFIED);
+                                BIOerror(BIO_R_NO_HOSTNAME_SPECIFIED);
                                 goto exit_loop;
                         }
                         for (; *p != '\0'; p++) {
@@ -157,7 +157,7 @@ conn_state(BIO *b, BIO_CONNECT *c)
                         }
 
                         if (c->param_port == NULL) {
-                                BIOerr(BIO_F_CONN_STATE, BIO_R_NO_PORT_SPECIFIED);
+                                BIOerror(BIO_R_NO_PORT_SPECIFIED);
                                 ERR_asprintf_error_data("host=%s",
                                     c->param_hostname);
                                 goto exit_loop;
@@ -195,11 +195,10 @@ conn_state(BIO *b, BIO_CONNECT *c)
 
                         ret = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL);
                         if (ret == -1) {
-                                SYSerr(SYS_F_SOCKET, errno);
+                                SYSerror(errno);
                                 ERR_asprintf_error_data("host=%s:%s",
                                     c->param_hostname, c->param_port);
-                                BIOerr(BIO_F_CONN_STATE,
-                                    BIO_R_UNABLE_TO_CREATE_SOCKET);
+                                BIOerror(BIO_R_UNABLE_TO_CREATE_SOCKET);
                                 goto exit_loop;
                         }
                         b->num = ret;
@@ -209,8 +208,7 @@ conn_state(BIO *b, BIO_CONNECT *c)
                 case BIO_CONN_S_NBIO:
                         if (c->nbio) {
                                 if (!BIO_socket_nbio(b->num, 1)) {
-                                        BIOerr(BIO_F_CONN_STATE,
-                                            BIO_R_ERROR_SETTING_NBIO);
+                                        BIOerror(BIO_R_ERROR_SETTING_NBIO);
                                         ERR_asprintf_error_data("host=%s:%s",
                                             c->param_hostname, c->param_port);
                                         goto exit_loop;
@@ -222,10 +220,10 @@ conn_state(BIO *b, BIO_CONNECT *c)
                         i = 1;
                         i = setsockopt(b->num, SOL_SOCKET, SO_KEEPALIVE, &i, sizeof(i));
                         if (i < 0) {
-                                SYSerr(SYS_F_SOCKET, errno);
+                                SYSerror(errno);
                                 ERR_asprintf_error_data("host=%s:%s",
                                     c->param_hostname, c->param_port);
-                                BIOerr(BIO_F_CONN_STATE, BIO_R_KEEPALIVE);
+                                BIOerror(BIO_R_KEEPALIVE);
                                 goto exit_loop;
                         }
 #endif
@@ -243,11 +241,10 @@ conn_state(BIO *b, BIO_CONNECT *c)
                                         c->state = BIO_CONN_S_BLOCKED_CONNECT;
                                         b->retry_reason = BIO_RR_CONNECT;
                                 } else {
-                                        SYSerr(SYS_F_CONNECT, errno);
+                                        SYSerror(errno);
                                         ERR_asprintf_error_data("host=%s:%s",
                                             c->param_hostname, c->param_port);
-                                        BIOerr(BIO_F_CONN_STATE,
-                                            BIO_R_CONNECT_ERROR);
+                                        BIOerror(BIO_R_CONNECT_ERROR);
                                 }
                                 goto exit_loop;
                         } else
@@ -258,11 +255,10 @@ 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);
+                                SYSerror(i);
                                 ERR_asprintf_error_data("host=%s:%s",
                                     c->param_hostname, c->param_port);
-                                BIOerr(BIO_F_CONN_STATE,
-                                    BIO_R_NBIO_CONNECT_ERROR);
+                                BIOerror(BIO_R_NBIO_CONNECT_ERROR);
                                 ret = 0;
                                 goto exit_loop;
                         } else
@@ -533,7 +529,7 @@ conn_ctrl(BIO *b, int cmd, long num, void *ptr)
         case BIO_CTRL_SET_CALLBACK:
                 {
 #if 0 /* FIXME: Should this be used?  -- Richard Levitte */
-                        BIOerr(BIO_F_CONN_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+                        BIOerror(ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
                         ret = -1;
 #else
                         ret = 0;
diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c
index c710076fea..01f4a3ff3b 100644
--- a/src/lib/libcrypto/bio/bss_file.c
+++ b/src/lib/libcrypto/bio/bss_file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bss_file.c,v 1.31 2014/11/11 19:26:12 miod Exp $ */
+/* $OpenBSD: bss_file.c,v 1.32 2017/01/29 17:49:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -119,12 +119,12 @@ BIO_new_file(const char *filename, const char *mode)
         file = fopen(filename, mode);
 
         if (file == NULL) {
-                SYSerr(SYS_F_FOPEN, errno);
+                SYSerror(errno);
                 ERR_asprintf_error_data("fopen('%s', '%s')", filename, mode);
                 if (errno == ENOENT)
-                        BIOerr(BIO_F_BIO_NEW_FILE, BIO_R_NO_SUCH_FILE);
+                        BIOerror(BIO_R_NO_SUCH_FILE);
                 else
-                        BIOerr(BIO_F_BIO_NEW_FILE, ERR_R_SYS_LIB);
+                        BIOerror(ERR_R_SYS_LIB);
                 return (NULL);
         }
         if ((ret = BIO_new(BIO_s_file())) == NULL) {
@@ -188,8 +188,8 @@ file_read(BIO *b, char *out, int outl)
         if (b->init && out != NULL) {
                 ret = fread(out, 1, outl, (FILE *)b->ptr);
                 if (ret == 0 && ferror((FILE *)b->ptr)) {
-                        SYSerr(SYS_F_FREAD, errno);
-                        BIOerr(BIO_F_FILE_READ, ERR_R_SYS_LIB);
+                        SYSerror(errno);
+                        BIOerror(ERR_R_SYS_LIB);
                         ret = -1;
                 }
         }
@@ -246,15 +246,15 @@ file_ctrl(BIO *b, int cmd, long num, void *ptr)
                 else if (num & BIO_FP_READ)
                         strlcpy(p, "r", sizeof p);
                 else {
-                        BIOerr(BIO_F_FILE_CTRL, BIO_R_BAD_FOPEN_MODE);
+                        BIOerror(BIO_R_BAD_FOPEN_MODE);
                         ret = 0;
                         break;
                 }
                 fp = fopen(ptr, p);
                 if (fp == NULL) {
-                        SYSerr(SYS_F_FOPEN, errno);
+                        SYSerror(errno);
                         ERR_asprintf_error_data("fopen('%s', '%s')", ptr, p);
-                        BIOerr(BIO_F_FILE_CTRL, ERR_R_SYS_LIB);
+                        BIOerror(ERR_R_SYS_LIB);
                         ret = 0;
                         break;
                 }
diff --git a/src/lib/libcrypto/bio/bss_mem.c b/src/lib/libcrypto/bio/bss_mem.c
index 119bd672f6..be491ca152 100644
--- a/src/lib/libcrypto/bio/bss_mem.c
+++ b/src/lib/libcrypto/bio/bss_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bss_mem.c,v 1.14 2015/03/21 08:05:20 doug Exp $ */
+/* $OpenBSD: bss_mem.c,v 1.15 2017/01/29 17:49:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -101,7 +101,7 @@ BIO_new_mem_buf(void *buf, int len)
         size_t sz;
 
         if (!buf) {
-                BIOerr(BIO_F_BIO_NEW_MEM_BUF, BIO_R_NULL_PARAMETER);
+                BIOerror(BIO_R_NULL_PARAMETER);
                 return NULL;
         }
         sz = (len < 0) ? strlen(buf) : (size_t)len;
@@ -183,12 +183,12 @@ mem_write(BIO *b, const char *in, int inl)
 
         bm = (BUF_MEM *)b->ptr;
         if (in == NULL) {
-                BIOerr(BIO_F_MEM_WRITE, BIO_R_NULL_PARAMETER);
+                BIOerror(BIO_R_NULL_PARAMETER);
                 goto end;
         }
 
         if (b->flags & BIO_FLAGS_MEM_RDONLY) {
-                BIOerr(BIO_F_MEM_WRITE, BIO_R_WRITE_TO_READ_ONLY_BIO);
+                BIOerror(BIO_R_WRITE_TO_READ_ONLY_BIO);
                 goto end;
         }