diff options
| author | June McEnroe <june@causal.agency> | 2022-03-21 17:14:22 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2022-03-21 17:14:22 -0400 |
| commit | 36e3e016edf8b8068aa7c5e9f188159ee4d4e2fb (patch) | |
| tree | abf6a8eda1231cf996ced611c8840384c0b03b81 | |
| parent | doc: Note OpenSSL 3.0.0 compatibility in README (diff) | |
| parent | Import LibreSSL 3.5.1 (diff) | |
| download | libretls-abcab1213a0d57f90824288c6c57e2d2f1b82f4d.tar.gz libretls-abcab1213a0d57f90824288c6c57e2d2f1b82f4d.zip | |
Merge LibreSSL 3.5.1 3.5.1
Diffstat (limited to '')
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | compat/arc4random.c | 4 | ||||
| -rw-r--r-- | compat/chacha_private.h | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | m4/check-hardening-options.m4 | 26 |
5 files changed, 16 insertions, 23 deletions
diff --git a/VERSION b/VERSION index fc1335a..6f711e8 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -3.5.0 +3.5.1 diff --git a/compat/arc4random.c b/compat/arc4random.c index 2bb4dbf..6f95d57 100644 --- a/compat/arc4random.c +++ b/compat/arc4random.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arc4random.c,v 1.55 2019/03/24 17:56:54 deraadt Exp $ */ +/* $OpenBSD: arc4random.c,v 1.56 2022/02/28 21:56:29 dtucker Exp $ */ /* * Copyright (c) 1996, David Mazieres <dm@uun.org> @@ -78,7 +78,7 @@ _rs_init(u_char *buf, size_t n) _exit(1); } - chacha_keysetup(&rsx->rs_chacha, buf, KEYSZ * 8, 0); + chacha_keysetup(&rsx->rs_chacha, buf, KEYSZ * 8); chacha_ivsetup(&rsx->rs_chacha, buf + KEYSZ); } diff --git a/compat/chacha_private.h b/compat/chacha_private.h index 7c3680f..b0427b6 100644 --- a/compat/chacha_private.h +++ b/compat/chacha_private.h @@ -4,7 +4,7 @@ D. J. Bernstein Public domain. */ -/* $OpenBSD: chacha_private.h,v 1.2 2013/10/04 07:02:27 djm Exp $ */ +/* $OpenBSD: chacha_private.h,v 1.3 2022/02/28 21:56:29 dtucker Exp $ */ typedef unsigned char u8; typedef unsigned int u32; @@ -52,7 +52,7 @@ static const char sigma[16] = "expand 32-byte k"; static const char tau[16] = "expand 16-byte k"; static void -chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits,u32 ivbits) +chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits) { const char *constants; diff --git a/configure.ac b/configure.ac index 150a6d6..ce20270 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -AC_INIT([libretls], m4_esyscmd([tr -d '\n' < VERSION])) +AC_INIT([libretls], m4_esyscmd(tr -d '\n' < VERSION)) AC_SUBST([LIBTLS_VERSION], m4_esyscmd([tr -d '\n' < LIBTLS_VERSION])) AC_CANONICAL_HOST @@ -25,7 +25,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) USER_CFLAGS="$CFLAGS" AC_PROG_CC([cc gcc]) -AC_PROG_CC_STDC AM_PROG_CC_C_O LT_INIT([pic-only]) diff --git a/m4/check-hardening-options.m4 b/m4/check-hardening-options.m4 index c8ab12e..4b5784b 100644 --- a/m4/check-hardening-options.m4 +++ b/m4/check-hardening-options.m4 @@ -4,16 +4,13 @@ AC_DEFUN([CHECK_CFLAG], [ AC_MSG_CHECKING([if $saved_CC supports "$1"]) old_cflags="$CFLAGS" CFLAGS="$1 -Wall -Werror" - AC_TRY_LINK([ - #include <stdio.h> - ], - [printf("Hello")], - AC_MSG_RESULT([yes]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[printf("Hello")]])], + [AC_MSG_RESULT([yes]) CFLAGS=$old_cflags - HARDEN_CFLAGS="$HARDEN_CFLAGS $1", - AC_MSG_RESULT([no]) + HARDEN_CFLAGS="$HARDEN_CFLAGS $1"], + [AC_MSG_RESULT([no]) CFLAGS=$old_cflags - [$2]) + [$2]]) ]) AC_DEFUN([CHECK_LDFLAG], [ @@ -21,16 +18,13 @@ AC_DEFUN([CHECK_LDFLAG], [ AC_MSG_CHECKING([if $saved_LD supports "$1"]) old_ldflags="$LDFLAGS" LDFLAGS="$1 -Wall -Werror" - AC_TRY_LINK([ - #include <stdio.h> - ], - [printf("Hello")], - AC_MSG_RESULT([yes]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[printf("Hello")]])], + [AC_MSG_RESULT([yes]) LDFLAGS=$old_ldflags - HARDEN_LDFLAGS="$HARDEN_LDFLAGS $1", - AC_MSG_RESULT([no]) + HARDEN_LDFLAGS="$HARDEN_LDFLAGS $1"], + [AC_MSG_RESULT([no]) LDFLAGS=$old_ldflags - [$2]) + [$2]]) ]) AC_DEFUN([DISABLE_AS_EXECUTABLE_STACK], [ |