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
@@ -1,680 +0,0 @@
|
|
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 <string.h>
|
19
|
-
|
20
|
-
#include <openssl/aead.h>
|
21
|
-
#include <openssl/bytestring.h>
|
22
|
-
#include <openssl/digest.h>
|
23
|
-
#include <openssl/err.h>
|
24
|
-
#include <openssl/mem.h>
|
25
|
-
#include <openssl/rand.h>
|
26
|
-
#include <openssl/stack.h>
|
27
|
-
|
28
|
-
#include "../crypto/internal.h"
|
29
|
-
#include "internal.h"
|
30
|
-
|
31
|
-
|
32
|
-
/* kMaxEarlyDataAccepted is the advertised number of plaintext bytes of early
|
33
|
-
* data that will be accepted. This value should be slightly below
|
34
|
-
* kMaxEarlyDataSkipped in tls_record.c, which is measured in ciphertext. */
|
35
|
-
static const size_t kMaxEarlyDataAccepted = 14336;
|
36
|
-
|
37
|
-
enum server_hs_state_t {
|
38
|
-
state_select_parameters = 0,
|
39
|
-
state_send_hello_retry_request,
|
40
|
-
state_process_second_client_hello,
|
41
|
-
state_send_server_hello,
|
42
|
-
state_send_server_certificate_verify,
|
43
|
-
state_complete_server_certificate_verify,
|
44
|
-
state_send_server_finished,
|
45
|
-
state_process_client_certificate,
|
46
|
-
state_process_client_certificate_verify,
|
47
|
-
state_process_channel_id,
|
48
|
-
state_process_client_finished,
|
49
|
-
state_send_new_session_ticket,
|
50
|
-
state_done,
|
51
|
-
};
|
52
|
-
|
53
|
-
static const uint8_t kZeroes[EVP_MAX_MD_SIZE] = {0};
|
54
|
-
|
55
|
-
static int resolve_ecdhe_secret(SSL_HANDSHAKE *hs, int *out_need_retry,
|
56
|
-
SSL_CLIENT_HELLO *client_hello) {
|
57
|
-
SSL *const ssl = hs->ssl;
|
58
|
-
*out_need_retry = 0;
|
59
|
-
|
60
|
-
/* We only support connections that include an ECDHE key exchange. */
|
61
|
-
CBS key_share;
|
62
|
-
if (!ssl_client_hello_get_extension(client_hello, &key_share,
|
63
|
-
TLSEXT_TYPE_key_share)) {
|
64
|
-
OPENSSL_PUT_ERROR(SSL, SSL_R_MISSING_KEY_SHARE);
|
65
|
-
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_MISSING_EXTENSION);
|
66
|
-
return 0;
|
67
|
-
}
|
68
|
-
|
69
|
-
int found_key_share;
|
70
|
-
uint8_t *dhe_secret;
|
71
|
-
size_t dhe_secret_len;
|
72
|
-
uint8_t alert = SSL_AD_DECODE_ERROR;
|
73
|
-
if (!ssl_ext_key_share_parse_clienthello(hs, &found_key_share, &dhe_secret,
|
74
|
-
&dhe_secret_len, &alert,
|
75
|
-
&key_share)) {
|
76
|
-
ssl3_send_alert(ssl, SSL3_AL_FATAL, alert);
|
77
|
-
return 0;
|
78
|
-
}
|
79
|
-
|
80
|
-
if (!found_key_share) {
|
81
|
-
*out_need_retry = 1;
|
82
|
-
return 0;
|
83
|
-
}
|
84
|
-
|
85
|
-
int ok = tls13_advance_key_schedule(hs, dhe_secret, dhe_secret_len);
|
86
|
-
OPENSSL_free(dhe_secret);
|
87
|
-
return ok;
|
88
|
-
}
|
89
|
-
|
90
|
-
static const SSL_CIPHER *choose_tls13_cipher(
|
91
|
-
const SSL *ssl, const SSL_CLIENT_HELLO *client_hello) {
|
92
|
-
if (client_hello->cipher_suites_len % 2 != 0) {
|
93
|
-
return NULL;
|
94
|
-
}
|
95
|
-
|
96
|
-
CBS cipher_suites;
|
97
|
-
CBS_init(&cipher_suites, client_hello->cipher_suites,
|
98
|
-
client_hello->cipher_suites_len);
|
99
|
-
|
100
|
-
const int aes_is_fine = EVP_has_aes_hardware();
|
101
|
-
const uint16_t version = ssl3_protocol_version(ssl);
|
102
|
-
|
103
|
-
const SSL_CIPHER *best = NULL;
|
104
|
-
while (CBS_len(&cipher_suites) > 0) {
|
105
|
-
uint16_t cipher_suite;
|
106
|
-
if (!CBS_get_u16(&cipher_suites, &cipher_suite)) {
|
107
|
-
return NULL;
|
108
|
-
}
|
109
|
-
|
110
|
-
/* Limit to TLS 1.3 ciphers we know about. */
|
111
|
-
const SSL_CIPHER *candidate = SSL_get_cipher_by_value(cipher_suite);
|
112
|
-
if (candidate == NULL ||
|
113
|
-
SSL_CIPHER_get_min_version(candidate) > version ||
|
114
|
-
SSL_CIPHER_get_max_version(candidate) < version) {
|
115
|
-
continue;
|
116
|
-
}
|
117
|
-
|
118
|
-
/* TLS 1.3 removes legacy ciphers, so honor the client order, but prefer
|
119
|
-
* ChaCha20 if we do not have AES hardware. */
|
120
|
-
if (aes_is_fine) {
|
121
|
-
return candidate;
|
122
|
-
}
|
123
|
-
|
124
|
-
if (candidate->algorithm_enc == SSL_CHACHA20POLY1305) {
|
125
|
-
return candidate;
|
126
|
-
}
|
127
|
-
|
128
|
-
if (best == NULL) {
|
129
|
-
best = candidate;
|
130
|
-
}
|
131
|
-
}
|
132
|
-
|
133
|
-
return best;
|
134
|
-
}
|
135
|
-
|
136
|
-
static enum ssl_hs_wait_t do_select_parameters(SSL_HANDSHAKE *hs) {
|
137
|
-
SSL *const ssl = hs->ssl;
|
138
|
-
/* The short record header extension is incompatible with early data. */
|
139
|
-
if (ssl->s3->skip_early_data && ssl->s3->short_header) {
|
140
|
-
OPENSSL_PUT_ERROR(SSL, SSL_R_UNEXPECTED_EXTENSION);
|
141
|
-
return ssl_hs_error;
|
142
|
-
}
|
143
|
-
|
144
|
-
SSL_CLIENT_HELLO client_hello;
|
145
|
-
if (!ssl_client_hello_init(ssl, &client_hello, ssl->init_msg,
|
146
|
-
ssl->init_num)) {
|
147
|
-
OPENSSL_PUT_ERROR(SSL, SSL_R_CLIENTHELLO_PARSE_FAILED);
|
148
|
-
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
|
149
|
-
return ssl_hs_error;
|
150
|
-
}
|
151
|
-
|
152
|
-
/* Negotiate the cipher suite. */
|
153
|
-
hs->new_cipher = choose_tls13_cipher(ssl, &client_hello);
|
154
|
-
if (hs->new_cipher == NULL) {
|
155
|
-
OPENSSL_PUT_ERROR(SSL, SSL_R_NO_SHARED_CIPHER);
|
156
|
-
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
|
157
|
-
return ssl_hs_error;
|
158
|
-
}
|
159
|
-
|
160
|
-
/* The PRF hash is now known. Set up the key schedule and hash the
|
161
|
-
* ClientHello. */
|
162
|
-
if (!tls13_init_key_schedule(hs) ||
|
163
|
-
!ssl_hash_current_message(hs)) {
|
164
|
-
return ssl_hs_error;
|
165
|
-
}
|
166
|
-
|
167
|
-
|
168
|
-
/* Decode the ticket if we agree on a PSK key exchange mode. */
|
169
|
-
uint8_t alert = SSL_AD_DECODE_ERROR;
|
170
|
-
SSL_SESSION *session = NULL;
|
171
|
-
CBS pre_shared_key, binders;
|
172
|
-
if (hs->accept_psk_mode &&
|
173
|
-
ssl_client_hello_get_extension(&client_hello, &pre_shared_key,
|
174
|
-
TLSEXT_TYPE_pre_shared_key)) {
|
175
|
-
/* Verify that the pre_shared_key extension is the last extension in
|
176
|
-
* ClientHello. */
|
177
|
-
if (CBS_data(&pre_shared_key) + CBS_len(&pre_shared_key) !=
|
178
|
-
client_hello.extensions + client_hello.extensions_len) {
|
179
|
-
OPENSSL_PUT_ERROR(SSL, SSL_R_PRE_SHARED_KEY_MUST_BE_LAST);
|
180
|
-
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_ILLEGAL_PARAMETER);
|
181
|
-
return ssl_hs_error;
|
182
|
-
}
|
183
|
-
|
184
|
-
if (!ssl_ext_pre_shared_key_parse_clienthello(hs, &session, &binders,
|
185
|
-
&alert, &pre_shared_key)) {
|
186
|
-
ssl3_send_alert(ssl, SSL3_AL_FATAL, alert);
|
187
|
-
return ssl_hs_error;
|
188
|
-
}
|
189
|
-
}
|
190
|
-
|
191
|
-
if (session != NULL &&
|
192
|
-
!ssl_session_is_resumable(hs, session)) {
|
193
|
-
SSL_SESSION_free(session);
|
194
|
-
session = NULL;
|
195
|
-
}
|
196
|
-
|
197
|
-
/* Set up the new session, either using the original one as a template or
|
198
|
-
* creating a fresh one. */
|
199
|
-
if (session == NULL) {
|
200
|
-
if (!ssl_get_new_session(hs, 1 /* server */)) {
|
201
|
-
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
|
202
|
-
return ssl_hs_error;
|
203
|
-
}
|
204
|
-
|
205
|
-
hs->new_session->cipher = hs->new_cipher;
|
206
|
-
|
207
|
-
/* On new sessions, stash the SNI value in the session. */
|
208
|
-
if (hs->hostname != NULL) {
|
209
|
-
OPENSSL_free(hs->new_session->tlsext_hostname);
|
210
|
-
hs->new_session->tlsext_hostname = BUF_strdup(hs->hostname);
|
211
|
-
if (hs->new_session->tlsext_hostname == NULL) {
|
212
|
-
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
|
213
|
-
return ssl_hs_error;
|
214
|
-
}
|
215
|
-
}
|
216
|
-
} else {
|
217
|
-
/* Check the PSK binder. */
|
218
|
-
if (!tls13_verify_psk_binder(hs, session, &binders)) {
|
219
|
-
SSL_SESSION_free(session);
|
220
|
-
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_DECRYPT_ERROR);
|
221
|
-
return ssl_hs_error;
|
222
|
-
}
|
223
|
-
|
224
|
-
/* Only authentication information carries over in TLS 1.3. */
|
225
|
-
hs->new_session = SSL_SESSION_dup(session, SSL_SESSION_DUP_AUTH_ONLY);
|
226
|
-
if (hs->new_session == NULL) {
|
227
|
-
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
|
228
|
-
return ssl_hs_error;
|
229
|
-
}
|
230
|
-
ssl->s3->session_reused = 1;
|
231
|
-
SSL_SESSION_free(session);
|
232
|
-
|
233
|
-
/* Resumption incorporates fresh key material, so refresh the timeout. */
|
234
|
-
ssl_session_renew_timeout(ssl, hs->new_session,
|
235
|
-
ssl->initial_ctx->session_psk_dhe_timeout);
|
236
|
-
}
|
237
|
-
|
238
|
-
if (ssl->ctx->dos_protection_cb != NULL &&
|
239
|
-
ssl->ctx->dos_protection_cb(&client_hello) == 0) {
|
240
|
-
/* Connection rejected for DOS reasons. */
|
241
|
-
OPENSSL_PUT_ERROR(SSL, SSL_R_CONNECTION_REJECTED);
|
242
|
-
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
|
243
|
-
return ssl_hs_error;
|
244
|
-
}
|
245
|
-
|
246
|
-
/* HTTP/2 negotiation depends on the cipher suite, so ALPN negotiation was
|
247
|
-
* deferred. Complete it now. */
|
248
|
-
alert = SSL_AD_DECODE_ERROR;
|
249
|
-
if (!ssl_negotiate_alpn(hs, &alert, &client_hello)) {
|
250
|
-
ssl3_send_alert(ssl, SSL3_AL_FATAL, alert);
|
251
|
-
return ssl_hs_error;
|
252
|
-
}
|
253
|
-
|
254
|
-
/* Store the initial negotiated ALPN in the session. */
|
255
|
-
if (ssl->s3->alpn_selected != NULL) {
|
256
|
-
hs->new_session->early_alpn =
|
257
|
-
BUF_memdup(ssl->s3->alpn_selected, ssl->s3->alpn_selected_len);
|
258
|
-
if (hs->new_session->early_alpn == NULL) {
|
259
|
-
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
|
260
|
-
return ssl_hs_error;
|
261
|
-
}
|
262
|
-
hs->new_session->early_alpn_len = ssl->s3->alpn_selected_len;
|
263
|
-
}
|
264
|
-
|
265
|
-
/* Incorporate the PSK into the running secret. */
|
266
|
-
if (ssl->s3->session_reused) {
|
267
|
-
if (!tls13_advance_key_schedule(hs, hs->new_session->master_key,
|
268
|
-
hs->new_session->master_key_length)) {
|
269
|
-
return ssl_hs_error;
|
270
|
-
}
|
271
|
-
} else if (!tls13_advance_key_schedule(hs, kZeroes, hs->hash_len)) {
|
272
|
-
return ssl_hs_error;
|
273
|
-
}
|
274
|
-
|
275
|
-
ssl->method->received_flight(ssl);
|
276
|
-
|
277
|
-
/* Resolve ECDHE and incorporate it into the secret. */
|
278
|
-
int need_retry;
|
279
|
-
if (!resolve_ecdhe_secret(hs, &need_retry, &client_hello)) {
|
280
|
-
if (need_retry) {
|
281
|
-
hs->tls13_state = state_send_hello_retry_request;
|
282
|
-
return ssl_hs_ok;
|
283
|
-
}
|
284
|
-
return ssl_hs_error;
|
285
|
-
}
|
286
|
-
|
287
|
-
hs->tls13_state = state_send_server_hello;
|
288
|
-
return ssl_hs_ok;
|
289
|
-
}
|
290
|
-
|
291
|
-
static enum ssl_hs_wait_t do_send_hello_retry_request(SSL_HANDSHAKE *hs) {
|
292
|
-
SSL *const ssl = hs->ssl;
|
293
|
-
CBB cbb, body, extensions;
|
294
|
-
uint16_t group_id;
|
295
|
-
if (!ssl->method->init_message(ssl, &cbb, &body,
|
296
|
-
SSL3_MT_HELLO_RETRY_REQUEST) ||
|
297
|
-
!CBB_add_u16(&body, ssl->version) ||
|
298
|
-
!tls1_get_shared_group(hs, &group_id) ||
|
299
|
-
!CBB_add_u16_length_prefixed(&body, &extensions) ||
|
300
|
-
!CBB_add_u16(&extensions, TLSEXT_TYPE_key_share) ||
|
301
|
-
!CBB_add_u16(&extensions, 2 /* length */) ||
|
302
|
-
!CBB_add_u16(&extensions, group_id) ||
|
303
|
-
!ssl_add_message_cbb(ssl, &cbb)) {
|
304
|
-
CBB_cleanup(&cbb);
|
305
|
-
return ssl_hs_error;
|
306
|
-
}
|
307
|
-
|
308
|
-
hs->tls13_state = state_process_second_client_hello;
|
309
|
-
return ssl_hs_flush_and_read_message;
|
310
|
-
}
|
311
|
-
|
312
|
-
static enum ssl_hs_wait_t do_process_second_client_hello(SSL_HANDSHAKE *hs) {
|
313
|
-
SSL *const ssl = hs->ssl;
|
314
|
-
if (!ssl_check_message_type(ssl, SSL3_MT_CLIENT_HELLO)) {
|
315
|
-
return ssl_hs_error;
|
316
|
-
}
|
317
|
-
|
318
|
-
SSL_CLIENT_HELLO client_hello;
|
319
|
-
if (!ssl_client_hello_init(ssl, &client_hello, ssl->init_msg,
|
320
|
-
ssl->init_num)) {
|
321
|
-
OPENSSL_PUT_ERROR(SSL, SSL_R_CLIENTHELLO_PARSE_FAILED);
|
322
|
-
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
|
323
|
-
return ssl_hs_error;
|
324
|
-
}
|
325
|
-
|
326
|
-
int need_retry;
|
327
|
-
if (!resolve_ecdhe_secret(hs, &need_retry, &client_hello)) {
|
328
|
-
if (need_retry) {
|
329
|
-
/* Only send one HelloRetryRequest. */
|
330
|
-
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_ILLEGAL_PARAMETER);
|
331
|
-
OPENSSL_PUT_ERROR(SSL, SSL_R_WRONG_CURVE);
|
332
|
-
}
|
333
|
-
return ssl_hs_error;
|
334
|
-
}
|
335
|
-
|
336
|
-
if (!ssl_hash_current_message(hs)) {
|
337
|
-
return ssl_hs_error;
|
338
|
-
}
|
339
|
-
|
340
|
-
ssl->method->received_flight(ssl);
|
341
|
-
hs->tls13_state = state_send_server_hello;
|
342
|
-
return ssl_hs_ok;
|
343
|
-
}
|
344
|
-
|
345
|
-
static enum ssl_hs_wait_t do_send_server_hello(SSL_HANDSHAKE *hs) {
|
346
|
-
SSL *const ssl = hs->ssl;
|
347
|
-
|
348
|
-
/* Send a ServerHello. */
|
349
|
-
CBB cbb, body, extensions;
|
350
|
-
if (!ssl->method->init_message(ssl, &cbb, &body, SSL3_MT_SERVER_HELLO) ||
|
351
|
-
!CBB_add_u16(&body, ssl->version) ||
|
352
|
-
!RAND_bytes(ssl->s3->server_random, sizeof(ssl->s3->server_random)) ||
|
353
|
-
!CBB_add_bytes(&body, ssl->s3->server_random, SSL3_RANDOM_SIZE) ||
|
354
|
-
!CBB_add_u16(&body, ssl_cipher_get_value(hs->new_cipher)) ||
|
355
|
-
!CBB_add_u16_length_prefixed(&body, &extensions) ||
|
356
|
-
!ssl_ext_pre_shared_key_add_serverhello(hs, &extensions) ||
|
357
|
-
!ssl_ext_key_share_add_serverhello(hs, &extensions)) {
|
358
|
-
goto err;
|
359
|
-
}
|
360
|
-
|
361
|
-
if (ssl->s3->short_header) {
|
362
|
-
if (!CBB_add_u16(&extensions, TLSEXT_TYPE_short_header) ||
|
363
|
-
!CBB_add_u16(&extensions, 0 /* empty extension */)) {
|
364
|
-
goto err;
|
365
|
-
}
|
366
|
-
}
|
367
|
-
|
368
|
-
if (!ssl_add_message_cbb(ssl, &cbb)) {
|
369
|
-
goto err;
|
370
|
-
}
|
371
|
-
|
372
|
-
/* Derive and enable the handshake traffic secrets. */
|
373
|
-
if (!tls13_derive_handshake_secrets(hs) ||
|
374
|
-
!tls13_set_traffic_key(ssl, evp_aead_open, hs->client_handshake_secret,
|
375
|
-
hs->hash_len) ||
|
376
|
-
!tls13_set_traffic_key(ssl, evp_aead_seal, hs->server_handshake_secret,
|
377
|
-
hs->hash_len)) {
|
378
|
-
goto err;
|
379
|
-
}
|
380
|
-
|
381
|
-
/* Send EncryptedExtensions. */
|
382
|
-
if (!ssl->method->init_message(ssl, &cbb, &body,
|
383
|
-
SSL3_MT_ENCRYPTED_EXTENSIONS) ||
|
384
|
-
!ssl_add_serverhello_tlsext(hs, &body) ||
|
385
|
-
!ssl_add_message_cbb(ssl, &cbb)) {
|
386
|
-
goto err;
|
387
|
-
}
|
388
|
-
|
389
|
-
/* Determine whether to request a client certificate. */
|
390
|
-
hs->cert_request = !!(ssl->verify_mode & SSL_VERIFY_PEER);
|
391
|
-
/* CertificateRequest may only be sent in non-resumption handshakes. */
|
392
|
-
if (ssl->s3->session_reused) {
|
393
|
-
hs->cert_request = 0;
|
394
|
-
}
|
395
|
-
|
396
|
-
/* Send a CertificateRequest, if necessary. */
|
397
|
-
if (hs->cert_request) {
|
398
|
-
CBB sigalgs_cbb;
|
399
|
-
if (!ssl->method->init_message(ssl, &cbb, &body,
|
400
|
-
SSL3_MT_CERTIFICATE_REQUEST) ||
|
401
|
-
!CBB_add_u8(&body, 0 /* no certificate_request_context. */)) {
|
402
|
-
goto err;
|
403
|
-
}
|
404
|
-
|
405
|
-
const uint16_t *sigalgs;
|
406
|
-
size_t num_sigalgs = tls12_get_verify_sigalgs(ssl, &sigalgs);
|
407
|
-
if (!CBB_add_u16_length_prefixed(&body, &sigalgs_cbb)) {
|
408
|
-
goto err;
|
409
|
-
}
|
410
|
-
|
411
|
-
for (size_t i = 0; i < num_sigalgs; i++) {
|
412
|
-
if (!CBB_add_u16(&sigalgs_cbb, sigalgs[i])) {
|
413
|
-
goto err;
|
414
|
-
}
|
415
|
-
}
|
416
|
-
|
417
|
-
if (!ssl_add_client_CA_list(ssl, &body) ||
|
418
|
-
!CBB_add_u16(&body, 0 /* empty certificate_extensions. */) ||
|
419
|
-
!ssl_add_message_cbb(ssl, &cbb)) {
|
420
|
-
goto err;
|
421
|
-
}
|
422
|
-
}
|
423
|
-
|
424
|
-
/* Send the server Certificate message, if necessary. */
|
425
|
-
if (!ssl->s3->session_reused) {
|
426
|
-
if (!ssl_has_certificate(ssl)) {
|
427
|
-
OPENSSL_PUT_ERROR(SSL, SSL_R_NO_CERTIFICATE_SET);
|
428
|
-
goto err;
|
429
|
-
}
|
430
|
-
|
431
|
-
if (!tls13_add_certificate(hs)) {
|
432
|
-
goto err;
|
433
|
-
}
|
434
|
-
|
435
|
-
hs->tls13_state = state_send_server_certificate_verify;
|
436
|
-
return ssl_hs_ok;
|
437
|
-
}
|
438
|
-
|
439
|
-
hs->tls13_state = state_send_server_finished;
|
440
|
-
return ssl_hs_ok;
|
441
|
-
|
442
|
-
err:
|
443
|
-
CBB_cleanup(&cbb);
|
444
|
-
return ssl_hs_error;
|
445
|
-
}
|
446
|
-
|
447
|
-
static enum ssl_hs_wait_t do_send_server_certificate_verify(SSL_HANDSHAKE *hs,
|
448
|
-
int is_first_run) {
|
449
|
-
switch (tls13_add_certificate_verify(hs, is_first_run)) {
|
450
|
-
case ssl_private_key_success:
|
451
|
-
hs->tls13_state = state_send_server_finished;
|
452
|
-
return ssl_hs_ok;
|
453
|
-
|
454
|
-
case ssl_private_key_retry:
|
455
|
-
hs->tls13_state = state_complete_server_certificate_verify;
|
456
|
-
return ssl_hs_private_key_operation;
|
457
|
-
|
458
|
-
case ssl_private_key_failure:
|
459
|
-
return ssl_hs_error;
|
460
|
-
}
|
461
|
-
|
462
|
-
assert(0);
|
463
|
-
return ssl_hs_error;
|
464
|
-
}
|
465
|
-
|
466
|
-
static enum ssl_hs_wait_t do_send_server_finished(SSL_HANDSHAKE *hs) {
|
467
|
-
SSL *const ssl = hs->ssl;
|
468
|
-
if (!tls13_add_finished(hs) ||
|
469
|
-
/* Update the secret to the master secret and derive traffic keys. */
|
470
|
-
!tls13_advance_key_schedule(hs, kZeroes, hs->hash_len) ||
|
471
|
-
!tls13_derive_application_secrets(hs) ||
|
472
|
-
!tls13_set_traffic_key(ssl, evp_aead_seal, hs->server_traffic_secret_0,
|
473
|
-
hs->hash_len)) {
|
474
|
-
return ssl_hs_error;
|
475
|
-
}
|
476
|
-
|
477
|
-
hs->tls13_state = state_process_client_certificate;
|
478
|
-
return ssl_hs_flush_and_read_message;
|
479
|
-
}
|
480
|
-
|
481
|
-
static enum ssl_hs_wait_t do_process_client_certificate(SSL_HANDSHAKE *hs) {
|
482
|
-
SSL *const ssl = hs->ssl;
|
483
|
-
if (!hs->cert_request) {
|
484
|
-
/* OpenSSL returns X509_V_OK when no certificates are requested. This is
|
485
|
-
* classed by them as a bug, but it's assumed by at least NGINX. */
|
486
|
-
hs->new_session->verify_result = X509_V_OK;
|
487
|
-
|
488
|
-
/* Skip this state. */
|
489
|
-
hs->tls13_state = state_process_channel_id;
|
490
|
-
return ssl_hs_ok;
|
491
|
-
}
|
492
|
-
|
493
|
-
const int allow_anonymous =
|
494
|
-
(ssl->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT) == 0;
|
495
|
-
|
496
|
-
if (!ssl_check_message_type(ssl, SSL3_MT_CERTIFICATE) ||
|
497
|
-
!tls13_process_certificate(hs, allow_anonymous) ||
|
498
|
-
!ssl_hash_current_message(hs)) {
|
499
|
-
return ssl_hs_error;
|
500
|
-
}
|
501
|
-
|
502
|
-
hs->tls13_state = state_process_client_certificate_verify;
|
503
|
-
return ssl_hs_read_message;
|
504
|
-
}
|
505
|
-
|
506
|
-
static enum ssl_hs_wait_t do_process_client_certificate_verify(
|
507
|
-
SSL_HANDSHAKE *hs) {
|
508
|
-
SSL *const ssl = hs->ssl;
|
509
|
-
if (sk_CRYPTO_BUFFER_num(hs->new_session->certs) == 0) {
|
510
|
-
/* Skip this state. */
|
511
|
-
hs->tls13_state = state_process_channel_id;
|
512
|
-
return ssl_hs_ok;
|
513
|
-
}
|
514
|
-
|
515
|
-
if (!ssl_check_message_type(ssl, SSL3_MT_CERTIFICATE_VERIFY) ||
|
516
|
-
!tls13_process_certificate_verify(hs) ||
|
517
|
-
!ssl_hash_current_message(hs)) {
|
518
|
-
return ssl_hs_error;
|
519
|
-
}
|
520
|
-
|
521
|
-
hs->tls13_state = state_process_channel_id;
|
522
|
-
return ssl_hs_read_message;
|
523
|
-
}
|
524
|
-
|
525
|
-
static enum ssl_hs_wait_t do_process_channel_id(SSL_HANDSHAKE *hs) {
|
526
|
-
if (!hs->ssl->s3->tlsext_channel_id_valid) {
|
527
|
-
hs->tls13_state = state_process_client_finished;
|
528
|
-
return ssl_hs_ok;
|
529
|
-
}
|
530
|
-
|
531
|
-
if (!ssl_check_message_type(hs->ssl, SSL3_MT_CHANNEL_ID) ||
|
532
|
-
!tls1_verify_channel_id(hs) ||
|
533
|
-
!ssl_hash_current_message(hs)) {
|
534
|
-
return ssl_hs_error;
|
535
|
-
}
|
536
|
-
|
537
|
-
hs->tls13_state = state_process_client_finished;
|
538
|
-
return ssl_hs_read_message;
|
539
|
-
}
|
540
|
-
|
541
|
-
static enum ssl_hs_wait_t do_process_client_finished(SSL_HANDSHAKE *hs) {
|
542
|
-
SSL *const ssl = hs->ssl;
|
543
|
-
if (!ssl_check_message_type(ssl, SSL3_MT_FINISHED) ||
|
544
|
-
!tls13_process_finished(hs) ||
|
545
|
-
!ssl_hash_current_message(hs) ||
|
546
|
-
/* evp_aead_seal keys have already been switched. */
|
547
|
-
!tls13_set_traffic_key(ssl, evp_aead_open, hs->client_traffic_secret_0,
|
548
|
-
hs->hash_len) ||
|
549
|
-
!tls13_derive_resumption_secret(hs)) {
|
550
|
-
return ssl_hs_error;
|
551
|
-
}
|
552
|
-
|
553
|
-
ssl->method->received_flight(ssl);
|
554
|
-
|
555
|
-
/* Rebase the session timestamp so that it is measured from ticket
|
556
|
-
* issuance. */
|
557
|
-
ssl_session_rebase_time(ssl, hs->new_session);
|
558
|
-
hs->tls13_state = state_send_new_session_ticket;
|
559
|
-
return ssl_hs_ok;
|
560
|
-
}
|
561
|
-
|
562
|
-
static enum ssl_hs_wait_t do_send_new_session_ticket(SSL_HANDSHAKE *hs) {
|
563
|
-
/* TLS 1.3 recommends single-use tickets, so issue multiple tickets in case the
|
564
|
-
* client makes several connections before getting a renewal. */
|
565
|
-
static const int kNumTickets = 2;
|
566
|
-
|
567
|
-
SSL *const ssl = hs->ssl;
|
568
|
-
/* If the client doesn't accept resumption with PSK_DHE_KE, don't send a
|
569
|
-
* session ticket. */
|
570
|
-
if (!hs->accept_psk_mode) {
|
571
|
-
hs->tls13_state = state_done;
|
572
|
-
return ssl_hs_ok;
|
573
|
-
}
|
574
|
-
|
575
|
-
SSL_SESSION *session = hs->new_session;
|
576
|
-
CBB cbb;
|
577
|
-
CBB_zero(&cbb);
|
578
|
-
|
579
|
-
for (int i = 0; i < kNumTickets; i++) {
|
580
|
-
if (!RAND_bytes((uint8_t *)&session->ticket_age_add, 4)) {
|
581
|
-
goto err;
|
582
|
-
}
|
583
|
-
|
584
|
-
CBB body, ticket, extensions;
|
585
|
-
if (!ssl->method->init_message(ssl, &cbb, &body,
|
586
|
-
SSL3_MT_NEW_SESSION_TICKET) ||
|
587
|
-
!CBB_add_u32(&body, session->timeout) ||
|
588
|
-
!CBB_add_u32(&body, session->ticket_age_add) ||
|
589
|
-
!CBB_add_u16_length_prefixed(&body, &ticket) ||
|
590
|
-
!ssl_encrypt_ticket(ssl, &ticket, session) ||
|
591
|
-
!CBB_add_u16_length_prefixed(&body, &extensions)) {
|
592
|
-
goto err;
|
593
|
-
}
|
594
|
-
|
595
|
-
if (ssl->ctx->enable_early_data) {
|
596
|
-
session->ticket_max_early_data = kMaxEarlyDataAccepted;
|
597
|
-
|
598
|
-
CBB early_data_info;
|
599
|
-
if (!CBB_add_u16(&extensions, TLSEXT_TYPE_ticket_early_data_info) ||
|
600
|
-
!CBB_add_u16_length_prefixed(&extensions, &early_data_info) ||
|
601
|
-
!CBB_add_u32(&early_data_info, session->ticket_max_early_data) ||
|
602
|
-
!CBB_flush(&extensions)) {
|
603
|
-
goto err;
|
604
|
-
}
|
605
|
-
}
|
606
|
-
|
607
|
-
/* Add a fake extension. See draft-davidben-tls-grease-01. */
|
608
|
-
if (!CBB_add_u16(&extensions,
|
609
|
-
ssl_get_grease_value(ssl, ssl_grease_ticket_extension)) ||
|
610
|
-
!CBB_add_u16(&extensions, 0 /* empty */)) {
|
611
|
-
goto err;
|
612
|
-
}
|
613
|
-
|
614
|
-
if (!ssl_add_message_cbb(ssl, &cbb)) {
|
615
|
-
goto err;
|
616
|
-
}
|
617
|
-
}
|
618
|
-
|
619
|
-
hs->session_tickets_sent++;
|
620
|
-
hs->tls13_state = state_done;
|
621
|
-
return ssl_hs_flush;
|
622
|
-
|
623
|
-
err:
|
624
|
-
CBB_cleanup(&cbb);
|
625
|
-
return ssl_hs_error;
|
626
|
-
}
|
627
|
-
|
628
|
-
enum ssl_hs_wait_t tls13_server_handshake(SSL_HANDSHAKE *hs) {
|
629
|
-
while (hs->tls13_state != state_done) {
|
630
|
-
enum ssl_hs_wait_t ret = ssl_hs_error;
|
631
|
-
enum server_hs_state_t state = hs->tls13_state;
|
632
|
-
switch (state) {
|
633
|
-
case state_select_parameters:
|
634
|
-
ret = do_select_parameters(hs);
|
635
|
-
break;
|
636
|
-
case state_send_hello_retry_request:
|
637
|
-
ret = do_send_hello_retry_request(hs);
|
638
|
-
break;
|
639
|
-
case state_process_second_client_hello:
|
640
|
-
ret = do_process_second_client_hello(hs);
|
641
|
-
break;
|
642
|
-
case state_send_server_hello:
|
643
|
-
ret = do_send_server_hello(hs);
|
644
|
-
break;
|
645
|
-
case state_send_server_certificate_verify:
|
646
|
-
ret = do_send_server_certificate_verify(hs, 1 /* first run */);
|
647
|
-
break;
|
648
|
-
case state_complete_server_certificate_verify:
|
649
|
-
ret = do_send_server_certificate_verify(hs, 0 /* complete */);
|
650
|
-
break;
|
651
|
-
case state_send_server_finished:
|
652
|
-
ret = do_send_server_finished(hs);
|
653
|
-
break;
|
654
|
-
case state_process_client_certificate:
|
655
|
-
ret = do_process_client_certificate(hs);
|
656
|
-
break;
|
657
|
-
case state_process_client_certificate_verify:
|
658
|
-
ret = do_process_client_certificate_verify(hs);
|
659
|
-
break;
|
660
|
-
case state_process_channel_id:
|
661
|
-
ret = do_process_channel_id(hs);
|
662
|
-
break;
|
663
|
-
case state_process_client_finished:
|
664
|
-
ret = do_process_client_finished(hs);
|
665
|
-
break;
|
666
|
-
case state_send_new_session_ticket:
|
667
|
-
ret = do_send_new_session_ticket(hs);
|
668
|
-
break;
|
669
|
-
case state_done:
|
670
|
-
ret = ssl_hs_ok;
|
671
|
-
break;
|
672
|
-
}
|
673
|
-
|
674
|
-
if (ret != ssl_hs_ok) {
|
675
|
-
return ret;
|
676
|
-
}
|
677
|
-
}
|
678
|
-
|
679
|
-
return ssl_hs_ok;
|
680
|
-
}
|