libressl: Update to 2.8.2

13 files changed, 19 insertions, 18 deletions

diff --git a/pkg/curl/README.md b/pkg/curl/README.md
index c065c159..5cb0821a 100644
--- a/pkg/curl/README.md
+++ b/pkg/curl/README.md
@@ -10,8 +10,8 @@ Generated with
 		--with-ca-fallback \
 		--without-ca-bundle \
 		CPPFLAGS='-I/src/oasis/out/pkg/libressl/include -I/src/oasis/out/pkg/zlib/include' \
-		LDFLAGS='-L/src/oasis/out/pkg/libressl -L/src/oasis/out/pkg/zlib' \
-		LIBS=/src/oasis/out/pkg/openbsd/libbsd.a
+		LDFLAGS='-L/src/oasis/out/pkg/openbsd -L/src/oasis/out/pkg/libressl -L/src/oasis/out/pkg/zlib' \
+		LIBS='-lbsd -lcrypto-sha'
 
 There are a number of non-standard definitions, but they don't seem to be
 architecture-specific except for
diff --git a/pkg/expat/README.md b/pkg/expat/README.md
index 7ac4119b..171f5b39 100644
--- a/pkg/expat/README.md
+++ b/pkg/expat/README.md
@@ -5,4 +5,5 @@ Generated with
 
 	./configure \
 		CPPFLAGS=-I/src/oasis/pkg/openbsd/include \
-		LIBS='/src/oasis/out/pkg/openbsd/libbsd.a /src/oasis/out/pkg/libressl/libcrypto.a'
+		LDFLAGS='-L/src/oasis/pkg/libressl -L/src/oasis/pkg/openbsd' \
+		LIBS='-lbsd -lcrypto-sha'
diff --git a/pkg/fontconfig/README.md b/pkg/fontconfig/README.md
index d4836be0..1d1fecd3 100644
--- a/pkg/fontconfig/README.md
+++ b/pkg/fontconfig/README.md
@@ -12,7 +12,7 @@ Generated with
 		--with-default-fonts=/share/fonts \
 		FREETYPE_CFLAGS=-I/src/oasis/out/pkg/freetype/include \
 		FREETYPE_LIBS=/src/oasis/out/pkg/freetype/libfreetype.a \
-		UUID_LIBS=/src/oasis/out/pkg/util-linux/libuuid.a \
 		UUID_CFLAGS=-I/src/oasis/out/pkg/util-linux/include \
+		UUID_LIBS=/src/oasis/out/pkg/util-linux/libuuid.a \
 		EXPAT_CFLAGS=-I/src/oasis/out/pkg/expat/include \
-		EXPAT_LIBS='/src/oasis/out/pkg/expat/libexpat.a /src/oasis/out/pkg/openbsd/libbsd.a /src/oasis/out/pkg/libressl/libcrypto.a'
+		EXPAT_LIBS='/src/oasis/out/pkg/expat/libexpat.a /src/oasis/out/pkg/openbsd/libbsd.a /src/oasis/out/pkg/libressl/libcrypto-sha.a'
diff --git a/pkg/hostap/gen.lua b/pkg/hostap/gen.lua
index 8f88e567..10c8e675 100644
--- a/pkg/hostap/gen.lua
+++ b/pkg/hostap/gen.lua
@@ -76,8 +76,7 @@ exe('bin/wpa_supplicant', [[
 	)
 	libcommon.a
 	$builddir/pkg/(
-		libressl/libcrypto.a
-		openbsd/libbsd.a
+		libressl/libcrypto.a.d
 		libnl/(libnl-3.a libnl-genl-3.a)
 	)
 ]])
diff --git a/pkg/libressl/.gitignore b/pkg/libressl/.gitignore
index 22e2bfaf..e9f7eb4e 100644
--- a/pkg/libressl/.gitignore
+++ b/pkg/libressl/.gitignore
@@ -1,2 +1,2 @@
-/libressl-2.7.4.tar.gz
+/libressl-2.8.2.tar.gz
 /src
diff --git a/pkg/libressl/gen.lua b/pkg/libressl/gen.lua
index d6e36e9f..af8b44b7 100644
--- a/pkg/libressl/gen.lua
+++ b/pkg/libressl/gen.lua
@@ -94,6 +94,7 @@ pkg.hdrs = {
 }
 
 -- src/crypto/Makefile.am
+lib('libcrypto-sha.a', [[crypto/sha/(sha1dgst.c sha1_one.c sha256.c sha512.c)]])
 lib('libcrypto.a', [[crypto/(
 	cryptlib.c malloc-wrapper.c mem_dbg.c cversion.c ex_data.c cpt_err.c
 	o_time.c o_str.c o_init.c
@@ -240,7 +241,6 @@ lib('libcrypto.a', [[crypto/(
 		rsa_pss.c rsa_x931.c rsa_asn1.c rsa_depr.c rsa_ameth.c rsa_prn.c
 		rsa_pmeth.c rsa_crpt.c rsa_meth.c
 	)
-	sha/(sha1dgst.c sha1_one.c sha256.c sha512.c)
 	stack/stack.c
 	ts/(
 		ts_err.c ts_req_utils.c ts_req_print.c ts_rsp_utils.c ts_rsp_print.c
@@ -273,7 +273,7 @@ lib('libcrypto.a', [[crypto/(
 	des/(des_enc.c fcrypt_b.c)
 	rc4/(rc4_enc.c rc4_skey.c)
 	whrlpool/wp_block.c
-) $builddir/pkg/openbsd/libbsd.a]])
+) libcrypto-sha.a $builddir/pkg/openbsd/libbsd.a.d]])
 file('lib/libcrypto.a', '644', '$outdir/libcrypto.a')
 
 -- src/ssl/Makefile.am
@@ -293,7 +293,7 @@ lib('libssl.a', [[ssl/(
 ) libcrypto.a.d]])
 file('lib/libssl.a', '644', '$outdir/libssl.a')
 
--- src/libtls/Makefile.am
+-- src/tls/Makefile.am
 lib('libtls.a', [[tls/(
 	tls.c tls_bio_cb.c tls_client.c tls_config.c tls_conninfo.c
 	tls_keypair.c tls_peer.c tls_server.c tls_util.c tls_ocsp.c tls_verify.c
diff --git a/pkg/libressl/rev b/pkg/libressl/rev
index b1bd38b6..8351c193 100644
--- a/pkg/libressl/rev
+++ b/pkg/libressl/rev
@@ -1 +1 @@
-13
+14
diff --git a/pkg/libressl/sha256 b/pkg/libressl/sha256
index 3523cb77..7ea56ecb 100644
--- a/pkg/libressl/sha256
+++ b/pkg/libressl/sha256
@@ -1 +1 @@
-1e3a9fada06c1c060011470ad0ff960de28f9a0515277d7336f7e09362517da6  libressl-2.7.4.tar.gz
+b8cb31e59f1294557bfc80f2a662969bc064e83006ceef0574e2553a1c254fd5  libressl-2.8.2.tar.gz
diff --git a/pkg/libressl/url b/pkg/libressl/url
index 21e088b5..e0efdbfd 100644
--- a/pkg/libressl/url
+++ b/pkg/libressl/url
@@ -1 +1 @@
-url = "https://fastly.cdn.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.7.4.tar.gz"
+url = "https://fastly.cdn.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.2.tar.gz"
diff --git a/pkg/openbsd/gen.lua b/pkg/openbsd/gen.lua
index 5fd6d9c6..aa47ce0c 100644
--- a/pkg/openbsd/gen.lua
+++ b/pkg/openbsd/gen.lua
@@ -9,7 +9,7 @@ local libs
 
 if not config.tls or config.tls == 'libressl' then
 	cflags{'-D USE_OPENSSL', '-I $builddir/pkg/libressl/include'}
-	libs = {'$builddir/pkg/libressl/libcrypto.a'}
+	libs = {'$builddir/pkg/libressl/libcrypto-sha.a'}
 elseif config.tls == 'bearssl' then
 	cflags{'-D USE_BEARSSL', '-I pkg/bearssl/src/inc'}
 	libs = {'$builddir/pkg/bearssl/libbearssl.a'}
@@ -33,7 +33,7 @@ lib('libbsd.a', {paths[[
 		gen/(fts.c getprogname.c pwcache.c readpassphrase.c setprogname.c unvis.c vis.c warnc.c vwarnc.c)
 		net/base64.c
 		stdlib/(freezero.c reallocarray.c recallocarray.c strtonum.c)
-		string/(explicit_bzero.c strmode.c timingsafe_memcmp.c)
+		string/(explicit_bzero.c strmode.c timingsafe_bcmp.c timingsafe_memcmp.c)
 	)
 	lib/libcrypto/arc4random/getentropy_linux.c
 	lib/libutil/ohash.c
diff --git a/pkg/openbsd/include/string.h b/pkg/openbsd/include/string.h
index 19298a67..aded485f 100644
--- a/pkg/openbsd/include/string.h
+++ b/pkg/openbsd/include/string.h
@@ -3,3 +3,4 @@ void explicit_bzero(void *, size_t);
 char *strcasestr(const char *, const char *);
 void strmode(int, char *);
 int timingsafe_memcmp(const void *, const void *, size_t);
+int timingsafe_bcmp(const void *, const void *, size_t);
diff --git a/pkg/openntpd/README.md b/pkg/openntpd/README.md
index 277a3876..a837a395 100644
--- a/pkg/openntpd/README.md
+++ b/pkg/openntpd/README.md
@@ -7,4 +7,4 @@ Generated with
 		--with-privsep-user=ntpd \
 		CPPFLAGS='-I/src/oasis/out/pkg/libressl/include' \
 		LDFLAGS='-L/src/oasis/out/pkg/libressl -L/src/oasis/out/pkg/openbsd' \
-		LIBS='-ltls -lssl -lbsd -lcrypto'
+		LIBS='-ltls -lssl -lcrypto -lbsd -lcrypto-sha'
diff --git a/pkg/openssh/README.md b/pkg/openssh/README.md
index c29ad8cc..ece72d1a 100644
--- a/pkg/openssh/README.md
+++ b/pkg/openssh/README.md
@@ -8,7 +8,7 @@ Generated with
 		--without-pie \
 		CPPFLAGS='-I/src/oasis/out/pkg/zlib/include' \
 		LDFLAGS='-L/src/oasis/out/pkg/libressl -L/src/oasis/out/pkg/openbsd -L/src/oasis/out/pkg/zlib' \
-		LIBS='-lbsd -lcrypto'
+		LIBS='-lcrypto -lbsd -lcrypto-sha'
 
 Several changes were made:
 * `SECCOMP_AUDIT_ARCH` is removed and instead defined in `gen.lua` dependent on