4 files changed, 11 insertions, 12 deletions
diff --git a/lib/libbearssl/Makefile b/lib/libbearssl/Makefile
index 53e0eb210820..2c649bb80e9e 100644
--- a/lib/libbearssl/Makefile
+++ b/lib/libbearssl/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 # This is a reach over build of BearSSL (www.BearSSL.org)
 
 .include <src.opts.mk>
@@ -46,6 +44,7 @@ SRCS+= \
 	hash/ghash_pwr8.c \
 	hash/md5.c \
 	hash/md5sha1.c \
+	hash/mgf1.c
 
 
 # this one does not compile for amd64
@@ -150,6 +149,11 @@ SRCS+= \
 	x509/x509_knownkey.c \
 	x509/x509_minimal_full.c \
 
+SRCS+= \
+	rand/hmac_drbg.c \
+	mac/hmac.c \
+	mac/hmac_ct.c \
+
 INCS= \
 	inc/bearssl.h \
 	inc/bearssl_aead.h \
@@ -170,9 +174,6 @@ INCS:= ${INCS:S,^,${BEARSSL}/,}
 
 .if ${MK_BEARSSL_SSL:Uno} == "yes"
 SRCS+= \
-	mac/hmac.c \
-	mac/hmac_ct.c \
-	rand/hmac_drbg.c \
 	ssl/prf.c \
 	ssl/prf_md5sha1.c \
 	ssl/prf_sha256.c \
diff --git a/lib/libbearssl/Makefile.depend b/lib/libbearssl/Makefile.depend
index 6cfaab1c3644..6ef78fac5cbf 100644
--- a/lib/libbearssl/Makefile.depend
+++ b/lib/libbearssl/Makefile.depend
@@ -1,8 +1,6 @@
-# $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/lib/libbearssl/Makefile.inc b/lib/libbearssl/Makefile.inc
index dd0e242c8ef0..75365bb98be7 100644
--- a/lib/libbearssl/Makefile.inc
+++ b/lib/libbearssl/Makefile.inc
@@ -1,7 +1,6 @@
-# $FreeBSD$
-
 BEARSSL?= ${SRCTOP}/contrib/bearssl
 BEARSSL_SRC= ${BEARSSL}/src
+BEARSSL_TOOLS= ${BEARSSL}/tools
 
 CFLAGS+= -I${BEARSSL}/inc
-
+CFLAGS+= ${NO_WDEPRECATED_NON_PROTOTYPE}
diff --git a/lib/libbearssl/Makefile.libsa.inc b/lib/libbearssl/Makefile.libsa.inc
index f4562865ff25..827ce82d1304 100644
--- a/lib/libbearssl/Makefile.libsa.inc
+++ b/lib/libbearssl/Makefile.libsa.inc
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 # This file is included by libsa
 # It contains SRCS needed for loader
 
@@ -84,3 +82,6 @@ SRCS+= \
 	x509/x509_decoder.c \
 	x509/x509_minimal.c \
 
+# We want find_error_name().
+SRCS+= \
+	${BEARSSL_TOOLS}/errors.c \