diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile
index bbc5d8e66437..4944847d4629 100644
--- a/security/boringssl/Makefile
+++ b/security/boringssl/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	boringssl
-PORTVERSION=	0.0.0.0.2024.02.28.01
+PORTVERSION=	0.0.0.0.2024.03.22.01
 CATEGORIES=	security
 MASTER_SITES+=	https://proxy.golang.org/:gomods
 DISTFILES+=	golang.org/x/crypto/@v/v0.17.0.zip:gomods \
 		golang.org/x/crypto/@v/v0.17.0.mod:gomods \
 		golang.org/x/net/@v/v0.17.0.zip:gomods \
 		golang.org/x/net/@v/v0.17.0.mod:gomods \
 		golang.org/x/sys/@v/v0.15.0.zip:gomods \
 		golang.org/x/sys/@v/v0.15.0.mod:gomods \
 		golang.org/x/term/@v/v0.15.0.zip:gomods \
 		golang.org/x/term/@v/v0.15.0.mod:gomods
 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 localbase perl5
 
 CONFLICTS_INSTALL=	libressl libressl-devel \
 			openssl openssl3[012] openssl-quictls
 
 CPE_VENDOR=	google
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
-GH_TAGNAME=	df3b58e
+GH_TAGNAME=	231510c
 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}
 
 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.mk>
diff --git a/security/boringssl/distinfo b/security/boringssl/distinfo
index 89c7c1e5c616..96af871e0052 100644
--- a/security/boringssl/distinfo
+++ b/security/boringssl/distinfo
@@ -1,19 +1,19 @@
-TIMESTAMP = 1709406072
+TIMESTAMP = 1711202760
 SHA256 (golang.org/x/crypto/@v/v0.17.0.zip) = 97ea91df712ac1ca39c122480489be532b437bf4aeb5d781465cb1cf39824083
 SIZE (golang.org/x/crypto/@v/v0.17.0.zip) = 1798689
 SHA256 (golang.org/x/crypto/@v/v0.17.0.mod) = dc40867bef3ca5179569cc2f8742bb618b8cc684b0d25a753250e81d6dc29442
 SIZE (golang.org/x/crypto/@v/v0.17.0.mod) = 190
 SHA256 (golang.org/x/net/@v/v0.17.0.zip) = d99428e95af6fd8fdc23285d69b8f6e7c52c964c990295e45183718e33ebeb5a
 SIZE (golang.org/x/net/@v/v0.17.0.zip) = 1824828
 SHA256 (golang.org/x/net/@v/v0.17.0.mod) = cba6184b8b8e0d54560bf5a65f136ccd76a734c49c066ed803eb70bd06c17696
 SIZE (golang.org/x/net/@v/v0.17.0.mod) = 155
 SHA256 (golang.org/x/sys/@v/v0.15.0.zip) = 8612eb416c739c3b04ce48dcbe65632c6fbc427031fd981caeceec6410d1e1fc
 SIZE (golang.org/x/sys/@v/v0.15.0.zip) = 1901954
 SHA256 (golang.org/x/sys/@v/v0.15.0.mod) = d227b325f621f4ebe28d39ba773ea99b870f393b7c09c34592c365b16dd560de
 SIZE (golang.org/x/sys/@v/v0.15.0.mod) = 33
 SHA256 (golang.org/x/term/@v/v0.15.0.zip) = cb7fff77d2925dc0e4f5ac0ced38d10683824de81aae3728c633a9f7382d2052
 SIZE (golang.org/x/term/@v/v0.15.0.zip) = 19883
 SHA256 (golang.org/x/term/@v/v0.15.0.mod) = 4b86976f8c4efb87bbcbec283cbfb395a28177b4b8b83420b49d95728eb7a2f8
 SIZE (golang.org/x/term/@v/v0.15.0.mod) = 68
-SHA256 (google-boringssl-0.0.0.0.2024.02.28.01-df3b58e_GH0.tar.gz) = 06611a466cf36fb9608f46a5dbcef9588789726ac4edc22dd27b8def0b3e740a
-SIZE (google-boringssl-0.0.0.0.2024.02.28.01-df3b58e_GH0.tar.gz) = 36141420
+SHA256 (google-boringssl-0.0.0.0.2024.03.22.01-231510c_GH0.tar.gz) = a8a75d7c75ff152cfec8eff70c88b431ea083c0778795800214293c4011d04a6
+SIZE (google-boringssl-0.0.0.0.2024.03.22.01-231510c_GH0.tar.gz) = 36788739
diff --git a/security/boringssl/files/patch-ssl_CMakeLists.txt b/security/boringssl/files/patch-CMakeLists.txt
similarity index 51%
rename from security/boringssl/files/patch-ssl_CMakeLists.txt
rename to security/boringssl/files/patch-CMakeLists.txt
index d8c91acbddb2..c54f8fa02fad 100644
--- a/security/boringssl/files/patch-ssl_CMakeLists.txt
+++ b/security/boringssl/files/patch-CMakeLists.txt
@@ -1,8 +1,10 @@
---- ssl/CMakeLists.txt.orig	2023-07-12 16:42:06 UTC
-+++ ssl/CMakeLists.txt
-@@ -45,3 +45,5 @@ add_library(
+--- CMakeLists.txt.orig	2024-03-23 14:15:05 UTC
++++ CMakeLists.txt
+@@ -522,6 +522,7 @@ add_library(ssl ${SSL_SOURCES})
  install_if_enabled(TARGETS ssl EXPORT OpenSSLTargets ${INSTALL_DESTINATION_DEFAULT})
  set_property(TARGET ssl PROPERTY EXPORT_NAME SSL)
  target_link_libraries(ssl crypto)
-+
 +SET_TARGET_PROPERTIES(ssl PROPERTIES SOVERSION 1)
+ 
+ add_library(decrepit ${DECREPIT_SOURCES})
+ target_link_libraries(decrepit crypto ssl)
diff --git a/security/boringssl/files/patch-crypto_CMakeLists.txt b/security/boringssl/files/patch-crypto_CMakeLists.txt
index 6222ac5d5416..d123e69b80a9 100644
--- a/security/boringssl/files/patch-crypto_CMakeLists.txt
+++ b/security/boringssl/files/patch-crypto_CMakeLists.txt
@@ -1,8 +1,8 @@
---- crypto/CMakeLists.txt.orig	2024-02-28 18:04:35 UTC
+--- crypto/CMakeLists.txt.orig	2024-03-23 00:06:50 UTC
 +++ crypto/CMakeLists.txt
-@@ -358,3 +358,5 @@ endif()
+@@ -375,3 +375,5 @@ endif()
  if(USE_CUSTOM_LIBCXX)
    target_link_libraries(crypto libcxx)
  endif()
 +
 +SET_TARGET_PROPERTIES(crypto PROPERTIES SOVERSION 1)
diff --git a/security/boringssl/pkg-plist b/security/boringssl/pkg-plist
index d98a5680514e..3bc465aa8145 100644
--- a/security/boringssl/pkg-plist
+++ b/security/boringssl/pkg-plist
@@ -1,100 +1,102 @@
 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/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/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/experimental/spx.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/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/signature_verify_cache.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/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