From bf808ea0fc581f58ec4aabd9d7f24d3a5275bc7a Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Thu, 19 Dec 2024 20:24:33 +0100 Subject: Provide getdelim and getline compat shims These are portable implementations from NetBSD that are needed on Windows and perhaps some other platforms with the new versions of the mlkem tests. --- .gitignore | 4 +++ CMakeLists.txt | 10 +++++++ crypto/CMakeLists.txt | 8 +++++ crypto/Makefile.am | 8 +++++ crypto/compat/getdelim.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ crypto/compat/getline.c | 40 +++++++++++++++++++++++++ include/compat/stdio.h | 12 ++++++++ m4/check-libc.m4 | 4 ++- 8 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 crypto/compat/getdelim.c create mode 100644 crypto/compat/getline.c diff --git a/.gitignore b/.gitignore index 3c82386..18f99c1 100644 --- a/.gitignore +++ b/.gitignore @@ -237,10 +237,14 @@ include/openssl/*.h /crypto/* !/crypto/Makefile.am.* +!/crypto/compat/ +/crypto/compat/* !/crypto/compat/arc4random.h !/crypto/compat/b_win.c !/crypto/compat/explicit_bzero_win.c !/crypto/compat/freezero.c +!/crypto/compat/getdelim.c +!/crypto/compat/getline.c !/crypto/compat/getpagesize.c !/crypto/compat/posix_win.c !/crypto/compat/bsd_asprintf.c diff --git a/CMakeLists.txt b/CMakeLists.txt index ebd8260..437570b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,6 +214,16 @@ if(HAVE_ASPRINTF) add_definitions(-DHAVE_ASPRINTF) endif() +check_symbol_exists(getdelim "stdio.h" HAVE_GETDELIM) +if(HAVE_GETDELIM) + add_definitions(-DHAVE_GETDELIM) +endif() + +check_symbol_exists(getline "stdio.h" HAVE_GETLINE) +if(HAVE_GETLINE) + add_definitions(-DHAVE_GETLINE) +endif() + check_symbol_exists(getopt "unistd.h" HAVE_GETOPT) if(HAVE_GETOPT) add_definitions(-DHAVE_GETOPT) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 7b3439d..92a10ba 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -607,6 +607,14 @@ if(NOT HAVE_FREEZERO) set(COMPAT_SRC ${COMPAT_SRC} compat/freezero.c) endif() +if(NOT HAVE_GETDELIM) + set(COMPAT_SRC ${COMPAT_SRC} compat/getdelim.c) +endif() + +if(NOT HAVE_GETLINE) + set(COMPAT_SRC ${COMPAT_SRC} compat/getline.c) +endif() + if(NOT HAVE_GETOPT) set(COMPAT_SRC ${COMPAT_SRC} compat/getopt_long.c) endif() diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 06fde29..31fcffd 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -134,6 +134,14 @@ if !HAVE_FREEZERO libcompat_la_SOURCES += compat/freezero.c endif +if !HAVE_GETDELIM +libcompat_la_SOURCES += compat/getdelim.c +endif + +if !HAVE_GETLINE +libcompat_la_SOURCES += compat/getline.c +endif + if !HAVE_GETPAGESIZE libcompat_la_SOURCES += compat/getpagesize.c endif diff --git a/crypto/compat/getdelim.c b/crypto/compat/getdelim.c new file mode 100644 index 0000000..caec3f2 --- /dev/null +++ b/crypto/compat/getdelim.c @@ -0,0 +1,78 @@ +/*- + * Copyright (c) 2011 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Christos Zoulas. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include + +#ifndef HAVE_GETDELIM + +ssize_t +getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp) +{ + char *ptr, *eptr; + + + if (*buf == NULL || *bufsiz == 0) { + *bufsiz = BUFSIZ; + if ((*buf = malloc(*bufsiz)) == NULL) + return -1; + } + + for (ptr = *buf, eptr = *buf + *bufsiz;;) { + int c = fgetc(fp); + if (c == -1) { + if (feof(fp)) { + ssize_t diff = (ssize_t)(ptr - *buf); + if (diff != 0) { + *ptr = '\0'; + return diff; + } + } + return -1; + } + *ptr++ = c; + if (c == delimiter) { + *ptr = '\0'; + return ptr - *buf; + } + if (ptr + 2 >= eptr) { + char *nbuf; + size_t nbufsiz = *bufsiz * 2; + ssize_t d = ptr - *buf; + if ((nbuf = realloc(*buf, nbufsiz)) == NULL) + return -1; + *buf = nbuf; + *bufsiz = nbufsiz; + eptr = nbuf + nbufsiz; + ptr = nbuf + d; + } + } +} + +#endif /* HAVE_GETDELIM */ diff --git a/crypto/compat/getline.c b/crypto/compat/getline.c new file mode 100644 index 0000000..e6ecde0 --- /dev/null +++ b/crypto/compat/getline.c @@ -0,0 +1,40 @@ +/*- + * Copyright (c) 2011 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Christos Zoulas. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include + +#ifndef HAVE_GETLINE + +ssize_t +getline(char **buf, size_t *bufsiz, FILE *fp) +{ + return getdelim(buf, bufsiz, '\n', fp); +} + +#endif /* HAVE_GETLINE */ diff --git a/include/compat/stdio.h b/include/compat/stdio.h index 2af8f3e..2ccdeeb 100644 --- a/include/compat/stdio.h +++ b/include/compat/stdio.h @@ -18,6 +18,18 @@ #include_next #endif +#ifndef HAVE_GETDELIM +#include +#define getdelim libressl_getdelim +ssize_t getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp); +#endif + +#ifndef HAVE_GETLINE +#include +#define getline libressl_getline +ssize_t getline(char **buf, size_t *bufsiz, FILE *fp); +#endif + #ifndef HAVE_ASPRINTF #include #define vasprintf libressl_vasprintf diff --git a/m4/check-libc.m4 b/m4/check-libc.m4 index 40df15b..8cb849b 100644 --- a/m4/check-libc.m4 +++ b/m4/check-libc.m4 @@ -7,7 +7,7 @@ AC_CHECK_HEADERS([netinet/ip.h], [], [], ]) AC_HEADER_RESOLV # Check for general libc functions -AC_CHECK_FUNCS([asprintf freezero memmem]) +AC_CHECK_FUNCS([asprintf freezero getdelim getline memmem]) AC_CHECK_FUNCS([readpassphrase reallocarray recallocarray]) AC_CHECK_FUNCS([strcasecmp strlcat strlcpy strndup strnlen strsep strtonum]) AC_CHECK_FUNCS([timegm _mkgmtime timespecsub]) @@ -24,6 +24,8 @@ AC_CACHE_CHECK([for getpagesize], ac_cv_func_getpagesize, [ ]) AM_CONDITIONAL([HAVE_ASPRINTF], [test "x$ac_cv_func_asprintf" = xyes]) AM_CONDITIONAL([HAVE_FREEZERO], [test "x$ac_cv_func_freezero" = xyes]) +AM_CONDITIONAL([HAVE_GETDELIM], [test "x$ac_cv_func_getdelim" = xyes]) +AM_CONDITIONAL([HAVE_GETLINE], [test "x$ac_cv_func_getline" = xyes]) AM_CONDITIONAL([HAVE_GETPAGESIZE], [test "x$ac_cv_func_getpagesize" = xyes]) AM_CONDITIONAL([HAVE_GETOPT], [test "x$ac_cv_func_getopt" = xyes]) AM_CONDITIONAL([HAVE_MEMMEM], [test "x$ac_cv_func_memmem" = xyes]) -- cgit v1.2.3-55-g6feb