grpc-flamingo 1.11.0 → 1.15.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Makefile +1150 -176
- data/etc/roots.pem +40 -196
- data/include/grpc/grpc.h +49 -8
- data/include/grpc/grpc_security.h +123 -2
- data/include/grpc/grpc_security_constants.h +6 -0
- data/include/grpc/impl/codegen/fork.h +4 -4
- data/include/grpc/impl/codegen/grpc_types.h +26 -5
- data/include/grpc/impl/codegen/log.h +112 -0
- data/include/grpc/impl/codegen/port_platform.h +55 -4
- data/include/grpc/module.modulemap +2 -0
- data/include/grpc/support/log.h +2 -80
- data/include/grpc/support/string_util.h +2 -0
- data/include/grpc/support/sync.h +0 -16
- data/src/boringssl/err_data.c +602 -588
- data/src/core/ext/{census → filters/census}/grpc_context.cc +0 -0
- data/src/core/ext/filters/client_channel/channel_connectivity.cc +1 -1
- data/src/core/ext/filters/client_channel/client_channel.cc +1234 -1070
- data/src/core/ext/filters/client_channel/client_channel.h +5 -0
- data/src/core/ext/filters/client_channel/client_channel_channelz.cc +113 -0
- data/src/core/ext/filters/client_channel/client_channel_channelz.h +71 -0
- data/src/core/ext/filters/client_channel/client_channel_plugin.cc +9 -0
- data/src/core/ext/filters/client_channel/http_connect_handshaker.cc +1 -1
- data/src/core/ext/filters/client_channel/http_proxy.cc +22 -5
- data/src/core/ext/filters/client_channel/lb_policy.cc +2 -2
- data/src/core/ext/filters/client_channel/lb_policy.h +30 -10
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc +11 -9
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +120 -127
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h +36 -0
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc +36 -102
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h +37 -32
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +25 -22
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h +4 -2
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c +19 -0
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.h +54 -0
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c +19 -0
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.h +54 -0
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c +4 -17
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h +37 -63
- data/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +306 -239
- data/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +444 -392
- data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +538 -98
- data/src/core/ext/filters/client_channel/lb_policy_factory.cc +8 -0
- data/src/core/ext/filters/client_channel/lb_policy_factory.h +4 -0
- data/src/core/ext/filters/client_channel/method_params.h +4 -0
- data/src/core/ext/filters/client_channel/resolver.h +10 -0
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +36 -19
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc +320 -0
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h +62 -9
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +49 -294
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +537 -0
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +112 -87
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h +17 -2
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc +6 -5
- data/src/core/ext/filters/{load_reporting/server_load_reporting_filter.h → client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc} +7 -8
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc +29 -0
- data/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +32 -15
- data/src/core/ext/filters/client_channel/retry_throttle.h +4 -0
- data/src/core/ext/filters/client_channel/subchannel.cc +58 -15
- data/src/core/ext/filters/client_channel/subchannel.h +11 -0
- data/src/core/ext/filters/deadline/deadline_filter.cc +18 -15
- data/src/core/ext/filters/deadline/deadline_filter.h +5 -5
- data/src/core/ext/filters/http/client/http_client_filter.cc +10 -9
- data/src/core/ext/filters/http/client_authority_filter.cc +6 -5
- data/src/core/ext/filters/http/message_compress/message_compress_filter.cc +6 -6
- data/src/core/ext/filters/http/server/http_server_filter.cc +123 -131
- data/src/core/ext/filters/http/server/http_server_filter.h +1 -1
- data/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc +1 -1
- data/src/core/ext/transport/chttp2/server/chttp2_server.cc +1 -1
- data/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc +3 -2
- data/src/core/ext/transport/chttp2/transport/bin_decoder.cc +9 -8
- data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +97 -48
- data/src/core/ext/transport/chttp2/transport/flow_control.cc +10 -7
- data/src/core/ext/transport/chttp2/transport/frame_settings.cc +3 -3
- data/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +12 -8
- data/src/core/ext/transport/chttp2/transport/hpack_encoder.h +4 -3
- data/src/core/ext/transport/chttp2/transport/hpack_parser.cc +2 -2
- data/src/core/ext/transport/chttp2/transport/hpack_table.cc +2 -2
- data/src/core/ext/transport/chttp2/transport/parsing.cc +14 -12
- data/src/core/ext/transport/chttp2/transport/stream_lists.cc +3 -3
- data/src/core/ext/transport/chttp2/transport/writing.cc +32 -27
- data/src/core/ext/transport/inproc/inproc_transport.cc +87 -49
- data/src/core/lib/channel/channel_args.cc +28 -0
- data/src/core/lib/channel/channel_args.h +4 -0
- data/src/core/lib/channel/channel_stack.cc +22 -29
- data/src/core/lib/channel/channel_stack.h +2 -2
- data/src/core/lib/channel/channel_stack_builder.cc +0 -3
- data/src/core/lib/channel/channel_stack_builder.h +0 -2
- data/src/core/lib/channel/channel_trace.cc +28 -63
- data/src/core/lib/channel/channel_trace.h +13 -17
- data/src/core/lib/channel/channelz.cc +153 -0
- data/src/core/lib/channel/channelz.h +133 -0
- data/src/core/lib/channel/channelz_registry.cc +145 -0
- data/src/core/lib/channel/channelz_registry.h +120 -0
- data/src/core/lib/channel/connected_channel.cc +8 -1
- data/src/core/lib/channel/handshaker.cc +71 -0
- data/src/core/lib/channel/handshaker.h +4 -0
- data/src/core/lib/debug/stats.h +7 -0
- data/src/core/lib/debug/stats_data.cc +5 -0
- data/src/core/lib/debug/stats_data.h +120 -0
- data/src/core/lib/debug/trace.cc +2 -1
- data/src/core/lib/debug/trace.h +12 -1
- data/src/core/lib/gpr/alloc.h +28 -0
- data/src/core/lib/gpr/arena.cc +38 -45
- data/src/core/lib/gpr/log.cc +8 -2
- data/src/core/lib/gpr/log_android.cc +4 -0
- data/src/core/lib/gpr/log_linux.cc +4 -0
- data/src/core/lib/gpr/log_posix.cc +4 -0
- data/src/core/lib/gpr/log_windows.cc +5 -0
- data/src/core/lib/gpr/string.cc +28 -0
- data/src/core/lib/gpr/string.h +10 -0
- data/src/core/lib/gprpp/abstract.h +5 -2
- data/src/core/lib/gprpp/fork.cc +268 -0
- data/src/core/lib/gprpp/fork.h +88 -0
- data/src/core/lib/gprpp/inlined_vector.h +87 -37
- data/src/core/lib/gprpp/memory.h +12 -0
- data/src/core/lib/gprpp/mutex_lock.h +42 -0
- data/src/core/lib/gprpp/orphanable.h +10 -12
- data/src/core/lib/gprpp/ref_counted.h +10 -12
- data/src/core/lib/gprpp/ref_counted_ptr.h +65 -8
- data/src/core/lib/gprpp/thd.h +0 -3
- data/src/core/lib/gprpp/thd_posix.cc +5 -54
- data/src/core/lib/gprpp/thd_windows.cc +0 -7
- data/src/core/lib/http/httpcli_security_connector.cc +1 -3
- data/src/core/lib/iomgr/call_combiner.cc +13 -13
- data/src/core/lib/iomgr/call_combiner.h +84 -1
- data/src/core/lib/iomgr/closure.h +6 -5
- data/src/core/lib/iomgr/combiner.cc +30 -13
- data/src/core/lib/iomgr/combiner.h +1 -1
- data/src/core/lib/iomgr/endpoint_pair_posix.cc +2 -2
- data/src/core/lib/iomgr/error.cc +12 -0
- data/src/core/lib/iomgr/error.h +5 -0
- data/src/core/lib/iomgr/ev_epoll1_linux.cc +138 -51
- data/src/core/lib/iomgr/ev_epollex_linux.cc +276 -93
- data/src/core/lib/iomgr/ev_epollsig_linux.cc +58 -50
- data/src/core/lib/iomgr/ev_poll_posix.cc +163 -42
- data/src/core/lib/iomgr/ev_posix.cc +88 -24
- data/src/core/lib/iomgr/ev_posix.h +48 -12
- data/src/core/lib/iomgr/exec_ctx.cc +15 -9
- data/src/core/lib/iomgr/exec_ctx.h +48 -20
- data/src/core/lib/iomgr/executor.cc +274 -142
- data/src/core/lib/iomgr/executor.h +82 -16
- data/src/core/lib/iomgr/fork_posix.cc +42 -19
- data/src/core/lib/iomgr/iocp_windows.cc +9 -4
- data/src/core/lib/iomgr/iomgr.cc +2 -0
- data/src/core/lib/iomgr/iomgr.h +5 -0
- data/src/core/lib/iomgr/iomgr_posix.cc +2 -2
- data/src/core/lib/iomgr/is_epollexclusive_available.cc +1 -0
- data/src/core/lib/iomgr/lockfree_event.cc +5 -1
- data/src/core/lib/iomgr/polling_entity.cc +11 -2
- data/src/core/lib/iomgr/pollset_custom.cc +2 -2
- data/src/core/lib/iomgr/port.h +51 -1
- data/src/core/lib/iomgr/resolve_address.h +1 -1
- data/src/core/lib/iomgr/resolve_address_posix.cc +4 -3
- data/src/core/lib/iomgr/resolve_address_windows.cc +3 -2
- data/src/core/lib/iomgr/resource_quota.cc +89 -12
- data/src/core/lib/iomgr/resource_quota.h +16 -0
- data/src/core/lib/iomgr/sockaddr_posix.h +1 -1
- data/src/core/lib/iomgr/socket_factory_posix.cc +1 -1
- data/src/core/lib/iomgr/socket_mutator.cc +1 -1
- data/src/core/lib/iomgr/socket_mutator.h +1 -1
- data/src/core/lib/iomgr/socket_utils.h +9 -0
- data/src/core/lib/iomgr/socket_utils_common_posix.cc +29 -1
- data/src/core/lib/iomgr/socket_utils_linux.cc +0 -1
- data/src/core/lib/iomgr/socket_utils_posix.cc +2 -3
- data/src/core/lib/iomgr/socket_utils_posix.h +3 -0
- data/src/core/lib/iomgr/socket_utils_uv.cc +4 -0
- data/src/core/lib/iomgr/socket_utils_windows.cc +4 -0
- data/src/core/lib/iomgr/socket_windows.cc +33 -0
- data/src/core/lib/iomgr/socket_windows.h +6 -0
- data/src/core/lib/iomgr/tcp_client_custom.cc +5 -5
- data/src/core/lib/iomgr/tcp_client_posix.cc +10 -11
- data/src/core/lib/iomgr/tcp_custom.cc +11 -11
- data/src/core/lib/iomgr/tcp_posix.cc +49 -36
- data/src/core/lib/iomgr/tcp_server_custom.cc +5 -5
- data/src/core/lib/iomgr/tcp_server_posix.cc +16 -36
- data/src/core/lib/iomgr/tcp_server_utils_posix.h +1 -1
- data/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +17 -5
- data/src/core/lib/iomgr/tcp_server_windows.cc +1 -0
- data/src/core/lib/iomgr/tcp_uv.cc +3 -0
- data/src/core/lib/iomgr/tcp_windows.cc +18 -2
- data/src/core/lib/iomgr/tcp_windows.h +2 -0
- data/src/core/lib/iomgr/timer.h +4 -3
- data/src/core/lib/iomgr/timer_generic.cc +133 -51
- data/src/core/lib/iomgr/timer_manager.cc +12 -14
- data/src/core/lib/iomgr/timer_uv.cc +3 -0
- data/src/core/lib/iomgr/udp_server.cc +106 -52
- data/src/core/lib/iomgr/udp_server.h +8 -4
- data/src/core/lib/json/json.cc +12 -1
- data/src/core/lib/json/json.h +5 -0
- data/src/core/lib/profiling/basic_timers.cc +1 -0
- data/src/core/lib/security/context/security_context.cc +8 -8
- data/src/core/lib/security/context/security_context.h +6 -2
- data/src/core/lib/security/credentials/alts/alts_credentials.h +0 -20
- data/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc +3 -2
- data/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc +7 -7
- data/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h +1 -38
- data/src/core/lib/security/credentials/credentials.h +1 -0
- data/src/core/lib/security/credentials/google_default/google_default_credentials.cc +89 -115
- data/src/core/lib/security/credentials/google_default/google_default_credentials.h +16 -0
- data/src/core/lib/security/credentials/jwt/json_token.h +2 -0
- data/src/core/lib/security/credentials/jwt/jwt_verifier.cc +2 -0
- data/src/core/lib/security/credentials/local/local_credentials.cc +77 -0
- data/src/core/lib/security/credentials/local/local_credentials.h +40 -0
- data/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +11 -7
- data/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +1 -1
- data/src/core/lib/security/credentials/ssl/ssl_credentials.cc +17 -3
- data/src/core/lib/security/security_connector/alts_security_connector.cc +2 -1
- data/src/core/lib/security/security_connector/load_system_roots.h +29 -0
- data/src/core/lib/{gpr/fork.h → security/security_connector/load_system_roots_fallback.cc} +10 -13
- data/src/core/lib/security/security_connector/load_system_roots_linux.cc +165 -0
- data/src/core/lib/security/security_connector/load_system_roots_linux.h +44 -0
- data/src/core/lib/security/security_connector/local_security_connector.cc +245 -0
- data/src/core/lib/security/security_connector/local_security_connector.h +58 -0
- data/src/core/lib/security/security_connector/security_connector.cc +79 -32
- data/src/core/lib/security/security_connector/security_connector.h +5 -3
- data/src/core/lib/security/transport/client_auth_filter.cc +5 -5
- data/src/core/lib/security/transport/secure_endpoint.cc +2 -2
- data/src/core/lib/security/transport/security_handshaker.cc +7 -2
- data/src/core/lib/security/transport/server_auth_filter.cc +4 -7
- data/src/core/lib/security/util/json_util.cc +4 -0
- data/src/core/lib/slice/slice.cc +6 -2
- data/src/core/lib/slice/slice_buffer.cc +27 -7
- data/src/core/lib/slice/slice_hash_table.h +4 -0
- data/src/core/lib/slice/slice_weak_hash_table.h +4 -0
- data/src/core/lib/surface/call.cc +119 -58
- data/src/core/lib/surface/call.h +7 -0
- data/src/core/lib/surface/channel.cc +50 -18
- data/src/core/lib/surface/channel.h +4 -0
- data/src/core/lib/surface/completion_queue.cc +153 -18
- data/src/core/lib/surface/completion_queue.h +20 -2
- data/src/core/lib/surface/completion_queue_factory.cc +13 -4
- data/src/core/lib/surface/init.cc +7 -8
- data/src/core/lib/surface/init.h +0 -1
- data/src/core/lib/surface/server.cc +16 -0
- data/src/core/lib/surface/version.cc +1 -1
- data/src/core/lib/transport/bdp_estimator.cc +3 -3
- data/src/core/lib/transport/bdp_estimator.h +2 -2
- data/src/core/lib/transport/byte_stream.cc +1 -1
- data/src/core/lib/transport/connectivity_state.cc +6 -7
- data/src/core/lib/transport/service_config.cc +2 -2
- data/src/core/lib/transport/service_config.h +3 -3
- data/src/core/lib/transport/transport.cc +22 -10
- data/src/core/lib/transport/transport.h +18 -18
- data/src/core/lib/transport/transport_op_string.cc +1 -8
- data/src/core/plugin_registry/grpc_plugin_registry.cc +0 -4
- data/src/core/tsi/alts/crypt/aes_gcm.cc +2 -0
- data/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +19 -7
- data/src/core/tsi/alts/handshaker/alts_handshaker_client.h +10 -0
- data/src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.h +2 -2
- data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +38 -3
- data/src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h +3 -0
- data/src/core/tsi/alts/handshaker/altscontext.pb.c +0 -1
- data/src/core/tsi/alts/handshaker/altscontext.pb.h +1 -2
- data/src/core/tsi/alts/handshaker/handshaker.pb.c +0 -1
- data/src/core/tsi/alts/handshaker/handshaker.pb.h +1 -2
- data/src/core/tsi/alts/handshaker/transport_security_common.pb.c +0 -1
- data/src/core/tsi/alts/handshaker/transport_security_common.pb.h +1 -1
- data/src/core/tsi/alts/handshaker/transport_security_common_api.h +2 -2
- data/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc +47 -1
- data/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h +3 -1
- data/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc +12 -11
- data/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h +7 -2
- data/src/core/tsi/fake_transport_security.cc +1 -0
- data/src/core/tsi/grpc_shadow_boringssl.h +3006 -0
- data/src/core/tsi/local_transport_security.cc +209 -0
- data/src/core/tsi/local_transport_security.h +51 -0
- data/src/core/tsi/ssl/session_cache/ssl_session.h +2 -0
- data/src/core/tsi/ssl/session_cache/ssl_session_cache.cc +5 -5
- data/src/core/tsi/ssl/session_cache/ssl_session_cache.h +6 -0
- data/src/core/tsi/ssl_transport_security.cc +245 -116
- data/src/core/tsi/ssl_types.h +2 -0
- data/src/core/tsi/transport_security.cc +14 -0
- data/src/core/tsi/transport_security.h +2 -0
- data/src/core/tsi/transport_security_interface.h +11 -1
- data/src/ruby/bin/math_client.rb +17 -9
- data/src/ruby/ext/grpc/extconf.rb +1 -26
- data/src/ruby/ext/grpc/rb_channel_credentials.c +3 -3
- data/src/ruby/ext/grpc/rb_grpc_imports.generated.c +42 -16
- data/src/ruby/ext/grpc/rb_grpc_imports.generated.h +65 -26
- data/src/ruby/lib/grpc/generic/active_call.rb +19 -23
- data/src/ruby/lib/grpc/generic/rpc_server.rb +2 -1
- data/src/ruby/lib/grpc/version.rb +1 -1
- data/src/ruby/pb/generate_proto_ruby.sh +7 -1
- data/src/ruby/pb/grpc/health/v1/health_services_pb.rb +4 -1
- data/src/ruby/spec/call_credentials_spec.rb +1 -1
- data/src/ruby/spec/call_spec.rb +1 -1
- data/src/ruby/spec/channel_credentials_spec.rb +1 -1
- data/src/ruby/spec/channel_spec.rb +1 -1
- data/src/ruby/spec/client_auth_spec.rb +1 -12
- data/src/ruby/spec/client_server_spec.rb +1 -1
- data/src/ruby/spec/compression_options_spec.rb +1 -1
- data/src/ruby/spec/error_sanity_spec.rb +1 -1
- data/src/ruby/spec/generic/client_stub_spec.rb +16 -4
- data/src/ruby/spec/generic/rpc_desc_spec.rb +1 -1
- data/src/ruby/spec/generic/rpc_server_pool_spec.rb +1 -1
- data/src/ruby/spec/generic/service_spec.rb +1 -1
- data/src/ruby/spec/google_rpc_status_utils_spec.rb +1 -12
- data/src/ruby/spec/pb/duplicate/codegen_spec.rb +1 -0
- data/src/ruby/spec/pb/health/checker_spec.rb +1 -1
- data/src/ruby/spec/server_credentials_spec.rb +1 -1
- data/src/ruby/spec/server_spec.rb +1 -1
- data/src/ruby/spec/spec_helper.rb +1 -0
- data/src/ruby/spec/support/services.rb +1 -1
- data/src/ruby/spec/time_consts_spec.rb +1 -1
- data/third_party/address_sorting/address_sorting.c +17 -11
- data/third_party/address_sorting/address_sorting_windows.c +43 -3
- data/third_party/address_sorting/include/address_sorting/address_sorting.h +3 -0
- data/third_party/boringssl/crypto/asn1/a_int.c +33 -28
- data/third_party/boringssl/crypto/asn1/a_mbstr.c +24 -22
- data/third_party/boringssl/crypto/asn1/a_utf8.c +13 -11
- data/third_party/boringssl/crypto/asn1/asn1_locl.h +3 -0
- data/third_party/boringssl/crypto/asn1/tasn_dec.c +40 -19
- data/third_party/boringssl/crypto/bio/fd.c +1 -0
- data/third_party/boringssl/crypto/bio/file.c +2 -0
- data/third_party/boringssl/crypto/bn_extra/convert.c +6 -5
- data/third_party/boringssl/crypto/bytestring/ber.c +1 -4
- data/third_party/boringssl/crypto/bytestring/cbb.c +116 -16
- data/third_party/boringssl/crypto/bytestring/cbs.c +151 -20
- data/third_party/boringssl/crypto/cipher_extra/e_aesccm.c +203 -0
- data/third_party/boringssl/crypto/cipher_extra/e_rc2.c +2 -0
- data/third_party/boringssl/crypto/cipher_extra/e_tls.c +1 -2
- data/third_party/boringssl/crypto/cpu-aarch64-fuchsia.c +55 -0
- data/third_party/boringssl/crypto/cpu-aarch64-linux.c +2 -1
- data/third_party/boringssl/crypto/dsa/dsa.c +16 -54
- data/third_party/boringssl/crypto/ec_extra/ec_asn1.c +9 -10
- data/third_party/boringssl/crypto/ecdh/ecdh.c +4 -3
- data/third_party/boringssl/crypto/fipsmodule/bcm.c +11 -542
- data/third_party/boringssl/crypto/fipsmodule/bn/add.c +57 -112
- data/third_party/boringssl/crypto/fipsmodule/bn/asm/x86_64-gcc.c +4 -3
- data/third_party/boringssl/crypto/fipsmodule/bn/bn.c +128 -70
- data/third_party/boringssl/crypto/fipsmodule/bn/bytes.c +32 -71
- data/third_party/boringssl/crypto/fipsmodule/bn/cmp.c +64 -118
- data/third_party/boringssl/crypto/fipsmodule/bn/div.c +284 -122
- data/third_party/boringssl/crypto/fipsmodule/bn/exponentiation.c +31 -65
- data/third_party/boringssl/crypto/fipsmodule/bn/gcd.c +274 -218
- data/third_party/boringssl/crypto/fipsmodule/bn/generic.c +2 -1
- data/third_party/boringssl/crypto/fipsmodule/bn/internal.h +187 -27
- data/third_party/boringssl/crypto/fipsmodule/bn/jacobi.c +1 -1
- data/third_party/boringssl/crypto/fipsmodule/bn/montgomery.c +124 -81
- data/third_party/boringssl/crypto/fipsmodule/bn/montgomery_inv.c +8 -30
- data/third_party/boringssl/crypto/fipsmodule/bn/mul.c +321 -347
- data/third_party/boringssl/crypto/fipsmodule/bn/prime.c +326 -66
- data/third_party/boringssl/crypto/fipsmodule/bn/random.c +77 -25
- data/third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.c +199 -222
- data/third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.h +27 -47
- data/third_party/boringssl/crypto/fipsmodule/bn/shift.c +155 -96
- data/third_party/boringssl/crypto/fipsmodule/bn/sqrt.c +1 -1
- data/third_party/boringssl/crypto/fipsmodule/cipher/e_aes.c +10 -10
- data/third_party/boringssl/crypto/fipsmodule/des/internal.h +2 -0
- data/third_party/boringssl/crypto/fipsmodule/ec/ec.c +78 -47
- data/third_party/boringssl/crypto/fipsmodule/ec/ec_key.c +99 -163
- data/third_party/boringssl/crypto/fipsmodule/ec/ec_montgomery.c +3 -10
- data/third_party/boringssl/crypto/fipsmodule/ec/internal.h +44 -23
- data/third_party/boringssl/crypto/fipsmodule/ec/oct.c +59 -90
- data/third_party/boringssl/crypto/fipsmodule/ec/p224-64.c +38 -65
- data/third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64-table.h +5378 -5418
- data/third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.c +17 -26
- data/third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.h +15 -11
- data/third_party/boringssl/crypto/fipsmodule/ec/simple.c +45 -51
- data/third_party/boringssl/crypto/fipsmodule/ec/{util-64.c → util.c} +0 -5
- data/third_party/boringssl/crypto/fipsmodule/ec/wnaf.c +144 -264
- data/third_party/boringssl/crypto/fipsmodule/ecdsa/ecdsa.c +78 -62
- data/third_party/boringssl/crypto/fipsmodule/modes/ccm.c +256 -0
- data/third_party/boringssl/crypto/fipsmodule/modes/internal.h +36 -32
- data/third_party/boringssl/crypto/fipsmodule/rand/ctrdrbg.c +9 -7
- data/third_party/boringssl/crypto/fipsmodule/rsa/blinding.c +16 -40
- data/third_party/boringssl/crypto/fipsmodule/rsa/internal.h +1 -6
- data/third_party/boringssl/crypto/fipsmodule/rsa/rsa.c +57 -39
- data/third_party/boringssl/crypto/fipsmodule/rsa/rsa_impl.c +309 -142
- data/third_party/boringssl/crypto/fipsmodule/self_check/self_check.c +581 -0
- data/third_party/boringssl/crypto/fipsmodule/tls/internal.h +39 -0
- data/third_party/boringssl/crypto/fipsmodule/tls/kdf.c +165 -0
- data/third_party/boringssl/crypto/internal.h +65 -2
- data/third_party/boringssl/crypto/mem.c +0 -2
- data/third_party/boringssl/crypto/obj/obj.c +6 -73
- data/third_party/boringssl/crypto/thread_pthread.c +35 -5
- data/third_party/boringssl/crypto/x509/a_strex.c +11 -11
- data/third_party/boringssl/crypto/x509/vpm_int.h +1 -0
- data/third_party/boringssl/crypto/x509/x509_vfy.c +4 -0
- data/third_party/boringssl/crypto/x509/x509_vpm.c +44 -22
- data/third_party/boringssl/crypto/x509/x_name.c +13 -0
- data/third_party/boringssl/include/openssl/aead.h +10 -0
- data/third_party/boringssl/include/openssl/asn1.h +2 -3
- data/third_party/boringssl/include/openssl/base.h +5 -14
- data/third_party/boringssl/include/openssl/bio.h +1 -1
- data/third_party/boringssl/include/openssl/bn.h +62 -18
- data/third_party/boringssl/include/openssl/bytestring.h +53 -28
- data/third_party/boringssl/include/openssl/crypto.h +4 -0
- data/third_party/boringssl/include/openssl/ec.h +10 -4
- data/third_party/boringssl/include/openssl/ec_key.h +7 -6
- data/third_party/boringssl/include/openssl/err.h +9 -9
- data/third_party/boringssl/include/openssl/evp.h +1 -1
- data/third_party/boringssl/include/openssl/rsa.h +35 -10
- data/third_party/boringssl/include/openssl/ssl.h +167 -19
- data/third_party/boringssl/include/openssl/ssl3.h +0 -1
- data/third_party/boringssl/include/openssl/stack.h +1 -1
- data/third_party/boringssl/include/openssl/tls1.h +10 -2
- data/third_party/boringssl/include/openssl/x509.h +4 -0
- data/third_party/boringssl/include/openssl/x509v3.h +1 -0
- data/third_party/boringssl/ssl/d1_both.cc +16 -2
- data/third_party/boringssl/ssl/dtls_method.cc +1 -1
- data/third_party/boringssl/ssl/handoff.cc +285 -0
- data/third_party/boringssl/ssl/handshake.cc +26 -12
- data/third_party/boringssl/ssl/handshake_client.cc +101 -95
- data/third_party/boringssl/ssl/handshake_server.cc +14 -2
- data/third_party/boringssl/ssl/internal.h +132 -79
- data/third_party/boringssl/ssl/s3_both.cc +2 -2
- data/third_party/boringssl/ssl/s3_lib.cc +3 -1
- data/third_party/boringssl/ssl/s3_pkt.cc +0 -18
- data/third_party/boringssl/ssl/ssl_aead_ctx.cc +1 -4
- data/third_party/boringssl/ssl/ssl_asn1.cc +47 -43
- data/third_party/boringssl/ssl/ssl_cipher.cc +12 -8
- data/third_party/boringssl/ssl/ssl_key_share.cc +3 -1
- data/third_party/boringssl/ssl/ssl_lib.cc +83 -14
- data/third_party/boringssl/ssl/ssl_privkey.cc +6 -0
- data/third_party/boringssl/ssl/ssl_stat.cc +6 -6
- data/third_party/boringssl/ssl/ssl_versions.cc +12 -85
- data/third_party/boringssl/ssl/ssl_x509.cc +59 -61
- data/third_party/boringssl/ssl/t1_enc.cc +73 -124
- data/third_party/boringssl/ssl/t1_lib.cc +367 -41
- data/third_party/boringssl/ssl/tls13_both.cc +8 -0
- data/third_party/boringssl/ssl/tls13_client.cc +98 -184
- data/third_party/boringssl/ssl/tls13_enc.cc +88 -158
- data/third_party/boringssl/ssl/tls13_server.cc +91 -137
- data/third_party/boringssl/ssl/tls_method.cc +0 -17
- data/third_party/boringssl/ssl/tls_record.cc +1 -10
- data/third_party/boringssl/third_party/fiat/curve25519.c +921 -2753
- data/third_party/boringssl/third_party/fiat/curve25519_tables.h +7880 -0
- data/third_party/boringssl/third_party/fiat/internal.h +32 -20
- data/third_party/boringssl/third_party/fiat/p256.c +1824 -0
- metadata +86 -71
- data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc +0 -253
- data/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +0 -222
- data/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc +0 -71
- data/src/core/ext/filters/load_reporting/server_load_reporting_plugin.h +0 -61
- data/src/core/lib/channel/channel_trace_registry.cc +0 -80
- data/src/core/lib/channel/channel_trace_registry.h +0 -43
- data/src/core/lib/gpr/fork.cc +0 -78
- data/src/core/tsi/transport_security_adapter.cc +0 -235
- data/src/core/tsi/transport_security_adapter.h +0 -41
- data/src/ruby/bin/apis/google/protobuf/empty.rb +0 -29
- data/src/ruby/bin/apis/pubsub_demo.rb +0 -241
- data/src/ruby/bin/apis/tech/pubsub/proto/pubsub.rb +0 -159
- data/src/ruby/bin/apis/tech/pubsub/proto/pubsub_services.rb +0 -88
- data/src/ruby/pb/test/client.rb +0 -764
- data/src/ruby/pb/test/server.rb +0 -252
- data/src/ruby/spec/pb/package_with_underscore/checker_spec.rb +0 -54
- data/src/ruby/spec/pb/package_with_underscore/data.proto +0 -23
- data/src/ruby/spec/pb/package_with_underscore/service.proto +0 -23
- data/third_party/boringssl/crypto/curve25519/x25519-x86_64.c +0 -247
- data/third_party/boringssl/crypto/fipsmodule/ec/p256-64.c +0 -1674
@@ -42,14 +42,54 @@
|
|
42
42
|
|
43
43
|
#if defined(ADDRESS_SORTING_WINDOWS)
|
44
44
|
|
45
|
+
#include <errno.h>
|
46
|
+
#include <inttypes.h>
|
47
|
+
#include <limits.h>
|
45
48
|
#include <stdlib.h>
|
49
|
+
#include <string.h>
|
50
|
+
#include <sys/types.h>
|
46
51
|
|
47
|
-
|
52
|
+
static bool windows_source_addr_factory_get_source_addr(
|
53
|
+
address_sorting_source_addr_factory* factory,
|
54
|
+
const address_sorting_address* dest_addr,
|
55
|
+
address_sorting_address* source_addr) {
|
56
|
+
bool source_addr_exists = false;
|
57
|
+
SOCKET s = socket(((struct sockaddr_in6*)dest_addr)->sin6_family, SOCK_DGRAM,
|
58
|
+
IPPROTO_UDP);
|
59
|
+
if (s != INVALID_SOCKET) {
|
60
|
+
if (connect(s, (struct sockaddr*)dest_addr, (int)dest_addr->len) == 0) {
|
61
|
+
address_sorting_address found_source_addr;
|
62
|
+
memset(&found_source_addr, 0, sizeof(found_source_addr));
|
63
|
+
found_source_addr.len = sizeof(found_source_addr.addr);
|
64
|
+
if (getsockname(s, (struct sockaddr*)&found_source_addr.addr,
|
65
|
+
(socklen_t*)&found_source_addr.len) == 0) {
|
66
|
+
source_addr_exists = true;
|
67
|
+
*source_addr = found_source_addr;
|
68
|
+
}
|
69
|
+
}
|
70
|
+
closesocket(s);
|
71
|
+
}
|
72
|
+
return source_addr_exists;
|
73
|
+
}
|
74
|
+
|
75
|
+
static void windows_source_addr_factory_destroy(
|
76
|
+
address_sorting_source_addr_factory* self) {
|
77
|
+
free(self);
|
78
|
+
}
|
79
|
+
|
80
|
+
static const address_sorting_source_addr_factory_vtable
|
81
|
+
windows_source_addr_factory_vtable = {
|
82
|
+
windows_source_addr_factory_get_source_addr,
|
83
|
+
windows_source_addr_factory_destroy,
|
84
|
+
};
|
48
85
|
|
49
86
|
address_sorting_source_addr_factory*
|
50
87
|
address_sorting_create_source_addr_factory_for_current_platform() {
|
51
|
-
|
52
|
-
|
88
|
+
address_sorting_source_addr_factory* factory =
|
89
|
+
malloc(sizeof(address_sorting_source_addr_factory));
|
90
|
+
memset(factory, 0, sizeof(address_sorting_source_addr_factory));
|
91
|
+
factory->vtable = &windows_source_addr_factory_vtable;
|
92
|
+
return factory;
|
53
93
|
}
|
54
94
|
|
55
95
|
#endif // defined(ADDRESS_SORTING_WINDOWS)
|
@@ -103,6 +103,9 @@ address_sorting_family address_sorting_abstract_get_family(
|
|
103
103
|
void address_sorting_override_source_addr_factory_for_testing(
|
104
104
|
address_sorting_source_addr_factory* factory);
|
105
105
|
|
106
|
+
bool address_sorting_get_source_addr_for_testing(
|
107
|
+
const address_sorting_address* dest, address_sorting_address* source);
|
108
|
+
|
106
109
|
#ifdef __cplusplus
|
107
110
|
}
|
108
111
|
#endif
|
@@ -347,40 +347,45 @@ ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
|
|
347
347
|
|
348
348
|
int ASN1_INTEGER_set(ASN1_INTEGER *a, long v)
|
349
349
|
{
|
350
|
-
|
351
|
-
|
352
|
-
unsigned char buf[sizeof(long) + 1];
|
353
|
-
long d;
|
354
|
-
|
355
|
-
a->type = V_ASN1_INTEGER;
|
356
|
-
if (a->length < (int)(sizeof(long) + 1)) {
|
357
|
-
if (a->data != NULL)
|
358
|
-
OPENSSL_free(a->data);
|
359
|
-
if ((a->data =
|
360
|
-
(unsigned char *)OPENSSL_malloc(sizeof(long) + 1)) != NULL)
|
361
|
-
OPENSSL_memset((char *)a->data, 0, sizeof(long) + 1);
|
350
|
+
if (v >= 0) {
|
351
|
+
return ASN1_INTEGER_set_uint64(a, (uint64_t) v);
|
362
352
|
}
|
363
|
-
|
364
|
-
|
365
|
-
return
|
353
|
+
|
354
|
+
if (!ASN1_INTEGER_set_uint64(a, 0 - (uint64_t) v)) {
|
355
|
+
return 0;
|
366
356
|
}
|
367
|
-
|
368
|
-
|
369
|
-
|
370
|
-
|
357
|
+
|
358
|
+
a->type = V_ASN1_NEG_INTEGER;
|
359
|
+
return 1;
|
360
|
+
}
|
361
|
+
|
362
|
+
int ASN1_INTEGER_set_uint64(ASN1_INTEGER *out, uint64_t v)
|
363
|
+
{
|
364
|
+
uint8_t *const newdata = OPENSSL_malloc(sizeof(uint64_t));
|
365
|
+
if (newdata == NULL) {
|
366
|
+
OPENSSL_PUT_ERROR(ASN1, ERR_R_MALLOC_FAILURE);
|
367
|
+
return 0;
|
371
368
|
}
|
372
369
|
|
373
|
-
|
374
|
-
|
370
|
+
OPENSSL_free(out->data);
|
371
|
+
out->data = newdata;
|
372
|
+
v = CRYPTO_bswap8(v);
|
373
|
+
memcpy(out->data, &v, sizeof(v));
|
374
|
+
|
375
|
+
out->type = V_ASN1_INTEGER;
|
376
|
+
|
377
|
+
size_t leading_zeros;
|
378
|
+
for (leading_zeros = 0; leading_zeros < sizeof(uint64_t) - 1;
|
379
|
+
leading_zeros++) {
|
380
|
+
if (out->data[leading_zeros] != 0) {
|
375
381
|
break;
|
376
|
-
|
377
|
-
d >>= 8;
|
382
|
+
}
|
378
383
|
}
|
379
|
-
|
380
|
-
|
381
|
-
|
382
|
-
|
383
|
-
return
|
384
|
+
|
385
|
+
out->length = sizeof(uint64_t) - leading_zeros;
|
386
|
+
OPENSSL_memmove(out->data, out->data + leading_zeros, out->length);
|
387
|
+
|
388
|
+
return 1;
|
384
389
|
}
|
385
390
|
|
386
391
|
long ASN1_INTEGER_get(const ASN1_INTEGER *a)
|
@@ -61,17 +61,19 @@
|
|
61
61
|
#include <openssl/err.h>
|
62
62
|
#include <openssl/mem.h>
|
63
63
|
|
64
|
+
#include "asn1_locl.h"
|
65
|
+
|
64
66
|
static int traverse_string(const unsigned char *p, int len, int inform,
|
65
|
-
int (*rfunc) (
|
67
|
+
int (*rfunc) (uint32_t value, void *in),
|
66
68
|
void *arg);
|
67
|
-
static int in_utf8(
|
68
|
-
static int out_utf8(
|
69
|
-
static int type_str(
|
70
|
-
static int cpy_asc(
|
71
|
-
static int cpy_bmp(
|
72
|
-
static int cpy_univ(
|
73
|
-
static int cpy_utf8(
|
74
|
-
static int is_printable(
|
69
|
+
static int in_utf8(uint32_t value, void *arg);
|
70
|
+
static int out_utf8(uint32_t value, void *arg);
|
71
|
+
static int type_str(uint32_t value, void *arg);
|
72
|
+
static int cpy_asc(uint32_t value, void *arg);
|
73
|
+
static int cpy_bmp(uint32_t value, void *arg);
|
74
|
+
static int cpy_univ(uint32_t value, void *arg);
|
75
|
+
static int cpy_utf8(uint32_t value, void *arg);
|
76
|
+
static int is_printable(uint32_t value);
|
75
77
|
|
76
78
|
/*
|
77
79
|
* These functions take a string in UTF8, ASCII or multibyte form and a mask
|
@@ -100,7 +102,7 @@ int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
|
|
100
102
|
unsigned char *p;
|
101
103
|
int nchar;
|
102
104
|
char strbuf[32];
|
103
|
-
int (*cpyfunc) (
|
105
|
+
int (*cpyfunc) (uint32_t, void *) = NULL;
|
104
106
|
if (len == -1)
|
105
107
|
len = strlen((const char *)in);
|
106
108
|
if (!mask)
|
@@ -253,10 +255,10 @@ int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
|
|
253
255
|
*/
|
254
256
|
|
255
257
|
static int traverse_string(const unsigned char *p, int len, int inform,
|
256
|
-
int (*rfunc) (
|
258
|
+
int (*rfunc) (uint32_t value, void *in),
|
257
259
|
void *arg)
|
258
260
|
{
|
259
|
-
|
261
|
+
uint32_t value;
|
260
262
|
int ret;
|
261
263
|
while (len) {
|
262
264
|
if (inform == MBSTRING_ASC) {
|
@@ -267,8 +269,8 @@ static int traverse_string(const unsigned char *p, int len, int inform,
|
|
267
269
|
value |= *p++;
|
268
270
|
len -= 2;
|
269
271
|
} else if (inform == MBSTRING_UNIV) {
|
270
|
-
value = ((
|
271
|
-
value |= ((
|
272
|
+
value = ((uint32_t)*p++) << 24;
|
273
|
+
value |= ((uint32_t)*p++) << 16;
|
272
274
|
value |= *p++ << 8;
|
273
275
|
value |= *p++;
|
274
276
|
len -= 4;
|
@@ -292,7 +294,7 @@ static int traverse_string(const unsigned char *p, int len, int inform,
|
|
292
294
|
|
293
295
|
/* Just count number of characters */
|
294
296
|
|
295
|
-
static int in_utf8(
|
297
|
+
static int in_utf8(uint32_t value, void *arg)
|
296
298
|
{
|
297
299
|
int *nchar;
|
298
300
|
nchar = arg;
|
@@ -302,7 +304,7 @@ static int in_utf8(unsigned long value, void *arg)
|
|
302
304
|
|
303
305
|
/* Determine size of output as a UTF8 String */
|
304
306
|
|
305
|
-
static int out_utf8(
|
307
|
+
static int out_utf8(uint32_t value, void *arg)
|
306
308
|
{
|
307
309
|
int *outlen;
|
308
310
|
outlen = arg;
|
@@ -315,7 +317,7 @@ static int out_utf8(unsigned long value, void *arg)
|
|
315
317
|
* "mask".
|
316
318
|
*/
|
317
319
|
|
318
|
-
static int type_str(
|
320
|
+
static int type_str(uint32_t value, void *arg)
|
319
321
|
{
|
320
322
|
unsigned long types;
|
321
323
|
types = *((unsigned long *)arg);
|
@@ -335,7 +337,7 @@ static int type_str(unsigned long value, void *arg)
|
|
335
337
|
|
336
338
|
/* Copy one byte per character ASCII like strings */
|
337
339
|
|
338
|
-
static int cpy_asc(
|
340
|
+
static int cpy_asc(uint32_t value, void *arg)
|
339
341
|
{
|
340
342
|
unsigned char **p, *q;
|
341
343
|
p = arg;
|
@@ -347,7 +349,7 @@ static int cpy_asc(unsigned long value, void *arg)
|
|
347
349
|
|
348
350
|
/* Copy two byte per character BMPStrings */
|
349
351
|
|
350
|
-
static int cpy_bmp(
|
352
|
+
static int cpy_bmp(uint32_t value, void *arg)
|
351
353
|
{
|
352
354
|
unsigned char **p, *q;
|
353
355
|
p = arg;
|
@@ -360,7 +362,7 @@ static int cpy_bmp(unsigned long value, void *arg)
|
|
360
362
|
|
361
363
|
/* Copy four byte per character UniversalStrings */
|
362
364
|
|
363
|
-
static int cpy_univ(
|
365
|
+
static int cpy_univ(uint32_t value, void *arg)
|
364
366
|
{
|
365
367
|
unsigned char **p, *q;
|
366
368
|
p = arg;
|
@@ -375,7 +377,7 @@ static int cpy_univ(unsigned long value, void *arg)
|
|
375
377
|
|
376
378
|
/* Copy to a UTF8String */
|
377
379
|
|
378
|
-
static int cpy_utf8(
|
380
|
+
static int cpy_utf8(uint32_t value, void *arg)
|
379
381
|
{
|
380
382
|
unsigned char **p;
|
381
383
|
int ret;
|
@@ -387,7 +389,7 @@ static int cpy_utf8(unsigned long value, void *arg)
|
|
387
389
|
}
|
388
390
|
|
389
391
|
/* Return 1 if the character is permitted in a PrintableString */
|
390
|
-
static int is_printable(
|
392
|
+
static int is_printable(uint32_t value)
|
391
393
|
{
|
392
394
|
int ch;
|
393
395
|
if (value > 0x7f)
|
@@ -59,6 +59,8 @@
|
|
59
59
|
#include <openssl/err.h>
|
60
60
|
#include <openssl/mem.h>
|
61
61
|
|
62
|
+
#include "asn1_locl.h"
|
63
|
+
|
62
64
|
/* UTF8 utilities */
|
63
65
|
|
64
66
|
/*
|
@@ -70,10 +72,10 @@
|
|
70
72
|
* incorrectly (not minimal length).
|
71
73
|
*/
|
72
74
|
|
73
|
-
int UTF8_getc(const unsigned char *str, int len,
|
75
|
+
int UTF8_getc(const unsigned char *str, int len, uint32_t *val)
|
74
76
|
{
|
75
77
|
const unsigned char *p;
|
76
|
-
|
78
|
+
uint32_t value;
|
77
79
|
int ret;
|
78
80
|
if (len <= 0)
|
79
81
|
return 0;
|
@@ -112,7 +114,7 @@ int UTF8_getc(const unsigned char *str, int len, unsigned long *val)
|
|
112
114
|
|| ((p[2] & 0xc0) != 0x80)
|
113
115
|
|| ((p[3] & 0xc0) != 0x80))
|
114
116
|
return -3;
|
115
|
-
value = ((
|
117
|
+
value = ((uint32_t)(*p++ & 0x7)) << 18;
|
116
118
|
value |= (*p++ & 0x3f) << 12;
|
117
119
|
value |= (*p++ & 0x3f) << 6;
|
118
120
|
value |= *p++ & 0x3f;
|
@@ -127,9 +129,9 @@ int UTF8_getc(const unsigned char *str, int len, unsigned long *val)
|
|
127
129
|
|| ((p[3] & 0xc0) != 0x80)
|
128
130
|
|| ((p[4] & 0xc0) != 0x80))
|
129
131
|
return -3;
|
130
|
-
value = ((
|
131
|
-
value |= ((
|
132
|
-
value |= ((
|
132
|
+
value = ((uint32_t)(*p++ & 0x3)) << 24;
|
133
|
+
value |= ((uint32_t)(*p++ & 0x3f)) << 18;
|
134
|
+
value |= ((uint32_t)(*p++ & 0x3f)) << 12;
|
133
135
|
value |= (*p++ & 0x3f) << 6;
|
134
136
|
value |= *p++ & 0x3f;
|
135
137
|
if (value < 0x200000)
|
@@ -144,10 +146,10 @@ int UTF8_getc(const unsigned char *str, int len, unsigned long *val)
|
|
144
146
|
|| ((p[4] & 0xc0) != 0x80)
|
145
147
|
|| ((p[5] & 0xc0) != 0x80))
|
146
148
|
return -3;
|
147
|
-
value = ((
|
148
|
-
value |= ((
|
149
|
-
value |= ((
|
150
|
-
value |= ((
|
149
|
+
value = ((uint32_t)(*p++ & 0x1)) << 30;
|
150
|
+
value |= ((uint32_t)(*p++ & 0x3f)) << 24;
|
151
|
+
value |= ((uint32_t)(*p++ & 0x3f)) << 18;
|
152
|
+
value |= ((uint32_t)(*p++ & 0x3f)) << 12;
|
151
153
|
value |= (*p++ & 0x3f) << 6;
|
152
154
|
value |= *p++ & 0x3f;
|
153
155
|
if (value < 0x4000000)
|
@@ -167,7 +169,7 @@ int UTF8_getc(const unsigned char *str, int len, unsigned long *val)
|
|
167
169
|
* most 6 characters.
|
168
170
|
*/
|
169
171
|
|
170
|
-
int UTF8_putc(unsigned char *str, int len,
|
172
|
+
int UTF8_putc(unsigned char *str, int len, uint32_t value)
|
171
173
|
{
|
172
174
|
if (!str)
|
173
175
|
len = 6; /* Maximum we will need */
|
@@ -93,6 +93,9 @@ int asn1_generalizedtime_to_tm(struct tm *tm, const ASN1_GENERALIZEDTIME *d);
|
|
93
93
|
void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it,
|
94
94
|
int combine);
|
95
95
|
|
96
|
+
int UTF8_getc(const unsigned char *str, int len, uint32_t *val);
|
97
|
+
int UTF8_putc(unsigned char *str, int len, uint32_t value);
|
98
|
+
|
96
99
|
|
97
100
|
#if defined(__cplusplus)
|
98
101
|
} /* extern C */
|
@@ -66,6 +66,14 @@
|
|
66
66
|
|
67
67
|
#include "../internal.h"
|
68
68
|
|
69
|
+
/*
|
70
|
+
* Constructed types with a recursive definition (such as can be found in PKCS7)
|
71
|
+
* could eventually exceed the stack given malicious input with excessive
|
72
|
+
* recursion. Therefore we limit the stack depth. This is the maximum number of
|
73
|
+
* recursive invocations of asn1_item_embed_d2i().
|
74
|
+
*/
|
75
|
+
#define ASN1_MAX_CONSTRUCTED_NEST 30
|
76
|
+
|
69
77
|
static int asn1_check_eoc(const unsigned char **in, long len);
|
70
78
|
static int asn1_find_end(const unsigned char **in, long len, char inf);
|
71
79
|
|
@@ -82,11 +90,11 @@ static int asn1_check_tlen(long *olen, int *otag, unsigned char *oclass,
|
|
82
90
|
static int asn1_template_ex_d2i(ASN1_VALUE **pval,
|
83
91
|
const unsigned char **in, long len,
|
84
92
|
const ASN1_TEMPLATE *tt, char opt,
|
85
|
-
ASN1_TLC *ctx);
|
93
|
+
ASN1_TLC *ctx, int depth);
|
86
94
|
static int asn1_template_noexp_d2i(ASN1_VALUE **val,
|
87
95
|
const unsigned char **in, long len,
|
88
96
|
const ASN1_TEMPLATE *tt, char opt,
|
89
|
-
ASN1_TLC *ctx);
|
97
|
+
ASN1_TLC *ctx, int depth);
|
90
98
|
static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
|
91
99
|
const unsigned char **in, long len,
|
92
100
|
const ASN1_ITEM *it,
|
@@ -153,9 +161,9 @@ ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **pval,
|
|
153
161
|
* tag mismatch return -1 to handle OPTIONAL
|
154
162
|
*/
|
155
163
|
|
156
|
-
int
|
157
|
-
|
158
|
-
|
164
|
+
static int asn1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in,
|
165
|
+
long len, const ASN1_ITEM *it, int tag, int aclass,
|
166
|
+
char opt, ASN1_TLC *ctx, int depth)
|
159
167
|
{
|
160
168
|
const ASN1_TEMPLATE *tt, *errtt = NULL;
|
161
169
|
const ASN1_COMPAT_FUNCS *cf;
|
@@ -188,6 +196,11 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
|
|
188
196
|
len = INT_MAX/2;
|
189
197
|
}
|
190
198
|
|
199
|
+
if (++depth > ASN1_MAX_CONSTRUCTED_NEST) {
|
200
|
+
OPENSSL_PUT_ERROR(ASN1, ASN1_R_NESTED_TOO_DEEP);
|
201
|
+
goto err;
|
202
|
+
}
|
203
|
+
|
191
204
|
switch (it->itype) {
|
192
205
|
case ASN1_ITYPE_PRIMITIVE:
|
193
206
|
if (it->templates) {
|
@@ -203,7 +216,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
|
|
203
216
|
goto err;
|
204
217
|
}
|
205
218
|
return asn1_template_ex_d2i(pval, in, len,
|
206
|
-
it->templates, opt, ctx);
|
219
|
+
it->templates, opt, ctx, depth);
|
207
220
|
}
|
208
221
|
return asn1_d2i_ex_primitive(pval, in, len, it,
|
209
222
|
tag, aclass, opt, ctx);
|
@@ -326,7 +339,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
|
|
326
339
|
/*
|
327
340
|
* We mark field as OPTIONAL so its absence can be recognised.
|
328
341
|
*/
|
329
|
-
ret = asn1_template_ex_d2i(pchptr, &p, len, tt, 1, ctx);
|
342
|
+
ret = asn1_template_ex_d2i(pchptr, &p, len, tt, 1, ctx, depth);
|
330
343
|
/* If field not present, try the next one */
|
331
344
|
if (ret == -1)
|
332
345
|
continue;
|
@@ -444,7 +457,8 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
|
|
444
457
|
* attempt to read in field, allowing each to be OPTIONAL
|
445
458
|
*/
|
446
459
|
|
447
|
-
ret = asn1_template_ex_d2i(pseqval, &p, len, seqtt, isopt, ctx
|
460
|
+
ret = asn1_template_ex_d2i(pseqval, &p, len, seqtt, isopt, ctx,
|
461
|
+
depth);
|
448
462
|
if (!ret) {
|
449
463
|
errtt = seqtt;
|
450
464
|
goto err;
|
@@ -514,6 +528,13 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
|
|
514
528
|
return 0;
|
515
529
|
}
|
516
530
|
|
531
|
+
int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
|
532
|
+
const ASN1_ITEM *it,
|
533
|
+
int tag, int aclass, char opt, ASN1_TLC *ctx)
|
534
|
+
{
|
535
|
+
return asn1_item_ex_d2i(pval, in, len, it, tag, aclass, opt, ctx, 0);
|
536
|
+
}
|
537
|
+
|
517
538
|
/*
|
518
539
|
* Templates are handled with two separate functions. One handles any
|
519
540
|
* EXPLICIT tag and the other handles the rest.
|
@@ -522,7 +543,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
|
|
522
543
|
static int asn1_template_ex_d2i(ASN1_VALUE **val,
|
523
544
|
const unsigned char **in, long inlen,
|
524
545
|
const ASN1_TEMPLATE *tt, char opt,
|
525
|
-
ASN1_TLC *ctx)
|
546
|
+
ASN1_TLC *ctx, int depth)
|
526
547
|
{
|
527
548
|
int flags, aclass;
|
528
549
|
int ret;
|
@@ -556,7 +577,7 @@ static int asn1_template_ex_d2i(ASN1_VALUE **val,
|
|
556
577
|
return 0;
|
557
578
|
}
|
558
579
|
/* We've found the field so it can't be OPTIONAL now */
|
559
|
-
ret = asn1_template_noexp_d2i(val, &p, len, tt, 0, ctx);
|
580
|
+
ret = asn1_template_noexp_d2i(val, &p, len, tt, 0, ctx, depth);
|
560
581
|
if (!ret) {
|
561
582
|
OPENSSL_PUT_ERROR(ASN1, ASN1_R_NESTED_ASN1_ERROR);
|
562
583
|
return 0;
|
@@ -579,7 +600,7 @@ static int asn1_template_ex_d2i(ASN1_VALUE **val,
|
|
579
600
|
}
|
580
601
|
}
|
581
602
|
} else
|
582
|
-
return asn1_template_noexp_d2i(val, in, inlen, tt, opt, ctx);
|
603
|
+
return asn1_template_noexp_d2i(val, in, inlen, tt, opt, ctx, depth);
|
583
604
|
|
584
605
|
*in = p;
|
585
606
|
return 1;
|
@@ -592,7 +613,7 @@ static int asn1_template_ex_d2i(ASN1_VALUE **val,
|
|
592
613
|
static int asn1_template_noexp_d2i(ASN1_VALUE **val,
|
593
614
|
const unsigned char **in, long len,
|
594
615
|
const ASN1_TEMPLATE *tt, char opt,
|
595
|
-
ASN1_TLC *ctx)
|
616
|
+
ASN1_TLC *ctx, int depth)
|
596
617
|
{
|
597
618
|
int flags, aclass;
|
598
619
|
int ret;
|
@@ -661,8 +682,8 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val,
|
|
661
682
|
break;
|
662
683
|
}
|
663
684
|
skfield = NULL;
|
664
|
-
|
665
|
-
|
685
|
+
if (!asn1_item_ex_d2i(&skfield, &p, len, ASN1_ITEM_ptr(tt->item),
|
686
|
+
-1, 0, 0, ctx, depth)) {
|
666
687
|
OPENSSL_PUT_ERROR(ASN1, ASN1_R_NESTED_ASN1_ERROR);
|
667
688
|
goto err;
|
668
689
|
}
|
@@ -679,9 +700,8 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val,
|
|
679
700
|
}
|
680
701
|
} else if (flags & ASN1_TFLG_IMPTAG) {
|
681
702
|
/* IMPLICIT tagging */
|
682
|
-
ret =
|
683
|
-
|
684
|
-
ctx);
|
703
|
+
ret = asn1_item_ex_d2i(val, &p, len, ASN1_ITEM_ptr(tt->item), tt->tag,
|
704
|
+
aclass, opt, ctx, depth);
|
685
705
|
if (!ret) {
|
686
706
|
OPENSSL_PUT_ERROR(ASN1, ASN1_R_NESTED_ASN1_ERROR);
|
687
707
|
goto err;
|
@@ -689,8 +709,9 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val,
|
|
689
709
|
return -1;
|
690
710
|
} else {
|
691
711
|
/* Nothing special */
|
692
|
-
ret =
|
693
|
-
-1, tt->flags & ASN1_TFLG_COMBINE, opt, ctx
|
712
|
+
ret = asn1_item_ex_d2i(val, &p, len, ASN1_ITEM_ptr(tt->item),
|
713
|
+
-1, tt->flags & ASN1_TFLG_COMBINE, opt, ctx,
|
714
|
+
depth);
|
694
715
|
if (!ret) {
|
695
716
|
OPENSSL_PUT_ERROR(ASN1, ASN1_R_NESTED_ASN1_ERROR);
|
696
717
|
goto err;
|