grpc 1.9.1 → 1.10.0.pre1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of grpc might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/Makefile +2654 -953
- data/etc/roots.pem +282 -683
- data/include/grpc/compression.h +9 -26
- data/include/grpc/grpc.h +10 -24
- data/include/grpc/grpc_security.h +7 -1
- data/include/grpc/impl/codegen/compression_types.h +5 -62
- data/include/grpc/impl/codegen/grpc_types.h +10 -6
- data/include/grpc/module.modulemap +1 -10
- data/include/grpc/support/alloc.h +3 -2
- data/include/grpc/support/log.h +1 -2
- data/{src/core/lib/gpr/thd_internal.h → include/grpc/support/thd_id.h} +23 -9
- data/src/boringssl/err_data.c +550 -496
- data/src/core/ext/census/grpc_context.cc +2 -1
- data/src/core/ext/filters/client_channel/backup_poller.cc +5 -4
- data/src/core/ext/filters/client_channel/channel_connectivity.cc +7 -7
- data/src/core/ext/filters/client_channel/client_channel.cc +162 -172
- data/src/core/ext/filters/client_channel/client_channel_factory.cc +4 -2
- data/src/core/ext/filters/client_channel/client_channel_plugin.cc +10 -10
- data/src/core/ext/filters/client_channel/http_connect_handshaker.cc +18 -14
- data/src/core/ext/filters/client_channel/http_proxy.cc +3 -1
- data/src/core/ext/filters/client_channel/lb_policy.cc +21 -105
- data/src/core/ext/filters/client_channel/lb_policy.h +166 -170
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc +41 -36
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +1452 -1459
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h +1 -1
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc +3 -2
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc +7 -8
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +27 -27
- data/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +279 -304
- data/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +358 -330
- data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc +30 -41
- data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +7 -14
- data/src/core/ext/filters/client_channel/lb_policy_factory.cc +8 -21
- data/src/core/ext/filters/client_channel/lb_policy_factory.h +23 -27
- data/src/core/ext/filters/client_channel/lb_policy_registry.cc +58 -33
- data/src/core/ext/filters/client_channel/lb_policy_registry.h +25 -12
- data/src/core/ext/filters/client_channel/parse_address.cc +10 -8
- data/src/core/ext/filters/client_channel/proxy_mapper_registry.cc +2 -2
- data/src/core/ext/filters/client_channel/resolver.cc +6 -52
- data/src/core/ext/filters/client_channel/resolver.h +98 -55
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +266 -237
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +5 -5
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +31 -27
- data/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +244 -207
- data/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +161 -148
- data/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h +47 -31
- data/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc +126 -126
- data/src/core/ext/filters/client_channel/resolver_factory.h +33 -32
- data/src/core/ext/filters/client_channel/resolver_registry.cc +110 -90
- data/src/core/ext/filters/client_channel/resolver_registry.h +49 -36
- data/src/core/ext/filters/client_channel/retry_throttle.cc +29 -22
- data/src/core/ext/filters/client_channel/subchannel.cc +173 -173
- data/src/core/ext/filters/client_channel/subchannel.h +38 -45
- data/src/core/ext/filters/client_channel/subchannel_index.cc +44 -40
- data/src/core/ext/filters/client_channel/uri_parser.cc +3 -3
- data/src/core/ext/filters/deadline/deadline_filter.cc +27 -18
- data/src/core/ext/filters/http/client/http_client_filter.cc +26 -23
- data/src/core/ext/filters/http/http_filters_plugin.cc +3 -2
- data/src/core/ext/filters/http/message_compress/message_compress_filter.cc +78 -110
- data/src/core/ext/filters/http/server/http_server_filter.cc +29 -26
- data/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +9 -11
- data/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc +2 -1
- data/src/core/ext/filters/max_age/max_age_filter.cc +14 -14
- data/src/core/ext/filters/message_size/message_size_filter.cc +20 -18
- data/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc +4 -4
- data/src/core/ext/filters/workarounds/workaround_utils.cc +4 -4
- data/src/core/ext/transport/chttp2/alpn/alpn.cc +2 -1
- data/src/core/ext/transport/chttp2/client/chttp2_connector.cc +10 -10
- data/src/core/ext/transport/chttp2/client/insecure/channel_create.cc +4 -4
- data/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +11 -12
- data/src/core/ext/transport/chttp2/server/chttp2_server.cc +16 -13
- data/src/core/ext/transport/chttp2/transport/bin_decoder.cc +36 -9
- data/src/core/ext/transport/chttp2/transport/bin_decoder.h +3 -0
- data/src/core/ext/transport/chttp2/transport/bin_encoder.cc +17 -14
- data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +139 -145
- data/src/core/ext/transport/chttp2/transport/flow_control.cc +16 -14
- data/src/core/ext/transport/chttp2/transport/flow_control.h +8 -7
- data/src/core/ext/transport/chttp2/transport/frame_data.cc +35 -33
- data/src/core/ext/transport/chttp2/transport/frame_goaway.cc +27 -25
- data/src/core/ext/transport/chttp2/transport/frame_ping.cc +12 -12
- data/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +16 -15
- data/src/core/ext/transport/chttp2/transport/frame_settings.cc +19 -19
- data/src/core/ext/transport/chttp2/transport/frame_window_update.cc +11 -11
- data/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +23 -22
- data/src/core/ext/transport/chttp2/transport/hpack_parser.cc +35 -35
- data/src/core/ext/transport/chttp2/transport/hpack_table.cc +10 -7
- data/src/core/ext/transport/chttp2/transport/http2_settings.cc +2 -2
- data/src/core/ext/transport/chttp2/transport/incoming_metadata.cc +2 -2
- data/src/core/ext/transport/chttp2/transport/internal.h +1 -1
- data/src/core/ext/transport/chttp2/transport/parsing.cc +35 -39
- data/src/core/ext/transport/chttp2/transport/stream_map.cc +8 -7
- data/src/core/ext/transport/chttp2/transport/varint.cc +5 -5
- data/src/core/ext/transport/chttp2/transport/writing.cc +18 -18
- data/src/core/ext/transport/inproc/inproc_transport.cc +43 -23
- data/src/core/lib/{gpr → avl}/avl.cc +61 -57
- data/{include/grpc/support → src/core/lib/avl}/avl.h +25 -35
- data/src/core/lib/backoff/backoff.cc +6 -5
- data/src/core/lib/channel/channel_args.cc +23 -109
- data/src/core/lib/channel/channel_args.h +5 -31
- data/src/core/lib/channel/channel_stack.cc +11 -8
- data/src/core/lib/channel/channel_stack_builder.cc +10 -7
- data/src/core/lib/channel/connected_channel.cc +18 -17
- data/src/core/lib/channel/handshaker.cc +8 -8
- data/src/core/lib/channel/handshaker_registry.cc +3 -2
- data/src/core/lib/compression/algorithm_metadata.h +13 -6
- data/src/core/lib/compression/compression.cc +72 -183
- data/src/core/lib/compression/compression_internal.cc +274 -0
- data/src/core/lib/compression/compression_internal.h +86 -0
- data/src/core/lib/compression/message_compress.cc +15 -15
- data/src/core/lib/compression/message_compress.h +4 -3
- data/src/core/lib/compression/stream_compression_gzip.cc +8 -8
- data/src/core/lib/compression/stream_compression_identity.cc +1 -1
- data/src/core/lib/debug/stats.cc +10 -8
- data/src/core/lib/debug/stats_data.cc +2 -1
- data/src/core/lib/debug/trace.cc +3 -3
- data/src/core/lib/gpr/alloc.cc +7 -11
- data/src/core/lib/gpr/arena.cc +34 -12
- data/src/core/lib/gpr/atm.cc +2 -1
- data/src/core/lib/gpr/cpu_linux.cc +3 -3
- data/src/core/lib/gpr/cpu_posix.cc +2 -1
- data/src/core/lib/gpr/env.h +1 -1
- data/src/core/lib/gpr/env_linux.cc +1 -1
- data/src/core/lib/gpr/env_windows.cc +4 -4
- data/src/core/lib/gpr/fork.cc +16 -2
- data/src/core/lib/gpr/host_port.cc +5 -4
- data/{include/grpc/support → src/core/lib/gpr}/host_port.h +5 -13
- data/src/core/lib/gpr/log.cc +5 -4
- data/src/core/lib/gpr/log_linux.cc +1 -1
- data/src/core/lib/gpr/mpscq.cc +1 -0
- data/src/core/lib/gpr/murmur_hash.cc +4 -4
- data/src/core/lib/gpr/string.cc +19 -16
- data/src/core/lib/gpr/string_posix.cc +3 -3
- data/src/core/lib/gpr/sync_posix.cc +5 -9
- data/src/core/lib/gpr/thd.cc +3 -3
- data/{include/grpc/support → src/core/lib/gpr}/thd.h +20 -28
- data/src/core/lib/gpr/thd_posix.cc +6 -4
- data/src/core/lib/gpr/thd_windows.cc +3 -1
- data/src/core/lib/gpr/time.cc +6 -4
- data/src/core/lib/gpr/time_posix.cc +2 -2
- data/{include/grpc/support → src/core/lib/gpr}/tls.h +6 -6
- data/{include/grpc/support → src/core/lib/gpr}/tls_gcc.h +3 -3
- data/{include/grpc/support → src/core/lib/gpr}/tls_msvc.h +3 -3
- data/src/core/lib/gpr/tls_pthread.cc +1 -1
- data/{include/grpc/support → src/core/lib/gpr}/tls_pthread.h +3 -3
- data/{include/grpc/support → src/core/lib/gpr}/useful.h +3 -3
- data/src/core/lib/{gpr++ → gprpp}/abstract.h +3 -3
- data/src/core/lib/{gpr++ → gprpp}/atomic.h +5 -5
- data/src/core/lib/{gpr++ → gprpp}/atomic_with_atm.h +3 -3
- data/src/core/lib/{gpr++ → gprpp}/atomic_with_std.h +3 -3
- data/src/core/lib/{gpr++ → gprpp}/debug_location.h +3 -3
- data/src/core/lib/{gpr++ → gprpp}/inlined_vector.h +44 -22
- data/src/core/lib/{gpr++ → gprpp}/manual_constructor.h +2 -2
- data/src/core/lib/{gpr++ → gprpp}/memory.h +14 -5
- data/src/core/lib/{gpr++ → gprpp}/orphanable.h +39 -14
- data/src/core/lib/{gpr++ → gprpp}/ref_counted.h +42 -10
- data/src/core/lib/{gpr++ → gprpp}/ref_counted_ptr.h +18 -8
- data/src/core/lib/http/format_request.cc +3 -3
- data/src/core/lib/http/httpcli.cc +6 -7
- data/src/core/lib/http/httpcli_security_connector.cc +10 -10
- data/src/core/lib/http/parser.cc +16 -12
- data/src/core/lib/iomgr/call_combiner.cc +12 -13
- data/src/core/lib/iomgr/closure.h +4 -6
- data/src/core/lib/iomgr/combiner.cc +10 -21
- data/src/core/lib/iomgr/error.cc +50 -55
- data/src/core/lib/iomgr/ev_epoll1_linux.cc +41 -52
- data/src/core/lib/iomgr/ev_epollex_linux.cc +80 -28
- data/src/core/lib/iomgr/ev_epollsig_linux.cc +23 -30
- data/src/core/lib/iomgr/ev_poll_posix.cc +52 -46
- data/src/core/lib/iomgr/ev_posix.cc +47 -6
- data/src/core/lib/iomgr/exec_ctx.cc +10 -10
- data/src/core/lib/iomgr/exec_ctx.h +1 -1
- data/src/core/lib/iomgr/executor.cc +16 -13
- data/src/core/lib/iomgr/fork_posix.cc +1 -3
- data/src/core/lib/iomgr/gethostname_host_name_max.cc +1 -1
- data/src/core/lib/iomgr/iocp_windows.cc +1 -2
- data/src/core/lib/iomgr/iomgr.cc +2 -2
- data/src/core/lib/iomgr/iomgr_uv.cc +2 -0
- data/src/core/lib/iomgr/iomgr_uv.h +1 -1
- data/src/core/lib/iomgr/is_epollexclusive_available.cc +5 -4
- data/src/core/lib/iomgr/load_file.cc +3 -3
- data/src/core/lib/iomgr/pollset_windows.cc +1 -1
- data/src/core/lib/iomgr/resolve_address_posix.cc +10 -9
- data/src/core/lib/iomgr/resolve_address_uv.cc +2 -2
- data/src/core/lib/iomgr/resolve_address_windows.cc +3 -2
- data/src/core/lib/iomgr/resource_quota.cc +36 -34
- data/src/core/lib/iomgr/sockaddr_utils.cc +39 -23
- data/src/core/lib/iomgr/socket_factory_posix.cc +5 -5
- data/src/core/lib/iomgr/socket_mutator.cc +7 -7
- data/src/core/lib/iomgr/socket_utils_common_posix.cc +7 -4
- data/src/core/lib/iomgr/socket_utils_linux.cc +3 -2
- data/src/core/lib/iomgr/tcp_client_posix.cc +7 -6
- data/src/core/lib/iomgr/tcp_client_windows.cc +0 -1
- data/src/core/lib/iomgr/tcp_posix.cc +47 -55
- data/src/core/lib/iomgr/tcp_server_posix.cc +12 -10
- data/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +7 -5
- data/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc +4 -3
- data/src/core/lib/iomgr/tcp_windows.cc +1 -1
- data/src/core/lib/iomgr/timer_generic.cc +16 -14
- data/src/core/lib/iomgr/timer_heap.cc +8 -7
- data/src/core/lib/iomgr/timer_manager.cc +4 -3
- data/src/core/lib/iomgr/udp_server.cc +24 -16
- data/src/core/lib/iomgr/unix_sockets_posix.cc +15 -10
- data/src/core/lib/iomgr/wakeup_fd_cv.cc +6 -5
- data/src/core/lib/iomgr/wakeup_fd_eventfd.cc +1 -2
- data/src/core/lib/json/json.cc +1 -1
- data/src/core/lib/json/json_reader.cc +8 -6
- data/src/core/lib/json/json_string.cc +19 -18
- data/src/core/lib/json/json_writer.cc +10 -8
- data/src/core/lib/profiling/basic_timers.cc +1 -1
- data/src/core/lib/profiling/timers.h +3 -20
- data/src/core/lib/security/context/security_context.cc +16 -14
- data/src/core/lib/security/credentials/composite/composite_credentials.cc +17 -14
- data/src/core/lib/security/credentials/credentials.cc +9 -8
- data/src/core/lib/security/credentials/credentials.h +1 -1
- data/src/core/lib/security/credentials/credentials_metadata.cc +2 -2
- data/src/core/lib/security/credentials/fake/fake_credentials.cc +12 -13
- data/src/core/lib/security/credentials/google_default/google_default_credentials.cc +7 -4
- data/src/core/lib/security/credentials/iam/iam_credentials.cc +5 -3
- data/src/core/lib/security/credentials/jwt/json_token.cc +4 -3
- data/src/core/lib/security/credentials/jwt/jwt_credentials.cc +7 -7
- data/src/core/lib/security/credentials/jwt/jwt_verifier.cc +21 -18
- data/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +23 -18
- data/src/core/lib/security/credentials/plugin/plugin_credentials.cc +11 -7
- data/src/core/lib/security/credentials/ssl/ssl_credentials.cc +22 -21
- data/src/core/lib/security/{transport → security_connector}/security_connector.cc +46 -43
- data/src/core/lib/security/{transport → security_connector}/security_connector.h +3 -3
- data/src/core/lib/security/transport/client_auth_filter.cc +32 -34
- data/src/core/lib/security/transport/lb_targets_info.cc +7 -5
- data/src/core/lib/security/transport/secure_endpoint.cc +21 -21
- data/src/core/lib/security/transport/security_handshaker.cc +19 -18
- data/src/core/lib/security/transport/security_handshaker.h +1 -1
- data/src/core/lib/security/transport/server_auth_filter.cc +21 -21
- data/src/core/lib/slice/b64.cc +19 -16
- data/src/core/lib/slice/percent_encoding.cc +5 -5
- data/src/core/lib/slice/slice.cc +35 -33
- data/src/core/lib/slice/slice_buffer.cc +16 -14
- data/src/core/lib/slice/slice_hash_table.cc +3 -2
- data/src/core/lib/slice/slice_intern.cc +21 -25
- data/src/core/lib/slice/slice_string_helpers.cc +45 -9
- data/src/core/lib/slice/slice_string_helpers.h +6 -0
- data/src/core/lib/surface/byte_buffer.cc +2 -2
- data/src/core/lib/surface/byte_buffer_reader.cc +6 -3
- data/src/core/lib/surface/call.cc +171 -260
- data/src/core/lib/surface/call_test_only.h +1 -13
- data/src/core/lib/surface/channel.cc +20 -43
- data/src/core/lib/surface/channel_init.cc +7 -7
- data/src/core/lib/surface/channel_ping.cc +2 -2
- data/src/core/lib/surface/completion_queue.cc +69 -75
- data/src/core/lib/surface/init.cc +4 -5
- data/src/core/lib/surface/init_secure.cc +1 -1
- data/src/core/lib/surface/lame_client.cc +1 -1
- data/src/core/lib/surface/server.cc +64 -59
- data/src/core/lib/surface/version.cc +2 -2
- data/src/core/lib/transport/bdp_estimator.cc +6 -5
- data/src/core/lib/transport/byte_stream.cc +23 -14
- data/src/core/lib/transport/byte_stream.h +1 -1
- data/src/core/lib/transport/connectivity_state.cc +9 -13
- data/src/core/lib/transport/error_utils.cc +10 -7
- data/src/core/lib/transport/metadata.cc +27 -26
- data/src/core/lib/transport/metadata.h +1 -1
- data/src/core/lib/transport/pid_controller.cc +2 -1
- data/src/core/lib/transport/service_config.cc +5 -5
- data/src/core/lib/transport/static_metadata.cc +225 -222
- data/src/core/lib/transport/static_metadata.h +77 -76
- data/src/core/lib/transport/timeout_encoding.cc +3 -2
- data/src/core/lib/transport/transport.cc +6 -5
- data/src/core/lib/transport/transport_op_string.cc +0 -1
- data/src/core/plugin_registry/grpc_plugin_registry.cc +4 -4
- data/src/core/tsi/alts_transport_security.cc +61 -0
- data/src/core/tsi/{gts_transport_security.h → alts_transport_security.h} +16 -8
- data/src/core/tsi/fake_transport_security.cc +59 -43
- data/src/core/tsi/ssl_transport_security.cc +122 -107
- data/src/core/tsi/transport_security.cc +3 -3
- data/src/core/tsi/transport_security_adapter.cc +16 -10
- data/src/ruby/bin/apis/pubsub_demo.rb +1 -1
- data/src/ruby/ext/grpc/rb_channel.c +3 -4
- data/src/ruby/ext/grpc/rb_compression_options.c +13 -3
- data/src/ruby/ext/grpc/rb_grpc_imports.generated.c +4 -76
- data/src/ruby/ext/grpc/rb_grpc_imports.generated.h +8 -120
- data/src/ruby/ext/grpc/rb_server.c +52 -28
- data/src/ruby/lib/grpc/generic/rpc_server.rb +7 -4
- data/src/ruby/lib/grpc/version.rb +1 -1
- data/src/ruby/pb/test/client.rb +1 -1
- data/src/ruby/pb/test/server.rb +1 -1
- data/src/ruby/spec/client_server_spec.rb +4 -2
- data/src/ruby/spec/generic/active_call_spec.rb +2 -1
- data/src/ruby/spec/generic/client_stub_spec.rb +32 -8
- data/src/ruby/spec/server_spec.rb +26 -7
- data/third_party/boringssl/crypto/asn1/a_bitstr.c +7 -2
- data/third_party/boringssl/crypto/asn1/a_d2i_fp.c +15 -0
- data/third_party/boringssl/crypto/asn1/a_gentm.c +1 -1
- data/third_party/boringssl/crypto/asn1/a_print.c +0 -28
- data/third_party/boringssl/crypto/asn1/a_strnid.c +3 -0
- data/third_party/boringssl/crypto/asn1/a_time.c +17 -9
- data/third_party/boringssl/crypto/asn1/a_utctm.c +1 -1
- data/third_party/boringssl/crypto/asn1/asn1_lib.c +5 -49
- data/third_party/boringssl/crypto/asn1/asn1_locl.h +1 -1
- data/third_party/boringssl/crypto/asn1/tasn_dec.c +9 -9
- data/third_party/boringssl/crypto/asn1/tasn_enc.c +0 -6
- data/third_party/boringssl/crypto/asn1/time_support.c +5 -5
- data/third_party/boringssl/crypto/base64/base64.c +65 -43
- data/third_party/boringssl/crypto/bio/bio.c +134 -110
- data/third_party/boringssl/crypto/bio/bio_mem.c +9 -9
- data/third_party/boringssl/crypto/bio/connect.c +17 -17
- data/third_party/boringssl/crypto/bio/fd.c +2 -1
- data/third_party/boringssl/crypto/bio/file.c +14 -14
- data/third_party/boringssl/crypto/bio/hexdump.c +15 -16
- data/third_party/boringssl/crypto/bio/internal.h +14 -14
- data/third_party/boringssl/crypto/bio/pair.c +45 -45
- data/third_party/boringssl/crypto/bio/printf.c +6 -10
- data/third_party/boringssl/crypto/{bn → bn_extra}/bn_asn1.c +9 -9
- data/third_party/boringssl/crypto/{bn → bn_extra}/convert.c +18 -223
- data/third_party/boringssl/crypto/buf/buf.c +20 -44
- data/third_party/boringssl/crypto/bytestring/ber.c +35 -35
- data/third_party/boringssl/crypto/bytestring/cbb.c +24 -24
- data/third_party/boringssl/crypto/bytestring/cbs.c +33 -37
- data/third_party/boringssl/crypto/bytestring/internal.h +38 -38
- data/third_party/boringssl/crypto/chacha/chacha.c +7 -7
- data/third_party/boringssl/crypto/{asn1/t_bitst.c → cipher_extra/cipher_extra.c} +49 -38
- data/third_party/boringssl/crypto/{cipher → cipher_extra}/derive_key.c +0 -2
- data/third_party/boringssl/crypto/cipher_extra/e_aesctrhmac.c +281 -0
- data/third_party/boringssl/crypto/cipher_extra/e_aesgcmsiv.c +867 -0
- data/third_party/boringssl/crypto/cipher_extra/e_chacha20poly1305.c +326 -0
- data/third_party/boringssl/crypto/{cipher → cipher_extra}/e_null.c +0 -1
- data/third_party/boringssl/crypto/{cipher → cipher_extra}/e_rc2.c +22 -10
- data/third_party/boringssl/crypto/{cipher → cipher_extra}/e_rc4.c +0 -0
- data/third_party/boringssl/crypto/{cipher → cipher_extra}/e_ssl3.c +120 -64
- data/third_party/boringssl/crypto/{cipher → cipher_extra}/e_tls.c +220 -141
- data/third_party/boringssl/crypto/{asn1/x_bignum.c → cipher_extra/internal.h} +61 -86
- data/third_party/boringssl/crypto/cipher_extra/tls_cbc.c +482 -0
- data/third_party/boringssl/crypto/cmac/cmac.c +20 -20
- data/third_party/boringssl/crypto/conf/conf.c +32 -20
- data/third_party/boringssl/crypto/conf/internal.h +3 -3
- data/third_party/boringssl/crypto/cpu-aarch64-linux.c +5 -5
- data/third_party/boringssl/crypto/cpu-arm-linux.c +44 -41
- data/third_party/boringssl/crypto/cpu-intel.c +68 -43
- data/third_party/boringssl/crypto/cpu-ppc64le.c +5 -7
- data/third_party/boringssl/crypto/crypto.c +54 -32
- data/third_party/boringssl/crypto/curve25519/curve25519.c +269 -269
- data/third_party/boringssl/crypto/curve25519/internal.h +28 -8
- data/third_party/boringssl/crypto/curve25519/spake25519.c +180 -106
- data/third_party/boringssl/crypto/curve25519/x25519-x86_64.c +9 -9
- data/third_party/boringssl/crypto/dh/check.c +33 -34
- data/third_party/boringssl/crypto/dh/dh.c +72 -36
- data/third_party/boringssl/crypto/dh/dh_asn1.c +1 -1
- data/third_party/boringssl/crypto/dh/params.c +1 -161
- data/third_party/boringssl/crypto/digest_extra/digest_extra.c +240 -0
- data/third_party/boringssl/crypto/dsa/dsa.c +127 -87
- data/third_party/boringssl/crypto/dsa/dsa_asn1.c +1 -1
- data/third_party/boringssl/crypto/{ec → ec_extra}/ec_asn1.c +83 -70
- data/third_party/boringssl/crypto/ecdh/ecdh.c +1 -1
- data/third_party/boringssl/crypto/{ecdsa → ecdsa_extra}/ecdsa_asn1.c +86 -31
- data/third_party/boringssl/crypto/engine/engine.c +6 -6
- data/third_party/boringssl/crypto/err/err.c +197 -106
- data/third_party/boringssl/crypto/err/internal.h +58 -0
- data/third_party/boringssl/crypto/evp/digestsign.c +86 -14
- data/third_party/boringssl/crypto/evp/evp.c +6 -11
- data/third_party/boringssl/crypto/evp/evp_asn1.c +17 -17
- data/third_party/boringssl/crypto/evp/evp_ctx.c +15 -11
- data/third_party/boringssl/crypto/evp/internal.h +66 -51
- data/third_party/boringssl/crypto/evp/p_dsa_asn1.c +11 -11
- data/third_party/boringssl/crypto/evp/p_ec.c +10 -8
- data/third_party/boringssl/crypto/evp/p_ec_asn1.c +11 -12
- data/third_party/boringssl/crypto/evp/p_ed25519.c +71 -0
- data/third_party/boringssl/crypto/evp/p_ed25519_asn1.c +190 -0
- data/third_party/boringssl/crypto/evp/p_rsa.c +50 -95
- data/third_party/boringssl/crypto/evp/p_rsa_asn1.c +28 -18
- data/third_party/boringssl/crypto/evp/pbkdf.c +49 -56
- data/third_party/boringssl/crypto/evp/print.c +5 -36
- data/third_party/boringssl/crypto/evp/scrypt.c +209 -0
- data/third_party/boringssl/crypto/ex_data.c +15 -45
- data/third_party/boringssl/crypto/fipsmodule/aes/internal.h +100 -0
- data/third_party/boringssl/crypto/fipsmodule/bcm.c +679 -0
- data/third_party/boringssl/crypto/{bn → fipsmodule/bn}/internal.h +40 -27
- data/third_party/boringssl/crypto/{bn → fipsmodule/bn}/rsaz_exp.h +0 -0
- data/third_party/boringssl/crypto/{cipher → fipsmodule/cipher}/internal.h +34 -67
- data/third_party/boringssl/crypto/fipsmodule/delocate.h +88 -0
- data/third_party/boringssl/crypto/{des → fipsmodule/des}/internal.h +18 -4
- data/third_party/boringssl/crypto/{digest → fipsmodule/digest}/internal.h +18 -18
- data/third_party/boringssl/crypto/{digest → fipsmodule/digest}/md32_common.h +58 -64
- data/third_party/boringssl/crypto/{ec → fipsmodule/ec}/internal.h +58 -52
- data/third_party/boringssl/crypto/{ec → fipsmodule/ec}/p256-x86_64-table.h +11 -11
- data/third_party/boringssl/crypto/{ec → fipsmodule/ec}/p256-x86_64.h +32 -32
- data/third_party/boringssl/crypto/{rand/internal.h → fipsmodule/is_fips.c} +10 -15
- data/third_party/boringssl/crypto/{modes → fipsmodule/modes}/internal.h +112 -119
- data/third_party/boringssl/crypto/fipsmodule/rand/internal.h +92 -0
- data/third_party/boringssl/crypto/{rsa → fipsmodule/rsa}/internal.h +36 -49
- data/third_party/boringssl/crypto/hkdf/hkdf.c +6 -6
- data/third_party/boringssl/crypto/internal.h +301 -233
- data/third_party/boringssl/crypto/lhash/lhash.c +26 -45
- data/third_party/boringssl/crypto/mem.c +76 -33
- data/third_party/boringssl/crypto/obj/obj.c +44 -28
- data/third_party/boringssl/crypto/obj/obj_dat.h +102 -34
- data/third_party/boringssl/crypto/obj/obj_xref.c +6 -6
- data/third_party/boringssl/crypto/pem/pem_info.c +3 -5
- data/third_party/boringssl/crypto/pem/pem_lib.c +1 -6
- data/third_party/boringssl/crypto/pem/pem_pk8.c +1 -0
- data/third_party/boringssl/crypto/pem/pem_pkey.c +1 -1
- data/third_party/boringssl/crypto/pem/pem_xaux.c +0 -2
- data/third_party/boringssl/crypto/pkcs7/internal.h +49 -0
- data/third_party/boringssl/crypto/pkcs7/pkcs7.c +166 -0
- data/third_party/boringssl/crypto/{x509/pkcs7.c → pkcs7/pkcs7_x509.c} +27 -147
- data/third_party/boringssl/crypto/pkcs8/internal.h +34 -16
- data/third_party/boringssl/crypto/pkcs8/p5_pbev2.c +120 -39
- data/third_party/boringssl/crypto/pkcs8/pkcs8.c +144 -857
- data/third_party/boringssl/crypto/pkcs8/pkcs8_x509.c +789 -0
- data/third_party/boringssl/crypto/poly1305/internal.h +4 -3
- data/third_party/boringssl/crypto/poly1305/poly1305.c +14 -14
- data/third_party/boringssl/crypto/poly1305/poly1305_arm.c +11 -11
- data/third_party/boringssl/crypto/poly1305/poly1305_vec.c +41 -41
- data/third_party/boringssl/crypto/pool/internal.h +2 -2
- data/third_party/boringssl/crypto/pool/pool.c +15 -15
- data/third_party/boringssl/crypto/{rand → rand_extra}/deterministic.c +7 -7
- data/third_party/boringssl/crypto/rand_extra/forkunsafe.c +46 -0
- data/third_party/boringssl/crypto/{rand → rand_extra}/fuchsia.c +7 -7
- data/third_party/boringssl/crypto/rand_extra/rand_extra.c +70 -0
- data/third_party/boringssl/crypto/{rand → rand_extra}/windows.c +5 -5
- data/third_party/boringssl/crypto/refcount_c11.c +2 -2
- data/third_party/boringssl/crypto/refcount_lock.c +1 -1
- data/third_party/boringssl/crypto/{rsa → rsa_extra}/rsa_asn1.c +12 -120
- data/third_party/boringssl/crypto/stack/stack.c +13 -13
- data/third_party/boringssl/crypto/thread_none.c +1 -1
- data/third_party/boringssl/crypto/thread_pthread.c +1 -1
- data/third_party/boringssl/crypto/thread_win.c +40 -40
- data/third_party/boringssl/crypto/x509/a_sign.c +5 -12
- data/third_party/boringssl/crypto/x509/a_verify.c +6 -18
- data/third_party/boringssl/crypto/x509/algorithm.c +22 -6
- data/third_party/boringssl/crypto/x509/asn1_gen.c +30 -7
- data/third_party/boringssl/crypto/x509/by_dir.c +2 -2
- data/third_party/boringssl/crypto/x509/by_file.c +2 -2
- data/third_party/boringssl/crypto/x509/rsa_pss.c +5 -5
- data/third_party/boringssl/crypto/x509/t_x509.c +2 -1
- data/third_party/boringssl/crypto/x509/x509_def.c +5 -0
- data/third_party/boringssl/crypto/x509/x509_lu.c +35 -4
- data/third_party/boringssl/crypto/x509/x509_set.c +10 -0
- data/third_party/boringssl/crypto/x509/x509_vfy.c +20 -17
- data/third_party/boringssl/crypto/x509/x_name.c +13 -16
- data/third_party/boringssl/crypto/x509/x_x509.c +3 -3
- data/third_party/boringssl/crypto/x509/x_x509a.c +0 -7
- data/third_party/boringssl/crypto/x509v3/ext_dat.h +8 -0
- data/third_party/boringssl/crypto/x509v3/pcy_int.h +2 -2
- data/third_party/boringssl/crypto/x509v3/pcy_lib.c +0 -9
- data/third_party/boringssl/crypto/x509v3/pcy_node.c +1 -1
- data/third_party/boringssl/crypto/x509v3/pcy_tree.c +25 -15
- data/third_party/boringssl/crypto/x509v3/v3_alt.c +21 -11
- data/third_party/boringssl/crypto/x509v3/v3_cpols.c +9 -3
- data/third_party/boringssl/crypto/x509v3/v3_info.c +22 -14
- data/third_party/boringssl/crypto/x509v3/v3_ncons.c +27 -11
- data/third_party/boringssl/crypto/x509v3/v3_pci.c +0 -33
- data/third_party/boringssl/crypto/x509v3/v3_utl.c +4 -4
- data/third_party/boringssl/include/openssl/aead.h +280 -191
- data/third_party/boringssl/include/openssl/aes.h +50 -50
- data/third_party/boringssl/include/openssl/arm_arch.h +12 -12
- data/third_party/boringssl/include/openssl/asn1.h +14 -77
- data/third_party/boringssl/include/openssl/asn1t.h +11 -15
- data/third_party/boringssl/include/openssl/base.h +78 -51
- data/third_party/boringssl/include/openssl/base64.h +68 -68
- data/third_party/boringssl/include/openssl/bio.h +472 -406
- data/third_party/boringssl/include/openssl/blowfish.h +1 -1
- data/third_party/boringssl/include/openssl/bn.h +454 -435
- data/third_party/boringssl/include/openssl/buf.h +27 -27
- data/third_party/boringssl/include/openssl/bytestring.h +282 -267
- data/third_party/boringssl/include/openssl/cast.h +2 -2
- data/third_party/boringssl/include/openssl/chacha.h +5 -5
- data/third_party/boringssl/include/openssl/cipher.h +209 -200
- data/third_party/boringssl/include/openssl/cmac.h +27 -27
- data/third_party/boringssl/include/openssl/conf.h +49 -46
- data/third_party/boringssl/include/openssl/cpu.h +60 -45
- data/third_party/boringssl/include/openssl/crypto.h +59 -35
- data/third_party/boringssl/include/openssl/curve25519.h +97 -92
- data/third_party/boringssl/include/openssl/des.h +25 -25
- data/third_party/boringssl/include/openssl/dh.h +98 -97
- data/third_party/boringssl/include/openssl/digest.h +143 -114
- data/third_party/boringssl/include/openssl/dsa.h +217 -202
- data/third_party/boringssl/include/openssl/ec.h +132 -131
- data/third_party/boringssl/include/openssl/ec_key.h +132 -128
- data/third_party/boringssl/include/openssl/ecdh.h +9 -9
- data/third_party/boringssl/include/openssl/ecdsa.h +66 -66
- data/third_party/boringssl/include/openssl/engine.h +38 -38
- data/third_party/boringssl/include/openssl/err.h +189 -219
- data/third_party/boringssl/include/openssl/evp.h +473 -397
- data/third_party/boringssl/include/openssl/ex_data.h +46 -56
- data/third_party/boringssl/include/openssl/hkdf.h +17 -17
- data/third_party/boringssl/include/openssl/hmac.h +55 -43
- data/third_party/boringssl/include/openssl/is_boringssl.h +16 -0
- data/third_party/boringssl/include/openssl/lhash.h +67 -67
- data/third_party/boringssl/include/openssl/lhash_macros.h +4 -4
- data/third_party/boringssl/include/openssl/md4.h +14 -14
- data/third_party/boringssl/include/openssl/md5.h +14 -14
- data/third_party/boringssl/include/openssl/mem.h +39 -33
- data/third_party/boringssl/include/openssl/nid.h +43 -0
- data/third_party/boringssl/include/openssl/obj.h +93 -87
- data/third_party/boringssl/include/openssl/opensslconf.h +8 -1
- data/third_party/boringssl/include/openssl/pem.h +2 -122
- data/third_party/boringssl/include/openssl/pkcs7.h +68 -2
- data/third_party/boringssl/include/openssl/pkcs8.h +81 -66
- data/third_party/boringssl/include/openssl/poly1305.h +11 -11
- data/third_party/boringssl/include/openssl/pool.h +29 -25
- data/third_party/boringssl/include/openssl/rand.h +48 -45
- data/third_party/boringssl/include/openssl/rc4.h +9 -9
- data/third_party/boringssl/include/openssl/ripemd.h +13 -13
- data/third_party/boringssl/include/openssl/rsa.h +371 -340
- data/third_party/boringssl/include/openssl/sha.h +71 -71
- data/third_party/boringssl/include/openssl/span.h +191 -0
- data/third_party/boringssl/include/openssl/ssl.h +2639 -2519
- data/third_party/boringssl/include/openssl/ssl3.h +39 -122
- data/third_party/boringssl/include/openssl/stack.h +355 -164
- data/third_party/boringssl/include/openssl/thread.h +43 -43
- data/third_party/boringssl/include/openssl/tls1.h +60 -63
- data/third_party/boringssl/include/openssl/type_check.h +10 -14
- data/third_party/boringssl/include/openssl/x509.h +41 -116
- data/third_party/boringssl/include/openssl/x509_vfy.h +17 -25
- data/third_party/boringssl/include/openssl/x509v3.h +27 -21
- data/third_party/boringssl/ssl/{bio_ssl.c → bio_ssl.cc} +9 -5
- data/third_party/boringssl/ssl/{custom_extensions.c → custom_extensions.cc} +19 -12
- data/third_party/boringssl/ssl/{d1_both.c → d1_both.cc} +224 -193
- data/third_party/boringssl/ssl/{d1_lib.c → d1_lib.cc} +86 -79
- data/third_party/boringssl/ssl/{d1_pkt.c → d1_pkt.cc} +55 -87
- data/third_party/boringssl/ssl/{d1_srtp.c → d1_srtp.cc} +12 -16
- data/third_party/boringssl/ssl/{dtls_method.c → dtls_method.cc} +33 -50
- data/third_party/boringssl/ssl/{dtls_record.c → dtls_record.cc} +76 -64
- data/third_party/boringssl/ssl/handshake.cc +547 -0
- data/third_party/boringssl/ssl/handshake_client.cc +1828 -0
- data/third_party/boringssl/ssl/handshake_server.cc +1672 -0
- data/third_party/boringssl/ssl/internal.h +2027 -1280
- data/third_party/boringssl/ssl/s3_both.cc +603 -0
- data/third_party/boringssl/ssl/{s3_lib.c → s3_lib.cc} +22 -10
- data/third_party/boringssl/ssl/{s3_pkt.c → s3_pkt.cc} +171 -75
- data/third_party/boringssl/ssl/ssl_aead_ctx.cc +415 -0
- data/third_party/boringssl/ssl/{ssl_asn1.c → ssl_asn1.cc} +257 -261
- data/third_party/boringssl/ssl/{ssl_buffer.c → ssl_buffer.cc} +81 -97
- data/third_party/boringssl/ssl/{ssl_cert.c → ssl_cert.cc} +304 -414
- data/third_party/boringssl/ssl/{ssl_cipher.c → ssl_cipher.cc} +427 -505
- data/third_party/boringssl/ssl/{ssl_file.c → ssl_file.cc} +24 -16
- data/third_party/boringssl/ssl/ssl_key_share.cc +245 -0
- data/third_party/boringssl/ssl/{ssl_lib.c → ssl_lib.cc} +665 -828
- data/third_party/boringssl/ssl/ssl_privkey.cc +518 -0
- data/third_party/boringssl/ssl/{ssl_session.c → ssl_session.cc} +596 -471
- data/third_party/boringssl/ssl/{ssl_stat.c → ssl_stat.cc} +5 -224
- data/third_party/boringssl/ssl/{ssl_transcript.c → ssl_transcript.cc} +117 -140
- data/third_party/boringssl/ssl/ssl_versions.cc +439 -0
- data/third_party/boringssl/ssl/{ssl_x509.c → ssl_x509.cc} +751 -267
- data/third_party/boringssl/ssl/{t1_enc.c → t1_enc.cc} +120 -161
- data/third_party/boringssl/ssl/{t1_lib.c → t1_lib.cc} +859 -966
- data/third_party/boringssl/ssl/{tls13_both.c → tls13_both.cc} +202 -284
- data/third_party/boringssl/ssl/tls13_client.cc +842 -0
- data/third_party/boringssl/ssl/{tls13_enc.c → tls13_enc.cc} +108 -90
- data/third_party/boringssl/ssl/tls13_server.cc +967 -0
- data/third_party/boringssl/ssl/{tls_method.c → tls_method.cc} +94 -73
- data/third_party/boringssl/ssl/tls_record.cc +675 -0
- metadata +117 -168
- data/include/grpc/support/cmdline.h +0 -88
- data/include/grpc/support/subprocess.h +0 -44
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h +0 -29
- data/src/core/ext/filters/client_channel/resolver_factory.cc +0 -40
- data/src/core/lib/gpr/cmdline.cc +0 -330
- data/src/core/lib/gpr/subprocess_posix.cc +0 -99
- data/src/core/lib/gpr/subprocess_windows.cc +0 -126
- data/src/core/lib/surface/alarm.cc +0 -137
- data/src/core/lib/surface/alarm_internal.h +0 -40
- data/src/core/tsi/gts_transport_security.cc +0 -40
- data/third_party/boringssl/crypto/aes/aes.c +0 -1142
- data/third_party/boringssl/crypto/aes/internal.h +0 -87
- data/third_party/boringssl/crypto/aes/key_wrap.c +0 -138
- data/third_party/boringssl/crypto/aes/mode_wrappers.c +0 -112
- data/third_party/boringssl/crypto/asn1/x_long.c +0 -200
- data/third_party/boringssl/crypto/bn/add.c +0 -377
- data/third_party/boringssl/crypto/bn/asm/x86_64-gcc.c +0 -532
- data/third_party/boringssl/crypto/bn/bn.c +0 -365
- data/third_party/boringssl/crypto/bn/cmp.c +0 -239
- data/third_party/boringssl/crypto/bn/ctx.c +0 -313
- data/third_party/boringssl/crypto/bn/div.c +0 -728
- data/third_party/boringssl/crypto/bn/exponentiation.c +0 -1240
- data/third_party/boringssl/crypto/bn/gcd.c +0 -635
- data/third_party/boringssl/crypto/bn/generic.c +0 -707
- data/third_party/boringssl/crypto/bn/kronecker.c +0 -176
- data/third_party/boringssl/crypto/bn/montgomery.c +0 -409
- data/third_party/boringssl/crypto/bn/montgomery_inv.c +0 -207
- data/third_party/boringssl/crypto/bn/mul.c +0 -871
- data/third_party/boringssl/crypto/bn/prime.c +0 -861
- data/third_party/boringssl/crypto/bn/random.c +0 -343
- data/third_party/boringssl/crypto/bn/rsaz_exp.c +0 -254
- data/third_party/boringssl/crypto/bn/shift.c +0 -307
- data/third_party/boringssl/crypto/bn/sqrt.c +0 -506
- data/third_party/boringssl/crypto/cipher/aead.c +0 -156
- data/third_party/boringssl/crypto/cipher/cipher.c +0 -657
- data/third_party/boringssl/crypto/cipher/e_aes.c +0 -1771
- data/third_party/boringssl/crypto/cipher/e_chacha20poly1305.c +0 -276
- data/third_party/boringssl/crypto/cipher/e_des.c +0 -205
- data/third_party/boringssl/crypto/cipher/tls_cbc.c +0 -482
- data/third_party/boringssl/crypto/des/des.c +0 -771
- data/third_party/boringssl/crypto/digest/digest.c +0 -251
- data/third_party/boringssl/crypto/digest/digests.c +0 -358
- data/third_party/boringssl/crypto/ec/ec.c +0 -847
- data/third_party/boringssl/crypto/ec/ec_key.c +0 -479
- data/third_party/boringssl/crypto/ec/ec_montgomery.c +0 -303
- data/third_party/boringssl/crypto/ec/oct.c +0 -416
- data/third_party/boringssl/crypto/ec/p224-64.c +0 -1143
- data/third_party/boringssl/crypto/ec/p256-64.c +0 -1701
- data/third_party/boringssl/crypto/ec/p256-x86_64.c +0 -561
- data/third_party/boringssl/crypto/ec/simple.c +0 -1118
- data/third_party/boringssl/crypto/ec/util-64.c +0 -109
- data/third_party/boringssl/crypto/ec/wnaf.c +0 -458
- data/third_party/boringssl/crypto/ecdsa/ecdsa.c +0 -479
- data/third_party/boringssl/crypto/hmac/hmac.c +0 -215
- data/third_party/boringssl/crypto/md4/md4.c +0 -236
- data/third_party/boringssl/crypto/md5/md5.c +0 -285
- data/third_party/boringssl/crypto/modes/cbc.c +0 -212
- data/third_party/boringssl/crypto/modes/cfb.c +0 -230
- data/third_party/boringssl/crypto/modes/ctr.c +0 -219
- data/third_party/boringssl/crypto/modes/gcm.c +0 -1071
- data/third_party/boringssl/crypto/modes/ofb.c +0 -95
- data/third_party/boringssl/crypto/modes/polyval.c +0 -94
- data/third_party/boringssl/crypto/pkcs8/p8_pkey.c +0 -85
- data/third_party/boringssl/crypto/rand/rand.c +0 -244
- data/third_party/boringssl/crypto/rand/urandom.c +0 -335
- data/third_party/boringssl/crypto/rsa/blinding.c +0 -265
- data/third_party/boringssl/crypto/rsa/padding.c +0 -708
- data/third_party/boringssl/crypto/rsa/rsa.c +0 -830
- data/third_party/boringssl/crypto/rsa/rsa_impl.c +0 -1100
- data/third_party/boringssl/crypto/sha/sha1-altivec.c +0 -346
- data/third_party/boringssl/crypto/sha/sha1.c +0 -355
- data/third_party/boringssl/crypto/sha/sha256.c +0 -329
- data/third_party/boringssl/crypto/sha/sha512.c +0 -609
- data/third_party/boringssl/crypto/x509/x509type.c +0 -126
- data/third_party/boringssl/include/openssl/stack_macros.h +0 -3987
- data/third_party/boringssl/ssl/handshake_client.c +0 -1883
- data/third_party/boringssl/ssl/handshake_server.c +0 -1950
- data/third_party/boringssl/ssl/s3_both.c +0 -895
- data/third_party/boringssl/ssl/ssl_aead_ctx.c +0 -335
- data/third_party/boringssl/ssl/ssl_ecdh.c +0 -465
- data/third_party/boringssl/ssl/ssl_privkey.c +0 -683
- data/third_party/boringssl/ssl/ssl_privkey_cc.cc +0 -76
- data/third_party/boringssl/ssl/tls13_client.c +0 -712
- data/third_party/boringssl/ssl/tls13_server.c +0 -680
- data/third_party/boringssl/ssl/tls_record.c +0 -556
@@ -0,0 +1,842 @@
|
|
1
|
+
/* Copyright (c) 2016, Google Inc.
|
2
|
+
*
|
3
|
+
* Permission to use, copy, modify, and/or distribute this software for any
|
4
|
+
* purpose with or without fee is hereby granted, provided that the above
|
5
|
+
* copyright notice and this permission notice appear in all copies.
|
6
|
+
*
|
7
|
+
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
8
|
+
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
9
|
+
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
10
|
+
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
11
|
+
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
|
12
|
+
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
13
|
+
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
|
14
|
+
|
15
|
+
#include <openssl/ssl.h>
|
16
|
+
|
17
|
+
#include <assert.h>
|
18
|
+
#include <limits.h>
|
19
|
+
#include <string.h>
|
20
|
+
|
21
|
+
#include <utility>
|
22
|
+
|
23
|
+
#include <openssl/bytestring.h>
|
24
|
+
#include <openssl/digest.h>
|
25
|
+
#include <openssl/err.h>
|
26
|
+
#include <openssl/mem.h>
|
27
|
+
#include <openssl/stack.h>
|
28
|
+
|
29
|
+
#include "../crypto/internal.h"
|
30
|
+
#include "internal.h"
|
31
|
+
|
32
|
+
|
33
|
+
namespace bssl {
|
34
|
+
|
35
|
+
enum client_hs_state_t {
|
36
|
+
state_read_hello_retry_request = 0,
|
37
|
+
state_send_second_client_hello,
|
38
|
+
state_read_server_hello,
|
39
|
+
state_process_change_cipher_spec,
|
40
|
+
state_read_encrypted_extensions,
|
41
|
+
state_read_certificate_request,
|
42
|
+
state_read_server_certificate,
|
43
|
+
state_read_server_certificate_verify,
|
44
|
+
state_read_server_finished,
|
45
|
+
state_send_end_of_early_data,
|
46
|
+
state_send_client_certificate,
|
47
|
+
state_send_client_certificate_verify,
|
48
|
+
state_complete_second_flight,
|
49
|
+
state_done,
|
50
|
+
};
|
51
|
+
|
52
|
+
static const uint8_t kZeroes[EVP_MAX_MD_SIZE] = {0};
|
53
|
+
|
54
|
+
static enum ssl_hs_wait_t do_read_hello_retry_request(SSL_HANDSHAKE *hs) {
|
55
|
+
SSL *const ssl = hs->ssl;
|
56
|
+
SSLMessage msg;
|
57
|
+
if (!ssl->method->get_message(ssl, &msg)) {
|
58
|
+
return ssl_hs_read_message;
|
59
|
+
}
|
60
|
+
if (msg.type != SSL3_MT_HELLO_RETRY_REQUEST) {
|
61
|
+
hs->tls13_state = state_read_server_hello;
|
62
|
+
return ssl_hs_ok;
|
63
|
+
}
|
64
|
+
|
65
|
+
CBS body = msg.body, extensions;
|
66
|
+
uint16_t server_version;
|
67
|
+
if (!CBS_get_u16(&body, &server_version) ||
|
68
|
+
!CBS_get_u16_length_prefixed(&body, &extensions) ||
|
69
|
+
// HelloRetryRequest may not be empty.
|
70
|
+
CBS_len(&extensions) == 0 ||
|
71
|
+
CBS_len(&body) != 0) {
|
72
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
|
73
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
|
74
|
+
return ssl_hs_error;
|
75
|
+
}
|
76
|
+
|
77
|
+
bool have_cookie, have_key_share;
|
78
|
+
CBS cookie, key_share;
|
79
|
+
const SSL_EXTENSION_TYPE ext_types[] = {
|
80
|
+
{TLSEXT_TYPE_key_share, &have_key_share, &key_share},
|
81
|
+
{TLSEXT_TYPE_cookie, &have_cookie, &cookie},
|
82
|
+
};
|
83
|
+
|
84
|
+
uint8_t alert = SSL_AD_DECODE_ERROR;
|
85
|
+
if (!ssl_parse_extensions(&extensions, &alert, ext_types,
|
86
|
+
OPENSSL_ARRAY_SIZE(ext_types),
|
87
|
+
0 /* reject unknown */)) {
|
88
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, alert);
|
89
|
+
return ssl_hs_error;
|
90
|
+
}
|
91
|
+
|
92
|
+
if (have_cookie) {
|
93
|
+
CBS cookie_value;
|
94
|
+
if (!CBS_get_u16_length_prefixed(&cookie, &cookie_value) ||
|
95
|
+
CBS_len(&cookie_value) == 0 ||
|
96
|
+
CBS_len(&cookie) != 0) {
|
97
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
|
98
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
|
99
|
+
return ssl_hs_error;
|
100
|
+
}
|
101
|
+
|
102
|
+
if (!hs->cookie.CopyFrom(cookie_value)) {
|
103
|
+
return ssl_hs_error;
|
104
|
+
}
|
105
|
+
}
|
106
|
+
|
107
|
+
if (have_key_share) {
|
108
|
+
uint16_t group_id;
|
109
|
+
if (!CBS_get_u16(&key_share, &group_id) || CBS_len(&key_share) != 0) {
|
110
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
|
111
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
|
112
|
+
return ssl_hs_error;
|
113
|
+
}
|
114
|
+
|
115
|
+
// The group must be supported.
|
116
|
+
if (!tls1_check_group_id(ssl, group_id)) {
|
117
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_ILLEGAL_PARAMETER);
|
118
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_WRONG_CURVE);
|
119
|
+
return ssl_hs_error;
|
120
|
+
}
|
121
|
+
|
122
|
+
// Check that the HelloRetryRequest does not request the key share that
|
123
|
+
// was provided in the initial ClientHello.
|
124
|
+
if (hs->key_share->GroupID() == group_id) {
|
125
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_ILLEGAL_PARAMETER);
|
126
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_WRONG_CURVE);
|
127
|
+
return ssl_hs_error;
|
128
|
+
}
|
129
|
+
|
130
|
+
hs->key_share.reset();
|
131
|
+
hs->retry_group = group_id;
|
132
|
+
}
|
133
|
+
|
134
|
+
if (!ssl_hash_message(hs, msg)) {
|
135
|
+
return ssl_hs_error;
|
136
|
+
}
|
137
|
+
|
138
|
+
ssl->method->next_message(ssl);
|
139
|
+
hs->received_hello_retry_request = true;
|
140
|
+
hs->tls13_state = state_send_second_client_hello;
|
141
|
+
// 0-RTT is rejected if we receive a HelloRetryRequest.
|
142
|
+
if (hs->in_early_data) {
|
143
|
+
return ssl_hs_early_data_rejected;
|
144
|
+
}
|
145
|
+
return ssl_hs_ok;
|
146
|
+
}
|
147
|
+
|
148
|
+
static enum ssl_hs_wait_t do_send_second_client_hello(SSL_HANDSHAKE *hs) {
|
149
|
+
SSL *const ssl = hs->ssl;
|
150
|
+
// Restore the null cipher. We may have switched due to 0-RTT.
|
151
|
+
bssl::UniquePtr<SSLAEADContext> null_ctx =
|
152
|
+
SSLAEADContext::CreateNullCipher(SSL_is_dtls(ssl));
|
153
|
+
if (!null_ctx ||
|
154
|
+
!ssl->method->set_write_state(ssl, std::move(null_ctx))) {
|
155
|
+
return ssl_hs_error;
|
156
|
+
}
|
157
|
+
|
158
|
+
ssl->s3->aead_write_ctx->SetVersionIfNullCipher(ssl->version);
|
159
|
+
|
160
|
+
if (!ssl_write_client_hello(hs)) {
|
161
|
+
return ssl_hs_error;
|
162
|
+
}
|
163
|
+
|
164
|
+
hs->tls13_state = state_read_server_hello;
|
165
|
+
return ssl_hs_flush;
|
166
|
+
}
|
167
|
+
|
168
|
+
static enum ssl_hs_wait_t do_read_server_hello(SSL_HANDSHAKE *hs) {
|
169
|
+
SSL *const ssl = hs->ssl;
|
170
|
+
SSLMessage msg;
|
171
|
+
if (!ssl->method->get_message(ssl, &msg)) {
|
172
|
+
return ssl_hs_read_message;
|
173
|
+
}
|
174
|
+
if (!ssl_check_message_type(ssl, msg, SSL3_MT_SERVER_HELLO)) {
|
175
|
+
return ssl_hs_error;
|
176
|
+
}
|
177
|
+
|
178
|
+
CBS body = msg.body, server_random, session_id, extensions;
|
179
|
+
uint16_t server_version;
|
180
|
+
uint16_t cipher_suite;
|
181
|
+
uint8_t compression_method;
|
182
|
+
if (!CBS_get_u16(&body, &server_version) ||
|
183
|
+
!CBS_get_bytes(&body, &server_random, SSL3_RANDOM_SIZE) ||
|
184
|
+
(ssl_is_resumption_experiment(ssl->version) &&
|
185
|
+
!CBS_get_u8_length_prefixed(&body, &session_id)) ||
|
186
|
+
!CBS_get_u16(&body, &cipher_suite) ||
|
187
|
+
(ssl_is_resumption_experiment(ssl->version) &&
|
188
|
+
(!CBS_get_u8(&body, &compression_method) || compression_method != 0)) ||
|
189
|
+
!CBS_get_u16_length_prefixed(&body, &extensions) ||
|
190
|
+
CBS_len(&body) != 0) {
|
191
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
|
192
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
|
193
|
+
return ssl_hs_error;
|
194
|
+
}
|
195
|
+
|
196
|
+
uint16_t expected_version = ssl_is_resumption_experiment(ssl->version)
|
197
|
+
? TLS1_2_VERSION
|
198
|
+
: ssl->version;
|
199
|
+
if (server_version != expected_version) {
|
200
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
|
201
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_WRONG_VERSION_NUMBER);
|
202
|
+
return ssl_hs_error;
|
203
|
+
}
|
204
|
+
|
205
|
+
assert(ssl->s3->have_version);
|
206
|
+
OPENSSL_memcpy(ssl->s3->server_random, CBS_data(&server_random),
|
207
|
+
SSL3_RANDOM_SIZE);
|
208
|
+
|
209
|
+
const SSL_CIPHER *cipher = SSL_get_cipher_by_value(cipher_suite);
|
210
|
+
if (cipher == NULL) {
|
211
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_UNKNOWN_CIPHER_RETURNED);
|
212
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_ILLEGAL_PARAMETER);
|
213
|
+
return ssl_hs_error;
|
214
|
+
}
|
215
|
+
|
216
|
+
// Check if the cipher is a TLS 1.3 cipher.
|
217
|
+
if (SSL_CIPHER_get_min_version(cipher) > ssl3_protocol_version(ssl) ||
|
218
|
+
SSL_CIPHER_get_max_version(cipher) < ssl3_protocol_version(ssl)) {
|
219
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_WRONG_CIPHER_RETURNED);
|
220
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_ILLEGAL_PARAMETER);
|
221
|
+
return ssl_hs_error;
|
222
|
+
}
|
223
|
+
|
224
|
+
// Parse out the extensions.
|
225
|
+
bool have_key_share = false, have_pre_shared_key = false,
|
226
|
+
have_supported_versions = false;
|
227
|
+
CBS key_share, pre_shared_key, supported_versions;
|
228
|
+
const SSL_EXTENSION_TYPE ext_types[] = {
|
229
|
+
{TLSEXT_TYPE_key_share, &have_key_share, &key_share},
|
230
|
+
{TLSEXT_TYPE_pre_shared_key, &have_pre_shared_key, &pre_shared_key},
|
231
|
+
{TLSEXT_TYPE_supported_versions, &have_supported_versions,
|
232
|
+
&supported_versions},
|
233
|
+
};
|
234
|
+
|
235
|
+
uint8_t alert = SSL_AD_DECODE_ERROR;
|
236
|
+
if (!ssl_parse_extensions(&extensions, &alert, ext_types,
|
237
|
+
OPENSSL_ARRAY_SIZE(ext_types),
|
238
|
+
0 /* reject unknown */)) {
|
239
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, alert);
|
240
|
+
return ssl_hs_error;
|
241
|
+
}
|
242
|
+
|
243
|
+
// supported_versions is parsed in handshake_client to select the experimental
|
244
|
+
// TLS 1.3 version.
|
245
|
+
if (have_supported_versions && !ssl_is_resumption_experiment(ssl->version)) {
|
246
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_UNEXPECTED_EXTENSION);
|
247
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_UNSUPPORTED_EXTENSION);
|
248
|
+
return ssl_hs_error;
|
249
|
+
}
|
250
|
+
|
251
|
+
alert = SSL_AD_DECODE_ERROR;
|
252
|
+
if (have_pre_shared_key) {
|
253
|
+
if (ssl->session == NULL) {
|
254
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_UNEXPECTED_EXTENSION);
|
255
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_UNSUPPORTED_EXTENSION);
|
256
|
+
return ssl_hs_error;
|
257
|
+
}
|
258
|
+
|
259
|
+
if (!ssl_ext_pre_shared_key_parse_serverhello(hs, &alert,
|
260
|
+
&pre_shared_key)) {
|
261
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, alert);
|
262
|
+
return ssl_hs_error;
|
263
|
+
}
|
264
|
+
|
265
|
+
if (ssl->session->ssl_version != ssl->version) {
|
266
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_OLD_SESSION_VERSION_NOT_RETURNED);
|
267
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_ILLEGAL_PARAMETER);
|
268
|
+
return ssl_hs_error;
|
269
|
+
}
|
270
|
+
|
271
|
+
if (ssl->session->cipher->algorithm_prf != cipher->algorithm_prf) {
|
272
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_OLD_SESSION_PRF_HASH_MISMATCH);
|
273
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_ILLEGAL_PARAMETER);
|
274
|
+
return ssl_hs_error;
|
275
|
+
}
|
276
|
+
|
277
|
+
if (!ssl_session_is_context_valid(ssl, ssl->session)) {
|
278
|
+
// This is actually a client application bug.
|
279
|
+
OPENSSL_PUT_ERROR(SSL,
|
280
|
+
SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
|
281
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_ILLEGAL_PARAMETER);
|
282
|
+
return ssl_hs_error;
|
283
|
+
}
|
284
|
+
|
285
|
+
ssl->s3->session_reused = true;
|
286
|
+
// Only authentication information carries over in TLS 1.3.
|
287
|
+
hs->new_session = SSL_SESSION_dup(ssl->session, SSL_SESSION_DUP_AUTH_ONLY);
|
288
|
+
if (!hs->new_session) {
|
289
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
|
290
|
+
return ssl_hs_error;
|
291
|
+
}
|
292
|
+
ssl_set_session(ssl, NULL);
|
293
|
+
|
294
|
+
// Resumption incorporates fresh key material, so refresh the timeout.
|
295
|
+
ssl_session_renew_timeout(ssl, hs->new_session.get(),
|
296
|
+
ssl->session_ctx->session_psk_dhe_timeout);
|
297
|
+
} else if (!ssl_get_new_session(hs, 0)) {
|
298
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
|
299
|
+
return ssl_hs_error;
|
300
|
+
}
|
301
|
+
|
302
|
+
hs->new_session->cipher = cipher;
|
303
|
+
hs->new_cipher = cipher;
|
304
|
+
|
305
|
+
// The PRF hash is now known. Set up the key schedule.
|
306
|
+
if (!tls13_init_key_schedule(hs)) {
|
307
|
+
return ssl_hs_error;
|
308
|
+
}
|
309
|
+
|
310
|
+
// Incorporate the PSK into the running secret.
|
311
|
+
if (ssl->s3->session_reused) {
|
312
|
+
if (!tls13_advance_key_schedule(hs, hs->new_session->master_key,
|
313
|
+
hs->new_session->master_key_length)) {
|
314
|
+
return ssl_hs_error;
|
315
|
+
}
|
316
|
+
} else if (!tls13_advance_key_schedule(hs, kZeroes, hs->hash_len)) {
|
317
|
+
return ssl_hs_error;
|
318
|
+
}
|
319
|
+
|
320
|
+
if (!have_key_share) {
|
321
|
+
// We do not support psk_ke and thus always require a key share.
|
322
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_MISSING_KEY_SHARE);
|
323
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_MISSING_EXTENSION);
|
324
|
+
return ssl_hs_error;
|
325
|
+
}
|
326
|
+
|
327
|
+
// Resolve ECDHE and incorporate it into the secret.
|
328
|
+
Array<uint8_t> dhe_secret;
|
329
|
+
alert = SSL_AD_DECODE_ERROR;
|
330
|
+
if (!ssl_ext_key_share_parse_serverhello(hs, &dhe_secret, &alert,
|
331
|
+
&key_share)) {
|
332
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, alert);
|
333
|
+
return ssl_hs_error;
|
334
|
+
}
|
335
|
+
|
336
|
+
if (!tls13_advance_key_schedule(hs, dhe_secret.data(), dhe_secret.size()) ||
|
337
|
+
!ssl_hash_message(hs, msg) ||
|
338
|
+
!tls13_derive_handshake_secrets(hs)) {
|
339
|
+
return ssl_hs_error;
|
340
|
+
}
|
341
|
+
|
342
|
+
ssl->method->next_message(ssl);
|
343
|
+
hs->tls13_state = state_process_change_cipher_spec;
|
344
|
+
return ssl_is_resumption_experiment(ssl->version)
|
345
|
+
? ssl_hs_read_change_cipher_spec
|
346
|
+
: ssl_hs_ok;
|
347
|
+
}
|
348
|
+
|
349
|
+
static enum ssl_hs_wait_t do_process_change_cipher_spec(SSL_HANDSHAKE *hs) {
|
350
|
+
SSL *const ssl = hs->ssl;
|
351
|
+
if (!tls13_set_traffic_key(ssl, evp_aead_open, hs->server_handshake_secret,
|
352
|
+
hs->hash_len)) {
|
353
|
+
return ssl_hs_error;
|
354
|
+
}
|
355
|
+
|
356
|
+
if (!hs->early_data_offered) {
|
357
|
+
// If not sending early data, set client traffic keys now so that alerts are
|
358
|
+
// encrypted.
|
359
|
+
if ((ssl_is_resumption_client_ccs_experiment(ssl->version) &&
|
360
|
+
!ssl3_add_change_cipher_spec(ssl)) ||
|
361
|
+
!tls13_set_traffic_key(ssl, evp_aead_seal, hs->client_handshake_secret,
|
362
|
+
hs->hash_len)) {
|
363
|
+
return ssl_hs_error;
|
364
|
+
}
|
365
|
+
}
|
366
|
+
|
367
|
+
hs->tls13_state = state_read_encrypted_extensions;
|
368
|
+
return ssl_hs_ok;
|
369
|
+
}
|
370
|
+
|
371
|
+
static enum ssl_hs_wait_t do_read_encrypted_extensions(SSL_HANDSHAKE *hs) {
|
372
|
+
SSL *const ssl = hs->ssl;
|
373
|
+
SSLMessage msg;
|
374
|
+
if (!ssl->method->get_message(ssl, &msg)) {
|
375
|
+
return ssl_hs_read_message;
|
376
|
+
}
|
377
|
+
if (!ssl_check_message_type(ssl, msg, SSL3_MT_ENCRYPTED_EXTENSIONS)) {
|
378
|
+
return ssl_hs_error;
|
379
|
+
}
|
380
|
+
|
381
|
+
CBS body = msg.body;
|
382
|
+
if (!ssl_parse_serverhello_tlsext(hs, &body)) {
|
383
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_PARSE_TLSEXT);
|
384
|
+
return ssl_hs_error;
|
385
|
+
}
|
386
|
+
if (CBS_len(&body) != 0) {
|
387
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
|
388
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
|
389
|
+
return ssl_hs_error;
|
390
|
+
}
|
391
|
+
|
392
|
+
// Store the negotiated ALPN in the session.
|
393
|
+
if (ssl->s3->alpn_selected != NULL) {
|
394
|
+
hs->new_session->early_alpn = (uint8_t *)BUF_memdup(
|
395
|
+
ssl->s3->alpn_selected, ssl->s3->alpn_selected_len);
|
396
|
+
if (hs->new_session->early_alpn == NULL) {
|
397
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
|
398
|
+
return ssl_hs_error;
|
399
|
+
}
|
400
|
+
hs->new_session->early_alpn_len = ssl->s3->alpn_selected_len;
|
401
|
+
}
|
402
|
+
|
403
|
+
if (ssl->early_data_accepted) {
|
404
|
+
if (hs->early_session->cipher != hs->new_session->cipher ||
|
405
|
+
hs->early_session->early_alpn_len != ssl->s3->alpn_selected_len ||
|
406
|
+
OPENSSL_memcmp(hs->early_session->early_alpn, ssl->s3->alpn_selected,
|
407
|
+
ssl->s3->alpn_selected_len) != 0) {
|
408
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_ALPN_MISMATCH_ON_EARLY_DATA);
|
409
|
+
return ssl_hs_error;
|
410
|
+
}
|
411
|
+
if (ssl->s3->tlsext_channel_id_valid || hs->received_custom_extension) {
|
412
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_UNEXPECTED_EXTENSION_ON_EARLY_DATA);
|
413
|
+
return ssl_hs_error;
|
414
|
+
}
|
415
|
+
}
|
416
|
+
|
417
|
+
if (!ssl_hash_message(hs, msg)) {
|
418
|
+
return ssl_hs_error;
|
419
|
+
}
|
420
|
+
|
421
|
+
ssl->method->next_message(ssl);
|
422
|
+
hs->tls13_state = state_read_certificate_request;
|
423
|
+
if (hs->in_early_data && !ssl->early_data_accepted) {
|
424
|
+
return ssl_hs_early_data_rejected;
|
425
|
+
}
|
426
|
+
return ssl_hs_ok;
|
427
|
+
}
|
428
|
+
|
429
|
+
static enum ssl_hs_wait_t do_read_certificate_request(SSL_HANDSHAKE *hs) {
|
430
|
+
SSL *const ssl = hs->ssl;
|
431
|
+
// CertificateRequest may only be sent in non-resumption handshakes.
|
432
|
+
if (ssl->s3->session_reused) {
|
433
|
+
hs->tls13_state = state_read_server_finished;
|
434
|
+
return ssl_hs_ok;
|
435
|
+
}
|
436
|
+
|
437
|
+
SSLMessage msg;
|
438
|
+
if (!ssl->method->get_message(ssl, &msg)) {
|
439
|
+
return ssl_hs_read_message;
|
440
|
+
}
|
441
|
+
|
442
|
+
// CertificateRequest is optional.
|
443
|
+
if (msg.type != SSL3_MT_CERTIFICATE_REQUEST) {
|
444
|
+
hs->tls13_state = state_read_server_certificate;
|
445
|
+
return ssl_hs_ok;
|
446
|
+
}
|
447
|
+
|
448
|
+
CBS body = msg.body, context, supported_signature_algorithms;
|
449
|
+
if (!CBS_get_u8_length_prefixed(&body, &context) ||
|
450
|
+
// The request context is always empty during the handshake.
|
451
|
+
CBS_len(&context) != 0 ||
|
452
|
+
!CBS_get_u16_length_prefixed(&body, &supported_signature_algorithms) ||
|
453
|
+
CBS_len(&supported_signature_algorithms) == 0 ||
|
454
|
+
!tls1_parse_peer_sigalgs(hs, &supported_signature_algorithms)) {
|
455
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
|
456
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
|
457
|
+
return ssl_hs_error;
|
458
|
+
}
|
459
|
+
|
460
|
+
uint8_t alert = SSL_AD_DECODE_ERROR;
|
461
|
+
UniquePtr<STACK_OF(CRYPTO_BUFFER)> ca_names =
|
462
|
+
ssl_parse_client_CA_list(ssl, &alert, &body);
|
463
|
+
if (!ca_names) {
|
464
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, alert);
|
465
|
+
return ssl_hs_error;
|
466
|
+
}
|
467
|
+
|
468
|
+
// Ignore extensions.
|
469
|
+
CBS extensions;
|
470
|
+
if (!CBS_get_u16_length_prefixed(&body, &extensions) ||
|
471
|
+
CBS_len(&body) != 0) {
|
472
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
|
473
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
|
474
|
+
return ssl_hs_error;
|
475
|
+
}
|
476
|
+
|
477
|
+
hs->cert_request = true;
|
478
|
+
hs->ca_names = std::move(ca_names);
|
479
|
+
ssl->ctx->x509_method->hs_flush_cached_ca_names(hs);
|
480
|
+
|
481
|
+
if (!ssl_hash_message(hs, msg)) {
|
482
|
+
return ssl_hs_error;
|
483
|
+
}
|
484
|
+
|
485
|
+
ssl->method->next_message(ssl);
|
486
|
+
hs->tls13_state = state_read_server_certificate;
|
487
|
+
return ssl_hs_ok;
|
488
|
+
}
|
489
|
+
|
490
|
+
static enum ssl_hs_wait_t do_read_server_certificate(SSL_HANDSHAKE *hs) {
|
491
|
+
SSL *const ssl = hs->ssl;
|
492
|
+
SSLMessage msg;
|
493
|
+
if (!ssl->method->get_message(ssl, &msg)) {
|
494
|
+
return ssl_hs_read_message;
|
495
|
+
}
|
496
|
+
if (!ssl_check_message_type(ssl, msg, SSL3_MT_CERTIFICATE) ||
|
497
|
+
!tls13_process_certificate(hs, msg, 0 /* certificate required */) ||
|
498
|
+
!ssl_hash_message(hs, msg)) {
|
499
|
+
return ssl_hs_error;
|
500
|
+
}
|
501
|
+
|
502
|
+
ssl->method->next_message(ssl);
|
503
|
+
hs->tls13_state = state_read_server_certificate_verify;
|
504
|
+
return ssl_hs_ok;
|
505
|
+
}
|
506
|
+
|
507
|
+
static enum ssl_hs_wait_t do_read_server_certificate_verify(
|
508
|
+
SSL_HANDSHAKE *hs) {
|
509
|
+
SSL *const ssl = hs->ssl;
|
510
|
+
SSLMessage msg;
|
511
|
+
if (!ssl->method->get_message(ssl, &msg)) {
|
512
|
+
return ssl_hs_read_message;
|
513
|
+
}
|
514
|
+
switch (ssl_verify_peer_cert(hs)) {
|
515
|
+
case ssl_verify_ok:
|
516
|
+
break;
|
517
|
+
case ssl_verify_invalid:
|
518
|
+
return ssl_hs_error;
|
519
|
+
case ssl_verify_retry:
|
520
|
+
hs->tls13_state = state_read_server_certificate_verify;
|
521
|
+
return ssl_hs_certificate_verify;
|
522
|
+
}
|
523
|
+
|
524
|
+
if (!ssl_check_message_type(ssl, msg, SSL3_MT_CERTIFICATE_VERIFY) ||
|
525
|
+
!tls13_process_certificate_verify(hs, msg) ||
|
526
|
+
!ssl_hash_message(hs, msg)) {
|
527
|
+
return ssl_hs_error;
|
528
|
+
}
|
529
|
+
|
530
|
+
ssl->method->next_message(ssl);
|
531
|
+
hs->tls13_state = state_read_server_finished;
|
532
|
+
return ssl_hs_ok;
|
533
|
+
}
|
534
|
+
|
535
|
+
static enum ssl_hs_wait_t do_read_server_finished(SSL_HANDSHAKE *hs) {
|
536
|
+
SSL *const ssl = hs->ssl;
|
537
|
+
SSLMessage msg;
|
538
|
+
if (!ssl->method->get_message(ssl, &msg)) {
|
539
|
+
return ssl_hs_read_message;
|
540
|
+
}
|
541
|
+
if (!ssl_check_message_type(ssl, msg, SSL3_MT_FINISHED) ||
|
542
|
+
!tls13_process_finished(hs, msg, 0 /* don't use saved value */) ||
|
543
|
+
!ssl_hash_message(hs, msg) ||
|
544
|
+
// Update the secret to the master secret and derive traffic keys.
|
545
|
+
!tls13_advance_key_schedule(hs, kZeroes, hs->hash_len) ||
|
546
|
+
!tls13_derive_application_secrets(hs)) {
|
547
|
+
return ssl_hs_error;
|
548
|
+
}
|
549
|
+
|
550
|
+
ssl->method->next_message(ssl);
|
551
|
+
hs->tls13_state = state_send_end_of_early_data;
|
552
|
+
return ssl_hs_ok;
|
553
|
+
}
|
554
|
+
|
555
|
+
static enum ssl_hs_wait_t do_send_end_of_early_data(SSL_HANDSHAKE *hs) {
|
556
|
+
SSL *const ssl = hs->ssl;
|
557
|
+
|
558
|
+
if (ssl->early_data_accepted) {
|
559
|
+
hs->can_early_write = false;
|
560
|
+
if (!ssl->method->add_alert(ssl, SSL3_AL_WARNING,
|
561
|
+
TLS1_AD_END_OF_EARLY_DATA)) {
|
562
|
+
return ssl_hs_error;
|
563
|
+
}
|
564
|
+
}
|
565
|
+
|
566
|
+
if (hs->early_data_offered) {
|
567
|
+
if ((ssl_is_resumption_client_ccs_experiment(ssl->version) &&
|
568
|
+
!ssl3_add_change_cipher_spec(ssl)) ||
|
569
|
+
!tls13_set_traffic_key(ssl, evp_aead_seal, hs->client_handshake_secret,
|
570
|
+
hs->hash_len)) {
|
571
|
+
return ssl_hs_error;
|
572
|
+
}
|
573
|
+
}
|
574
|
+
|
575
|
+
hs->tls13_state = state_send_client_certificate;
|
576
|
+
return ssl_hs_ok;
|
577
|
+
}
|
578
|
+
|
579
|
+
static enum ssl_hs_wait_t do_send_client_certificate(SSL_HANDSHAKE *hs) {
|
580
|
+
SSL *const ssl = hs->ssl;
|
581
|
+
|
582
|
+
// The peer didn't request a certificate.
|
583
|
+
if (!hs->cert_request) {
|
584
|
+
hs->tls13_state = state_complete_second_flight;
|
585
|
+
return ssl_hs_ok;
|
586
|
+
}
|
587
|
+
|
588
|
+
// Call cert_cb to update the certificate.
|
589
|
+
if (ssl->cert->cert_cb != NULL) {
|
590
|
+
int rv = ssl->cert->cert_cb(ssl, ssl->cert->cert_cb_arg);
|
591
|
+
if (rv == 0) {
|
592
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
|
593
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_CERT_CB_ERROR);
|
594
|
+
return ssl_hs_error;
|
595
|
+
}
|
596
|
+
if (rv < 0) {
|
597
|
+
hs->tls13_state = state_send_client_certificate;
|
598
|
+
return ssl_hs_x509_lookup;
|
599
|
+
}
|
600
|
+
}
|
601
|
+
|
602
|
+
if (!ssl_on_certificate_selected(hs) ||
|
603
|
+
!tls13_add_certificate(hs)) {
|
604
|
+
return ssl_hs_error;
|
605
|
+
}
|
606
|
+
|
607
|
+
hs->tls13_state = state_send_client_certificate_verify;
|
608
|
+
return ssl_hs_ok;
|
609
|
+
}
|
610
|
+
|
611
|
+
static enum ssl_hs_wait_t do_send_client_certificate_verify(SSL_HANDSHAKE *hs) {
|
612
|
+
SSL *const ssl = hs->ssl;
|
613
|
+
// Don't send CertificateVerify if there is no certificate.
|
614
|
+
if (!ssl_has_certificate(ssl)) {
|
615
|
+
hs->tls13_state = state_complete_second_flight;
|
616
|
+
return ssl_hs_ok;
|
617
|
+
}
|
618
|
+
|
619
|
+
switch (tls13_add_certificate_verify(hs)) {
|
620
|
+
case ssl_private_key_success:
|
621
|
+
hs->tls13_state = state_complete_second_flight;
|
622
|
+
return ssl_hs_ok;
|
623
|
+
|
624
|
+
case ssl_private_key_retry:
|
625
|
+
hs->tls13_state = state_send_client_certificate_verify;
|
626
|
+
return ssl_hs_private_key_operation;
|
627
|
+
|
628
|
+
case ssl_private_key_failure:
|
629
|
+
return ssl_hs_error;
|
630
|
+
}
|
631
|
+
|
632
|
+
assert(0);
|
633
|
+
return ssl_hs_error;
|
634
|
+
}
|
635
|
+
|
636
|
+
static enum ssl_hs_wait_t do_complete_second_flight(SSL_HANDSHAKE *hs) {
|
637
|
+
SSL *const ssl = hs->ssl;
|
638
|
+
|
639
|
+
// Send a Channel ID assertion if necessary.
|
640
|
+
if (ssl->s3->tlsext_channel_id_valid) {
|
641
|
+
if (!ssl_do_channel_id_callback(ssl)) {
|
642
|
+
hs->tls13_state = state_complete_second_flight;
|
643
|
+
return ssl_hs_error;
|
644
|
+
}
|
645
|
+
|
646
|
+
if (ssl->tlsext_channel_id_private == NULL) {
|
647
|
+
return ssl_hs_channel_id_lookup;
|
648
|
+
}
|
649
|
+
|
650
|
+
ScopedCBB cbb;
|
651
|
+
CBB body;
|
652
|
+
if (!ssl->method->init_message(ssl, cbb.get(), &body, SSL3_MT_CHANNEL_ID) ||
|
653
|
+
!tls1_write_channel_id(hs, &body) ||
|
654
|
+
!ssl_add_message_cbb(ssl, cbb.get())) {
|
655
|
+
return ssl_hs_error;
|
656
|
+
}
|
657
|
+
}
|
658
|
+
|
659
|
+
// Send a Finished message.
|
660
|
+
if (!tls13_add_finished(hs)) {
|
661
|
+
return ssl_hs_error;
|
662
|
+
}
|
663
|
+
|
664
|
+
// Derive the final keys and enable them.
|
665
|
+
if (!tls13_set_traffic_key(ssl, evp_aead_open, hs->server_traffic_secret_0,
|
666
|
+
hs->hash_len) ||
|
667
|
+
!tls13_set_traffic_key(ssl, evp_aead_seal, hs->client_traffic_secret_0,
|
668
|
+
hs->hash_len) ||
|
669
|
+
!tls13_derive_resumption_secret(hs)) {
|
670
|
+
return ssl_hs_error;
|
671
|
+
}
|
672
|
+
|
673
|
+
hs->tls13_state = state_done;
|
674
|
+
return ssl_hs_flush;
|
675
|
+
}
|
676
|
+
|
677
|
+
enum ssl_hs_wait_t tls13_client_handshake(SSL_HANDSHAKE *hs) {
|
678
|
+
while (hs->tls13_state != state_done) {
|
679
|
+
enum ssl_hs_wait_t ret = ssl_hs_error;
|
680
|
+
enum client_hs_state_t state =
|
681
|
+
static_cast<enum client_hs_state_t>(hs->tls13_state);
|
682
|
+
switch (state) {
|
683
|
+
case state_read_hello_retry_request:
|
684
|
+
ret = do_read_hello_retry_request(hs);
|
685
|
+
break;
|
686
|
+
case state_send_second_client_hello:
|
687
|
+
ret = do_send_second_client_hello(hs);
|
688
|
+
break;
|
689
|
+
case state_read_server_hello:
|
690
|
+
ret = do_read_server_hello(hs);
|
691
|
+
break;
|
692
|
+
case state_process_change_cipher_spec:
|
693
|
+
ret = do_process_change_cipher_spec(hs);
|
694
|
+
break;
|
695
|
+
case state_read_encrypted_extensions:
|
696
|
+
ret = do_read_encrypted_extensions(hs);
|
697
|
+
break;
|
698
|
+
case state_read_certificate_request:
|
699
|
+
ret = do_read_certificate_request(hs);
|
700
|
+
break;
|
701
|
+
case state_read_server_certificate:
|
702
|
+
ret = do_read_server_certificate(hs);
|
703
|
+
break;
|
704
|
+
case state_read_server_certificate_verify:
|
705
|
+
ret = do_read_server_certificate_verify(hs);
|
706
|
+
break;
|
707
|
+
case state_read_server_finished:
|
708
|
+
ret = do_read_server_finished(hs);
|
709
|
+
break;
|
710
|
+
case state_send_end_of_early_data:
|
711
|
+
ret = do_send_end_of_early_data(hs);
|
712
|
+
break;
|
713
|
+
case state_send_client_certificate:
|
714
|
+
ret = do_send_client_certificate(hs);
|
715
|
+
break;
|
716
|
+
case state_send_client_certificate_verify:
|
717
|
+
ret = do_send_client_certificate_verify(hs);
|
718
|
+
break;
|
719
|
+
case state_complete_second_flight:
|
720
|
+
ret = do_complete_second_flight(hs);
|
721
|
+
break;
|
722
|
+
case state_done:
|
723
|
+
ret = ssl_hs_ok;
|
724
|
+
break;
|
725
|
+
}
|
726
|
+
|
727
|
+
if (hs->tls13_state != state) {
|
728
|
+
ssl_do_info_callback(hs->ssl, SSL_CB_CONNECT_LOOP, 1);
|
729
|
+
}
|
730
|
+
|
731
|
+
if (ret != ssl_hs_ok) {
|
732
|
+
return ret;
|
733
|
+
}
|
734
|
+
}
|
735
|
+
|
736
|
+
return ssl_hs_ok;
|
737
|
+
}
|
738
|
+
|
739
|
+
const char *tls13_client_handshake_state(SSL_HANDSHAKE *hs) {
|
740
|
+
enum client_hs_state_t state =
|
741
|
+
static_cast<enum client_hs_state_t>(hs->tls13_state);
|
742
|
+
switch (state) {
|
743
|
+
case state_read_hello_retry_request:
|
744
|
+
return "TLS 1.3 client read_hello_retry_request";
|
745
|
+
case state_send_second_client_hello:
|
746
|
+
return "TLS 1.3 client send_second_client_hello";
|
747
|
+
case state_read_server_hello:
|
748
|
+
return "TLS 1.3 client read_server_hello";
|
749
|
+
case state_process_change_cipher_spec:
|
750
|
+
return "TLS 1.3 client process_change_cipher_spec";
|
751
|
+
case state_read_encrypted_extensions:
|
752
|
+
return "TLS 1.3 client read_encrypted_extensions";
|
753
|
+
case state_read_certificate_request:
|
754
|
+
return "TLS 1.3 client read_certificate_request";
|
755
|
+
case state_read_server_certificate:
|
756
|
+
return "TLS 1.3 client read_server_certificate";
|
757
|
+
case state_read_server_certificate_verify:
|
758
|
+
return "TLS 1.3 client read_server_certificate_verify";
|
759
|
+
case state_read_server_finished:
|
760
|
+
return "TLS 1.3 client read_server_finished";
|
761
|
+
case state_send_end_of_early_data:
|
762
|
+
return "TLS 1.3 client send_end_of_early_data";
|
763
|
+
case state_send_client_certificate:
|
764
|
+
return "TLS 1.3 client send_client_certificate";
|
765
|
+
case state_send_client_certificate_verify:
|
766
|
+
return "TLS 1.3 client send_client_certificate_verify";
|
767
|
+
case state_complete_second_flight:
|
768
|
+
return "TLS 1.3 client complete_second_flight";
|
769
|
+
case state_done:
|
770
|
+
return "TLS 1.3 client done";
|
771
|
+
}
|
772
|
+
|
773
|
+
return "TLS 1.3 client unknown";
|
774
|
+
}
|
775
|
+
|
776
|
+
int tls13_process_new_session_ticket(SSL *ssl, const SSLMessage &msg) {
|
777
|
+
UniquePtr<SSL_SESSION> session(SSL_SESSION_dup(ssl->s3->established_session,
|
778
|
+
SSL_SESSION_INCLUDE_NONAUTH));
|
779
|
+
if (!session) {
|
780
|
+
return 0;
|
781
|
+
}
|
782
|
+
|
783
|
+
ssl_session_rebase_time(ssl, session.get());
|
784
|
+
|
785
|
+
uint32_t server_timeout;
|
786
|
+
CBS body = msg.body, ticket, extensions;
|
787
|
+
if (!CBS_get_u32(&body, &server_timeout) ||
|
788
|
+
!CBS_get_u32(&body, &session->ticket_age_add) ||
|
789
|
+
!CBS_get_u16_length_prefixed(&body, &ticket) ||
|
790
|
+
!CBS_stow(&ticket, &session->tlsext_tick, &session->tlsext_ticklen) ||
|
791
|
+
!CBS_get_u16_length_prefixed(&body, &extensions) ||
|
792
|
+
CBS_len(&body) != 0) {
|
793
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
|
794
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
|
795
|
+
return 0;
|
796
|
+
}
|
797
|
+
|
798
|
+
// Cap the renewable lifetime by the server advertised value. This avoids
|
799
|
+
// wasting bandwidth on 0-RTT when we know the server will reject it.
|
800
|
+
if (session->timeout > server_timeout) {
|
801
|
+
session->timeout = server_timeout;
|
802
|
+
}
|
803
|
+
|
804
|
+
// Parse out the extensions.
|
805
|
+
bool have_early_data_info = false;
|
806
|
+
CBS early_data_info;
|
807
|
+
const SSL_EXTENSION_TYPE ext_types[] = {
|
808
|
+
{TLSEXT_TYPE_ticket_early_data_info, &have_early_data_info,
|
809
|
+
&early_data_info},
|
810
|
+
};
|
811
|
+
|
812
|
+
uint8_t alert = SSL_AD_DECODE_ERROR;
|
813
|
+
if (!ssl_parse_extensions(&extensions, &alert, ext_types,
|
814
|
+
OPENSSL_ARRAY_SIZE(ext_types),
|
815
|
+
1 /* ignore unknown */)) {
|
816
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, alert);
|
817
|
+
return 0;
|
818
|
+
}
|
819
|
+
|
820
|
+
if (have_early_data_info && ssl->cert->enable_early_data) {
|
821
|
+
if (!CBS_get_u32(&early_data_info, &session->ticket_max_early_data) ||
|
822
|
+
CBS_len(&early_data_info) != 0) {
|
823
|
+
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
|
824
|
+
OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
|
825
|
+
return 0;
|
826
|
+
}
|
827
|
+
}
|
828
|
+
|
829
|
+
session->ticket_age_add_valid = 1;
|
830
|
+
session->not_resumable = 0;
|
831
|
+
|
832
|
+
if ((ssl->ctx->session_cache_mode & SSL_SESS_CACHE_CLIENT) &&
|
833
|
+
ssl->ctx->new_session_cb != NULL &&
|
834
|
+
ssl->ctx->new_session_cb(ssl, session.get())) {
|
835
|
+
// |new_session_cb|'s return value signals that it took ownership.
|
836
|
+
session.release();
|
837
|
+
}
|
838
|
+
|
839
|
+
return 1;
|
840
|
+
}
|
841
|
+
|
842
|
+
} // namespace bssl
|