From 8895ad8c5163462ae3150ed1ae13106537ef5a7d Mon Sep 17 00:00:00 2001
From: meta-aws-maintainer <meta-aws-maintainer@users.noreply.github.com>
Date: Wed, 22 Jul 2026 02:34:34 +0000
Subject: [PATCH]  BACKPORT-CONFLICT

---
 recipes-sdk/s2n/s2n_1.7.3.bb |  4 +++
 recipes-sdk/s2n/s2n_1.7.6.bb | 67 ++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 recipes-sdk/s2n/s2n_1.7.6.bb

diff --git a/recipes-sdk/s2n/s2n_1.7.3.bb b/recipes-sdk/s2n/s2n_1.7.3.bb
index 81797169c8..025d0f5261 100644
--- a/recipes-sdk/s2n/s2n_1.7.3.bb
+++ b/recipes-sdk/s2n/s2n_1.7.3.bb
@@ -17,7 +17,11 @@ SRC_URI = "\
     file://run-ptest \
     "
 
+<<<<<<<< HEAD:recipes-sdk/s2n/s2n_1.7.3.bb
 SRCREV = "211695cb91f5b74b64a81ebb3045ec3d7d5ab264"
+========
+SRCREV = "66b1c94d1dfc99b237427cbde230eca63bb8b89c"
+>>>>>>>> d6312a6a1 (s2n: upgrade 1.7.5 -> 1.7.6):recipes-sdk/s2n/s2n_1.7.6.bb
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
 
 inherit cmake ptest pkgconfig
diff --git a/recipes-sdk/s2n/s2n_1.7.6.bb b/recipes-sdk/s2n/s2n_1.7.6.bb
new file mode 100644
index 0000000000..025d0f5261
--- /dev/null
+++ b/recipes-sdk/s2n/s2n_1.7.6.bb
@@ -0,0 +1,67 @@
+SUMMARY = "s2n"
+DESCRIPTION = "s2n is a C99 implementation of the TLS/SSL protocols that is designed to be simple, small, fast, and with security as a priority."
+HOMEPAGE = "https://github.com/aws/s2n-tls"
+LICENSE = "Apache-2.0"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+DEPENDS = "\
+    ${@bb.utils.contains('PACKAGECONFIG', 'static', 'aws-lc', 'openssl', d)} \
+    "
+
+PROVIDES += "aws/s2n"
+
+BRANCH ?= "main"
+SRC_URI = "\
+    git://github.com/aws/s2n-tls.git;protocol=https;branch=${BRANCH} \
+    file://run-ptest \
+    "
+
+<<<<<<<< HEAD:recipes-sdk/s2n/s2n_1.7.3.bb
+SRCREV = "211695cb91f5b74b64a81ebb3045ec3d7d5ab264"
+========
+SRCREV = "66b1c94d1dfc99b237427cbde230eca63bb8b89c"
+>>>>>>>> d6312a6a1 (s2n: upgrade 1.7.5 -> 1.7.6):recipes-sdk/s2n/s2n_1.7.6.bb
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
+
+inherit cmake ptest pkgconfig
+
+CFLAGS:append = " -Wl,-Bsymbolic"
+
+PACKAGECONFIG ?= "\
+    ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)} \
+    "
+
+PACKAGECONFIG:append:x86-64 = " ${@bb.utils.contains('PTEST_ENABLED', '1', 'sanitize', '', d)}"
+
+# enable PACKAGECONFIG = "static" to build static instead of shared libs
+PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON"
+
+PACKAGECONFIG[with-tests] = "-DBUILD_TESTING=ON,-DBUILD_TESTING=OFF,"
+
+PACKAGECONFIG[sanitize] = "-DS2N_ADDRESS_SANITIZER=ON, -DS2N_ADDRESS_SANITIZER=OFF, gcc-sanitizers"
+
+EXTRA_OECMAKE:append = " -DCMAKE_BUILD_TYPE=RelWithDebInfo"
+
+# Fix "doesn't have GNU_HASH (didn't pass LDFLAGS?)" issue
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+# Assume that warnings from upstream have already been evaluated
+EXTRA_OECMAKE += "-DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF"
+
+FILES:${PN}-dev += "${libdir}/*/cmake"
+
+RDEPENDS:${PN}-ptest += "\
+    bash \
+    openssl \
+    "
+
+do_install_ptest () {
+   install -d ${D}${PTEST_PATH}/tests
+   cp -r ${B}/bin/* ${D}${PTEST_PATH}/tests/
+   cp -r ${S}/tests/pems ${D}${PTEST_PATH}/
+}
+
+BBCLASSEXTEND = "native nativesdk"
+
+OECMAKE_CXX_FLAGS += "${@bb.utils.contains('PACKAGECONFIG', 'sanitize', '-fsanitize=address,undefined', '', d)}"