libressl: Update to 2.5.0

4 files changed, 24 insertions, 23 deletions

diff --git a/core/libressl/.rev b/core/libressl/.rev
index 0cfbf088..00750edc 100644
--- a/core/libressl/.rev
+++ b/core/libressl/.rev
@@ -1 +1 @@
-2
+3
diff --git a/core/libressl/gen.rc b/core/libressl/gen.rc
index 124de324..5895e3f9 100644
--- a/core/libressl/gen.rc
+++ b/core/libressl/gen.rc
@@ -1,16 +1,18 @@
 cflags\
 	-D LIBRESSL_INTERNAL\
 	-D OPENSSL_NO_HW_PADLOCK\
+	-D OPENSSL_NO_ASM\
+	-D '''__warn_references(sym,msg)=''' \
 	-I core/openbsd/include\
 	-I '$outdir'/include\
 	-I '$outdir'/internal\
-	-I '$srcdir'/src/lib/libssl/src/crypto\
-	-I '$srcdir'/src/lib/libssl/src/crypto/asn1\
-	-I '$srcdir'/src/lib/libssl/src/crypto/evp\
-	-I '$srcdir'/src/lib/libssl/src/crypto/modes
+	-I '$srcdir'/src/lib/libcrypto\
+	-I '$srcdir'/src/lib/libcrypto/asn1\
+	-I '$srcdir'/src/lib/libcrypto/evp\
+	-I '$srcdir'/src/lib/libcrypto/modes
 
 srchdrs=(\
-	libssl/src/crypto/^(\
+	libcrypto/^(\
 		aes/aes.h\
 		asn1/asn1.h\
 		asn1/asn1_mac.h\
@@ -23,7 +25,6 @@ srchdrs=(\
 		cast/cast.h\
 		chacha/chacha.h\
 		cmac/cmac.h\
-		cms/cms.h\
 		comp/comp.h\
 		conf/conf.h\
 		conf/conf_api.h\
@@ -75,8 +76,8 @@ srchdrs=(\
 		\
 		objects/obj_mac.h\
 	)\
-	libssl/src/ssl/^(srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h)\
-	libcrypto/crypto/arch/amd64/opensslconf.h\
+	libssl/^(srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h)\
+	libcrypto/arch/amd64/opensslconf.h\
 )
 hdrs=()
 for(srchdr in $srchdrs) {
@@ -89,7 +90,7 @@ for(srchdr in $srchdrs) {
 phony headers $hdrs
 
 # src/lib/libcrypto/crypto/Makefile
-lib libcrypto.a -d 'phony/$dir/headers' src/lib/libssl/src/crypto/^(\
+lib libcrypto.a -d 'phony/$dir/headers' src/lib/libcrypto/^(\
 	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\
 	mem_clr.c\
@@ -270,7 +271,7 @@ lib libcrypto.a -d 'phony/$dir/headers' src/lib/libssl/src/crypto/^(\
 file lib/libcrypto.a '$outdir'/libcrypto.a 644
 
 # src/lib/libssl/ssl/Makefile
-lib libssl.a src/lib/libssl/src/ssl/^(\
+lib libssl.a src/lib/libssl/^(\
 	s3_srvr.c s3_clnt.c s3_lib.c s3_pkt.c s3_both.c \
 	s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c \
 	t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c \
@@ -289,7 +290,7 @@ file lib/libssl.a '$outdir'/libssl.a 644
 
 # src/usr.bin/openssl/Makefile
 exe openssl src/usr.bin/openssl/^(\
-	apps.c apps_posix.c asn1pars.c ca.c certhash.c ciphers.c cms.c crl.c\
+	apps.c apps_posix.c asn1pars.c ca.c certhash.c ciphers.c crl.c\
 	crl2p7.c dgst.c dh.c dhparam.c dsa.c dsaparam.c ec.c ecparam.c enc.c\
 	errstr.c gendh.c gendsa.c genpkey.c genrsa.c nseq.c ocsp.c\
 	openssl.c passwd.c pkcs12.c pkcs7.c pkcs8.c pkey.c pkeyparam.c\
diff --git a/core/libressl/patch/0001-Add-generated-obj_-dat-mac-.h-from-libressl-2.4.2-di.patch b/core/libressl/patch/0001-Add-generated-obj_-dat-mac-.h-from-libressl-2.5.0-di.patch
index 4f638b94..e1ecf6ad 100644
--- a/core/libressl/patch/0001-Add-generated-obj_-dat-mac-.h-from-libressl-2.4.2-di.patch
+++ b/core/libressl/patch/0001-Add-generated-obj_-dat-mac-.h-from-libressl-2.5.0-di.patch
@@ -1,21 +1,21 @@
-From 2e4c63fda4c6531feb78af2a0004e72d49343844 Mon Sep 17 00:00:00 2001
+From 9e633f64197625448e65ad2f86cb033bc12b2c4a Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Tue, 14 Jun 2016 21:17:48 -0700
-Subject: [PATCH] Add generated obj_{dat,mac}.h from libressl 2.4.2
+Subject: [PATCH] Add generated obj_{dat,mac}.h from libressl 2.5.0
  distribution
 
 ---
- src/lib/libssl/src/crypto/objects/obj_dat.h | 5266 +++++++++++++++++++++++++++
- src/lib/libssl/src/crypto/objects/obj_mac.h | 4156 +++++++++++++++++++++
+ src/lib/libcrypto/objects/obj_dat.h | 5266 +++++++++++++++++++++++++++++++++++
+ src/lib/libcrypto/objects/obj_mac.h | 4156 +++++++++++++++++++++++++++
  2 files changed, 9422 insertions(+)
- create mode 100644 src/lib/libssl/src/crypto/objects/obj_dat.h
- create mode 100644 src/lib/libssl/src/crypto/objects/obj_mac.h
+ create mode 100644 src/lib/libcrypto/objects/obj_dat.h
+ create mode 100644 src/lib/libcrypto/objects/obj_mac.h
 
-diff --git a/src/lib/libssl/src/crypto/objects/obj_dat.h b/src/lib/libssl/src/crypto/objects/obj_dat.h
+diff --git a/src/lib/libcrypto/objects/obj_dat.h b/src/lib/libcrypto/objects/obj_dat.h
 new file mode 100644
 index 0000000..fdb826a
 --- /dev/null
-+++ b/src/lib/libssl/src/crypto/objects/obj_dat.h
++++ b/src/lib/libcrypto/objects/obj_dat.h
 @@ -0,0 +1,5266 @@
 +/* crypto/objects/obj_dat.h */
 +
@@ -5283,11 +5283,11 @@ index 0000000..fdb826a
 +34,	/* OBJ_idea_cbc                     1 3 6 1 4 1 188 7 1 1 2 */
 +};
 +
-diff --git a/src/lib/libssl/src/crypto/objects/obj_mac.h b/src/lib/libssl/src/crypto/objects/obj_mac.h
+diff --git a/src/lib/libcrypto/objects/obj_mac.h b/src/lib/libcrypto/objects/obj_mac.h
 new file mode 100644
 index 0000000..f727262
 --- /dev/null
-+++ b/src/lib/libssl/src/crypto/objects/obj_mac.h
++++ b/src/lib/libcrypto/objects/obj_mac.h
 @@ -0,0 +1,4156 @@
 +/* crypto/objects/obj_mac.h */
 +
@@ -9446,5 +9446,5 @@ index 0000000..f727262
 +#define OBJ_id_tc26_signwithdigest_gost3410_2012_512		OBJ_tc26,1L,3L,3L
 +
 -- 
-2.9.2
+2.9.3
 
diff --git a/core/libressl/src b/core/libressl/src
-Subproject f00905854815243d9f51855e1241f675219ee9d
+Subproject 57212869395854dda193040c4f46c8f0d3bb5a0