Merge remote-tracking branch 'upstream/master' into pick_first_fuzzer

markdroth · Feb 13, 2025 · df0c022 · df0c022
2 parents 5d7555f + 822f9b1
commit df0c022
Show file tree

Hide file tree

Showing 47 changed files with 1,604 additions and 1,208 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -46,6 +46,7 @@ lang/python:
       - any-glob-to-any-file:
           - bazel/python_rules.bzl
           - examples/python/**
+          - requirements.bazel.lock
           - requirements.bazel.txt
           - src/compiler/python*
       - all-globs-to-any-file:

diff --git a/BUILD b/BUILD
@@ -528,6 +528,8 @@ GRPCXX_PUBLIC_HDRS = [
     "include/grpcpp/impl/codegen/sync_stream.h",
     "include/grpcpp/impl/codegen/time.h",
     "include/grpcpp/impl/codegen/sync.h",
+    "include/grpcpp/ports_def.inc",
+    "include/grpcpp/ports_undef.inc",
 ]
 
 grpc_cc_library(

diff --git a/BoringSSL-Package.swift b/BoringSSL-Package.swift
@@ -66,26 +66,26 @@ let package = Package(
         "src/crypto/bio/socket.cc",
         "src/crypto/bio/socket_helper.cc",
         "src/crypto/blake2/blake2.cc",
-        "src/crypto/bn_extra/bn_asn1.cc",
-        "src/crypto/bn_extra/convert.cc",
+        "src/crypto/bn/bn_asn1.cc",
+        "src/crypto/bn/convert.cc",
         "src/crypto/buf/buf.cc",
         "src/crypto/bytestring/asn1_compat.cc",
         "src/crypto/bytestring/ber.cc",
         "src/crypto/bytestring/cbb.cc",
         "src/crypto/bytestring/cbs.cc",
         "src/crypto/bytestring/unicode.cc",
         "src/crypto/chacha/chacha.cc",
-        "src/crypto/cipher_extra/cipher_extra.cc",
-        "src/crypto/cipher_extra/derive_key.cc",
-        "src/crypto/cipher_extra/e_aesctrhmac.cc",
-        "src/crypto/cipher_extra/e_aesgcmsiv.cc",
-        "src/crypto/cipher_extra/e_chacha20poly1305.cc",
-        "src/crypto/cipher_extra/e_des.cc",
-        "src/crypto/cipher_extra/e_null.cc",
-        "src/crypto/cipher_extra/e_rc2.cc",
-        "src/crypto/cipher_extra/e_rc4.cc",
-        "src/crypto/cipher_extra/e_tls.cc",
-        "src/crypto/cipher_extra/tls_cbc.cc",
+        "src/crypto/cipher/derive_key.cc",
+        "src/crypto/cipher/e_aesctrhmac.cc",
+        "src/crypto/cipher/e_aesgcmsiv.cc",
+        "src/crypto/cipher/e_chacha20poly1305.cc",
+        "src/crypto/cipher/e_des.cc",
+        "src/crypto/cipher/e_null.cc",
+        "src/crypto/cipher/e_rc2.cc",
+        "src/crypto/cipher/e_rc4.cc",
+        "src/crypto/cipher/e_tls.cc",
+        "src/crypto/cipher/get_cipher.cc",
+        "src/crypto/cipher/tls_cbc.cc",
         "src/crypto/conf/conf.cc",
         "src/crypto/cpu_aarch64_apple.cc",
         "src/crypto/cpu_aarch64_fuchsia.cc",
@@ -101,16 +101,16 @@ let package = Package(
         "src/crypto/curve25519/curve25519_64_adx.cc",
         "src/crypto/curve25519/spake25519.cc",
         "src/crypto/des/des.cc",
-        "src/crypto/dh_extra/dh_asn1.cc",
-        "src/crypto/dh_extra/params.cc",
-        "src/crypto/digest_extra/digest_extra.cc",
+        "src/crypto/dh/dh_asn1.cc",
+        "src/crypto/dh/params.cc",
+        "src/crypto/digest/digest_extra.cc",
         "src/crypto/dsa/dsa.cc",
         "src/crypto/dsa/dsa_asn1.cc",
-        "src/crypto/ec_extra/ec_asn1.cc",
-        "src/crypto/ec_extra/ec_derive.cc",
-        "src/crypto/ec_extra/hash_to_curve.cc",
-        "src/crypto/ecdh_extra/ecdh_extra.cc",
-        "src/crypto/ecdsa_extra/ecdsa_asn1.cc",
+        "src/crypto/ec/ec_asn1.cc",
+        "src/crypto/ec/ec_derive.cc",
+        "src/crypto/ec/hash_to_curve.cc",
+        "src/crypto/ecdh/ecdh.cc",
+        "src/crypto/ecdsa/ecdsa_asn1.cc",
         "src/crypto/engine/engine.cc",
         "src/crypto/err/err.cc",
         "src/crypto/evp/evp.cc",
@@ -137,7 +137,6 @@ let package = Package(
         "src/crypto/fipsmodule/fips_shared_support.cc",
         "src/crypto/hpke/hpke.cc",
         "src/crypto/hrss/hrss.cc",
-        "src/crypto/keccak/keccak.cc",
         "src/crypto/kyber/kyber.cc",
         "src/crypto/lhash/lhash.cc",
         "src/crypto/md4/md4.cc",
@@ -164,31 +163,28 @@ let package = Package(
         "src/crypto/poly1305/poly1305_arm.cc",
         "src/crypto/poly1305/poly1305_vec.cc",
         "src/crypto/pool/pool.cc",
-        "src/crypto/rand_extra/deterministic.cc",
-        "src/crypto/rand_extra/fork_detect.cc",
-        "src/crypto/rand_extra/forkunsafe.cc",
-        "src/crypto/rand_extra/getentropy.cc",
-        "src/crypto/rand_extra/ios.cc",
-        "src/crypto/rand_extra/passive.cc",
-        "src/crypto/rand_extra/rand_extra.cc",
-        "src/crypto/rand_extra/trusty.cc",
-        "src/crypto/rand_extra/urandom.cc",
-        "src/crypto/rand_extra/windows.cc",
+        "src/crypto/rand/deterministic.cc",
+        "src/crypto/rand/fork_detect.cc",
+        "src/crypto/rand/forkunsafe.cc",
+        "src/crypto/rand/getentropy.cc",
+        "src/crypto/rand/ios.cc",
+        "src/crypto/rand/passive.cc",
+        "src/crypto/rand/rand.cc",
+        "src/crypto/rand/trusty.cc",
+        "src/crypto/rand/urandom.cc",
+        "src/crypto/rand/windows.cc",
         "src/crypto/rc4/rc4.cc",
         "src/crypto/refcount.cc",
-        "src/crypto/rsa_extra/rsa_asn1.cc",
-        "src/crypto/rsa_extra/rsa_crypt.cc",
-        "src/crypto/rsa_extra/rsa_extra.cc",
-        "src/crypto/rsa_extra/rsa_print.cc",
+        "src/crypto/rsa/rsa_asn1.cc",
+        "src/crypto/rsa/rsa_crypt.cc",
+        "src/crypto/rsa/rsa_extra.cc",
+        "src/crypto/rsa/rsa_print.cc",
         "src/crypto/sha/sha1.cc",
         "src/crypto/sha/sha256.cc",
         "src/crypto/sha/sha512.cc",
         "src/crypto/siphash/siphash.cc",
-        "src/crypto/slhdsa/fors.cc",
-        "src/crypto/slhdsa/merkle.cc",
         "src/crypto/slhdsa/slhdsa.cc",
-        "src/crypto/slhdsa/thash.cc",
-        "src/crypto/slhdsa/wots.cc",
+        "src/crypto/spake2plus/spake2plus.cc",
         "src/crypto/stack/stack.cc",
         "src/crypto/thread.cc",
         "src/crypto/thread_none.cc",

diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -85,7 +85,7 @@ pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
     pip.parse(
         hub_name = "grpc_python_dependencies",
         python_version = python_version,
-        requirements_lock = "//:requirements.bazel.txt",
+        requirements_lock = "//:requirements.bazel.lock",
     )
     for python_version in PYTHON_VERSIONS
 ]

diff --git a/Makefile b/Makefile
diff --git a/WORKSPACE b/WORKSPACE
@@ -46,7 +46,7 @@ load("@rules_python//python:pip.bzl", "pip_parse")
 
 pip_parse(
     name = "grpc_python_dependencies",
-    requirements_lock = "@com_github_grpc_grpc//:requirements.bazel.txt",
+    requirements_lock = "@com_github_grpc_grpc//:requirements.bazel.lock",
 )
 
 load("@grpc_python_dependencies//:requirements.bzl", "install_deps")

diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
@@ -35,11 +35,11 @@ def grpc_deps():
             name = "boringssl",
             # Use github mirror instead of https://boringssl.googlesource.com/boringssl
             # to obtain a boringssl archive with consistent sha256
-            sha256 = "2f12c33d2cf25a658a1b981fb96923dac87e9175fb20e45db6950ee36c526356",
-            strip_prefix = "boringssl-dec0d8f681348af8bb675e07bd89989665fca8bc",
+            sha256 = "50356a71c44fec7196131bccbde72e7e4444274938f353256ad1983787b92c9d",
+            strip_prefix = "boringssl-9aab2f2a43f05a3c8dee685a94d1a5c816aac019",
             urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/dec0d8f681348af8bb675e07bd89989665fca8bc.tar.gz",
-                "https://github.com/google/boringssl/archive/dec0d8f681348af8bb675e07bd89989665fca8bc.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/9aab2f2a43f05a3c8dee685a94d1a5c816aac019.tar.gz",
+                "https://github.com/google/boringssl/archive/9aab2f2a43f05a3c8dee685a94d1a5c816aac019.tar.gz",
             ],
         )
 
@@ -368,66 +368,6 @@ def grpc_test_only_deps():
     Loads dependencies that are only needed to run grpc library's tests.
     """
 
-    if "com_github_twisted_twisted" not in native.existing_rules():
-        http_archive(
-            name = "com_github_twisted_twisted",
-            sha256 = "ca17699d0d62eafc5c28daf2c7d0a18e62ae77b4137300b6c7d7868b39b06139",
-            strip_prefix = "twisted-twisted-17.5.0",
-            urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/twisted/twisted/archive/twisted-17.5.0.zip",
-                "https://github.com/twisted/twisted/archive/twisted-17.5.0.zip",
-            ],
-            build_file = "@com_github_grpc_grpc//third_party:twisted.BUILD",
-        )
-
-    if "com_github_yaml_pyyaml" not in native.existing_rules():
-        http_archive(
-            name = "com_github_yaml_pyyaml",
-            sha256 = "e34d97db6d846f5e2ad51417fd646e7ce6a3a70726ccea2a857e0580a7155f39",
-            strip_prefix = "pyyaml-6.0.1",
-            urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/yaml/pyyaml/archive/6.0.1.zip",
-                "https://github.com/yaml/pyyaml/archive/6.0.1.zip",
-            ],
-            build_file = "@com_github_grpc_grpc//third_party:yaml.BUILD",
-        )
-
-    if "com_github_twisted_incremental" not in native.existing_rules():
-        http_archive(
-            name = "com_github_twisted_incremental",
-            sha256 = "f0ca93359ee70243ff7fbf2d904a6291810bd88cb80ed4aca6fa77f318a41a36",
-            strip_prefix = "incremental-incremental-17.5.0",
-            urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/twisted/incremental/archive/incremental-17.5.0.zip",
-                "https://github.com/twisted/incremental/archive/incremental-17.5.0.zip",
-            ],
-            build_file = "@com_github_grpc_grpc//third_party:incremental.BUILD",
-        )
-
-    if "com_github_zopefoundation_zope_interface" not in native.existing_rules():
-        http_archive(
-            name = "com_github_zopefoundation_zope_interface",
-            sha256 = "e9579fc6149294339897be3aa9ecd8a29217c0b013fe6f44fcdae00e3204198a",
-            strip_prefix = "zope.interface-4.4.3",
-            urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/zopefoundation/zope.interface/archive/4.4.3.zip",
-                "https://github.com/zopefoundation/zope.interface/archive/4.4.3.zip",
-            ],
-            build_file = "@com_github_grpc_grpc//third_party:zope_interface.BUILD",
-        )
-
-    if "com_github_twisted_constantly" not in native.existing_rules():
-        http_archive(
-            name = "com_github_twisted_constantly",
-            sha256 = "2702cd322161a579d2c0dbf94af4e57712eedc7bd7bbbdc554a230544f7d346c",
-            strip_prefix = "constantly-15.1.0",
-            urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/twisted/constantly/archive/15.1.0.zip",
-                "https://github.com/twisted/constantly/archive/15.1.0.zip",
-            ],
-            build_file = "@com_github_grpc_grpc//third_party:constantly.BUILD",
-        )
-
     if "com_google_libprotobuf_mutator" not in native.existing_rules():
         http_archive(
             name = "com_google_libprotobuf_mutator",