Remove BUF_[a-z]* API

This are a bunch of strange string handlers with NULL checks that make
no real sense except to some devs who like to sprinkle them everywhere.
Fortunately, nothing uses these anymore, so they can go.

ok jsing

diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index 6d9a6ca..a174cc1 100644 (file)
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.147 2023/07/28 10:02:11 tb Exp $
+# $OpenBSD: Makefile,v 1.148 2023/07/28 10:17:21 tb Exp $
 
 LIB=   crypto
 LIBREBUILD=y
@@ -201,7 +201,6 @@ SRCS+= bn_word.c
 
 # buffer/
 SRCS+= buf_err.c
-SRCS+= buf_str.c
 SRCS+= buffer.c
 
 # bytestring/

diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list
index 94a2293..2f081c1 100644 (file)
--- a/lib/libcrypto/Symbols.list
+++ b/lib/libcrypto/Symbols.list
@@ -495,12 +495,6 @@ BUF_MEM_free
 BUF_MEM_grow
 BUF_MEM_grow_clean
 BUF_MEM_new
-BUF_memdup
-BUF_reverse
-BUF_strdup
-BUF_strlcat
-BUF_strlcpy
-BUF_strndup
 CAST_cbc_encrypt
 CAST_cfb64_encrypt
 CAST_decrypt

diff --git a/lib/libcrypto/buffer/buf_str.c b/lib/libcrypto/buffer/buf_str.c
deleted file mode 100644 (file)
index 4ebc471..0000000
--- a/lib/libcrypto/buffer/buf_str.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* $OpenBSD: buf_str.c,v 1.11 2017/04/09 14:33:21 jsing Exp $ */
-/*
- * Copyright (c) 2014 Bob Beck
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <openssl/buffer.h>
-#include <openssl/err.h>
-
-/*
- * XXX these functions accept a NULL arg and return NULL
- * when the standard ones do not. we should at an appropriate
- * time change these to find the bad callers
- */
-
-char *
-BUF_strdup(const char *str)
-{
-       char *ret = NULL;
-
-       if (str != NULL) {
-               if ((ret = strdup(str)) == NULL)
-                       BUFerror(ERR_R_MALLOC_FAILURE);
-       }
-       return ret;
-}
-
-char *
-BUF_strndup(const char *str, size_t siz)
-{
-       char *ret = NULL;
-
-       if (str != NULL) {
-               if ((ret = strndup(str, siz)) == NULL)
-                       BUFerror(ERR_R_MALLOC_FAILURE);
-       }
-       return ret;
-}
-
-void *
-BUF_memdup(const void *data, size_t siz)
-{
-       void *ret = NULL;
-
-       if (data != NULL) {
-               if ((ret = malloc(siz)) == NULL)
-                       BUFerror(ERR_R_MALLOC_FAILURE);
-               else
-                       (void) memcpy(ret, data, siz);
-       }
-       return ret;
-}
-
-size_t
-BUF_strlcpy(char *dst, const char *src, size_t size)
-{
-       return strlcpy(dst, src, size);
-}
-
-size_t
-BUF_strlcat(char *dst, const char *src, size_t size)
-{
-       return strlcat(dst, src, size);
-}

diff --git a/lib/libcrypto/buffer/buffer.h b/lib/libcrypto/buffer/buffer.h
index c210bfd..d461d64 100644 (file)
--- a/lib/libcrypto/buffer/buffer.h
+++ b/lib/libcrypto/buffer/buffer.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.h,v 1.16 2022/07/12 14:42:48 kn Exp $ */
+/* $OpenBSD: buffer.h,v 1.17 2023/07/28 10:17:21 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -58,9 +58,6 @@
 
 #ifndef HEADER_BUFFER_H
 #define HEADER_BUFFER_H
-#if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__OpenBSD__)
-#define __bounded__(x, y, z)
-#endif
 
 #include <openssl/ossl_typ.h>
 
@@ -85,19 +82,6 @@ void BUF_MEM_free(BUF_MEM *a);
 int    BUF_MEM_grow(BUF_MEM *str, size_t len);
 int    BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
 
-#ifndef LIBRESSL_INTERNAL
-char * BUF_strdup(const char *str);
-char * BUF_strndup(const char *str, size_t siz);
-void * BUF_memdup(const void *data, size_t siz);
-void   BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz);
-
-/* safe string functions */
-size_t BUF_strlcpy(char *dst, const char *src, size_t siz)
-       __attribute__ ((__bounded__(__string__,1,3)));
-size_t BUF_strlcat(char *dst, const char *src, size_t siz)
-       __attribute__ ((__bounded__(__string__,1,3)));
-#endif
-
 void ERR_load_BUF_strings(void);
 
 /* Error codes for the BUF functions. */