Index: secure/lib/libcrypto/Makefile.asm
===================================================================
--- secure/lib/libcrypto/Makefile.asm
+++ secure/lib/libcrypto/Makefile.asm
@@ -10,20 +10,39 @@
 
 .PATH:	${LCRYPTO_SRC}/crypto \
 	${LCRYPTO_SRC}/crypto/aes/asm \
+	${LCRYPTO_SRC}/crypto/bn/asm \
+	${LCRYPTO_SRC}/crypto/chacha/asm \
+	${LCRYPTO_SRC}/crypto/ec/asm \
 	${LCRYPTO_SRC}/crypto/modes/asm \
+	${LCRYPTO_SRC}/crypto/poly1305 \
 	${LCRYPTO_SRC}/crypto/sha/asm
 
 PERLPATH=	-I${LCRYPTO_SRC}/crypto/perlasm
 
 # aes
-SRCS=	aesv8-armx.pl
+SRCS=	aesv8-armx.pl vpaes-armv8.pl
+
+# bn
+SRCS+=	armv8-mont.pl
+
+# chacha
+SRCS+=	chacha-armv8.pl
+
+# ec
+SRCS+=	ecp_nistz256-armv8.pl
 
 # modes
 SRCS+=	ghashv8-armx.pl
 
+# poly1305
+SRCS+=	poly1305-armv8.pl
+
 # sha
 SRCS+=	sha1-armv8.pl sha512-armv8.pl
 
+# cpuuid
+SRCS+=	arm64cpuid.pl
+
 ASM=	${SRCS:R:S/$/.S/} sha256-armv8.S
 
 all:	${ASM}
@@ -49,9 +68,11 @@
 	${LCRYPTO_SRC}/crypto/aes/asm \
 	${LCRYPTO_SRC}/crypto/bn/asm \
 	${LCRYPTO_SRC}/crypto/camellia/asm \
+	${LCRYPTO_SRC}/crypto/chacha/asm \
 	${LCRYPTO_SRC}/crypto/ec/asm \
 	${LCRYPTO_SRC}/crypto/md5/asm \
 	${LCRYPTO_SRC}/crypto/modes/asm \
+	${LCRYPTO_SRC}/crypto/poly1305/asm \
 	${LCRYPTO_SRC}/crypto/rc4/asm \
 	${LCRYPTO_SRC}/crypto/sha/asm \
 	${LCRYPTO_SRC}/crypto/whrlpool/asm
@@ -68,6 +89,9 @@
 # camellia
 SRCS+=	cmll-x86_64.pl
 
+# chacha
+SRCS+=	chacha-x86_64.pl
+
 # ec
 SRCS+=	ecp_nistz256-x86_64.pl
 
@@ -77,11 +101,14 @@
 # modes
 SRCS+=	aesni-gcm-x86_64.pl ghash-x86_64.pl
 
+# poly1305
+SRCS+=	poly1305-x86_64.pl
+
 # rc4
 SRCS+=	rc4-md5-x86_64.pl rc4-x86_64.pl
 
 # sha
-SRCS+=	sha1-mb-x86_64.pl sha1-x86_64.pl sha256-mb-x86_64.pl
+SRCS+=	sha1-mb-x86_64.pl sha1-x86_64.pl sha256-mb-x86_64.pl sha512-x86_64.pl
 
 # whrlpool
 SRCS+=	wp-x86_64.pl
@@ -120,23 +147,38 @@
 .PATH:	${LCRYPTO_SRC}/crypto \
 	${LCRYPTO_SRC}/crypto/aes/asm \
 	${LCRYPTO_SRC}/crypto/bn/asm \
+	${LCRYPTO_SRC}/crypto/chacha/asm \
+	${LCRYPTO_SRC}/crypto/ec/asm \
 	${LCRYPTO_SRC}/crypto/modes/asm \
+	${LCRYPTO_SRC}/crypto/poly1305/asm \
 	${LCRYPTO_SRC}/crypto/sha/asm
 
 PERLPATH=	-I${LCRYPTO_SRC}/crypto/perlasm
 
 # aes
-SRCS=	aesv8-armx.pl bsaes-armv7.pl
+SRCS=	aes-armv4.pl aesv8-armx.pl bsaes-armv7.pl aesv8-armx.pl
 
 # bn
 SRCS+=	armv4-mont.pl armv4-gf2m.pl
 
+# chacha
+SRCS+=	chacha-armv4.pl
+
+# ec
+SRCS+=	ecp_nistz256-armv4.pl
+
 # modes
 SRCS+=	ghash-armv4.pl ghashv8-armx.pl
 
+# poly1305
+SRCS+=	poly1305-armv4.pl
+
 # sha
 SRCS+=	sha1-armv4-large.pl sha256-armv4.pl sha512-armv4.pl
 
+# cpuuid
+SRCS+=	armv4cpuid.pl
+
 ASM=	aes-armv4.S ${SRCS:R:S/$/.S/}
 
 all:	${ASM}
@@ -162,9 +204,13 @@
 	${LCRYPTO_SRC}/crypto/bf/asm \
 	${LCRYPTO_SRC}/crypto/bn/asm \
 	${LCRYPTO_SRC}/crypto/camellia/asm \
+	${LCRYPTO_SRC}/crypto/cast/asm \
+	${LCRYPTO_SRC}/crypto/chacha/asm \
 	${LCRYPTO_SRC}/crypto/des/asm \
+	${LCRYPTO_SRC}/crypto/ec/asm \
 	${LCRYPTO_SRC}/crypto/md5/asm \
 	${LCRYPTO_SRC}/crypto/modes/asm \
+	${LCRYPTO_SRC}/crypto/poly1305/asm \
 	${LCRYPTO_SRC}/crypto/rc4/asm \
 	${LCRYPTO_SRC}/crypto/rc5/asm \
 	${LCRYPTO_SRC}/crypto/ripemd/asm \
@@ -177,7 +223,7 @@
 SRCS=	aes-586.pl aesni-x86.pl vpaes-x86.pl
 
 # blowfish
-SRCS+=	bf-586.pl bf-686.pl
+SRCS+=	bf-586.pl
 
 # bn
 SRCS+=	bn-586.pl co-586.pl x86-gf2m.pl x86-mont.pl
@@ -185,15 +231,27 @@
 # camellia
 SRCS+=	cmll-x86.pl
 
+# cast
+SRCS+=	cast-586.pl
+
+# chacha
+SRCS+=	chacha-x86.pl
+
 # des
 SRCS+=	crypt586.pl des-586.pl
 
+# ec
+SRCS+=	ecp_nistz256-x86.pl
+
 # md5
 SRCS+=	md5-586.pl
 
 # modes
 SRCS+=	ghash-x86.pl
 
+# poly1305
+SRCS+=	poly1305-x86.pl
+
 # rc4
 SRCS+=	rc4-586.pl
 
Index: secure/lib/libcrypto/Makefile.inc
===================================================================
--- secure/lib/libcrypto/Makefile.inc
+++ secure/lib/libcrypto/Makefile.inc
@@ -3,7 +3,7 @@
 .include <bsd.own.mk>
 
 # OpenSSL version used for manual page generation
-OPENSSL_VER=	1.0.2o
+OPENSSL_VER=	1.1.0h
 OPENSSL_DATE=	2018-03-27
 
 LCRYPTO_SRC=	${SRCTOP}/crypto/openssl
@@ -106,7 +106,8 @@
 			test -f $$j || continue; \
 			fn=`basename $$j .pod`; \
 			if ! echo '${_skip}' | grep -qw "$$fn"; then \
-			perl ${LCRYPTO_SRC}/util/extract-names.pl < $$j | \
+			sed '/=head1 NAME/,/^=.*/! d;/^=.*/d;/^\s*$$/d' $$j | tr '\n' ' ' | \
+			  sed 's/ - .*$$//;s/,/ /g;s/  / /g' | tr ' ' '\n' | \
 			  awk "/^$$fn\$$/ { next; } \
 			  { print \"MLINKS+= $$fn.${_sec} \" \$$1 \".${_sec}\" }"; \
 			fi; \