RubyGems - grpc - Versions diffs - 1.71.0 → 1.72.0 - Mend

grpc 1.71.0 → 1.72.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (597) hide show

data/src/core/xds/xds_client/xds_client.cc CHANGED Viewed

@@ -238,7 +238,7 @@ class XdsClient::XdsChannel::AdsCall final
         if (!state.HasResource()) {
           GRPC_TRACE_LOG(xds_client, INFO)
               << "[xds_client " << ads_call_->xds_client() << "] xds server "
-              << ads_call_->xds_channel()->server_.server_uri()
+              << ads_call_->xds_channel()->server_uri()
               << ": timeout obtaining resource {type=" << type_->type_url()
               << " name="
               << XdsClient::ConstructFullXdsResourceName(
@@ -405,9 +405,10 @@ XdsClient::XdsChannel::XdsChannel(WeakRefCountedPtr<XdsClient> xds_client,
       server_(server) {
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_client_.get() << "] creating channel " << this
-      << " for server " << server.server_uri();
+      << " for server " << server_uri();
   absl::Status status;
-  transport_ = xds_client_->transport_factory_->GetTransport(server, &status);
+  transport_ =
+      xds_client_->transport_factory_->GetTransport(*server.target(), &status);
   CHECK(transport_ != nullptr);
   if (!status.ok()) {
     SetChannelStatusLocked(std::move(status));
@@ -421,7 +422,7 @@ XdsClient::XdsChannel::XdsChannel(WeakRefCountedPtr<XdsClient> xds_client,
 XdsClient::XdsChannel::~XdsChannel() {
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_client() << "] destroying xds channel " << this
-      << " for server " << server_.server_uri();
+      << " for server " << server_uri();
   xds_client_.reset(DEBUG_LOCATION, "XdsChannel");
 }
@@ -432,7 +433,7 @@ XdsClient::XdsChannel::~XdsChannel() {
 void XdsClient::XdsChannel::Orphaned() ABSL_NO_THREAD_SAFETY_ANALYSIS {
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_client() << "] orphaning xds channel " << this
-      << " for server " << server_.server_uri();
+      << " for server " << server_uri();
   shutting_down_ = true;
   if (failure_watcher_ != nullptr) {
     transport_->StopConnectivityFailureWatch(failure_watcher_);
@@ -511,8 +512,9 @@ bool XdsClient::XdsChannel::MaybeFallbackLocked(
     }
     GRPC_TRACE_LOG(xds_client, INFO)
         << "[xds_client " << xds_client_.get() << "] authority " << authority
-        << ": added fallback server " << xds_servers[i]->server_uri() << " ("
-        << authority_state.xds_channels.back()->status().ToString() << ")";
+        << ": added fallback server " << xds_servers[i]->target()->server_uri()
+        << " (" << authority_state.xds_channels.back()->status().ToString()
+        << ")";
     if (authority_state.xds_channels.back()->status().ok()) return true;
   }
   GRPC_TRACE_LOG(xds_client, INFO)
@@ -536,7 +538,7 @@ void XdsClient::XdsChannel::SetHealthyLocked() {
     if (channel_it != channels.end()) {
       GRPC_TRACE_LOG(xds_client, INFO)
           << "[xds_client " << xds_client_.get() << "] authority " << authority
-          << ": Falling forward to " << server_.server_uri();
+          << ": Falling forward to " << server_uri();
       // Lower priority channels are no longer needed, connection is back!
       // Note that we move the lower priority channels out of the vector
       // before we unref them, or else
@@ -557,13 +559,13 @@ void XdsClient::XdsChannel::OnConnectivityFailure(absl::Status status) {
 void XdsClient::XdsChannel::SetChannelStatusLocked(absl::Status status) {
   if (shutting_down_) return;
-  status = absl::Status(status.code(), absl::StrCat("xDS channel for server ",
-                                                    server_.server_uri(), ": ",
-                                                    status.message()));
+  status = absl::Status(
+      status.code(), absl::StrCat("xDS channel for server ", server_uri(), ": ",
+                                  status.message()));
   LOG(INFO) << "[xds_client " << xds_client() << "] " << status;
   // If status was previously OK, report that the channel has gone unhealthy.
   if (status_.ok() && xds_client_->metrics_reporter_ != nullptr) {
-    xds_client_->metrics_reporter_->ReportServerFailure(server_.server_uri());
+    xds_client_->metrics_reporter_->ReportServerFailure(server_uri());
   }
   // Save status in channel, so that we can immediately generate an
   // error for any new watchers that may be started.
@@ -643,8 +645,8 @@ void XdsClient::XdsChannel::RetryableCall<T>::StartNewCallLocked() {
   CHECK(call_ == nullptr);
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_channel()->xds_client() << "] xds server "
-      << xds_channel()->server_.server_uri()
-      << ": start new call from retryable call " << this;
+      << xds_channel()->server_uri() << ": start new call from retryable call "
+      << this;
   call_ = MakeOrphanable<T>(
       this->Ref(DEBUG_LOCATION, "RetryableCall+start_new_call"));
 }
@@ -655,7 +657,7 @@ void XdsClient::XdsChannel::RetryableCall<T>::StartRetryTimerLocked() {
   const Duration delay = backoff_.NextAttemptDelay();
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_channel()->xds_client() << "] xds server "
-      << xds_channel()->server_.server_uri()
+      << xds_channel()->server_uri()
       << ": call attempt failed; retry timer will fire in " << delay.millis()
       << "ms.";
   timer_handle_ = xds_channel()->xds_client()->engine()->RunAfter(
@@ -674,7 +676,7 @@ void XdsClient::XdsChannel::RetryableCall<T>::OnRetryTimer() {
     if (shutting_down_) return;
     GRPC_TRACE_LOG(xds_client, INFO)
         << "[xds_client " << xds_channel()->xds_client() << "] xds server "
-        << xds_channel()->server_.server_uri()
+        << xds_channel()->server_uri()
         << ": retry timer fired (retryable call: " << this << ")";
     StartNewCallLocked();
   }
@@ -723,7 +725,7 @@ XdsClient::XdsChannel::AdsCall::AdsCall(
   // Start the call.
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_client() << "] xds server "
-      << xds_channel()->server_.server_uri()
+      << xds_channel()->server_uri()
       << ": starting ADS call (ads_call: " << this
       << ", streaming_call: " << streaming_call_.get() << ")";
   // If this is a reconnect, add any necessary subscriptions from what's
@@ -906,7 +908,7 @@ void XdsClient::XdsChannel::AdsCall::SendMessageLocked(
   sent_initial_message_ = true;
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_client() << "] xds server "
-      << xds_channel()->server_.server_uri()
+      << xds_channel()->server_uri()
       << ": sending ADS request: type=" << type->type_url()
       << " version=" << xds_channel()->resource_type_version_map_[type]
       << " nonce=" << state.nonce << " error=" << state.status;
@@ -1221,7 +1223,7 @@ absl::Status XdsClient::XdsChannel::AdsCall::DecodeAdsResponse(
   }
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_client() << "] xds server "
-      << xds_channel()->server_.server_uri()
+      << xds_channel()->server_uri()
       << ": received ADS response: type_url=" << context->type_url
       << ", version=" << context->version << ", nonce=" << context->nonce
       << ", num_resources=" << num_resources << ", num_errors=" << num_errors;
@@ -1306,7 +1308,7 @@ void XdsClient::XdsChannel::AdsCall::OnRecvMessage(absl::string_view payload) {
   if (!status.ok()) {
     // Ignore unparsable response.
     LOG(ERROR) << "[xds_client " << xds_client() << "] xds server "
-               << xds_channel()->server_.server_uri()
+               << xds_channel()->server_uri()
                << ": error parsing ADS response (" << status << ") -- ignoring";
   } else {
     seen_response_ = true;
@@ -1320,7 +1322,7 @@ void XdsClient::XdsChannel::AdsCall::OnRecvMessage(absl::string_view payload) {
           absl::StrCat("xDS response validation errors: [",
                        absl::StrJoin(context.errors, "; "), "]"));
       LOG(ERROR) << "[xds_client " << xds_client() << "] xds server "
-                 << xds_channel()->server_.server_uri()
+                 << xds_channel()->server_uri()
                  << ": ADS response invalid for resource type "
                  << context.type_url << " version " << context.version
                  << ", will NACK: nonce=" << state.nonce
@@ -1374,7 +1376,7 @@ void XdsClient::XdsChannel::AdsCall::OnRecvMessage(absl::string_view payload) {
   // Update metrics.
   if (xds_client()->metrics_reporter_ != nullptr) {
     xds_client()->metrics_reporter_->ReportResourceUpdates(
-        xds_channel()->server_.server_uri(), context.type_url,
+        xds_channel()->server_uri(), context.type_url,
         context.num_valid_resources, context.num_invalid_resources);
   }
 }
@@ -1383,7 +1385,7 @@ void XdsClient::XdsChannel::AdsCall::OnStatusReceived(absl::Status status) {
   MutexLock lock(&xds_client()->mu_);
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[xds_client " << xds_client() << "] xds server "
-      << xds_channel()->server_.server_uri()
+      << xds_channel()->server_uri()
       << ": ADS call status received (xds_channel=" << xds_channel()
       << ", ads_call=" << this << ", streaming_call=" << streaming_call_.get()
       << "): " << status;

data/src/core/xds/xds_client/xds_client.h CHANGED Viewed

@@ -213,7 +213,9 @@ class XdsClient : public DualRefCounted<XdsClient> {
                            bool delay_unsubscription)
         ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_);
-    absl::string_view server_uri() const { return server_.server_uri(); }
+    absl::string_view server_uri() const {
+      return server_.target()->server_uri();
+    }
    private:
     class ConnectivityFailureWatcher;

data/src/core/xds/xds_client/xds_resource_type.h CHANGED Viewed

@@ -87,8 +87,7 @@ class XdsResourceType {
   // properly in logs.
   // Note: This won't actually work properly until upb adds support for
   // Any fields in textproto printing (internal b/178821188).
-  virtual void InitUpbSymtab(XdsClient* xds_client,
-                             upb_DefPool* symtab) const = 0;
+  virtual void InitUpbSymtab(XdsClient*, upb_DefPool*) const {}
 };
 }  // namespace grpc_core

data/src/core/xds/xds_client/xds_transport.h CHANGED Viewed

@@ -96,7 +96,7 @@ class XdsTransportFactory : public DualRefCounted<XdsTransportFactory> {
   // *status will be set if there is an error creating the channel,
   // although the returned channel must still accept calls (which may fail).
   virtual RefCountedPtr<XdsTransport> GetTransport(
-      const XdsBootstrap::XdsServer& server, absl::Status* status) = 0;
+      const XdsBootstrap::XdsServerTarget& server, absl::Status* status) = 0;
 };
 }  // namespace grpc_core

data/src/ruby/ext/grpc/extconf.rb CHANGED Viewed

@@ -29,7 +29,7 @@ grpc_root = File.expand_path(File.join(File.dirname(__FILE__), '../../../..'))
 grpc_config = ENV['GRPC_CONFIG'] || 'opt'
-ENV['MACOSX_DEPLOYMENT_TARGET'] = '10.14'
+ENV['MACOSX_DEPLOYMENT_TARGET'] = '11.0'
 def debug_symbols_output_dir
   d = ENV['GRPC_RUBY_DEBUG_SYMBOLS_OUTPUT_DIR']

data/src/ruby/lib/grpc/version.rb CHANGED Viewed

@@ -14,5 +14,5 @@
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.71.0'
+  VERSION = '1.72.0'
 end

data/third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_apple.cc CHANGED Viewed

@@ -20,8 +20,6 @@
 #include <sys/sysctl.h>
 #include <sys/types.h>
-#include <openssl/arm_arch.h>
 static int has_hw_feature(const char *name) {
   int value;

data/third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_fuchsia.cc CHANGED Viewed

@@ -21,8 +21,6 @@
 #include <zircon/syscalls.h>
 #include <zircon/types.h>
-#include <openssl/arm_arch.h>
 void OPENSSL_cpuid_setup(void) {
   uint32_t hwcap;

data/third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_linux.cc CHANGED Viewed

@@ -19,8 +19,6 @@
 #include <sys/auxv.h>
-#include <openssl/arm_arch.h>
 void OPENSSL_cpuid_setup(void) {
   unsigned long hwcap = getauxval(AT_HWCAP);

data/third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_openbsd.cc CHANGED Viewed

@@ -21,8 +21,6 @@
 #include <machine/cpu.h>
 #include <sys/sysctl.h>
-#include <openssl/arm_arch.h>
 #include "internal.h"

data/third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_sysreg.cc CHANGED Viewed

@@ -21,8 +21,6 @@
     (defined(ANDROID_BAREMETAL) || defined(OPENSSL_FREEBSD)) &&    \
     !defined(OPENSSL_NO_ASM)
-#include <openssl/arm_arch.h>
 #define ID_AA64PFR0_EL1_ADVSIMD 5
 #define ID_AA64ISAR0_EL1_AES 1

data/third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_win.cc CHANGED Viewed

@@ -20,8 +20,6 @@
 #include <windows.h>
-#include <openssl/arm_arch.h>
 void OPENSSL_cpuid_setup(void) {
   // We do not need to check for the presence of NEON, as Armv8-A always has it

data/third_party/boringssl-with-bazel/src/crypto/cpu_arm_freebsd.cc CHANGED Viewed

@@ -19,7 +19,6 @@
 #include <sys/auxv.h>
 #include <sys/types.h>
-#include <openssl/arm_arch.h>
 #include <openssl/mem.h>

data/third_party/boringssl-with-bazel/src/crypto/cpu_arm_linux.cc CHANGED Viewed

@@ -22,7 +22,6 @@
 #include <sys/types.h>
 #include <unistd.h>
-#include <openssl/arm_arch.h>
 #include <openssl/mem.h>
 #include "cpu_arm_linux.h"

data/third_party/boringssl-with-bazel/src/crypto/crypto.cc CHANGED Viewed

@@ -69,8 +69,6 @@ uint32_t OPENSSL_get_ia32cap(int idx) {
 #elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
-#include <openssl/arm_arch.h>
 #if defined(OPENSSL_STATIC_ARMCAP)
 // See ARM ACLE for the definitions of these macros. Note |__ARM_FEATURE_AES|

data/third_party/boringssl-with-bazel/src/crypto/internal.h CHANGED Viewed

@@ -15,7 +15,6 @@
 #ifndef OPENSSL_HEADER_CRYPTO_INTERNAL_H
 #define OPENSSL_HEADER_CRYPTO_INTERNAL_H
-#include <openssl/arm_arch.h>
 #include <openssl/crypto.h>
 #include <openssl/ex_data.h>
 #include <openssl/stack.h>
@@ -1290,8 +1289,26 @@ inline int CRYPTO_is_VPCLMULQDQ_capable(void) {
 #if defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
-// OPENSSL_armcap_P contains ARM CPU capabilities. From C, this should only be
-// accessed with |OPENSSL_get_armcap|.
+// ARMV7_NEON indicates support for NEON.
+#define ARMV7_NEON (1 << 0)
+// ARMV8_AES indicates support for hardware AES instructions.
+#define ARMV8_AES (1 << 2)
+// ARMV8_SHA1 indicates support for hardware SHA-1 instructions.
+#define ARMV8_SHA1 (1 << 3)
+// ARMV8_SHA256 indicates support for hardware SHA-256 instructions.
+#define ARMV8_SHA256 (1 << 4)
+// ARMV8_PMULL indicates support for carryless multiplication.
+#define ARMV8_PMULL (1 << 5)
+// ARMV8_SHA512 indicates support for hardware SHA-512 instructions.
+#define ARMV8_SHA512 (1 << 6)
+// OPENSSL_armcap_P contains ARM CPU capabilities as a bitmask of the above
+// constants. This should only be accessed with |OPENSSL_get_armcap|.
 extern uint32_t OPENSSL_armcap_P;
 // OPENSSL_get_armcap initializes the library if needed and returns ARM CPU

data/third_party/boringssl-with-bazel/src/include/openssl/arm_arch.h CHANGED Viewed

@@ -17,30 +17,8 @@
 #include <openssl/target.h>
-// arm_arch.h contains symbols used by ARM assembly, and the C code that calls
-// it. It is included as a public header to simplify the build, but is not
-// intended for external use.
-#if defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
-// ARMV7_NEON is true when a NEON unit is present in the current CPU.
-#define ARMV7_NEON (1 << 0)
-// ARMV8_AES indicates support for hardware AES instructions.
-#define ARMV8_AES (1 << 2)
-// ARMV8_SHA1 indicates support for hardware SHA-1 instructions.
-#define ARMV8_SHA1 (1 << 3)
-// ARMV8_SHA256 indicates support for hardware SHA-256 instructions.
-#define ARMV8_SHA256 (1 << 4)
-// ARMV8_PMULL indicates support for carryless multiplication.
-#define ARMV8_PMULL (1 << 5)
-// ARMV8_SHA512 indicates support for hardware SHA-512 instructions.
-#define ARMV8_SHA512 (1 << 6)
-#endif  // ARM || AARCH64
+// This header historically defined constants used by Arm assembly, which was
+// exposed publicly to simplify the build. This is no longer needed, but we
+// retain the header for compatibility.
 #endif  // OPENSSL_HEADER_ARM_ARCH_H

data/third_party/boringssl-with-bazel/src/ssl/extensions.cc CHANGED Viewed

@@ -2879,12 +2879,8 @@ bool ssl_setup_pake_shares(SSL_HANDSHAKE *hs) {
     return true;
   }
-  Array<SSL_CREDENTIAL *> creds;
-  if (!ssl_get_credential_list(hs, &creds)) {
-    return false;
-  }
-  if (std::none_of(creds.begin(), creds.end(), [](SSL_CREDENTIAL *cred) {
+  const auto &creds = hs->config->cert->credentials;
+  if (std::none_of(creds.begin(), creds.end(), [](const auto &cred) {
         return cred->type == SSLCredentialType::kSPAKE2PlusV1Client;
       })) {
     // If there were no configured PAKE credentials, proceed without filling
@@ -2898,7 +2894,7 @@ bool ssl_setup_pake_shares(SSL_HANDSHAKE *hs) {
     OPENSSL_PUT_ERROR(SSL, SSL_R_UNSUPPORTED_CREDENTIAL_LIST);
     return false;
   }
-  SSL_CREDENTIAL *cred = creds[0];
+  SSL_CREDENTIAL *cred = creds[0].get();
   assert(cred->type == SSLCredentialType::kSPAKE2PlusV1Client);
   hs->pake_prover = MakeUnique<spake2plus::Prover>();

data/third_party/boringssl-with-bazel/src/ssl/handshake_client.cc CHANGED Viewed

@@ -1301,7 +1301,7 @@ static enum ssl_hs_wait_t do_send_client_certificate(SSL_HANDSHAKE *hs) {
   }
   Array<SSL_CREDENTIAL *> creds;
-  if (!ssl_get_credential_list(hs, &creds)) {
+  if (!ssl_get_full_credential_list(hs, &creds)) {
     return ssl_hs_error;
   }

data/third_party/boringssl-with-bazel/src/ssl/handshake_server.cc CHANGED Viewed

@@ -736,7 +736,7 @@ static enum ssl_hs_wait_t do_select_parameters(SSL_HANDSHAKE *hs) {
     return ssl_hs_error;
   }
   Array<SSL_CREDENTIAL *> creds;
-  if (!ssl_get_credential_list(hs, &creds)) {
+  if (!ssl_get_full_credential_list(hs, &creds)) {
     return ssl_hs_error;
   }
   TLS12ServerParams params;

data/third_party/boringssl-with-bazel/src/ssl/internal.h CHANGED Viewed

@@ -1956,13 +1956,20 @@ struct ssl_credential_st : public bssl::RefCounted<ssl_credential_st> {
 BSSL_NAMESPACE_BEGIN
-// ssl_get_credential_list computes |hs|'s credential list. On success, it
-// writes it to |*out| and returns true. Otherwise, it returns false. The
-// credential list may be empty, in which case this function will successfully
-// return an empty array.
+// ssl_get_full_credential_list computes |hs|'s full credential list, including
+// the legacy credential. On success, it writes it to |*out| and returns true.
+// Otherwise, it returns false. The credential list may be empty, in which case
+// this function will successfully output an empty array.
+//
+// This function should be called at most once during the handshake and is
+// intended to be used for certificate-based credentials. It runs the
+// auto-chaining logic as part of finishing the legacy credential. Other uses of
+// the credential list (e.g. PAKE credentials) should iterate over
+// |hs->config->cert->credentials|.
 //
 // The pointers in the result are only valid until |hs| is next mutated.
-bool ssl_get_credential_list(SSL_HANDSHAKE *hs, Array<SSL_CREDENTIAL *> *out);
+bool ssl_get_full_credential_list(SSL_HANDSHAKE *hs,
+                                  Array<SSL_CREDENTIAL *> *out);
 // ssl_credential_matches_requested_issuers returns true if |cred| is a
 // usable match for any requested issuers in |hs|, and false with an error
@@ -4524,7 +4531,7 @@ struct ssl_session_st : public bssl::RefCounted<ssl_session_st> {
   // original_handshake_hash contains the handshake hash (either SHA-1+MD5 or
   // SHA-2, depending on TLS version) for the original, full handshake that
   // created a session. This is used by Channel IDs during resumption.
-  bssl::InplaceVector<uint8_t, EVP_MAX_MD_SIZE> original_handshake_hash;
+  bssl::InplaceVector<uint8_t, SSL_MAX_MD_SIZE> original_handshake_hash;
   uint32_t ticket_lifetime_hint = 0;  // Session lifetime hint in seconds

data/third_party/boringssl-with-bazel/src/ssl/ssl_credential.cc CHANGED Viewed

@@ -35,7 +35,8 @@ static UniquePtr<STACK_OF(CRYPTO_BUFFER)> new_leafless_chain(void) {
   return chain;
 }
-bool ssl_get_credential_list(SSL_HANDSHAKE *hs, Array<SSL_CREDENTIAL *> *out) {
+bool ssl_get_full_credential_list(SSL_HANDSHAKE *hs,
+                                  Array<SSL_CREDENTIAL *> *out) {
   CERT *cert = hs->config->cert.get();
   // Finish filling in the legacy credential if needed.
   if (!cert->x509_method->ssl_auto_chain_if_needed(hs)) {

data/third_party/boringssl-with-bazel/src/ssl/tls13_client.cc CHANGED Viewed

@@ -935,7 +935,7 @@ static enum ssl_hs_wait_t do_send_client_certificate(SSL_HANDSHAKE *hs) {
   }
   Array<SSL_CREDENTIAL *> creds;
-  if (!ssl_get_credential_list(hs, &creds)) {
+  if (!ssl_get_full_credential_list(hs, &creds)) {
     return ssl_hs_error;
   }

data/third_party/boringssl-with-bazel/src/ssl/tls13_server.cc CHANGED Viewed

@@ -318,7 +318,7 @@ static enum ssl_hs_wait_t do_select_parameters(SSL_HANDSHAKE *hs) {
   }
   Array<SSL_CREDENTIAL *> creds;
-  if (!ssl_get_credential_list(hs, &creds)) {
+  if (!ssl_get_full_credential_list(hs, &creds)) {
     return ssl_hs_error;
   }
   if (creds.empty()) {

data/third_party/upb/upb/base/internal/log2.h CHANGED Viewed

@@ -27,7 +27,9 @@ UPB_INLINE int upb_Log2Ceiling(int x) {
 #endif
 }
-UPB_INLINE int upb_Log2CeilingSize(int x) { return 1 << upb_Log2Ceiling(x); }
+UPB_INLINE int upb_RoundUpToPowerOfTwo(int x) {
+  return 1 << upb_Log2Ceiling(x);
+}
 #ifdef __cplusplus
 } /* extern "C" */

data/third_party/upb/upb/base/string_view.h CHANGED Viewed

@@ -45,6 +45,16 @@ UPB_INLINE bool upb_StringView_IsEqual(upb_StringView a, upb_StringView b) {
   return (a.size == b.size) && (!a.size || !memcmp(a.data, b.data, a.size));
 }
+// Compares StringViews following strcmp rules.
+// Please note this comparison is neither unicode nor locale aware.
+UPB_INLINE int upb_StringView_Compare(upb_StringView a, upb_StringView b) {
+  int result = memcmp(a.data, b.data, UPB_MIN(a.size, b.size));
+  if (result == 0) {
+    return a.size - b.size;
+  }
+  return result;
+}
 // LINT.ThenChange(
 //  GoogleInternalName1,
 //  //depot/google3/third_party/upb/bits/golang/accessor.go:map_go_string,

data/third_party/upb/upb/hash/common.c CHANGED Viewed

@@ -402,8 +402,12 @@ uint32_t _upb_Hash(const void* p, size_t n, uint64_t seed) {
   return Wyhash(p, n, seed, kWyhashSalt);
 }
+// Returns a seed for upb's hash function. For now this is just a hard-coded
+// constant, but we are going to randomize it soon.
+static uint64_t _upb_Seed(void) { return 0x69835f69597ec1cc; }
 static uint32_t _upb_Hash_NoSeed(const char* p, size_t n) {
-  return _upb_Hash(p, n, 0);
+  return _upb_Hash(p, n, _upb_Seed());
 }
 static uint32_t strhash(upb_tabkey key) {

data/third_party/upb/upb/json/decode.c CHANGED Viewed

@@ -674,7 +674,7 @@ static int64_t jsondec_strtoint64(jsondec* d, upb_StringView str) {
 static void jsondec_checkempty(jsondec* d, upb_StringView str,
                                const upb_FieldDef* f) {
   if (str.size != 0) return;
-  d->result = kUpb_JsonDecodeResult_OkWithEmptyStringNumerics;
+  d->result = kUpb_JsonDecodeResult_Error;
   upb_Status_SetErrorFormat(d->status,
                             "Empty string is not a valid number (field: %s). "
                             "This will be an error in a future version.",
@@ -782,7 +782,7 @@ static upb_MessageValue jsondec_double(jsondec* d, const upb_FieldDef* f) {
         char* end;
         val.double_val = strtod(str.data, &end);
         if (end != str.data + str.size) {
-          d->result = kUpb_JsonDecodeResult_OkWithEmptyStringNumerics;
+          d->result = kUpb_JsonDecodeResult_Error;
           upb_Status_SetErrorFormat(
               d->status,
               "Non-number characters in quoted number (field: %s). "

data/third_party/upb/upb/json/decode.h CHANGED Viewed

@@ -26,7 +26,6 @@ enum { upb_JsonDecode_IgnoreUnknown = 1 };
 enum {
   kUpb_JsonDecodeResult_Ok = 0,
-  kUpb_JsonDecodeResult_OkWithEmptyStringNumerics = 1,
   kUpb_JsonDecodeResult_Error = 2,
 };

data/third_party/upb/upb/mem/alloc.h CHANGED Viewed

@@ -50,6 +50,11 @@ UPB_INLINE void upb_free(upb_alloc* alloc, void* ptr) {
   alloc->func(alloc, ptr, 0, 0);
 }
+UPB_INLINE void upb_free_sized(upb_alloc* alloc, void* ptr, size_t size) {
+  UPB_ASSERT(alloc);
+  alloc->func(alloc, ptr, size, 0);
+}
 // The global allocator used by upb. Uses the standard malloc()/free().
 extern upb_alloc upb_alloc_global;