diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile
index a286157d1a3a..b19fafe566e2 100644
--- a/security/boringssl/Makefile
+++ b/security/boringssl/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	boringssl
-PORTVERSION=	0.0.0.0.2025.04.11.01
+PORTVERSION=	0.0.0.0.2025.04.18.01
 CATEGORIES=	security
 EXTRACT_ONLY=	${GH_ACCOUNT}-${PORTNAME}-${PORTVERSION}-${GH_TAGNAME}_GH0.tar.gz
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	Fork of OpenSSL
 WWW=		https://boringssl.googlesource.com/boringssl/
 
 LICENSE=	OpenSSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake:insource cpe go:no_targets,1.24 localbase perl5
 
 CONFLICTS_INSTALL=	libressl libressl-devel openssl openssl111 \
 			openssl3[12345] openssl-quictls openssl31-quictls
 
 CPE_VENDOR=	google
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
-GH_TAGNAME=	5386d90
+GH_TAGNAME=	fa89199
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=1
 
 CFLAGS_i386=	-msse2
 USE_LDCONFIG=	yes
 LDFLAGS+=	-Wl,-rpath,${LOCALBASE}/lib
 TEST_TARGET=	run_tests
 MAKE_ENV+=	GOFLAGS=-mod=readonly \
 		GOPROXY=file://${DISTDIR}
 
 .include <bsd.port.pre.mk>
 
 .if ${.TARGETS} == "makesum" || ${.TARGETS} == "test"
 MASTER_SITES+=	https://proxy.golang.org/:gomods
 DISTFILES+=	filippo.io/edwards25519/@v/v1.1.0.zip:gomods \
 		filippo.io/edwards25519/@v/v1.1.0.mod:gomods \
-		golang.org/x/crypto/@v/v0.33.0.zip:gomods \
-		golang.org/x/crypto/@v/v0.33.0.mod:gomods \
-		golang.org/x/sys/@v/v0.30.0.zip:gomods \
-		golang.org/x/sys/@v/v0.30.0.mod:gomods
+		golang.org/x/crypto/@v/v0.37.0.zip:gomods \
+		golang.org/x/crypto/@v/v0.37.0.mod:gomods \
+		golang.org/x/sys/@v/v0.32.0.zip:gomods \
+		golang.org/x/sys/@v/v0.32.0.mod:gomods
 .endif
 
 post-install:
 	${LN} -sf libcrypto.so.1 ${STAGEDIR}${PREFIX}/lib/libcrypto.so.1.0.0
 	${LN} -sf libssl.so.1 ${STAGEDIR}${PREFIX}/lib/libssl.so.1.0.0
 
 .include <bsd.port.post.mk>
diff --git a/security/boringssl/distinfo b/security/boringssl/distinfo
index 9ecc116a5466..d4a1163ec896 100644
--- a/security/boringssl/distinfo
+++ b/security/boringssl/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1744371270
+TIMESTAMP = 1745161460
 SHA256 (filippo.io/edwards25519/@v/v1.1.0.zip) = 9ac43a686d06fdebd719f7af3866c87eb069302272dfb131007adf471c308b65
 SIZE (filippo.io/edwards25519/@v/v1.1.0.zip) = 55809
 SHA256 (filippo.io/edwards25519/@v/v1.1.0.mod) = 099556fc4d7e6f5cb135efdd8b6bb4c0932e38ea058c53fc5fa5ce285572fb61
 SIZE (filippo.io/edwards25519/@v/v1.1.0.mod) = 40
-SHA256 (golang.org/x/crypto/@v/v0.33.0.zip) = 3b0c19c1d259e93464f540165470de872721e5fc66ce3f0d36ffd27d307ec5bb
-SIZE (golang.org/x/crypto/@v/v0.33.0.zip) = 1793598
-SHA256 (golang.org/x/crypto/@v/v0.33.0.mod) = f6dad481462711b0c41f147aa175087f3656591c59336242fdc9fae95d0fc59e
-SIZE (golang.org/x/crypto/@v/v0.33.0.mod) = 190
-SHA256 (golang.org/x/sys/@v/v0.30.0.zip) = f5214bfec98f00e5432da68bbece03e98600fa41594ed026556cbde8fcb6f7c9
-SIZE (golang.org/x/sys/@v/v0.30.0.zip) = 1987982
-SHA256 (golang.org/x/sys/@v/v0.30.0.mod) = d227b325f621f4ebe28d39ba773ea99b870f393b7c09c34592c365b16dd560de
-SIZE (golang.org/x/sys/@v/v0.30.0.mod) = 33
-SHA256 (google-boringssl-0.0.0.0.2025.04.11.01-5386d90_GH0.tar.gz) = 2ef40f0b29ce397df951184494d678fdeeb6e5649f21a138d908c49162c83716
-SIZE (google-boringssl-0.0.0.0.2025.04.11.01-5386d90_GH0.tar.gz) = 46042440
+SHA256 (golang.org/x/crypto/@v/v0.37.0.zip) = 7ce6b2be21be1ce9e04dc784830e08931f09b5903596b8017839322c9e828667
+SIZE (golang.org/x/crypto/@v/v0.37.0.zip) = 1795190
+SHA256 (golang.org/x/crypto/@v/v0.37.0.mod) = 53a7d23b41aacaadfea2600c047e02eacb90039d4b0cb3d6f98c6cbec776b9a2
+SIZE (golang.org/x/crypto/@v/v0.37.0.mod) = 192
+SHA256 (golang.org/x/sys/@v/v0.32.0.zip) = 85d47075d21fd7ef35d9a47fc73f2356fb3cd2e7fab7f45c874b814bf312127d
+SIZE (golang.org/x/sys/@v/v0.32.0.zip) = 1991164
+SHA256 (golang.org/x/sys/@v/v0.32.0.mod) = f67e3e18f4c08e60a7e80726ab36b691fdcea5b81ae1c696ff64caf518bcfe3d
+SIZE (golang.org/x/sys/@v/v0.32.0.mod) = 35
+SHA256 (google-boringssl-0.0.0.0.2025.04.18.01-fa89199_GH0.tar.gz) = e29d03e496a90d77c0aee59b0029fbd39ae7cb22f10563161e67ff6dc262fd89
+SIZE (google-boringssl-0.0.0.0.2025.04.18.01-fa89199_GH0.tar.gz) = 45930997
diff --git a/security/boringssl/files/patch-CMakeLists.txt b/security/boringssl/files/patch-CMakeLists.txt
index 5326f4acacfc..342935382ee1 100644
--- a/security/boringssl/files/patch-CMakeLists.txt
+++ b/security/boringssl/files/patch-CMakeLists.txt
@@ -1,11 +1,11 @@
---- CMakeLists.txt.orig	2025-04-05 04:28:51 UTC
+--- CMakeLists.txt.orig	2025-04-18 21:55:37 UTC
 +++ CMakeLists.txt
-@@ -654,6 +654,8 @@ target_link_libraries(ssl crypto)
+@@ -657,6 +657,8 @@ target_link_libraries(ssl crypto)
  # here.
  set_property(TARGET ssl PROPERTY EXPORT_NAME SSL)
  target_link_libraries(ssl crypto)
 +SET_TARGET_PROPERTIES(ssl PROPERTIES SOVERSION 1)
 +SET_TARGET_PROPERTIES(crypto PROPERTIES SOVERSION 1)
  
  add_library(decrepit ${DECREPIT_SOURCES})
  target_link_libraries(decrepit ssl crypto)
diff --git a/security/boringssl/pkg-plist b/security/boringssl/pkg-plist
index 4bbfedc58fb8..362596a4c932 100644
--- a/security/boringssl/pkg-plist
+++ b/security/boringssl/pkg-plist
@@ -1,107 +1,108 @@
 bin/bssl
 include/openssl/aead.h
 include/openssl/aes.h
 include/openssl/arm_arch.h
 include/openssl/asm_base.h
 include/openssl/asn1.h
 include/openssl/asn1_mac.h
 include/openssl/asn1t.h
 include/openssl/base.h
 include/openssl/base64.h
 include/openssl/bcm_public.h
 include/openssl/bio.h
 include/openssl/blake2.h
 include/openssl/blowfish.h
 include/openssl/bn.h
 include/openssl/buf.h
 include/openssl/buffer.h
 include/openssl/bytestring.h
 include/openssl/cast.h
 include/openssl/chacha.h
 include/openssl/cipher.h
 include/openssl/cmac.h
+include/openssl/cms.h
 include/openssl/conf.h
 include/openssl/cpu.h
 include/openssl/crypto.h
 include/openssl/ctrdrbg.h
 include/openssl/curve25519.h
 include/openssl/des.h
 include/openssl/dh.h
 include/openssl/digest.h
 include/openssl/dsa.h
 include/openssl/dtls1.h
 include/openssl/e_os2.h
 include/openssl/ec.h
 include/openssl/ec_key.h
 include/openssl/ecdh.h
 include/openssl/ecdsa.h
 include/openssl/engine.h
 include/openssl/err.h
 include/openssl/evp.h
 include/openssl/evp_errors.h
 include/openssl/ex_data.h
 include/openssl/experimental/kyber.h
 include/openssl/hkdf.h
 include/openssl/hmac.h
 include/openssl/hpke.h
 include/openssl/hrss.h
 include/openssl/is_boringssl.h
 include/openssl/kdf.h
 include/openssl/lhash.h
 include/openssl/md4.h
 include/openssl/md5.h
 include/openssl/mem.h
 include/openssl/mldsa.h
 include/openssl/mlkem.h
 include/openssl/nid.h
 include/openssl/obj.h
 include/openssl/obj_mac.h
 include/openssl/objects.h
 include/openssl/opensslconf.h
 include/openssl/opensslv.h
 include/openssl/ossl_typ.h
 include/openssl/pem.h
 include/openssl/pkcs12.h
 include/openssl/pkcs7.h
 include/openssl/pkcs8.h
 include/openssl/pki/certificate.h
 include/openssl/pki/ocsp.h
 include/openssl/pki/signature_verify_cache.h
 include/openssl/pki/verify.h
 include/openssl/pki/verify_error.h
 include/openssl/poly1305.h
 include/openssl/pool.h
 include/openssl/posix_time.h
 include/openssl/rand.h
 include/openssl/rc4.h
 include/openssl/ripemd.h
 include/openssl/rsa.h
 include/openssl/safestack.h
 include/openssl/service_indicator.h
 include/openssl/sha.h
 include/openssl/siphash.h
 include/openssl/slhdsa.h
 include/openssl/span.h
 include/openssl/srtp.h
 include/openssl/ssl.h
 include/openssl/ssl3.h
 include/openssl/stack.h
 include/openssl/target.h
 include/openssl/thread.h
 include/openssl/time.h
 include/openssl/tls1.h
 include/openssl/trust_token.h
 include/openssl/type_check.h
 include/openssl/x509.h
 include/openssl/x509_vfy.h
 include/openssl/x509v3.h
 include/openssl/x509v3_errors.h
 lib/cmake/OpenSSL/OpenSSLConfig.cmake
 lib/cmake/OpenSSL/OpenSSLTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/OpenSSL/OpenSSLTargets.cmake
 lib/libcrypto.so
 lib/libcrypto.so.1
 lib/libcrypto.so.1.0.0
 lib/libssl.so
 lib/libssl.so.1
 lib/libssl.so.1.0.0