From d676f9545bb66558fbf81a49d32f8bb0edaa8aa9 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Tue, 10 Oct 2017 02:42:19 -0700
Subject: libressl: Update to 2.6.2

---
 pkg/libressl/.gitignore |  2 +-
 pkg/libressl/gen.lua    | 11 +++++++----
 pkg/libressl/rev        |  2 +-
 pkg/libressl/sha256     |  2 +-
 pkg/libressl/url        |  2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'pkg/libressl')

diff --git a/pkg/libressl/.gitignore b/pkg/libressl/.gitignore
index e90db203..b1d2246f 100644
--- a/pkg/libressl/.gitignore
+++ b/pkg/libressl/.gitignore
@@ -1,2 +1,2 @@
-/libressl-2.5.5.tar.gz
+/libressl-2.6.2.tar.gz
 /src
diff --git a/pkg/libressl/gen.lua b/pkg/libressl/gen.lua
index 8b22c65a..6b618c80 100644
--- a/pkg/libressl/gen.lua
+++ b/pkg/libressl/gen.lua
@@ -1,5 +1,5 @@
 cflags{
-	'-Wno-attributes',
+	'-Wundef', '-Wno-attributes',
 	'-D LIBRESSL_INTERNAL',
 	'-D OPENSSL_NO_HW_PADLOCK',
 	'-D OPENSSL_NO_ASM',
@@ -204,6 +204,7 @@ lib('libcrypto.a', [[crypto/(
 		gostr341001_ameth.c gostr341001_key.c gostr341001_params.c
 		gostr341001_pmeth.c gostr341194.c streebog.c
 	)
+	hkdf/hkdf.c
 	hmac/(hmac.c hm_ameth.c hm_pmeth.c)
 	idea/(i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c i_skey.c)
 	lhash/(lhash.c lh_stats.c)
@@ -234,7 +235,7 @@ lib('libcrypto.a', [[crypto/(
 	ripemd/(rmd_dgst.c rmd_one.c)
 	rsa/(
 		rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c
-		rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c rsa_chk.c
+		rsa_pk1.c rsa_none.c rsa_oaep.c rsa_chk.c
 		rsa_pss.c rsa_x931.c rsa_asn1.c rsa_depr.c rsa_ameth.c rsa_prn.c
 		rsa_pmeth.c rsa_crpt.c
 	)
@@ -271,6 +272,8 @@ lib('libcrypto.a', [[crypto/(
 	des/(des_enc.c fcrypt_b.c)
 	rc4/(rc4_enc.c rc4_skey.c)
 	whrlpool/wp_block.c
+
+	compat/freezero.c
 ) $builddir/pkg/openbsd/libbsd.a]])
 file('lib/libcrypto.a', '644', '$outdir/libcrypto.a')
 
@@ -283,8 +286,8 @@ lib('libssl.a', [[ssl/(
 	ssl_lib.c ssl_cert.c ssl_sess.c
 	ssl_ciph.c ssl_stat.c ssl_rsa.c
 	ssl_asn1.c ssl_txt.c ssl_algs.c
-	bio_ssl.c ssl_err.c t1_reneg.c
-	ssl_packet.c ssl_versions.c pqueue.c
+	bio_ssl.c ssl_err.c
+	ssl_packet.c ssl_tlsext.c ssl_versions.c pqueue.c
 
 	s3_cbc.c
 	bs_ber.c bs_cbb.c bs_cbs.c
diff --git a/pkg/libressl/rev b/pkg/libressl/rev
index 7f8f011e..45a4fb75 100644
--- a/pkg/libressl/rev
+++ b/pkg/libressl/rev
@@ -1 +1 @@
-7
+8
diff --git a/pkg/libressl/sha256 b/pkg/libressl/sha256
index 4fc4bcfa..f11d1b4d 100644
--- a/pkg/libressl/sha256
+++ b/pkg/libressl/sha256
@@ -1 +1 @@
-e57f5e3d5842a81fe9351b6e817fcaf0a749ca4ef35a91465edba9e071dce7c4  libressl-2.5.5.tar.gz
+b029d2492b72a9ba5b5fcd9f3d602c9fd0baa087912f2aaecc28f52f567ec478  libressl-2.6.2.tar.gz
diff --git a/pkg/libressl/url b/pkg/libressl/url
index 32c4504e..7d5fa2ae 100644
--- a/pkg/libressl/url
+++ b/pkg/libressl/url
@@ -1 +1 @@
-url = "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.5.5.tar.gz"
+url = "https://mirrors.sonic.net/pub/OpenBSD/LibreSSL/libressl-2.6.2.tar.gz"
-- 
cgit v1.2.3