grpc 1.36.0 → 1.37.0.pre1

data/src/ruby/ext/grpc/rb_xds_server_credentials.h

@@ -0,0 +1,35 @@
+/*
+ *
+ * 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_RB_XDS_SERVER_CREDENTIALS_H_
+#define GRPC_RB_XDS_SERVER_CREDENTIALS_H_
+
+#include <grpc/grpc_security.h>
+#include <ruby/ruby.h>
+#include <stdbool.h>
+
+/* Initializes the ruby XdsServerCredentials class. */
+void Init_grpc_xds_server_credentials();
+
+/* Gets the wrapped server_credentials from the ruby wrapper */
+grpc_server_credentials* grpc_rb_get_wrapped_xds_server_credentials(VALUE v);
+
+/* Check if v is kind of XdsServerCredentials */
+bool grpc_rb_is_xds_server_credentials(VALUE v);
+
+#endif /* GRPC_RB_XDS_SERVER_CREDENTIALS_H_ */

data/src/ruby/lib/grpc/generic/client_stub.rb

@@ -41,8 +41,10 @@ module GRPC
         channel_args['grpc.primary_user_agent'] += ' '
       end
       channel_args['grpc.primary_user_agent'] += "grpc-ruby/#{VERSION}"
-      unless creds.is_a?(Core::ChannelCredentials) || creds.is_a?(Symbol)
-        fail(TypeError, '!ChannelCredentials or Symbol')
+      unless creds.is_a?(Core::ChannelCredentials) ||
+             creds.is_a?(Core::XdsChannelCredentials) ||
+             creds.is_a?(Symbol)
+        fail(TypeError, 'creds is not a ChannelCredentials, XdsChannelCredentials, or Symbol')
       end
       Core::Channel.new(host, channel_args, creds)
     end

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

@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.36.0'
+  VERSION = '1.37.0.pre1'
 end

data/src/ruby/spec/call_spec.rb

@@ -171,7 +171,7 @@ describe GRPC::Core::Call do
   end
 
   def make_test_call
-    @ch.create_call(nil, nil, 'dummy_method', nil, deadline)
+    @ch.create_call(nil, nil, 'phony_method', nil, deadline)
   end
 
   def deadline

data/src/ruby/spec/channel_credentials_spec.rb

@@ -60,6 +60,38 @@ describe GRPC::Core::ChannelCredentials do
       blk = proc { GRPC::Core::ChannelCredentials.new(nil, '', nil) }
       expect(&blk).to raise_error
     end
+
+    it 'can be constructed with a fallback credential' do
+      blk = proc {
+        fallback = GRPC::Core::ChannelCredentials.new
+        GRPC::Core::XdsChannelCredentials.new(fallback)
+      }
+      expect(&blk).not_to raise_error
+    end
+
+    it 'fails gracefully constructed with nil' do
+      blk = proc {
+        GRPC::Core::XdsChannelCredentials.new(nil)
+      }
+      expect(&blk).to raise_error TypeError, /expected grpc_channel_credentials/
+    end
+
+    it 'fails gracefully constructed with a non-C-extension object' do
+      blk = proc {
+        not_a_fallback = 100
+        GRPC::Core::XdsChannelCredentials.new(not_a_fallback)
+      }
+      expect(&blk).to raise_error TypeError, /expected grpc_channel_credentials/
+    end
+
+    it 'fails gracefully constructed with a non-ChannelCredentials object' do
+      blk = proc {
+        not_a_fallback = GRPC::Core::Channel.new('dummy_host', nil,
+                                                 :this_channel_is_insecure)
+        GRPC::Core::XdsChannelCredentials.new(not_a_fallback)
+      }
+      expect(&blk).to raise_error TypeError, /expected grpc_channel_credentials/
+    end
   end
 
   describe '#compose' do

data/src/ruby/spec/channel_spec.rb

@@ -53,7 +53,7 @@ describe GRPC::Core::Channel do
   shared_examples '#new' do
     it 'take a host name without channel args' do
       blk = proc do
-        GRPC::Core::Channel.new('dummy_host', nil, :this_channel_is_insecure)
+        GRPC::Core::Channel.new('phony_host', nil, :this_channel_is_insecure)
       end
       expect(&blk).not_to raise_error
     end
@@ -114,7 +114,7 @@ describe GRPC::Core::Channel do
 
   describe '#new for secure channels' do
     def construct_with_args(a)
-      proc { GRPC::Core::Channel.new('dummy_host', a, create_test_cert) }
+      proc { GRPC::Core::Channel.new('phony_host', a, create_test_cert) }
     end
 
     it_behaves_like '#new'
@@ -125,7 +125,18 @@ describe GRPC::Core::Channel do
 
     def construct_with_args(a)
       proc do
-        GRPC::Core::Channel.new('dummy_host', a, :this_channel_is_insecure)
+        GRPC::Core::Channel.new('phony_host', a, :this_channel_is_insecure)
+      end
+    end
+  end
+
+  describe '#new for XDS channels' do
+    it_behaves_like '#new'
+
+    def construct_with_args(a)
+      proc do
+        xds_creds = GRPC::Core::XdsChannelCredentials.new(create_test_cert)
+        GRPC::Core::Channel.new('dummy_host', a, xds_creds)
       end
     end
   end
@@ -137,7 +148,7 @@ describe GRPC::Core::Channel do
       deadline = Time.now + 5
 
       blk = proc do
-        ch.create_call(nil, nil, 'dummy_method', nil, deadline)
+        ch.create_call(nil, nil, 'phony_method', nil, deadline)
       end
       expect(&blk).to_not raise_error
     end
@@ -148,7 +159,7 @@ describe GRPC::Core::Channel do
 
       deadline = Time.now + 5
       blk = proc do
-        ch.create_call(nil, nil, 'dummy_method', nil, deadline)
+        ch.create_call(nil, nil, 'phony_method', nil, deadline)
       end
       expect(&blk).to raise_error(RuntimeError)
     end
@@ -160,7 +171,7 @@ describe GRPC::Core::Channel do
 
       blk = proc do
         fork_with_propagated_error_message do
-          ch.create_call(nil, nil, 'dummy_method', nil, deadline)
+          ch.create_call(nil, nil, 'phony_method', nil, deadline)
         end
       end
       expect(&blk).to raise_error(RuntimeError, 'grpc cannot be used before and after forking')

data/src/ruby/spec/client_auth_spec.rb

@@ -85,7 +85,10 @@ describe 'client-server auth' do
       poll_period: 1
     }
     @srv = new_rpc_server_for_testing(**server_opts)
-    port = @srv.add_http2_port('0.0.0.0:0', create_server_creds)
+    ssl_creds = create_server_creds
+    xds_creds = GRPC::Core::XdsServerCredentials.new(ssl_creds)
+    port = @srv.add_http2_port('0.0.0.0:0', ssl_creds)
+    xds_port = @srv.add_http2_port('0.0.0.0:0', xds_creds)
     @srv.handle(SslTestService)
     @srv_thd = Thread.new { @srv.run }
     @srv.wait_till_running
@@ -98,6 +101,11 @@ describe 'client-server auth' do
     @stub = SslTestServiceStub.new("localhost:#{port}",
                                    create_channel_creds,
                                    **client_opts)
+    # auth should success as the fallback creds wil be used
+    xds_channel_creds = GRPC::Core::XdsChannelCredentials.new(create_channel_creds)
+    @xds_stub = SslTestServiceStub.new("localhost:#{xds_port}",
+                                       xds_channel_creds,
+                                       **client_opts)
   end
 
   after(:all) do
@@ -123,4 +131,22 @@ describe 'client-server auth' do
     responses = @stub.a_bidi_rpc([EchoMsg.new, EchoMsg.new])
     responses.each { |r| GRPC.logger.info(r) }
   end
+
+  it 'xds_client-xds_server ssl fallback auth with unary RPCs' do
+    @xds_stub.an_rpc(EchoMsg.new)
+  end
+
+  it 'xds_client-xds_server ssl fallback auth with client streaming RPCs' do
+    @xds_stub.a_client_streaming_rpc([EchoMsg.new, EchoMsg.new])
+  end
+
+  it 'xds_client-xds_server ssl fallback auth with server streaming RPCs' do
+    responses = @xds_stub.a_server_streaming_rpc(EchoMsg.new)
+    responses.each { |r| GRPC.logger.info(r) }
+  end
+
+  it 'xds_client-xds_server ssl fallback auth with bidi RPCs' do
+    responses = @xds_stub.a_bidi_rpc([EchoMsg.new, EchoMsg.new])
+    responses.each { |r| GRPC.logger.info(r) }
+  end
 end

data/src/ruby/spec/errors_spec.rb

@@ -131,7 +131,7 @@ describe GRPC::BadStatus do
 
       error_msg = 'parse error: to_rpc_status failed'
       error_desc = '<Google::Protobuf::ParseError> ' \
-        'Error occurred during parsing: Invalid wire type'
+        'Error occurred during parsing'
 
       # Check that the parse error was logged correctly
       log_contents = @log_output.read

data/src/ruby/spec/generic/active_call_spec.rb

@@ -198,11 +198,11 @@ describe GRPC::ActiveCall do
         deadline,
         started: false)
 
-      metadata = { key: 'dummy_val', other: 'other_val' }
+      metadata = { key: 'phony_val', other: 'other_val' }
       expect(@client_call.metadata_sent).to eq(false)
       @client_call.merge_metadata_to_send(metadata)
 
-      message = 'dummy message'
+      message = 'phony message'
 
       expect(call).to(
         receive(:run_batch)

data/src/ruby/spec/generic/client_stub_spec.rb

@@ -304,7 +304,7 @@ describe 'ClientStub' do  # rubocop:disable Metrics/BlockLength
 
     describe 'via a call operation' do
       after(:each) do
-        # make sure op.wait doesn't hang, even if there's a bad status
+        # make sure op.wait doesn't freeze, even if there's a bad status
         @op.wait
       end
       def get_response(stub, run_start_call_first: false, credentials: nil)
@@ -406,7 +406,7 @@ describe 'ClientStub' do  # rubocop:disable Metrics/BlockLength
 
     describe 'via a call operation' do
       after(:each) do
-        # make sure op.wait doesn't hang, even if there's a bad status
+        # make sure op.wait doesn't freeze, even if there's a bad status
         @op.wait
       end
       def get_response(stub, run_start_call_first: false)
@@ -547,7 +547,7 @@ describe 'ClientStub' do  # rubocop:disable Metrics/BlockLength
 
     describe 'via a call operation' do
       after(:each) do
-        @op.wait # make sure wait doesn't hang
+        @op.wait # make sure wait doesn't freeze
       end
       def get_responses(stub, run_start_call_first: false, unmarshal: noop)
         @op = stub.server_streamer(@method, @sent_msg, noop, unmarshal,
@@ -865,7 +865,7 @@ describe 'ClientStub' do  # rubocop:disable Metrics/BlockLength
 
     describe 'via a call operation' do
       after(:each) do
-        @op.wait # make sure wait doesn't hang
+        @op.wait # make sure wait doesn't freeze
       end
       def get_responses(stub, run_start_call_first: false, deadline: nil,
                         marshal_proc: noop)

data/src/ruby/spec/generic/rpc_server_spec.rb

@@ -104,7 +104,7 @@ end
 
 SynchronizedCancellationStub = SynchronizedCancellationService.rpc_stub_class
 
-# a test service that hangs onto call objects
+# a test service that holds onto call objects
 # and uses them after the server-side call has been
 # finished
 class CheckCallAfterFinishedService

data/src/ruby/spec/server_credentials_spec.rb

@@ -23,6 +23,7 @@ end
 
 describe GRPC::Core::ServerCredentials do
   Creds = GRPC::Core::ServerCredentials
+  XdsCreds = GRPC::Core::XdsServerCredentials
 
   describe '#new' do
     it 'can be constructed from a fake CA PEM, server PEM and a server key' do
@@ -75,5 +76,29 @@ describe GRPC::Core::ServerCredentials do
       blk = proc { Creds.new(nil, cert_pairs, false) }
       expect(&blk).to_not raise_error
     end
+
+    it 'can be constructed with a fallback credential' do
+      _, cert_pairs, _ = load_test_certs
+      fallback = Creds.new(nil, cert_pairs, false)
+      blk = proc { XdsCreds.new(fallback) }
+      expect(&blk).to_not raise_error
+    end
+
+    it 'cannot be constructed with nil' do
+      blk = proc { XdsCreds.new(nil) }
+      expect(&blk).to raise_error TypeError, /expected grpc_server_credentials/
+    end
+
+    it 'cannot be constructed with a non-C-extension object' do
+      not_a_fallback = 100
+      blk = proc { XdsCreds.new(not_a_fallback) }
+      expect(&blk).to raise_error TypeError, /expected grpc_server_credentials/
+    end
+
+    it 'cannot be constructed with a non-ServerCredentials object' do
+      not_a_fallback = GRPC::Core::ChannelCredentials.new
+      blk = proc { XdsCreds.new(not_a_fallback) }
+      expect(&blk).to raise_error TypeError, /expected grpc_server_credentials/
+    end
   end
 end

data/src/ruby/spec/server_spec.rb

@@ -139,6 +139,28 @@ describe Server do
         expect(&blk).to raise_error(RuntimeError)
       end
     end
+
+    describe 'for xds servers' do
+      let(:cert) { create_test_cert }
+      let(:xds) { GRPC::Core::XdsServerCredentials.new(cert) }
+      it 'runs without failing' do
+        blk = proc do
+          s = new_core_server_for_testing(nil)
+          s.add_http2_port('localhost:0', xds)
+          s.shutdown_and_notify(nil)
+          s.close
+        end
+        expect(&blk).to_not raise_error
+      end
+
+      it 'fails if the server is closed' do
+        s = new_core_server_for_testing(nil)
+        s.shutdown_and_notify(nil)
+        s.close
+        blk = proc { s.add_http2_port('localhost:0', xds) }
+        expect(&blk).to raise_error(RuntimeError)
+      end
+    end
   end
 
   shared_examples '#new' do

data/third_party/boringssl-with-bazel/err_data.c

@@ -192,47 +192,47 @@ const uint32_t kOpenSSLReasonValues[] = {
     0x283480b9,
     0x283500f7,
     0x28358c79,
-    0x2c3230db,
+    0x2c3230e6,
     0x2c3292ff,
-    0x2c3330e9,
-    0x2c33b0fb,
-    0x2c34310f,
-    0x2c34b121,
-    0x2c35313c,
-    0x2c35b14e,
-    0x2c36317e,
+    0x2c3330f4,
+    0x2c33b106,
+    0x2c34311a,
+    0x2c34b12c,
+    0x2c353147,
+    0x2c35b159,
+    0x2c363189,
     0x2c36833a,
-    0x2c37318b,
-    0x2c37b1b7,
-    0x2c3831dc,
-    0x2c38b1f3,
-    0x2c393211,
-    0x2c39b221,
-    0x2c3a3233,
-    0x2c3ab247,
-    0x2c3b3258,
-    0x2c3bb277,
+    0x2c373196,
+    0x2c37b1c2,
+    0x2c3831e7,
+    0x2c38b1fe,
+    0x2c39321c,
+    0x2c39b22c,
+    0x2c3a323e,
+    0x2c3ab252,
+    0x2c3b3263,
+    0x2c3bb282,
     0x2c3c1311,
     0x2c3c9327,
-    0x2c3d328b,
+    0x2c3d3296,
     0x2c3d9340,
-    0x2c3e32a8,
-    0x2c3eb2b6,
-    0x2c3f32ce,
-    0x2c3fb2e6,
-    0x2c403310,
+    0x2c3e32b3,
+    0x2c3eb2c1,
+    0x2c3f32d9,
+    0x2c3fb2f1,
+    0x2c40331b,
     0x2c409212,
-    0x2c413321,
-    0x2c41b334,
+    0x2c41332c,
+    0x2c41b33f,
     0x2c4211d8,
-    0x2c42b345,
+    0x2c42b350,
     0x2c43072f,
-    0x2c43b269,
-    0x2c4431ca,
-    0x2c44b2f3,
-    0x2c453161,
-    0x2c45b19d,
-    0x2c463201,
+    0x2c43b274,
+    0x2c4431d5,
+    0x2c44b2fe,
+    0x2c45316c,
+    0x2c45b1a8,
+    0x2c46320c,
     0x30320000,
     0x30328015,
     0x3033001f,
@@ -431,185 +431,185 @@ const uint32_t kOpenSSLReasonValues[] = {
     0x4050206f,
     0x4050a083,
     0x405120b6,
-    0x405220d3,
-    0x4052a0f7,
-    0x4053210f,
-    0x4053a122,
-    0x40542137,
-    0x4054a15a,
-    0x40552185,
-    0x4055a1c2,
-    0x405621cf,
-    0x4056a1e8,
-    0x40572200,
-    0x4057a213,
-    0x40582228,
-    0x4058a24f,
-    0x4059227e,
-    0x4059a2ab,
-    0x405a22bf,
-    0x405aa2cf,
-    0x405b22e7,
-    0x405ba2f8,
-    0x405c230b,
-    0x405ca34a,
-    0x405d2357,
-    0x405da37c,
-    0x405e23ba,
+    0x405220c6,
+    0x4052a0ea,
+    0x40532102,
+    0x4053a115,
+    0x4054212a,
+    0x4054a14d,
+    0x40552178,
+    0x4055a1b5,
+    0x405621da,
+    0x4056a1f3,
+    0x4057220b,
+    0x4057a21e,
+    0x40582233,
+    0x4058a25a,
+    0x40592289,
+    0x4059a2b6,
+    0x405a22ca,
+    0x405aa2da,
+    0x405b22f2,
+    0x405ba303,
+    0x405c2316,
+    0x405ca355,
+    0x405d2362,
+    0x405da387,
+    0x405e23c5,
     0x405e8ac0,
-    0x405f23db,
-    0x405fa3e8,
-    0x406023f6,
-    0x4060a418,
-    0x40612479,
-    0x4061a4b1,
-    0x406224c8,
-    0x4062a4d9,
-    0x40632526,
-    0x4063a53b,
-    0x40642552,
-    0x4064a57e,
-    0x40652599,
-    0x4065a5b0,
-    0x406625c8,
-    0x4066a5f2,
-    0x4067261d,
-    0x4067a662,
-    0x406826aa,
-    0x4068a6cb,
-    0x406926fd,
-    0x4069a72b,
-    0x406a274c,
-    0x406aa76c,
-    0x406b28f4,
-    0x406ba917,
-    0x406c292d,
-    0x406cac1e,
-    0x406d2c4d,
-    0x406dac75,
-    0x406e2ca3,
-    0x406eacf0,
-    0x406f2d49,
-    0x406fad81,
-    0x40702d94,
-    0x4070adb1,
+    0x405f23e6,
+    0x405fa3f3,
+    0x40602401,
+    0x4060a423,
+    0x40612484,
+    0x4061a4bc,
+    0x406224d3,
+    0x4062a4e4,
+    0x40632531,
+    0x4063a546,
+    0x4064255d,
+    0x4064a589,
+    0x406525a4,
+    0x4065a5bb,
+    0x406625d3,
+    0x4066a5fd,
+    0x40672628,
+    0x4067a66d,
+    0x406826b5,
+    0x4068a6d6,
+    0x40692708,
+    0x4069a736,
+    0x406a2757,
+    0x406aa777,
+    0x406b28ff,
+    0x406ba922,
+    0x406c2938,
+    0x406cac29,
+    0x406d2c58,
+    0x406dac80,
+    0x406e2cae,
+    0x406eacfb,
+    0x406f2d54,
+    0x406fad8c,
+    0x40702d9f,
+    0x4070adbc,
     0x4071080f,
-    0x4071adc3,
-    0x40722dd6,
-    0x4072ae0c,
-    0x40732e24,
+    0x4071adce,
+    0x40722de1,
+    0x4072ae17,
+    0x40732e2f,
     0x40739511,
-    0x40742e38,
-    0x4074ae52,
-    0x40752e63,
-    0x4075ae77,
-    0x40762e85,
+    0x40742e43,
+    0x4074ae5d,
+    0x40752e6e,
+    0x4075ae82,
+    0x40762e90,
     0x407692d5,
-    0x40772eaa,
-    0x4077aecc,
-    0x40782ee7,
-    0x4078af20,
-    0x40792f37,
-    0x4079af4d,
-    0x407a2f79,
-    0x407aaf8c,
-    0x407b2fa1,
-    0x407bafb3,
-    0x407c2fe4,
-    0x407cafed,
-    0x407d26e6,
+    0x40772eb5,
+    0x4077aed7,
+    0x40782ef2,
+    0x4078af2b,
+    0x40792f42,
+    0x4079af58,
+    0x407a2f84,
+    0x407aaf97,
+    0x407b2fac,
+    0x407bafbe,
+    0x407c2fef,
+    0x407caff8,
+    0x407d26f1,
     0x407da028,
-    0x407e2efc,
-    0x407ea25f,
+    0x407e2f07,
+    0x407ea26a,
     0x407f1d86,
     0x407f9ed2,
     0x40801fe2,
     0x40809dae,
-    0x408120e5,
+    0x408120d8,
     0x40819fbc,
-    0x40822c8e,
+    0x40822c99,
     0x40829b17,
-    0x4083223a,
-    0x4083a563,
+    0x40832245,
+    0x4083a56e,
     0x40841dc2,
-    0x4084a297,
-    0x4085231c,
-    0x4085a440,
-    0x4086239c,
+    0x4084a2a2,
+    0x40852327,
+    0x4085a44b,
+    0x408623a7,
     0x4086a042,
-    0x40872cd4,
-    0x4087a48e,
+    0x40872cdf,
+    0x4087a499,
     0x40881b55,
-    0x4088a675,
+    0x4088a680,
     0x40891ba4,
     0x40899b31,
-    0x408a2965,
+    0x408a2970,
     0x408a9929,
-    0x408b2fc8,
-    0x408bad5e,
-    0x408c232c,
+    0x408b2fd3,
+    0x408bad69,
+    0x408c2337,
     0x408c9961,
     0x408d1e23,
     0x408d9df4,
     0x408e1f53,
-    0x408ea1a2,
-    0x408f2689,
-    0x408fa45c,
-    0x4090263e,
-    0x4090a36e,
-    0x4091294d,
+    0x408ea195,
+    0x408f2694,
+    0x408fa467,
+    0x40902649,
+    0x4090a379,
+    0x40912958,
     0x40919987,
     0x40921bf1,
-    0x4092ad0f,
-    0x40932def,
+    0x4092ad1a,
+    0x40932dfa,
     0x4093a053,
     0x40941dd6,
-    0x4094a97e,
-    0x409524ea,
-    0x4095af59,
-    0x40962cbb,
+    0x4094a989,
+    0x409524f5,
+    0x4095af64,
+    0x40962cc6,
     0x40969ffb,
     0x4097209e,
     0x40979fa2,
     0x40981c51,
-    0x4098a4fe,
-    0x40992d2b,
-    0x4099a0c6,
-    0x409a2168,
+    0x4098a509,
+    0x40992d36,
+    0x4099a1c2,
+    0x409a215b,
     0x409a9945,
-    0x41f4281f,
-    0x41f928b1,
-    0x41fe27a4,
-    0x41feaa5a,
-    0x41ff2b6f,
-    0x42032838,
-    0x4208285a,
-    0x4208a896,
-    0x42092788,
-    0x4209a8d0,
-    0x420a27df,
-    0x420aa7bf,
-    0x420b27ff,
-    0x420ba878,
-    0x420c2b8b,
-    0x420ca98e,
-    0x420d2a41,
-    0x420daa78,
-    0x42122a92,
-    0x42172b52,
-    0x4217aad4,
-    0x421c2af6,
-    0x421f2ab1,
-    0x42212c03,
-    0x42262b35,
-    0x422b2be1,
-    0x422baa1c,
-    0x422c2bc3,
-    0x422ca9cf,
-    0x422d29a8,
-    0x422daba2,
-    0x422e29fb,
-    0x42302b11,
+    0x41f4282a,
+    0x41f928bc,
+    0x41fe27af,
+    0x41feaa65,
+    0x41ff2b7a,
+    0x42032843,
+    0x42082865,
+    0x4208a8a1,
+    0x42092793,
+    0x4209a8db,
+    0x420a27ea,
+    0x420aa7ca,
+    0x420b280a,
+    0x420ba883,
+    0x420c2b96,
+    0x420ca999,
+    0x420d2a4c,
+    0x420daa83,
+    0x42122a9d,
+    0x42172b5d,
+    0x4217aadf,
+    0x421c2b01,
+    0x421f2abc,
+    0x42212c0e,
+    0x42262b40,
+    0x422b2bec,
+    0x422baa27,
+    0x422c2bce,
+    0x422ca9da,
+    0x422d29b3,
+    0x422dabad,
+    0x422e2a06,
+    0x42302b1c,
     0x4432073a,
     0x44328749,
     0x44330755,
@@ -664,69 +664,69 @@ const uint32_t kOpenSSLReasonValues[] = {
     0x4c41156e,
     0x4c4193f1,
     0x4c42155a,
-    0x50323357,
-    0x5032b366,
-    0x50333371,
-    0x5033b381,
-    0x5034339a,
-    0x5034b3b4,
-    0x503533c2,
-    0x5035b3d8,
-    0x503633ea,
-    0x5036b400,
-    0x50373419,
-    0x5037b42c,
-    0x50383444,
-    0x5038b455,
-    0x5039346a,
-    0x5039b47e,
-    0x503a349e,
-    0x503ab4b4,
-    0x503b34cc,
-    0x503bb4de,
-    0x503c34fa,
-    0x503cb511,
-    0x503d352a,
-    0x503db540,
-    0x503e354d,
-    0x503eb563,
-    0x503f3575,
+    0x50323362,
+    0x5032b371,
+    0x5033337c,
+    0x5033b38c,
+    0x503433a5,
+    0x5034b3bf,
+    0x503533cd,
+    0x5035b3e3,
+    0x503633f5,
+    0x5036b40b,
+    0x50373424,
+    0x5037b437,
+    0x5038344f,
+    0x5038b460,
+    0x50393475,
+    0x5039b489,
+    0x503a34a9,
+    0x503ab4bf,
+    0x503b34d7,
+    0x503bb4e9,
+    0x503c3505,
+    0x503cb51c,
+    0x503d3535,
+    0x503db54b,
+    0x503e3558,
+    0x503eb56e,
+    0x503f3580,
     0x503f8388,
-    0x50403588,
-    0x5040b598,
-    0x504135b2,
-    0x5041b5c1,
-    0x504235db,
-    0x5042b5f8,
-    0x50433608,
-    0x5043b618,
-    0x50443627,
+    0x50403593,
+    0x5040b5a3,
+    0x504135bd,
+    0x5041b5cc,
+    0x504235e6,
+    0x5042b603,
+    0x50433613,
+    0x5043b623,
+    0x50443632,
     0x5044843e,
-    0x5045363b,
-    0x5045b659,
-    0x5046366c,
-    0x5046b682,
-    0x50473694,
-    0x5047b6a9,
-    0x504836cf,
-    0x5048b6dd,
-    0x504936f0,
-    0x5049b705,
-    0x504a371b,
-    0x504ab72b,
-    0x504b374b,
-    0x504bb75e,
-    0x504c3781,
-    0x504cb7af,
-    0x504d37c1,
-    0x504db7de,
-    0x504e37f9,
-    0x504eb815,
-    0x504f3827,
-    0x504fb83e,
-    0x5050384d,
+    0x50453646,
+    0x5045b664,
+    0x50463677,
+    0x5046b68d,
+    0x5047369f,
+    0x5047b6b4,
+    0x504836da,
+    0x5048b6e8,
+    0x504936fb,
+    0x5049b710,
+    0x504a3726,
+    0x504ab736,
+    0x504b3756,
+    0x504bb769,
+    0x504c378c,
+    0x504cb7ba,
+    0x504d37cc,
+    0x504db7e9,
+    0x504e3804,
+    0x504eb820,
+    0x504f3832,
+    0x504fb849,
+    0x50503858,
     0x505086fe,
-    0x50513860,
+    0x5051386b,
     0x58320f72,
     0x68320f34,
     0x68328c8c,
@@ -770,19 +770,19 @@ const uint32_t kOpenSSLReasonValues[] = {
     0x7c3211ee,
     0x80321404,
     0x80328090,
-    0x803330aa,
+    0x803330b5,
     0x803380b9,
-    0x803430b9,
-    0x8034b021,
-    0x8035303f,
-    0x8035b0cd,
-    0x80363081,
-    0x8036b030,
-    0x80373073,
-    0x8037b00e,
-    0x80383094,
-    0x8038b050,
-    0x80393065,
+    0x803430c4,
+    0x8034b02c,
+    0x8035304a,
+    0x8035b0d8,
+    0x8036308c,
+    0x8036b03b,
+    0x8037307e,
+    0x8037b019,
+    0x8038309f,
+    0x8038b05b,
+    0x80393070,
 };
 
 const size_t kOpenSSLReasonValuesLen = sizeof(kOpenSSLReasonValues) / sizeof(kOpenSSLReasonValues[0]);
@@ -1201,7 +1201,6 @@ const char kOpenSSLReasonStringData[] =
     "INVALID_TICKET_KEYS_LENGTH\0"
     "KEY_USAGE_BIT_INCORRECT\0"
     "LENGTH_MISMATCH\0"
-    "MISSING_ALPN\0"
     "MISSING_EXTENSION\0"
     "MISSING_KEY_SHARE\0"
     "MISSING_RSA_CERTIFICATE\0"
@@ -1213,6 +1212,7 @@ const char kOpenSSLReasonStringData[] =
     "NEGOTIATED_BOTH_NPN_AND_ALPN\0"
     "NEGOTIATED_TB_WITHOUT_EMS_OR_RI\0"
     "NESTED_GROUP\0"
+    "NO_APPLICATION_PROTOCOL\0"
     "NO_CERTIFICATES_RETURNED\0"
     "NO_CERTIFICATE_ASSIGNED\0"
     "NO_CERTIFICATE_SET\0"