[Backport release-26.05] boringssl: 0.20260526.0 -> 0.20260803.0 (#548860)

This commit is contained in:
Niklas Korz
2026-08-04 09:37:41 +00:00
committed by GitHub
2 changed files with 2 additions and 27 deletions

View File

@@ -13,19 +13,14 @@
# reference: https://boringssl.googlesource.com/boringssl/+/refs/tags/0.20250818.0/BUILDING.md
stdenv.mkDerivation (finalAttrs: {
pname = "boringssl";
version = "0.20260526.0";
version = "0.20260803.0";
src = fetchgit {
url = "https://boringssl.googlesource.com/boringssl";
tag = finalAttrs.version;
hash = "sha256-SmyImyzGn7v2b5qGJbMmQZX5bODA9i6+8jy3uGwOawA=";
hash = "sha256-GmaXG6I2euA+Q7naO2Oxu+P4mK37RbgwW5iM7ync6Gg=";
};
patches = [
# Add SECP224R1 for backward compatibility
./secp224r1-compat.patch
];
nativeBuildInputs = [
cmake
ninja

View File

@@ -1,20 +0,0 @@
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 51417d412..a961a1093 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2522,6 +2522,7 @@ OPENSSL_EXPORT size_t SSL_CTX_get_num_tickets(const SSL_CTX *ctx);
// |SSL_SIGN_*|.
// SSL_GROUP_* define TLS group IDs.
+#define SSL_GROUP_SECP224R1 22
#define SSL_GROUP_SECP256R1 23
#define SSL_GROUP_SECP384R1 24
#define SSL_GROUP_SECP521R1 25
@@ -5836,6 +5837,7 @@ OPENSSL_EXPORT int SSL_CTX_set_tlsext_status_arg(SSL_CTX *ctx, void *arg);
#define SSL_R_TLSV1_CERTIFICATE_REQUIRED SSL_R_TLSV1_ALERT_CERTIFICATE_REQUIRED
// The following symbols are compatibility aliases for |SSL_GROUP_*|.
+#define SSL_CURVE_SECP224R1 SSL_GROUP_SECP224R1
#define SSL_CURVE_SECP256R1 SSL_GROUP_SECP256R1
#define SSL_CURVE_SECP384R1 SSL_GROUP_SECP384R1
#define SSL_CURVE_SECP521R1 SSL_GROUP_SECP521R1