grpc 1.38.0 → 1.39.0.pre1

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

@@ -23,12 +23,12 @@
 #include <openssl/bytestring.h>
 #include <openssl/digest.h>
 #include <openssl/err.h>
+#include <openssl/hpke.h>
 #include <openssl/mem.h>
 #include <openssl/rand.h>
 #include <openssl/stack.h>
 
 #include "../crypto/internal.h"
-#include "../crypto/hpke/internal.h"
 #include "internal.h"
 
 
@@ -155,7 +155,7 @@ static bool add_new_session_tickets(SSL_HANDSHAKE *hs, bool *out_sent_tickets) {
         (!ssl->quic_method || !ssl->config->quic_early_data_context.empty());
     if (enable_early_data) {
       // QUIC does not use the max_early_data_size parameter and always sets it
-      // to a fixed value. See draft-ietf-quic-tls-22, section 4.5.
+      // to a fixed value. See RFC 9001, section 4.6.1.
       session->ticket_max_early_data =
           ssl->quic_method != nullptr ? 0xffffffff : kMaxEarlyDataAccepted;
     }
@@ -188,7 +188,7 @@ static bool add_new_session_tickets(SSL_HANDSHAKE *hs, bool *out_sent_tickets) {
       }
     }
 
-    // Add a fake extension. See draft-davidben-tls-grease-01.
+    // Add a fake extension. See RFC 8701.
     if (!CBB_add_u16(&extensions,
                      ssl_get_grease_value(hs, ssl_grease_ticket_extension)) ||
         !CBB_add_u16(&extensions, 0 /* empty */)) {
@@ -377,7 +377,7 @@ static enum ssl_hs_wait_t do_select_session(SSL_HANDSHAKE *hs) {
                          &offered_ticket, msg, &client_hello)) {
     case ssl_ticket_aead_ignore_ticket:
       assert(!session);
-      if (!ssl_get_new_session(hs, 1 /* server */)) {
+      if (!ssl_get_new_session(hs)) {
         ssl_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
         return ssl_hs_error;
       }
@@ -394,6 +394,7 @@ static enum ssl_hs_wait_t do_select_session(SSL_HANDSHAKE *hs) {
       }
 
       ssl->s3->session_reused = true;
+      hs->can_release_private_key = true;
 
       // Resumption incorporates fresh key material, so refresh the timeout.
       ssl_session_renew_timeout(ssl, hs->new_session.get(),
@@ -444,12 +445,9 @@ static enum ssl_hs_wait_t do_select_session(SSL_HANDSHAKE *hs) {
     ssl->s3->early_data_reason = ssl_early_data_unsupported_for_session;
   } else if (!hs->early_data_offered) {
     ssl->s3->early_data_reason = ssl_early_data_peer_declined;
-  } else if (ssl->s3->channel_id_valid) {
+  } else if (hs->channel_id_negotiated) {
     // Channel ID is incompatible with 0-RTT.
     ssl->s3->early_data_reason = ssl_early_data_channel_id;
-  } else if (ssl->s3->token_binding_negotiated) {
-    // Token Binding is incompatible with 0-RTT.
-    ssl->s3->early_data_reason = ssl_early_data_token_binding;
   } else if (MakeConstSpan(ssl->s3->alpn_selected) != session->early_alpn) {
     // The negotiated ALPN must match the one in the ticket.
     ssl->s3->early_data_reason = ssl_early_data_alpn_mismatch;
@@ -514,17 +512,12 @@ static enum ssl_hs_wait_t do_select_session(SSL_HANDSHAKE *hs) {
       ssl_get_handshake_digest(ssl_protocol_version(ssl), hs->new_cipher));
 
   // Set up the key schedule and incorporate the PSK into the running secret.
-  if (ssl->s3->session_reused) {
-    if (!tls13_init_key_schedule(
-            hs, MakeConstSpan(hs->new_session->secret,
-                              hs->new_session->secret_length))) {
-      return ssl_hs_error;
-    }
-  } else if (!tls13_init_key_schedule(hs, MakeConstSpan(kZeroes, hash_len))) {
-    return ssl_hs_error;
-  }
-
-  if (!ssl_hash_message(hs, msg)) {
+  if (!tls13_init_key_schedule(
+          hs, ssl->s3->session_reused
+                  ? MakeConstSpan(hs->new_session->secret,
+                                  hs->new_session->secret_length)
+                  : MakeConstSpan(kZeroes, hash_len)) ||
+      !ssl_hash_message(hs, msg)) {
     return ssl_hs_error;
   }
 
@@ -608,7 +601,7 @@ static enum ssl_hs_wait_t do_read_second_client_hello(SSL_HANDSHAKE *hs) {
     return ssl_hs_error;
   }
 
-  if (hs->ech_accept) {
+  if (ssl->s3->ech_accept) {
     // If we previously accepted the ClientHelloInner, check that the second
     // ClientHello contains an encrypted_client_hello extension.
     CBS ech_body;
@@ -621,10 +614,11 @@ static enum ssl_hs_wait_t do_read_second_client_hello(SSL_HANDSHAKE *hs) {
 
     // Parse a ClientECH out of the extension body.
     uint16_t kdf_id, aead_id;
-    CBS config_id, enc, payload;
+    uint8_t config_id;
+    CBS enc, payload;
     if (!CBS_get_u16(&ech_body, &kdf_id) ||  //
         !CBS_get_u16(&ech_body, &aead_id) ||
-        !CBS_get_u8_length_prefixed(&ech_body, &config_id) ||
+        !CBS_get_u8(&ech_body, &config_id) ||
         !CBS_get_u16_length_prefixed(&ech_body, &enc) ||
         !CBS_get_u16_length_prefixed(&ech_body, &payload) ||
         CBS_len(&ech_body) != 0) {
@@ -634,10 +628,11 @@ static enum ssl_hs_wait_t do_read_second_client_hello(SSL_HANDSHAKE *hs) {
     }
 
     // Check that ClientECH.cipher_suite is unchanged and that
-    // ClientECH.config_id and ClientECH.enc are empty.
-    if (kdf_id != EVP_HPKE_CTX_get_kdf_id(hs->ech_hpke_ctx.get()) ||
-        aead_id != EVP_HPKE_CTX_get_aead_id(hs->ech_hpke_ctx.get()) ||
-        CBS_len(&config_id) > 0 || CBS_len(&enc) > 0) {
+    // ClientECH.enc is empty.
+    if (kdf_id != EVP_HPKE_KDF_id(EVP_HPKE_CTX_kdf(hs->ech_hpke_ctx.get())) ||
+        aead_id !=
+            EVP_HPKE_AEAD_id(EVP_HPKE_CTX_aead(hs->ech_hpke_ctx.get())) ||
+        config_id != hs->ech_config_id || CBS_len(&enc) > 0) {
       OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
       ssl_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_ILLEGAL_PARAMETER);
       return ssl_hs_error;
@@ -730,28 +725,6 @@ static enum ssl_hs_wait_t do_read_second_client_hello(SSL_HANDSHAKE *hs) {
   return ssl_hs_ok;
 }
 
-static bool make_server_hello(SSL_HANDSHAKE *hs, Array<uint8_t> *out) {
-  SSL *const ssl = hs->ssl;
-  ScopedCBB cbb;
-  CBB body, extensions, session_id;
-  if (!ssl->method->init_message(ssl, cbb.get(), &body, SSL3_MT_SERVER_HELLO) ||
-      !CBB_add_u16(&body, TLS1_2_VERSION) ||
-      !CBB_add_bytes(&body, ssl->s3->server_random,
-                     sizeof(ssl->s3->server_random)) ||
-      !CBB_add_u8_length_prefixed(&body, &session_id) ||
-      !CBB_add_bytes(&session_id, hs->session_id, hs->session_id_len) ||
-      !CBB_add_u16(&body, SSL_CIPHER_get_protocol_id(hs->new_cipher)) ||
-      !CBB_add_u8(&body, 0) ||
-      !CBB_add_u16_length_prefixed(&body, &extensions) ||
-      !ssl_ext_pre_shared_key_add_serverhello(hs, &extensions) ||
-      !ssl_ext_key_share_add_serverhello(hs, &extensions) ||
-      !ssl_ext_supported_versions_add_serverhello(hs, &extensions) ||
-      !ssl->method->finish_message(ssl, cbb.get(), out)) {
-    return false;
-  }
-  return true;
-}
-
 static enum ssl_hs_wait_t do_send_server_hello(SSL_HANDSHAKE *hs) {
   SSL *const ssl = hs->ssl;
 
@@ -769,25 +742,44 @@ static enum ssl_hs_wait_t do_send_server_hello(SSL_HANDSHAKE *hs) {
     }
   }
 
-  assert(!hs->ech_accept || hs->ech_is_inner_present);
+  Array<uint8_t> server_hello;
+  ScopedCBB cbb;
+  CBB body, extensions, session_id;
+  if (!ssl->method->init_message(ssl, cbb.get(), &body, SSL3_MT_SERVER_HELLO) ||
+      !CBB_add_u16(&body, TLS1_2_VERSION) ||
+      !CBB_add_bytes(&body, ssl->s3->server_random,
+                     sizeof(ssl->s3->server_random)) ||
+      !CBB_add_u8_length_prefixed(&body, &session_id) ||
+      !CBB_add_bytes(&session_id, hs->session_id, hs->session_id_len) ||
+      !CBB_add_u16(&body, SSL_CIPHER_get_protocol_id(hs->new_cipher)) ||
+      !CBB_add_u8(&body, 0) ||
+      !CBB_add_u16_length_prefixed(&body, &extensions) ||
+      !ssl_ext_pre_shared_key_add_serverhello(hs, &extensions) ||
+      !ssl_ext_key_share_add_serverhello(hs, &extensions) ||
+      !ssl_ext_supported_versions_add_serverhello(hs, &extensions) ||
+      !ssl->method->finish_message(ssl, cbb.get(), &server_hello)) {
+    return ssl_hs_error;
+  }
 
+  assert(!ssl->s3->ech_accept || hs->ech_is_inner_present);
   if (hs->ech_is_inner_present) {
-    // Construct the ServerHelloECHConf message, which is the same as
-    // ServerHello, except the last 8 bytes of its random field are zeroed out.
-    Span<uint8_t> random_suffix = random.subspan(24);
-    OPENSSL_memset(random_suffix.data(), 0, random_suffix.size());
-
-    Array<uint8_t> server_hello_ech_conf;
-    if (!make_server_hello(hs, &server_hello_ech_conf) ||
-        !tls13_ech_accept_confirmation(hs, random_suffix,
-                                       server_hello_ech_conf)) {
+    // Fill in the ECH confirmation signal.
+    Span<uint8_t> random_suffix =
+        random.subspan(SSL3_RANDOM_SIZE - ECH_CONFIRMATION_SIGNAL_LEN);
+    if (!ssl_ech_accept_confirmation(hs, random_suffix, hs->transcript,
+                                     server_hello)) {
       return ssl_hs_error;
     }
+
+    // Update |server_hello|.
+    const size_t offset = ssl_ech_confirmation_signal_hello_offset(ssl);
+    Span<uint8_t> server_hello_out =
+        MakeSpan(server_hello).subspan(offset, ECH_CONFIRMATION_SIGNAL_LEN);
+    OPENSSL_memcpy(server_hello_out.data(), random_suffix.data(),
+                   ECH_CONFIRMATION_SIGNAL_LEN);
   }
 
-  Array<uint8_t> server_hello;
-  if (!make_server_hello(hs, &server_hello) ||
-      !ssl->method->add_message(ssl, std::move(server_hello))) {
+  if (!ssl->method->add_message(ssl, std::move(server_hello))) {
     return ssl_hs_error;
   }
 
@@ -806,8 +798,6 @@ static enum ssl_hs_wait_t do_send_server_hello(SSL_HANDSHAKE *hs) {
   }
 
   // Send EncryptedExtensions.
-  ScopedCBB cbb;
-  CBB body;
   if (!ssl->method->init_message(ssl, cbb.get(), &body,
                                  SSL3_MT_ENCRYPTED_EXTENSIONS) ||
       !ssl_add_serverhello_tlsext(hs, &body) ||
@@ -820,7 +810,7 @@ static enum ssl_hs_wait_t do_send_server_hello(SSL_HANDSHAKE *hs) {
     hs->cert_request = !!(hs->config->verify_mode & SSL_VERIFY_PEER);
     // Only request a certificate if Channel ID isn't negotiated.
     if ((hs->config->verify_mode & SSL_VERIFY_PEER_IF_NO_OBC) &&
-        ssl->s3->channel_id_valid) {
+        hs->channel_id_negotiated) {
       hs->cert_request = false;
     }
   }
@@ -901,6 +891,7 @@ static enum ssl_hs_wait_t do_send_server_finished(SSL_HANDSHAKE *hs) {
     return ssl_hs_hints_ready;
   }
 
+  hs->can_release_private_key = true;
   if (!tls13_add_finished(hs) ||
       // Update the secret to the master secret and derive traffic keys.
       !tls13_advance_key_schedule(
@@ -978,9 +969,8 @@ static enum ssl_hs_wait_t do_read_second_client_flight(SSL_HANDSHAKE *hs) {
     hs->in_early_data = true;
   }
 
-  // QUIC doesn't use an EndOfEarlyData message (draft-ietf-quic-tls-22,
-  // section 8.3), so we switch to client_handshake_secret before the early
-  // return.
+  // QUIC doesn't use an EndOfEarlyData message (RFC 9001, section 8.3), so we
+  // switch to client_handshake_secret before the early return.
   if (ssl->quic_method != nullptr) {
     if (!tls13_set_traffic_key(ssl, ssl_encryption_handshake, evp_aead_open,
                                hs->new_session.get(),
@@ -1156,7 +1146,7 @@ static enum ssl_hs_wait_t do_read_client_certificate_verify(SSL_HANDSHAKE *hs) {
 
 static enum ssl_hs_wait_t do_read_channel_id(SSL_HANDSHAKE *hs) {
   SSL *const ssl = hs->ssl;
-  if (!ssl->s3->channel_id_valid) {
+  if (!hs->channel_id_negotiated) {
     hs->tls13_state = state13_read_client_finished;
     return ssl_hs_ok;
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.38.0
+  version: 1.39.0.pre1
 platform: ruby
 authors:
 - gRPC Authors
 autorequire: 
 bindir: src/ruby/bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -213,7 +213,7 @@ files:
 - include/grpc/census.h
 - include/grpc/compression.h
 - include/grpc/event_engine/README.md
-- include/grpc/event_engine/channel_args.h
+- include/grpc/event_engine/endpoint_config.h
 - include/grpc/event_engine/event_engine.h
 - include/grpc/event_engine/port.h
 - include/grpc/event_engine/slice_allocator.h
@@ -340,11 +340,13 @@ files:
 - src/core/ext/filters/client_channel/resolver.h
 - src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
 - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h
+- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_event_engine.cc
 - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc
 - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
 - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
 - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
 - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h
+- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_event_engine.cc
 - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc
 - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
 - src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
@@ -919,8 +921,12 @@ files:
 - src/core/lib/debug/stats_data.h
 - src/core/lib/debug/trace.cc
 - src/core/lib/debug/trace.h
+- src/core/lib/event_engine/endpoint_config.cc
+- src/core/lib/event_engine/endpoint_config_internal.h
+- src/core/lib/event_engine/event_engine.cc
 - src/core/lib/event_engine/slice_allocator.cc
 - src/core/lib/event_engine/sockaddr.cc
+- src/core/lib/event_engine/sockaddr.h
 - src/core/lib/gpr/alloc.cc
 - src/core/lib/gpr/alloc.h
 - src/core/lib/gpr/arena.h
@@ -1026,6 +1032,7 @@ files:
 - src/core/lib/iomgr/endpoint_cfstream.cc
 - src/core/lib/iomgr/endpoint_cfstream.h
 - src/core/lib/iomgr/endpoint_pair.h
+- src/core/lib/iomgr/endpoint_pair_event_engine.cc
 - src/core/lib/iomgr/endpoint_pair_posix.cc
 - src/core/lib/iomgr/endpoint_pair_uv.cc
 - src/core/lib/iomgr/endpoint_pair_windows.cc
@@ -1045,6 +1052,20 @@ files:
 - src/core/lib/iomgr/ev_posix.cc
 - src/core/lib/iomgr/ev_posix.h
 - src/core/lib/iomgr/ev_windows.cc
+- src/core/lib/iomgr/event_engine/closure.cc
+- src/core/lib/iomgr/event_engine/closure.h
+- src/core/lib/iomgr/event_engine/endpoint.cc
+- src/core/lib/iomgr/event_engine/endpoint.h
+- src/core/lib/iomgr/event_engine/iomgr.cc
+- src/core/lib/iomgr/event_engine/iomgr.h
+- src/core/lib/iomgr/event_engine/pollset.cc
+- src/core/lib/iomgr/event_engine/pollset.h
+- src/core/lib/iomgr/event_engine/promise.h
+- src/core/lib/iomgr/event_engine/resolved_address_internal.cc
+- src/core/lib/iomgr/event_engine/resolved_address_internal.h
+- src/core/lib/iomgr/event_engine/resolver.cc
+- src/core/lib/iomgr/event_engine/tcp.cc
+- src/core/lib/iomgr/event_engine/timer.cc
 - src/core/lib/iomgr/exec_ctx.cc
 - src/core/lib/iomgr/exec_ctx.h
 - src/core/lib/iomgr/executor.cc
@@ -1186,6 +1207,11 @@ files:
 - src/core/lib/profiling/basic_timers.cc
 - src/core/lib/profiling/stap_timers.cc
 - src/core/lib/profiling/timers.h
+- src/core/lib/security/authorization/authorization_engine.h
+- src/core/lib/security/authorization/authorization_policy_provider.h
+- src/core/lib/security/authorization/authorization_policy_provider_vtable.cc
+- src/core/lib/security/authorization/evaluate_args.cc
+- src/core/lib/security/authorization/evaluate_args.h
 - src/core/lib/security/context/security_context.cc
 - src/core/lib/security/context/security_context.h
 - src/core/lib/security/credentials/alts/alts_credentials.cc
@@ -1997,7 +2023,6 @@ files:
 - third_party/boringssl-with-bazel/src/crypto/fipsmodule/tls/kdf.c
 - third_party/boringssl-with-bazel/src/crypto/hkdf/hkdf.c
 - third_party/boringssl-with-bazel/src/crypto/hpke/hpke.c
-- third_party/boringssl-with-bazel/src/crypto/hpke/internal.h
 - third_party/boringssl-with-bazel/src/crypto/hrss/hrss.c
 - third_party/boringssl-with-bazel/src/crypto/hrss/internal.h
 - third_party/boringssl-with-bazel/src/crypto/internal.h
@@ -2064,7 +2089,6 @@ files:
 - third_party/boringssl-with-bazel/src/crypto/x509/t_req.c
 - third_party/boringssl-with-bazel/src/crypto/x509/t_x509.c
 - third_party/boringssl-with-bazel/src/crypto/x509/t_x509a.c
-- third_party/boringssl-with-bazel/src/crypto/x509/vpm_int.h
 - third_party/boringssl-with-bazel/src/crypto/x509/x509.c
 - third_party/boringssl-with-bazel/src/crypto/x509/x509_att.c
 - third_party/boringssl-with-bazel/src/crypto/x509/x509_cmp.c
@@ -2173,6 +2197,7 @@ files:
 - third_party/boringssl-with-bazel/src/include/openssl/ex_data.h
 - third_party/boringssl-with-bazel/src/include/openssl/hkdf.h
 - third_party/boringssl-with-bazel/src/include/openssl/hmac.h
+- third_party/boringssl-with-bazel/src/include/openssl/hpke.h
 - third_party/boringssl-with-bazel/src/include/openssl/hrss.h
 - third_party/boringssl-with-bazel/src/include/openssl/is_boringssl.h
 - third_party/boringssl-with-bazel/src/include/openssl/lhash.h
@@ -2448,55 +2473,55 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.2.21
 signing_key: 
 specification_version: 4
 summary: GRPC system in Ruby
 test_files:
-- src/ruby/spec/testdata/server1.pem
-- src/ruby/spec/testdata/client.key
-- src/ruby/spec/testdata/ca.pem
-- src/ruby/spec/testdata/README
-- src/ruby/spec/testdata/client.pem
-- src/ruby/spec/testdata/server1.key
 - src/ruby/spec/compression_options_spec.rb
 - src/ruby/spec/error_sanity_spec.rb
+- src/ruby/spec/debug_message_spec.rb
+- src/ruby/spec/testdata/server1.key
+- src/ruby/spec/testdata/README
+- src/ruby/spec/testdata/client.pem
+- src/ruby/spec/testdata/ca.pem
+- src/ruby/spec/testdata/server1.pem
+- src/ruby/spec/testdata/client.key
+- src/ruby/spec/time_consts_spec.rb
+- src/ruby/spec/server_credentials_spec.rb
+- src/ruby/spec/generic/rpc_desc_spec.rb
+- src/ruby/spec/generic/active_call_spec.rb
+- src/ruby/spec/generic/client_interceptors_spec.rb
+- src/ruby/spec/generic/client_stub_spec.rb
+- src/ruby/spec/generic/rpc_server_spec.rb
+- src/ruby/spec/generic/interceptor_registry_spec.rb
+- src/ruby/spec/generic/rpc_server_pool_spec.rb
+- src/ruby/spec/generic/service_spec.rb
+- src/ruby/spec/generic/server_interceptors_spec.rb
+- src/ruby/spec/google_rpc_status_utils_spec.rb
+- src/ruby/spec/channel_spec.rb
 - src/ruby/spec/user_agent_spec.rb
+- src/ruby/spec/channel_credentials_spec.rb
+- src/ruby/spec/call_credentials_spec.rb
+- src/ruby/spec/spec_helper.rb
+- src/ruby/spec/server_spec.rb
 - src/ruby/spec/call_spec.rb
+- src/ruby/spec/channel_connection_spec.rb
+- src/ruby/spec/client_server_spec.rb
+- src/ruby/spec/support/helpers.rb
+- src/ruby/spec/support/services.rb
+- src/ruby/spec/client_auth_spec.rb
+- src/ruby/spec/errors_spec.rb
 - src/ruby/spec/pb/health/checker_spec.rb
 - src/ruby/spec/pb/duplicate/codegen_spec.rb
-- src/ruby/spec/pb/codegen/grpc/testing/package_options_import.proto
-- src/ruby/spec/pb/codegen/grpc/testing/package_options_import2.proto
 - src/ruby/spec/pb/codegen/grpc/testing/package_options.proto
 - src/ruby/spec/pb/codegen/grpc/testing/package_options_ruby_style.proto
 - src/ruby/spec/pb/codegen/grpc/testing/same_package_service_name.proto
+- src/ruby/spec/pb/codegen/grpc/testing/package_options_import2.proto
 - src/ruby/spec/pb/codegen/grpc/testing/same_ruby_package_service_name.proto
+- src/ruby/spec/pb/codegen/grpc/testing/package_options_import.proto
 - src/ruby/spec/pb/codegen/package_option_spec.rb
-- src/ruby/spec/call_credentials_spec.rb
-- src/ruby/spec/channel_connection_spec.rb
-- src/ruby/spec/channel_credentials_spec.rb
-- src/ruby/spec/client_server_spec.rb
-- src/ruby/spec/server_spec.rb
-- src/ruby/spec/spec_helper.rb
-- src/ruby/spec/support/helpers.rb
-- src/ruby/spec/support/services.rb
-- src/ruby/spec/errors_spec.rb
-- src/ruby/spec/channel_spec.rb
-- src/ruby/spec/server_credentials_spec.rb
-- src/ruby/spec/client_auth_spec.rb
-- src/ruby/spec/google_rpc_status_utils_spec.rb
-- src/ruby/spec/debug_message_spec.rb
-- src/ruby/spec/time_consts_spec.rb
-- src/ruby/spec/generic/client_interceptors_spec.rb
-- src/ruby/spec/generic/active_call_spec.rb
-- src/ruby/spec/generic/rpc_server_pool_spec.rb
-- src/ruby/spec/generic/rpc_server_spec.rb
-- src/ruby/spec/generic/interceptor_registry_spec.rb
-- src/ruby/spec/generic/rpc_desc_spec.rb
-- src/ruby/spec/generic/client_stub_spec.rb
-- src/ruby/spec/generic/service_spec.rb
-- src/ruby/spec/generic/server_interceptors_spec.rb