grpc 1.42.0 → 1.45.0

data/src/core/tsi/ssl/key_logging/ssl_key_logging.cc

@@ -0,0 +1,141 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <grpc/support/port_platform.h>
+
+#include "src/core/tsi/ssl/key_logging/ssl_key_logging.h"
+
+#include <map>
+
+#include <grpc/support/log.h>
+
+#include "src/core/lib/gprpp/sync.h"
+#include "src/core/lib/iomgr/error.h"
+#include "src/core/lib/slice/slice_internal.h"
+
+using TlsSessionKeyLogger = tsi::TlsSessionKeyLoggerCache::TlsSessionKeyLogger;
+
+namespace tsi {
+
+namespace {
+
+gpr_once g_cache_mutex_init = GPR_ONCE_INIT;
+grpc_core::Mutex* g_tls_session_key_log_cache_mu = nullptr;
+// A pointer to a global singleton instance.
+TlsSessionKeyLoggerCache* g_cache_instance
+    ABSL_GUARDED_BY(g_tls_session_key_log_cache_mu) = nullptr;
+
+void do_cache_mutex_init(void) {
+  g_tls_session_key_log_cache_mu = new grpc_core::Mutex();
+}
+
+}  // namespace
+
+TlsSessionKeyLoggerCache::TlsSessionKeyLogger::TlsSessionKeyLogger(
+    std::string tls_session_key_log_file_path,
+    grpc_core::RefCountedPtr<TlsSessionKeyLoggerCache> cache)
+    : tls_session_key_log_file_path_(std::move(tls_session_key_log_file_path)),
+      cache_(std::move(cache)) {
+  GPR_ASSERT(!tls_session_key_log_file_path_.empty());
+  GPR_ASSERT(cache_ != nullptr);
+  fd_ = fopen(tls_session_key_log_file_path_.c_str(), "w+");
+  if (fd_ == nullptr) {
+    grpc_error_handle error = GRPC_OS_ERROR(errno, "fopen");
+    gpr_log(GPR_ERROR,
+            "Ignoring TLS Key logging. ERROR Opening TLS Keylog "
+            "file: %s",
+            grpc_error_std_string(error).c_str());
+  }
+  cache_->tls_session_key_logger_map_.emplace(tls_session_key_log_file_path_,
+                                              this);
+};
+
+TlsSessionKeyLoggerCache::TlsSessionKeyLogger::~TlsSessionKeyLogger() {
+  {
+    grpc_core::MutexLock lock(&lock_);
+    if (fd_ != nullptr) fclose(fd_);
+  }
+  {
+    grpc_core::MutexLock lock(g_tls_session_key_log_cache_mu);
+    auto it = cache_->tls_session_key_logger_map_.find(
+        tls_session_key_log_file_path_);
+    if (it != cache_->tls_session_key_logger_map_.end() && it->second == this) {
+      cache_->tls_session_key_logger_map_.erase(it);
+    }
+  }
+}
+
+void TlsSessionKeyLoggerCache::TlsSessionKeyLogger::LogSessionKeys(
+    SSL_CTX* /* ssl_context */, const std::string& session_keys_info) {
+  grpc_core::MutexLock lock(&lock_);
+  if (fd_ == nullptr || session_keys_info.empty()) return;
+  // Append to key log file under lock
+  bool err =
+      fwrite((session_keys_info + "\r\n").c_str(), sizeof(char),
+             session_keys_info.length() + 1, fd_) < session_keys_info.length();
+
+  if (err) {
+    grpc_error_handle error = GRPC_OS_ERROR(errno, "fwrite");
+    gpr_log(GPR_ERROR, "Error Appending to TLS session key log file: %s",
+            grpc_error_std_string(error).c_str());
+    fclose(fd_);
+    fd_ = nullptr;  // disable future attempts to write to this file
+  } else {
+    fflush(fd_);
+  }
+}
+
+TlsSessionKeyLoggerCache::TlsSessionKeyLoggerCache()
+    ABSL_EXCLUSIVE_LOCKS_REQUIRED(g_tls_session_key_log_cache_mu) {
+  g_cache_instance = this;
+}
+
+TlsSessionKeyLoggerCache::~TlsSessionKeyLoggerCache() {
+  grpc_core::MutexLock lock(g_tls_session_key_log_cache_mu);
+  g_cache_instance = nullptr;
+}
+
+grpc_core::RefCountedPtr<TlsSessionKeyLogger> TlsSessionKeyLoggerCache::Get(
+    std::string tls_session_key_log_file_path) {
+  gpr_once_init(&g_cache_mutex_init, do_cache_mutex_init);
+  GPR_DEBUG_ASSERT(g_tls_session_key_log_cache_mu != nullptr);
+  if (tls_session_key_log_file_path.empty()) {
+    return nullptr;
+  }
+  {
+    grpc_core::MutexLock lock(g_tls_session_key_log_cache_mu);
+    grpc_core::RefCountedPtr<TlsSessionKeyLoggerCache> cache;
+    if (g_cache_instance == nullptr) {
+      // This will automatically set g_cache_instance.
+      cache = grpc_core::MakeRefCounted<TlsSessionKeyLoggerCache>();
+    } else {
+      cache = g_cache_instance->Ref();
+    }
+    // Check cache for entry.
+    auto it =
+        cache->tls_session_key_logger_map_.find(tls_session_key_log_file_path);
+    if (it != cache->tls_session_key_logger_map_.end()) {
+      // Avoid a race condition if the destructor of the tls key logger
+      // of interest is currently executing.
+      auto key_logger = it->second->RefIfNonZero();
+      if (key_logger != nullptr) return key_logger;
+    }
+    // Not found in cache, so create new entry.
+    // This will automatically add itself to tls_session_key_logger_map_.
+    return grpc_core::MakeRefCounted<TlsSessionKeyLogger>(
+        std::move(tls_session_key_log_file_path), std::move(cache));
+  }
+}
+
+};  // namespace tsi

data/src/core/tsi/ssl/key_logging/ssl_key_logging.h

@@ -0,0 +1,81 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef GRPC_CORE_TSI_SSL_KEY_LOGGING_SSL_KEY_LOGGING_H
+#define GRPC_CORE_TSI_SSL_KEY_LOGGING_SSL_KEY_LOGGING_H
+
+#include <grpc/support/port_platform.h>
+
+#include <iostream>
+#include <map>
+
+#include <openssl/ssl.h>
+
+#include "absl/base/thread_annotations.h"
+
+#include <grpc/grpc_security.h>
+#include <grpc/slice.h>
+#include <grpc/support/sync.h>
+
+#include "src/core/lib/gprpp/memory.h"
+#include "src/core/lib/gprpp/ref_counted.h"
+#include "src/core/lib/gprpp/sync.h"
+
+namespace tsi {
+
+class TlsSessionKeyLoggerCache
+    : public grpc_core::RefCounted<TlsSessionKeyLoggerCache> {
+ public:
+  TlsSessionKeyLoggerCache();
+  ~TlsSessionKeyLoggerCache() override;
+
+  // A helper class which facilitates appending Tls session keys into a file.
+  // The instance is bound to a file meaning only one instance of this object
+  // can ever exist for a given file path.
+  class TlsSessionKeyLogger
+      : public grpc_core::RefCounted<TlsSessionKeyLogger> {
+   public:
+    // Instantiates a TlsSessionKeyLogger instance bound to a specific path.
+    TlsSessionKeyLogger(
+        std::string tls_session_key_log_file_path,
+        grpc_core::RefCountedPtr<TlsSessionKeyLoggerCache> cache);
+    ~TlsSessionKeyLogger() override;
+
+    // Not copyable nor assignable.
+    TlsSessionKeyLogger(const TlsSessionKeyLogger&) = delete;
+    TlsSessionKeyLogger& operator=(const TlsSessionKeyLogger&) = delete;
+    // Writes session keys into the file in the NSS key logging format.
+    // This is called upon completion of a handshake. The associated ssl_context
+    // is also provided here to support future extensions such as logging
+    // keys only when connections are made by certain IPs etc.
+    void LogSessionKeys(SSL_CTX* ssl_context,
+                        const std::string& session_keys_info);
+
+   private:
+    grpc_core::Mutex lock_;  // protects appends to file
+    FILE* fd_ ABSL_GUARDED_BY(lock_);
+    std::string tls_session_key_log_file_path_;
+    grpc_core::RefCountedPtr<TlsSessionKeyLoggerCache> cache_;
+  };
+  // Creates and returns a TlsSessionKeyLogger instance.
+  static grpc_core::RefCountedPtr<TlsSessionKeyLogger> Get(
+      std::string tls_session_key_log_file_path);
+
+ private:
+  std::map<std::string, TlsSessionKeyLogger*> tls_session_key_logger_map_;
+};
+
+}  // namespace tsi
+
+#endif  // GRPC_CORE_TSI_SSL_KEY_LOGGING_SSL_KEY_LOGGING_H

data/src/core/tsi/ssl/session_cache/ssl_session.h

@@ -21,11 +21,9 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <grpc/slice.h>
-
-extern "C" {
 #include <openssl/ssl.h>
-}
+
+#include <grpc/slice.h>
 
 #include "src/core/lib/gprpp/ref_counted.h"
 

data/src/core/tsi/ssl/session_cache/ssl_session_cache.h

@@ -21,14 +21,12 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <grpc/slice.h>
-#include <grpc/support/sync.h>
+#include <map>
 
-extern "C" {
 #include <openssl/ssl.h>
-}
 
-#include <map>
+#include <grpc/slice.h>
+#include <grpc/support/sync.h>
 
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/gprpp/ref_counted.h"

data/src/core/tsi/ssl_transport_security.cc

@@ -35,6 +35,15 @@
 
 #include <string>
 
+#include <openssl/bio.h>
+#include <openssl/crypto.h> /* For OPENSSL_free */
+#include <openssl/engine.h>
+#include <openssl/err.h>
+#include <openssl/ssl.h>
+#include <openssl/tls1.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+
 #include "absl/strings/match.h"
 #include "absl/strings/string_view.h"
 
@@ -45,18 +54,8 @@
 #include <grpc/support/sync.h>
 #include <grpc/support/thd_id.h>
 
-extern "C" {
-#include <openssl/bio.h>
-#include <openssl/crypto.h> /* For OPENSSL_free */
-#include <openssl/engine.h>
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-#include <openssl/tls1.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
-}
-
 #include "src/core/lib/gpr/useful.h"
+#include "src/core/tsi/ssl/key_logging/ssl_key_logging.h"
 #include "src/core/tsi/ssl/session_cache/ssl_session_cache.h"
 #include "src/core/tsi/ssl_types.h"
 #include "src/core/tsi/transport_security.h"
@@ -78,6 +77,8 @@ extern "C" {
    SSL structure. This is what we would ultimately want though... */
 #define TSI_SSL_MAX_PROTECTION_OVERHEAD 100
 
+using TlsSessionKeyLogger = tsi::TlsSessionKeyLoggerCache::TlsSessionKeyLogger;
+
 /* --- Structure definitions. ---*/
 
 struct tsi_ssl_root_certs_store {
@@ -95,6 +96,7 @@ struct tsi_ssl_client_handshaker_factory {
   unsigned char* alpn_protocol_list;
   size_t alpn_protocol_list_length;
   grpc_core::RefCountedPtr<tsi::SslSessionLRUCache> session_cache;
+  grpc_core::RefCountedPtr<TlsSessionKeyLogger> key_logger;
 };
 
 struct tsi_ssl_server_handshaker_factory {
@@ -107,6 +109,7 @@ struct tsi_ssl_server_handshaker_factory {
   size_t ssl_context_count;
   unsigned char* alpn_protocol_list;
   size_t alpn_protocol_list_length;
+  grpc_core::RefCountedPtr<TlsSessionKeyLogger> key_logger;
 };
 
 struct tsi_ssl_handshaker {
@@ -323,6 +326,30 @@ static tsi_result peer_property_from_x509_common_name(
   return result;
 }
 
+/* Gets the subject of an X509 cert as a tsi_peer_property. */
+static tsi_result peer_property_from_x509_subject(X509* cert,
+                                                  tsi_peer_property* property) {
+  X509_NAME* subject_name = X509_get_subject_name(cert);
+  if (subject_name == nullptr) {
+    gpr_log(GPR_INFO, "Could not get subject name from certificate.");
+    return TSI_NOT_FOUND;
+  }
+  BIO* bio = BIO_new(BIO_s_mem());
+  X509_NAME_print_ex(bio, subject_name, 0, XN_FLAG_RFC2253);
+  char* contents;
+  long len = BIO_get_mem_data(bio, &contents);
+  if (len < 0) {
+    gpr_log(GPR_ERROR, "Could not get subject entry from certificate.");
+    BIO_free(bio);
+    return TSI_INTERNAL_ERROR;
+  }
+  tsi_result result = tsi_construct_string_peer_property(
+      TSI_X509_SUBJECT_PEER_PROPERTY, contents, static_cast<size_t>(len),
+      property);
+  BIO_free(bio);
+  return result;
+}
+
 /* Gets the X509 cert in PEM format as a tsi_peer_property. */
 static tsi_result add_pem_certificate(X509* cert, tsi_peer_property* property) {
   BIO* bio = BIO_new(BIO_s_mem());
@@ -439,7 +466,7 @@ static tsi_result peer_from_x509(X509* cert, int include_certificate_type,
   tsi_result result;
   GPR_ASSERT(subject_alt_name_count >= 0);
   property_count = (include_certificate_type ? static_cast<size_t>(1) : 0) +
-                   2 /* common name, certificate */ +
+                   3 /* subject, common name, certificate */ +
                    static_cast<size_t>(subject_alt_name_count);
   for (int i = 0; i < subject_alt_name_count; i++) {
     GENERAL_NAME* subject_alt_name =
@@ -465,6 +492,11 @@ static tsi_result peer_from_x509(X509* cert, int include_certificate_type,
           &peer->properties[current_insert_index++]);
       if (result != TSI_OK) break;
     }
+
+    result = peer_property_from_x509_subject(
+        cert, &peer->properties[current_insert_index++]);
+    if (result != TSI_OK) break;
+
     result = peer_property_from_x509_common_name(
         cert, &peer->properties[current_insert_index++]);
     if (result != TSI_OK) break;
@@ -1735,6 +1767,7 @@ static void tsi_ssl_client_handshaker_factory_destroy(
   if (self->ssl_context != nullptr) SSL_CTX_free(self->ssl_context);
   if (self->alpn_protocol_list != nullptr) gpr_free(self->alpn_protocol_list);
   self->session_cache.reset();
+  self->key_logger.reset();
   gpr_free(self);
 }
 
@@ -1782,6 +1815,7 @@ static void tsi_ssl_server_handshaker_factory_destroy(
     gpr_free(self->ssl_context_x509_subject_names);
   }
   if (self->alpn_protocol_list != nullptr) gpr_free(self->alpn_protocol_list);
+  self->key_logger.reset();
   gpr_free(self);
 }
 
@@ -1894,6 +1928,25 @@ static int server_handshaker_factory_new_session_callback(
   return 1;
 }
 
+/// This callback is invoked at client or server when ssl/tls handshakes
+/// complete and keylogging is enabled.
+template <typename T>
+static void ssl_keylogging_callback(const SSL* ssl, const char* info) {
+  SSL_CTX* ssl_context = SSL_get_SSL_CTX(ssl);
+  GPR_ASSERT(ssl_context != nullptr);
+  void* arg = SSL_CTX_get_ex_data(ssl_context, g_ssl_ctx_ex_factory_index);
+  T* factory = static_cast<T*>(arg);
+  factory->key_logger->LogSessionKeys(ssl_context, info);
+}
+
+static int verify_cb(int ok, X509_STORE_CTX* ctx) {
+  int cert_error = X509_STORE_CTX_get_error(ctx);
+  if (cert_error != 0) {
+    gpr_log(GPR_ERROR, "Certificate verify failed with code %d", cert_error);
+  }
+  return ok;
+}
+
 /* --- tsi_ssl_handshaker_factory constructors. --- */
 
 static tsi_ssl_handshaker_factory_vtable client_handshaker_factory_vtable = {
@@ -1954,12 +2007,27 @@ tsi_result tsi_create_ssl_client_handshaker_factory_with_options(
     impl->session_cache =
         reinterpret_cast<tsi::SslSessionLRUCache*>(options->session_cache)
             ->Ref();
-    SSL_CTX_set_ex_data(ssl_context, g_ssl_ctx_ex_factory_index, impl);
     SSL_CTX_sess_set_new_cb(ssl_context,
                             server_handshaker_factory_new_session_callback);
     SSL_CTX_set_session_cache_mode(ssl_context, SSL_SESS_CACHE_CLIENT);
   }
 
+#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
+  if (options->key_logger != nullptr) {
+    impl->key_logger = options->key_logger->Ref();
+    // SSL_CTX_set_keylog_callback is set here to register callback
+    // when ssl/tls handshakes complete.
+    SSL_CTX_set_keylog_callback(
+        ssl_context,
+        ssl_keylogging_callback<tsi_ssl_client_handshaker_factory>);
+  }
+#endif
+
+  if (options->session_cache != nullptr || options->key_logger != nullptr) {
+    // Need to set factory at g_ssl_ctx_ex_factory_index
+    SSL_CTX_set_ex_data(ssl_context, g_ssl_ctx_ex_factory_index, impl);
+  }
+
   do {
     result = populate_ssl_context(ssl_context, options->pem_key_cert_pair,
                                   options->cipher_suites);
@@ -2014,7 +2082,24 @@ tsi_result tsi_create_ssl_client_handshaker_factory_with_options(
   } else {
     SSL_CTX_set_verify(ssl_context, SSL_VERIFY_PEER, nullptr);
   }
-  /* TODO(jboeuf): Add revocation verification. */
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
+  if (options->crl_directory != nullptr &&
+      strcmp(options->crl_directory, "") != 0) {
+    gpr_log(GPR_INFO, "enabling client CRL checking with path: %s",
+            options->crl_directory);
+    X509_STORE* cert_store = SSL_CTX_get_cert_store(ssl_context);
+    X509_STORE_set_verify_cb(cert_store, verify_cb);
+    if (!X509_STORE_load_locations(cert_store, nullptr,
+                                   options->crl_directory)) {
+      gpr_log(GPR_ERROR, "Failed to load CRL File from directory.");
+    } else {
+      X509_VERIFY_PARAM* param = X509_STORE_get0_param(cert_store);
+      X509_VERIFY_PARAM_set_flags(param, X509_V_FLAG_CRL_CHECK);
+      gpr_log(GPR_INFO, "enabled client side CRL checking.");
+    }
+  }
+#endif
 
   *factory = impl;
   return TSI_OK;
@@ -2096,6 +2181,10 @@ tsi_result tsi_create_ssl_server_handshaker_factory_with_options(
     }
   }
 
+  if (options->key_logger != nullptr) {
+    impl->key_logger = options->key_logger->Ref();
+  }
+
   for (i = 0; i < options->num_key_cert_pairs; i++) {
     do {
 #if OPENSSL_VERSION_NUMBER >= 0x10100000
@@ -2176,7 +2265,24 @@ tsi_result tsi_create_ssl_server_handshaker_factory_with_options(
                              nullptr);
           break;
       }
-      /* TODO(jboeuf): Add revocation verification. */
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
+      if (options->crl_directory != nullptr &&
+          strcmp(options->crl_directory, "") != 0) {
+        gpr_log(GPR_INFO, "enabling server CRL checking with path %s",
+                options->crl_directory);
+        X509_STORE* cert_store = SSL_CTX_get_cert_store(impl->ssl_contexts[i]);
+        X509_STORE_set_verify_cb(cert_store, verify_cb);
+        if (!X509_STORE_load_locations(cert_store, nullptr,
+                                       options->crl_directory)) {
+          gpr_log(GPR_ERROR, "Failed to load CRL File from directory.");
+        } else {
+          X509_VERIFY_PARAM* param = X509_STORE_get0_param(cert_store);
+          X509_VERIFY_PARAM_set_flags(param, X509_V_FLAG_CRL_CHECK);
+          gpr_log(GPR_INFO, "enabled server CRL checking.");
+        }
+      }
+#endif
 
       result = tsi_ssl_extract_x509_subject_names_from_pem_cert(
           options->pem_key_cert_pairs[i].cert_chain,
@@ -2194,6 +2300,20 @@ tsi_result tsi_create_ssl_server_handshaker_factory_with_options(
       SSL_CTX_set_next_protos_advertised_cb(
           impl->ssl_contexts[i],
           server_handshaker_factory_npn_advertised_callback, impl);
+
+#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
+      /* Register factory at index */
+      if (options->key_logger != nullptr) {
+        // Need to set factory at g_ssl_ctx_ex_factory_index
+        SSL_CTX_set_ex_data(impl->ssl_contexts[i], g_ssl_ctx_ex_factory_index,
+                            impl);
+        // SSL_CTX_set_keylog_callback is set here to register callback
+        // when ssl/tls handshakes complete.
+        SSL_CTX_set_keylog_callback(
+            impl->ssl_contexts[i],
+            ssl_keylogging_callback<tsi_ssl_server_handshaker_factory>);
+      }
+#endif
     } while (false);
 
     if (result != TSI_OK) {

data/src/core/tsi/ssl_transport_security.h

@@ -21,20 +21,20 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <openssl/x509.h>
+
 #include "absl/strings/string_view.h"
 
 #include <grpc/grpc_security_constants.h>
 
+#include "src/core/tsi/ssl/key_logging/ssl_key_logging.h"
 #include "src/core/tsi/transport_security_interface.h"
 
-extern "C" {
-#include <openssl/x509.h>
-}
-
 /* Value for the TSI_CERTIFICATE_TYPE_PEER_PROPERTY property for X509 certs. */
 #define TSI_X509_CERTIFICATE_TYPE "X509"
 
 /* This property is of type TSI_PEER_PROPERTY_STRING.  */
+#define TSI_X509_SUBJECT_PEER_PROPERTY "x509_subject"
 #define TSI_X509_SUBJECT_COMMON_NAME_PEER_PROPERTY "x509_subject_common_name"
 #define TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY \
   "x509_subject_alternative_name"
@@ -76,6 +76,19 @@ void tsi_ssl_session_cache_ref(tsi_ssl_session_cache* cache);
 /* Decrement reference counter of \a cache.  */
 void tsi_ssl_session_cache_unref(tsi_ssl_session_cache* cache);
 
+/* --- tsi_ssl_key_logger object ---
+
+   Experimental SSL Key logging functionality to enable decryption of
+   packet captures.  */
+static constexpr bool tsi_tls_session_key_logging_supported() {
+// Supported only for open-ssl versions >= 1.1.1
+#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
+  return true;
+#else
+  return false;
+#endif
+}
+
 /* --- tsi_ssl_client_handshaker_factory object ---
 
    This object creates a client tsi_handshaker objects implemented in terms of
@@ -150,6 +163,8 @@ struct tsi_ssl_client_handshaker_options {
   size_t num_alpn_protocols;
   /* ssl_session_cache is a cache for reusable client-side sessions. */
   tsi_ssl_session_cache* session_cache;
+  /* tsi_ssl_key_logger is an instance used to log SSL keys to a file. */
+  tsi::TlsSessionKeyLoggerCache::TlsSessionKeyLogger* key_logger;
 
   /* skip server certificate verification. */
   bool skip_server_certificate_verification;
@@ -158,6 +173,12 @@ struct tsi_ssl_client_handshaker_options {
   tsi_tls_version min_tls_version;
   tsi_tls_version max_tls_version;
 
+  /* The directory where all hashed CRL files enforced by the handshaker are
+     located. If the directory is invalid, CRL checking will fail open and just
+     log. An empty directory will not enable crl checking. Only OpenSSL version
+     > 1.1 is supported for CRL checking*/
+  const char* crl_directory;
+
   tsi_ssl_client_handshaker_options()
       : pem_key_cert_pair(nullptr),
         pem_root_certs(nullptr),
@@ -166,9 +187,11 @@ struct tsi_ssl_client_handshaker_options {
         alpn_protocols(nullptr),
         num_alpn_protocols(0),
         session_cache(nullptr),
+        key_logger(nullptr),
         skip_server_certificate_verification(false),
         min_tls_version(tsi_tls_version::TSI_TLS1_2),
-        max_tls_version(tsi_tls_version::TSI_TLS1_3) {}
+        max_tls_version(tsi_tls_version::TSI_TLS1_3),
+        crl_directory(nullptr) {}
 };
 
 /* Creates a client handshaker factory.
@@ -287,6 +310,14 @@ struct tsi_ssl_server_handshaker_options {
   /* The min and max TLS versions that will be negotiated by the handshaker. */
   tsi_tls_version min_tls_version;
   tsi_tls_version max_tls_version;
+  /* tsi_ssl_key_logger is an instance used to log SSL keys to a file. */
+  tsi::TlsSessionKeyLoggerCache::TlsSessionKeyLogger* key_logger;
+
+  /* The directory where all hashed CRL files are cached in the x.509 store and
+   * enforced by the handshaker are located. If the directory is invalid, CRL
+   * checking will fail open and just log. An empty directory will not enable
+   * crl checking. Only OpenSSL version > 1.1 is supported for CRL checking */
+  const char* crl_directory;
 
   tsi_ssl_server_handshaker_options()
       : pem_key_cert_pairs(nullptr),
@@ -299,7 +330,9 @@ struct tsi_ssl_server_handshaker_options {
         session_ticket_key(nullptr),
         session_ticket_key_size(0),
         min_tls_version(tsi_tls_version::TSI_TLS1_2),
-        max_tls_version(tsi_tls_version::TSI_TLS1_3) {}
+        max_tls_version(tsi_tls_version::TSI_TLS1_3),
+        key_logger(nullptr),
+        crl_directory(nullptr) {}
 };
 
 /* Creates a server handshaker factory.

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

@@ -60,7 +60,7 @@ end
 
 ENV['CPPFLAGS'] = '-DGPR_BACKWARDS_COMPATIBILITY_MODE'
 ENV['CPPFLAGS'] += ' -DGRPC_XDS_USER_AGENT_NAME_SUFFIX="\"RUBY\"" '
-ENV['CPPFLAGS'] += ' -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX="\"1.42.0\"" '
+ENV['CPPFLAGS'] += ' -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX="\"1.45.0\"" '
 
 output_dir = File.expand_path(RbConfig::CONFIG['topdir'])
 grpc_lib_dir = File.join(output_dir, 'libs', grpc_config)
@@ -69,9 +69,16 @@ ENV['BUILDDIR'] = output_dir
 unless windows
   puts 'Building internal gRPC into ' + grpc_lib_dir
   nproc = 4
-  nproc = Etc.nprocessors * 2 if Etc.respond_to? :nprocessors
+  nproc = Etc.nprocessors if Etc.respond_to? :nprocessors
+  nproc_override = ENV['GRPC_RUBY_BUILD_PROCS']
+  unless nproc_override.nil? or nproc_override.size == 0
+    nproc = nproc_override
+    puts "Overriding make parallelism to #{nproc}"
+  end
   make = bsd ? 'gmake' : 'make'
-  system("#{make} -j#{nproc} -C #{grpc_root} #{grpc_lib_dir}/libgrpc.a CONFIG=#{grpc_config} Q=")
+  cmd = "#{make} -j#{nproc} -C #{grpc_root} #{grpc_lib_dir}/libgrpc.a CONFIG=#{grpc_config} Q="
+  puts "Building grpc native library: #{cmd}"
+  system(cmd)
   exit 1 unless $? == 0
 end
 

data/src/ruby/ext/grpc/rb_channel.c

@@ -242,7 +242,10 @@ static VALUE grpc_rb_channel_init(int argc, VALUE* argv, VALUE self) {
                "bad creds symbol, want :this_channel_is_insecure");
       return Qnil;
     }
-    ch = grpc_insecure_channel_create(target_chars, &args, NULL);
+    grpc_channel_credentials* insecure_creds =
+        grpc_insecure_credentials_create();
+    ch = grpc_channel_create(target_chars, insecure_creds, &args);
+    grpc_channel_credentials_release(insecure_creds);
   } else {
     wrapper->credentials = credentials;
     if (grpc_rb_is_channel_credentials(credentials)) {
@@ -254,7 +257,7 @@ static VALUE grpc_rb_channel_init(int argc, VALUE* argv, VALUE self) {
                "bad creds, want ChannelCredentials or XdsChannelCredentials");
       return Qnil;
     }
-    ch = grpc_secure_channel_create(creds, target_chars, &args, NULL);
+    ch = grpc_channel_create(target_chars, creds, &args);
   }
 
   GPR_ASSERT(ch);