From: Daiki Ueno Date: Tue, 3 Mar 2026 09:13:27 +0000 (+0900) Subject: nettle: remove unused block8.h, block-internal.h, and nettle-internal.h X-Git-Tag: 3.8.13~22^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bfe319dae8fd7fbee73bd5876fd0899698fb3dc6;p=thirdparty%2Fgnutls.git nettle: remove unused block8.h, block-internal.h, and nettle-internal.h Signed-off-by: Daiki Ueno --- diff --git a/devel/import-from-nettle.sh b/devel/import-from-nettle.sh index 0a94c884d5..e2ac638f08 100755 --- a/devel/import-from-nettle.sh +++ b/devel/import-from-nettle.sh @@ -10,22 +10,9 @@ SRC=$srcdir/devel/nettle DST=$srcdir/lib/nettle/backport IMPORTS=" -block-internal.h " PUBLIC=" -bignum.h -des.h -ecc-curve.h -ecc.h -macros.h -md5.h -memops.h -memxor.h -nettle-meta.h -nettle-types.h -sha1.h -sha2.h " test -d $DST || mkdir $DST @@ -75,15 +62,6 @@ for f in $IMPORTS; do mv $dst-t $dst ;; esac - case $dst in - */*.[ch]) - sed \ - -e '/^#include /a\ -#include "block8.h" -' \ - $dst > $dst-t && mv $dst-t $dst - ;; - esac else echo "Error: $src not found" 1>&2 exit 1 diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am index 16ba4d6f26..e6cb5126e7 100644 --- a/lib/nettle/Makefile.am +++ b/lib/nettle/Makefile.am @@ -50,8 +50,7 @@ libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c init.c \ int/dsa-compute-k.c int/dsa-compute-k.h \ int/ecdsa-compute-k.c int/ecdsa-compute-k.h \ int/mpn-base256.c int/mpn-base256.h \ - int/block8.h backport/block-internal.h \ - int/rsa-pad.c int/nettle-internal.h + int/rsa-pad.c if WINDOWS if HAVE_BCRYPT diff --git a/lib/nettle/int/block8.h b/lib/nettle/int/block8.h deleted file mode 100644 index 609a160ac7..0000000000 --- a/lib/nettle/int/block8.h +++ /dev/null @@ -1,59 +0,0 @@ -/* nettle-types.h - - Copyright (C) 2005, 2014 Niels Möller - - This file is part of GNU Nettle. - - GNU Nettle is free software: you can redistribute it and/or - modify it under the terms of either: - - * the GNU Lesser General Public License as published by the Free - Software Foundation; either version 3 of the License, or (at your - option) any later version. - - or - - * the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your - option) any later version. - - or both in parallel, as here. - - GNU Nettle is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received copies of the GNU General Public License and - the GNU Lesser General Public License along with this program. If - not, see https://www.gnu.org/licenses/. -*/ - -#ifndef GNUTLS_LIB_NETTLE_BLOCK8_H -#define GNUTLS_LIB_NETTLE_BLOCK8_H - -#include "config.h" - -#ifndef HAVE_UNION_NETTLE_BLOCK8 - -/* An aligned 16-byte block. */ -union gnutls_nettle_backport_nettle_block16 { - uint8_t b[16]; - unsigned long w[16 / sizeof(unsigned long)]; - uint64_t u64[2]; -}; - -union gnutls_nettle_backport_nettle_block8 { - uint8_t b[8]; - uint64_t u64; -}; - -#undef nettle_block16 -#undef nettle_block8 - -#define nettle_block16 gnutls_nettle_backport_nettle_block16 -#define nettle_block8 gnutls_nettle_backport_nettle_block8 - -#endif - -#endif /* GNUTLS_LIB_NETTLE_BLOCK8_H */ diff --git a/lib/nettle/int/nettle-internal.h b/lib/nettle/int/nettle-internal.h deleted file mode 100644 index 5cf16961eb..0000000000 --- a/lib/nettle/int/nettle-internal.h +++ /dev/null @@ -1,91 +0,0 @@ -/* nettle-internal.h - - Things that are used only by the testsuite and benchmark, and - not included in the library. - - Copyright (C) 2002, 2014 Niels Möller - - This file is part of GNU Nettle. - - GNU Nettle is free software: you can redistribute it and/or - modify it under the terms of either: - - * the GNU Lesser General Public License as published by the Free - Software Foundation; either version 3 of the License, or (at your - option) any later version. - - or - - * the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your - option) any later version. - - or both in parallel, as here. - - GNU Nettle is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received copies of the GNU General Public License and - the GNU Lesser General Public License along with this program. If - not, see http://www.gnu.org/licenses/. -*/ - -#ifndef GNUTLS_NETTLE_INT_NETTLE_INTERNAL_H_INCLUDED -#define GNUTLS_NETTLE_INT_NETTLE_INTERNAL_H_INCLUDED - -#include -#ifdef HAVE_ALLOCA_H -#include -#endif -/* Needed for alloca on bsd systems. */ -#include - -/* Temporary allocation, for systems that don't support alloca. Note - * that the allocation requests should always be reasonably small, so - * that they can fit on the stack. For non-alloca systems, we use a - * fix maximum size + an assert. - * - * TMP_DECL and TMP_ALLOC allocate an array of the given type, and - * take the array size (not byte size) as argument. - * - * TMP_DECL_ALIGN and TMP_ALLOC_ALIGN are intended for context - * structs, which need proper alignment. They take the size in bytes, - * and produce a void *. On systems without alloca, implemented as an - * array of uint64_t, to ensure alignment. Since it is used as void * - * argument, no type casts are needed. - */ - -#if HAVE_ALLOCA -#define TMP_DECL(name, type, max) type *name -#define TMP_ALLOC(name, size) (name = alloca(sizeof(*name) * (size))) -#define TMP_DECL_ALIGN(name, max) void *name -#define TMP_ALLOC_ALIGN(name, size) (name = alloca(size)) -#else /* !HAVE_ALLOCA */ -#define TMP_DECL(name, type, max) type name[max] -#define TMP_ALLOC(name, size) \ - do { \ - assert((size_t)(size) <= (sizeof(name) / sizeof(name[0]))); \ - } while (0) -#define TMP_DECL_ALIGN(name, max) \ - uint64_t name[((max) + (sizeof(uint64_t) - 1)) / sizeof(uint64_t)] -#define TMP_ALLOC_ALIGN(name, size) \ - do { \ - assert((size_t)(size) <= (sizeof(name))); \ - } while (0) -#endif - -/* Limits that apply to systems that don't have alloca */ -#define NETTLE_MAX_HASH_BLOCK_SIZE 144 /* For sha3_224*/ -#define NETTLE_MAX_HASH_DIGEST_SIZE 64 -#define NETTLE_MAX_HASH_CONTEXT_SIZE (sizeof(struct sha3_224_ctx)) -#define NETTLE_MAX_SEXP_ASSOC 17 -#define NETTLE_MAX_CIPHER_BLOCK_SIZE 32 -#define NETTLE_MAX_CIPHER_KEY_SIZE 32 - -/* Equivalent to x == 0, but with an expression that should compile to - branch free code on all compilers. Requires that x is at most 31 bits. */ -#define IS_ZERO_SMALL(x) (((uint32_t)(x) - 1U) >> 31) - -#endif /* GNUTLS_NETTLE_INT_NETTLE_INTERNAL_H_INCLUDED */