The bell tolls for BUF_strdup - Start the migration to using

intrinsics. This is the easy ones, a few left to check one at
a time.
ok miod@ deraadt@

3 files changed, 8 insertions, 8 deletions

diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c
index 8c37a3e175..ced0406bc1 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.54 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: b_sock.c,v 1.55 2014/07/13 16:03:09 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -235,7 +235,7 @@ BIO_get_accept_socket(char *host, int bind_mode)
         unsigned long l;
         int err_num;
 
-        if ((str = BUF_strdup(host)) == NULL)
+        if (host == NULL || (str = strdup(host)) == NULL)
                 return (-1);
 
         h = p = NULL;
diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c
index c0316a2999..65d4bb2547 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.23 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: bss_acpt.c,v 1.24 2014/07/13 16:03:09 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -354,7 +354,7 @@ acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
                         if (num == 0) {
                                 b->init = 1;
                                 free(data->param_addr);
-                                data->param_addr = BUF_strdup(ptr);
+                                data->param_addr = strdup(ptr);
                         } else if (num == 1) {
                                 data->accept_nbio = (ptr != NULL);
                         } else if (num == 2) {
diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c
index 8049f5c3f0..5120dabcb5 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.29 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: bss_conn.c,v 1.30 2014/07/13 16:03:09 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -152,7 +152,7 @@ conn_state(BIO *b, BIO_CONNECT *c)
                                                         break;
                                                 }
                                         free(c->param_port);
-                                        c->param_port = BUF_strdup(p);
+                                        c->param_port = strdup(p);
                                 }
                         }
 
@@ -471,10 +471,10 @@ conn_ctrl(BIO *b, int cmd, long num, void *ptr)
                         b->init = 1;
                         if (num == 0) {
                                 free(data->param_hostname);
-                                data->param_hostname = BUF_strdup(ptr);
+                                data->param_hostname = strdup(ptr);
                         } else if (num == 1) {
                                 free(data->param_port);
-                                data->param_port = BUF_strdup(ptr);
+                                data->param_port = strdup(ptr);
                         } else if (num == 2) {
                                 unsigned char *p = ptr;
                                 free(data->param_hostname);