grpc 1.28.0 → 1.30.2
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 +7694 -11190
- data/include/grpc/grpc.h +2 -2
- data/include/grpc/grpc_security.h +30 -9
- data/include/grpc/grpc_security_constants.h +1 -0
- data/include/grpc/impl/codegen/grpc_types.h +19 -21
- data/include/grpc/impl/codegen/port_platform.h +6 -2
- data/include/grpc/module.modulemap +24 -39
- data/src/core/ext/filters/client_channel/backend_metric.cc +7 -4
- data/src/core/ext/filters/client_channel/client_channel.cc +212 -241
- data/src/core/ext/filters/client_channel/client_channel_plugin.cc +3 -2
- data/src/core/ext/filters/client_channel/health/health_check_client.cc +7 -22
- data/src/core/ext/filters/client_channel/health/health_check_client.h +3 -3
- data/src/core/ext/filters/client_channel/http_proxy.cc +17 -10
- data/src/core/ext/filters/client_channel/lb_policy.cc +19 -18
- data/src/core/ext/filters/client_channel/lb_policy.h +42 -33
- data/src/core/ext/filters/client_channel/lb_policy/address_filtering.cc +83 -0
- data/src/core/ext/filters/client_channel/lb_policy/address_filtering.h +99 -0
- data/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc +10 -4
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +240 -301
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc +89 -0
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h +40 -0
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc +11 -9
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h +3 -2
- data/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc +871 -0
- data/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +1 -1
- data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +5 -11
- data/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc +734 -0
- data/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc +84 -37
- data/src/core/ext/filters/client_channel/lb_policy/xds/eds.cc +938 -0
- data/src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc +528 -0
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds.h +1 -2
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc +834 -0
- data/src/core/ext/filters/client_channel/lb_policy_registry.cc +6 -2
- data/src/core/ext/filters/client_channel/local_subchannel_pool.h +2 -1
- data/src/core/ext/filters/client_channel/parse_address.cc +22 -21
- data/src/core/ext/filters/client_channel/resolver.cc +5 -8
- data/src/core/ext/filters/client_channel/resolver.h +12 -14
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +73 -59
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc +35 -35
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h +8 -7
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc +16 -20
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +4 -4
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +72 -117
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +184 -133
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h +5 -3
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc +7 -4
- data/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +40 -43
- data/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +93 -102
- data/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h +0 -4
- data/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc +2 -2
- data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc +32 -5
- data/src/core/ext/filters/client_channel/resolver_factory.h +2 -2
- data/src/core/ext/filters/client_channel/resolver_registry.cc +6 -3
- data/src/core/ext/filters/client_channel/resolver_registry.h +8 -8
- data/src/core/ext/filters/client_channel/resolver_result_parsing.cc +16 -16
- data/src/core/ext/filters/client_channel/resolver_result_parsing.h +19 -16
- data/src/core/ext/filters/client_channel/resolving_lb_policy.cc +20 -31
- data/src/core/ext/filters/client_channel/resolving_lb_policy.h +4 -3
- data/src/core/ext/filters/client_channel/server_address.cc +6 -9
- data/src/core/ext/filters/client_channel/server_address.h +6 -12
- data/src/core/ext/filters/client_channel/service_config.cc +104 -144
- data/src/core/ext/filters/client_channel/service_config.h +28 -98
- data/src/core/ext/filters/client_channel/service_config_call_data.h +68 -0
- data/src/core/ext/filters/client_channel/service_config_parser.cc +87 -0
- data/src/core/ext/filters/client_channel/service_config_parser.h +89 -0
- data/src/core/ext/filters/client_channel/subchannel.cc +54 -24
- data/src/core/ext/filters/client_channel/subchannel.h +35 -11
- data/src/core/ext/filters/client_channel/xds/xds_api.cc +348 -221
- data/src/core/ext/filters/client_channel/xds/xds_api.h +37 -37
- data/src/core/ext/filters/client_channel/xds/xds_bootstrap.cc +44 -49
- data/src/core/ext/filters/client_channel/xds/xds_bootstrap.h +4 -3
- data/src/core/ext/filters/client_channel/xds/xds_channel_secure.cc +4 -2
- data/src/core/ext/filters/client_channel/xds/xds_client.cc +532 -339
- data/src/core/ext/filters/client_channel/xds/xds_client.h +57 -22
- data/src/core/ext/filters/client_channel/xds/xds_client_stats.cc +11 -12
- data/src/core/ext/filters/client_channel/xds/xds_client_stats.h +31 -19
- data/src/core/ext/filters/http/client/http_client_filter.cc +23 -28
- data/src/core/ext/filters/http/client_authority_filter.cc +4 -4
- data/src/core/ext/filters/http/http_filters_plugin.cc +27 -12
- data/src/core/ext/filters/http/message_compress/message_compress_filter.cc +258 -221
- data/src/core/ext/filters/http/message_compress/message_decompress_filter.cc +358 -0
- data/src/core/ext/filters/http/message_compress/message_decompress_filter.h +29 -0
- data/src/core/ext/filters/message_size/message_size_filter.cc +7 -10
- data/src/core/ext/filters/message_size/message_size_filter.h +4 -4
- data/src/core/ext/transport/chttp2/server/chttp2_server.cc +4 -4
- data/src/core/ext/transport/chttp2/transport/bin_encoder.cc +4 -6
- data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +23 -22
- data/src/core/ext/transport/chttp2/transport/chttp2_transport.h +1 -0
- data/src/core/ext/transport/chttp2/transport/flow_control.cc +3 -3
- data/src/core/ext/transport/chttp2/transport/frame_goaway.h +2 -3
- data/src/core/ext/transport/chttp2/transport/frame_ping.h +2 -3
- data/src/core/ext/transport/chttp2/transport/frame_rst_stream.h +2 -3
- data/src/core/ext/transport/chttp2/transport/frame_settings.h +2 -3
- data/src/core/ext/transport/chttp2/transport/frame_window_update.h +2 -3
- data/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +29 -16
- data/src/core/ext/transport/chttp2/transport/hpack_encoder.h +2 -3
- data/src/core/ext/transport/chttp2/transport/hpack_parser.h +2 -3
- data/src/core/ext/transport/chttp2/transport/hpack_table.h +2 -2
- data/src/core/ext/transport/chttp2/transport/http2_settings.h +4 -5
- data/src/core/ext/transport/chttp2/transport/huffsyms.h +2 -3
- data/src/core/ext/transport/chttp2/transport/internal.h +14 -21
- data/src/core/ext/transport/chttp2/transport/stream_map.h +2 -3
- data/src/core/ext/transport/chttp2/transport/writing.cc +15 -8
- data/src/core/ext/transport/inproc/inproc_transport.cc +19 -0
- data/src/core/ext/upb-generated/envoy/api/v2/auth/cert.upb.c +4 -229
- data/src/core/ext/upb-generated/envoy/api/v2/auth/cert.upb.h +5 -875
- data/src/core/ext/upb-generated/envoy/api/v2/auth/common.upb.c +114 -0
- data/src/core/ext/upb-generated/envoy/api/v2/auth/common.upb.h +418 -0
- data/src/core/ext/upb-generated/envoy/api/v2/auth/secret.upb.c +72 -0
- data/src/core/ext/upb-generated/envoy/api/v2/auth/secret.upb.h +197 -0
- data/src/core/ext/upb-generated/envoy/api/v2/auth/tls.upb.c +105 -0
- data/src/core/ext/upb-generated/envoy/api/v2/auth/tls.upb.h +378 -0
- data/src/core/ext/upb-generated/envoy/api/v2/cds.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/cluster.upb.c +21 -8
- data/src/core/ext/upb-generated/envoy/api/v2/cluster.upb.h +43 -7
- data/src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/cluster/filter.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/core/address.upb.c +2 -1
- data/src/core/ext/upb-generated/envoy/api/v2/core/backoff.upb.c +35 -0
- data/src/core/ext/upb-generated/envoy/api/v2/core/backoff.upb.h +78 -0
- data/src/core/ext/upb-generated/envoy/api/v2/core/base.upb.c +47 -26
- data/src/core/ext/upb-generated/envoy/api/v2/core/base.upb.h +115 -65
- data/src/core/ext/upb-generated/envoy/api/v2/core/config_source.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/core/event_service_config.upb.c +34 -0
- data/src/core/ext/upb-generated/envoy/api/v2/core/event_service_config.upb.h +72 -0
- data/src/core/ext/upb-generated/envoy/api/v2/core/grpc_service.upb.c +2 -1
- data/src/core/ext/upb-generated/envoy/api/v2/core/health_check.upb.c +24 -20
- data/src/core/ext/upb-generated/envoy/api/v2/core/health_check.upb.h +28 -13
- data/src/core/ext/upb-generated/envoy/api/v2/core/http_uri.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.c +38 -18
- data/src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.h +88 -6
- data/src/core/ext/upb-generated/envoy/api/v2/core/socket_option.upb.c +34 -0
- data/src/core/ext/upb-generated/envoy/api/v2/core/socket_option.upb.h +89 -0
- data/src/core/ext/upb-generated/envoy/api/v2/discovery.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/eds.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/endpoint.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint_components.upb.c +9 -6
- data/src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint_components.upb.h +12 -4
- data/src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/lds.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/listener.upb.c +15 -10
- data/src/core/ext/upb-generated/envoy/api/v2/listener.upb.h +16 -0
- data/src/core/ext/upb-generated/envoy/api/v2/listener/listener.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/listener/listener_components.upb.c +2 -1
- data/src/core/ext/upb-generated/envoy/api/v2/listener/udp_listener_config.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/rds.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/route.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/route/route.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/route/route_components.upb.c +63 -41
- data/src/core/ext/upb-generated/envoy/api/v2/route/route_components.upb.h +173 -77
- data/src/core/ext/upb-generated/envoy/api/v2/scoped_route.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/api/v2/srds.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/config/filter/accesslog/v2/accesslog.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.upb.c +48 -28
- data/src/core/ext/upb-generated/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.upb.h +90 -30
- data/src/core/ext/upb-generated/envoy/config/listener/v2/api_listener.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/config/trace/v2/http_tracer.upb.c +51 -0
- data/src/core/ext/upb-generated/envoy/config/trace/v2/http_tracer.upb.h +125 -0
- data/src/core/ext/upb-generated/envoy/service/discovery/v2/ads.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/service/load_stats/v2/lrs.upb.c +4 -2
- data/src/core/ext/upb-generated/envoy/service/load_stats/v2/lrs.upb.h +4 -0
- data/src/core/ext/upb-generated/envoy/type/http.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/type/matcher/regex.upb.c +16 -0
- data/src/core/ext/upb-generated/envoy/type/matcher/regex.upb.h +36 -0
- data/src/core/ext/upb-generated/envoy/type/matcher/string.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/type/metadata/v2/metadata.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/type/percent.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/type/range.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/type/semantic_version.upb.c +1 -0
- data/src/core/ext/upb-generated/envoy/type/tracing/v2/custom_tag.upb.c +1 -0
- data/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c +9 -8
- data/src/core/ext/upb-generated/google/protobuf/descriptor.upb.h +30 -24
- data/src/core/ext/upb-generated/udpa/annotations/status.upb.c +28 -0
- data/src/core/ext/upb-generated/udpa/annotations/status.upb.h +65 -0
- data/src/core/ext/upb-generated/validate/validate.upb.c +21 -20
- data/src/core/ext/upb-generated/validate/validate.upb.h +69 -63
- data/src/core/lib/channel/channel_args.cc +15 -14
- data/src/core/lib/channel/channel_args.h +3 -1
- data/src/core/lib/channel/channel_stack.h +20 -13
- data/src/core/lib/channel/channelz.cc +5 -6
- data/src/core/lib/channel/channelz.h +3 -2
- data/src/core/lib/channel/channelz_registry.cc +5 -3
- data/src/core/lib/channel/connected_channel.cc +7 -5
- data/src/core/lib/channel/context.h +1 -1
- data/src/core/lib/channel/handshaker.cc +11 -13
- data/src/core/lib/channel/handshaker.h +4 -2
- data/src/core/lib/channel/handshaker_registry.cc +5 -17
- data/src/core/lib/channel/status_util.cc +2 -3
- data/src/core/lib/compression/message_compress.cc +5 -1
- data/src/core/lib/debug/stats.cc +21 -27
- data/src/core/lib/debug/stats.h +3 -1
- data/src/core/lib/gpr/spinlock.h +2 -3
- data/src/core/lib/gpr/string.cc +2 -26
- data/src/core/lib/gpr/string.h +0 -16
- data/src/core/lib/gpr/sync_abseil.cc +2 -0
- data/src/core/lib/gpr/time.cc +4 -0
- data/src/core/lib/gpr/time_posix.cc +1 -1
- data/src/core/lib/gprpp/atomic.h +6 -6
- data/src/core/lib/gprpp/fork.cc +1 -1
- data/src/core/lib/gprpp/host_port.cc +29 -35
- data/src/core/lib/gprpp/host_port.h +14 -17
- data/src/core/lib/gprpp/map.h +5 -11
- data/src/core/lib/gprpp/ref_counted_ptr.h +5 -0
- data/src/core/lib/http/format_request.cc +46 -65
- data/src/core/lib/http/httpcli.cc +2 -3
- data/src/core/lib/http/httpcli.h +2 -3
- data/src/core/lib/http/httpcli_security_connector.cc +5 -5
- data/src/core/lib/http/parser.h +2 -3
- data/src/core/lib/iomgr/buffer_list.h +22 -21
- data/src/core/lib/iomgr/call_combiner.h +3 -2
- data/src/core/lib/iomgr/cfstream_handle.cc +3 -2
- data/src/core/lib/iomgr/closure.h +2 -3
- data/src/core/lib/iomgr/dualstack_socket_posix.cc +47 -0
- data/src/core/lib/iomgr/endpoint_cfstream.cc +2 -3
- data/src/core/lib/iomgr/endpoint_pair.h +2 -3
- data/src/core/lib/iomgr/error.cc +6 -9
- data/src/core/lib/iomgr/error.h +0 -1
- data/src/core/lib/iomgr/ev_apple.cc +356 -0
- data/src/core/lib/iomgr/ev_apple.h +43 -0
- data/src/core/lib/iomgr/ev_epoll1_linux.cc +20 -23
- data/src/core/lib/iomgr/ev_epollex_linux.cc +2 -3
- data/src/core/lib/iomgr/ev_poll_posix.cc +3 -3
- data/src/core/lib/iomgr/ev_posix.cc +2 -3
- data/src/core/lib/iomgr/exec_ctx.h +14 -2
- data/src/core/lib/iomgr/iomgr_posix_cfstream.cc +84 -20
- data/src/core/lib/iomgr/pollset_set_custom.cc +10 -10
- data/src/core/lib/{gprpp/optional.h → iomgr/pollset_uv.h} +11 -12
- data/src/core/lib/iomgr/port.h +1 -0
- data/src/core/lib/iomgr/python_util.h +46 -0
- data/src/core/lib/iomgr/resolve_address.h +4 -6
- data/src/core/lib/iomgr/resolve_address_custom.cc +29 -39
- data/src/core/lib/iomgr/resolve_address_custom.h +4 -2
- data/src/core/lib/iomgr/resolve_address_posix.cc +10 -11
- data/src/core/lib/iomgr/resolve_address_windows.cc +8 -17
- data/src/core/lib/iomgr/resource_quota.cc +4 -6
- data/src/core/lib/iomgr/sockaddr_utils.cc +23 -29
- data/src/core/lib/iomgr/sockaddr_utils.h +9 -14
- data/src/core/lib/iomgr/socket_factory_posix.h +2 -3
- data/src/core/lib/iomgr/socket_mutator.h +2 -3
- data/src/core/lib/iomgr/socket_utils_common_posix.cc +7 -26
- data/src/core/lib/iomgr/socket_utils_posix.h +3 -0
- data/src/core/lib/iomgr/tcp_client_cfstream.cc +5 -7
- data/src/core/lib/iomgr/tcp_client_posix.cc +8 -5
- data/src/core/lib/iomgr/tcp_client_windows.cc +2 -3
- data/src/core/lib/iomgr/tcp_custom.cc +2 -3
- data/src/core/lib/iomgr/tcp_server_custom.cc +5 -9
- data/src/core/lib/iomgr/tcp_server_posix.cc +5 -4
- data/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +5 -4
- data/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc +8 -11
- data/src/core/lib/iomgr/tcp_uv.cc +3 -2
- data/src/core/lib/iomgr/time_averaged_stats.h +2 -3
- data/src/core/lib/iomgr/timer_generic.cc +2 -3
- data/src/core/lib/{gprpp/inlined_vector.h → iomgr/timer_generic.h} +19 -17
- data/src/core/lib/iomgr/timer_heap.h +2 -3
- data/src/core/lib/iomgr/udp_server.cc +9 -14
- data/src/core/lib/json/json.h +3 -2
- data/src/core/lib/json/json_reader.cc +5 -5
- data/src/core/lib/json/json_writer.cc +13 -12
- data/src/core/lib/security/credentials/composite/composite_credentials.cc +12 -0
- data/src/core/lib/security/credentials/composite/composite_credentials.h +6 -3
- data/src/core/lib/security/credentials/credentials.cc +0 -84
- data/src/core/lib/security/credentials/credentials.h +8 -59
- data/src/core/lib/security/credentials/fake/fake_credentials.h +4 -0
- data/src/core/lib/security/credentials/google_default/google_default_credentials.cc +3 -8
- data/src/core/lib/security/credentials/iam/iam_credentials.cc +8 -6
- data/src/core/lib/security/credentials/iam/iam_credentials.h +4 -0
- data/src/core/lib/security/credentials/jwt/json_token.cc +1 -1
- data/src/core/lib/security/credentials/jwt/json_token.h +2 -5
- data/src/core/lib/security/credentials/jwt/jwt_credentials.h +12 -0
- data/src/core/lib/security/credentials/jwt/jwt_verifier.cc +8 -15
- data/src/core/lib/security/credentials/jwt/jwt_verifier.h +2 -3
- data/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +55 -27
- data/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +9 -3
- data/src/core/lib/security/credentials/plugin/plugin_credentials.cc +13 -0
- data/src/core/lib/security/credentials/plugin/plugin_credentials.h +2 -0
- data/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc +23 -13
- data/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h +38 -11
- data/src/core/lib/security/security_connector/alts/alts_security_connector.cc +21 -6
- data/src/core/lib/security/security_connector/fake/fake_security_connector.cc +7 -7
- data/src/core/lib/security/security_connector/load_system_roots_linux.cc +3 -2
- data/src/core/lib/security/security_connector/local/local_security_connector.cc +1 -1
- data/src/core/lib/security/security_connector/security_connector.h +1 -1
- data/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc +20 -25
- data/src/core/lib/security/security_connector/ssl/ssl_security_connector.h +4 -6
- data/src/core/lib/security/security_connector/ssl_utils.cc +59 -12
- data/src/core/lib/security/security_connector/ssl_utils.h +12 -10
- data/src/core/lib/security/security_connector/tls/tls_security_connector.cc +77 -51
- data/src/core/lib/security/security_connector/tls/tls_security_connector.h +27 -5
- data/src/core/lib/security/transport/auth_filters.h +0 -5
- data/src/core/lib/security/transport/client_auth_filter.cc +1 -2
- data/src/core/lib/slice/slice_intern.cc +2 -3
- data/src/core/lib/slice/slice_internal.h +14 -0
- data/src/core/lib/slice/slice_utils.h +9 -0
- data/src/core/lib/surface/byte_buffer_reader.cc +2 -47
- data/src/core/lib/surface/call.cc +2 -3
- data/src/core/lib/surface/call_log_batch.cc +50 -58
- data/src/core/lib/surface/channel.cc +53 -31
- data/src/core/lib/surface/channel.h +35 -4
- data/src/core/lib/surface/channel_ping.cc +2 -3
- data/src/core/lib/surface/completion_queue.cc +33 -33
- data/src/core/lib/surface/event_string.cc +18 -25
- data/src/core/lib/surface/event_string.h +3 -1
- data/src/core/lib/surface/init_secure.cc +1 -4
- data/src/core/lib/surface/server.cc +570 -369
- data/src/core/lib/surface/server.h +32 -0
- data/src/core/lib/surface/version.cc +2 -2
- data/src/core/lib/transport/byte_stream.h +7 -2
- data/src/core/lib/transport/connectivity_state.cc +7 -6
- data/src/core/lib/transport/connectivity_state.h +5 -3
- data/src/core/lib/transport/metadata.cc +3 -3
- data/src/core/lib/transport/metadata_batch.h +2 -3
- data/src/core/lib/transport/static_metadata.h +1 -1
- data/src/core/lib/transport/status_conversion.cc +6 -14
- data/src/core/lib/transport/transport.cc +2 -3
- data/src/core/lib/transport/transport.h +3 -2
- data/src/core/lib/transport/transport_op_string.cc +61 -102
- data/src/core/lib/uri/uri_parser.h +2 -3
- data/src/core/plugin_registry/grpc_plugin_registry.cc +20 -4
- data/src/core/tsi/alts/crypt/aes_gcm.cc +0 -2
- data/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +8 -1
- data/src/core/tsi/alts/handshaker/alts_handshaker_client.h +8 -4
- data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +32 -2
- data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h +9 -1
- data/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h +2 -3
- data/src/core/tsi/fake_transport_security.cc +10 -15
- data/src/core/tsi/ssl/session_cache/ssl_session.h +0 -2
- data/src/core/tsi/ssl/session_cache/ssl_session_cache.h +0 -2
- data/src/core/tsi/ssl_transport_security.cc +52 -39
- data/src/core/tsi/ssl_transport_security.h +8 -8
- data/src/core/tsi/ssl_types.h +0 -2
- data/src/core/tsi/transport_security.h +6 -9
- data/src/core/tsi/transport_security_grpc.h +2 -3
- data/src/core/tsi/transport_security_interface.h +3 -3
- data/src/ruby/ext/grpc/rb_call.c +9 -1
- data/src/ruby/ext/grpc/rb_call_credentials.c +3 -2
- data/src/ruby/ext/grpc/rb_grpc_imports.generated.c +4 -0
- data/src/ruby/ext/grpc/rb_grpc_imports.generated.h +6 -0
- data/src/ruby/lib/grpc/errors.rb +103 -42
- data/src/ruby/lib/grpc/generic/active_call.rb +2 -3
- data/src/ruby/lib/grpc/generic/interceptors.rb +4 -4
- data/src/ruby/lib/grpc/generic/rpc_server.rb +9 -10
- data/src/ruby/lib/grpc/generic/service.rb +5 -4
- data/src/ruby/lib/grpc/structs.rb +1 -1
- data/src/ruby/lib/grpc/version.rb +1 -1
- data/src/ruby/pb/generate_proto_ruby.sh +5 -3
- data/src/ruby/pb/src/proto/grpc/testing/messages_pb.rb +11 -0
- data/src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb +16 -0
- data/src/ruby/spec/debug_message_spec.rb +134 -0
- data/src/ruby/spec/generic/service_spec.rb +2 -0
- data/src/ruby/spec/pb/codegen/grpc/testing/package_options_import2.proto +23 -0
- data/src/ruby/spec/pb/codegen/grpc/testing/package_options_ruby_style.proto +7 -0
- data/src/ruby/spec/pb/codegen/package_option_spec.rb +7 -1
- data/src/ruby/spec/support/services.rb +10 -4
- data/src/ruby/spec/testdata/ca.pem +18 -13
- data/src/ruby/spec/testdata/client.key +26 -14
- data/src/ruby/spec/testdata/client.pem +18 -12
- data/src/ruby/spec/testdata/server1.key +26 -14
- data/src/ruby/spec/testdata/server1.pem +20 -14
- data/third_party/abseil-cpp/absl/time/civil_time.cc +175 -0
- data/third_party/abseil-cpp/absl/time/civil_time.h +538 -0
- data/third_party/abseil-cpp/absl/time/clock.cc +569 -0
- data/third_party/abseil-cpp/absl/time/clock.h +74 -0
- data/third_party/abseil-cpp/absl/time/duration.cc +922 -0
- data/third_party/abseil-cpp/absl/time/format.cc +153 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/include/cctz/civil_time.h +332 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/include/cctz/civil_time_detail.h +622 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/include/cctz/time_zone.h +384 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/include/cctz/zone_info_source.h +102 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/src/civil_time_detail.cc +94 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_fixed.cc +140 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_fixed.h +52 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc +922 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_if.cc +45 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_if.h +76 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_impl.cc +121 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_impl.h +93 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_info.cc +958 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_info.h +138 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.cc +308 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.h +55 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_lookup.cc +187 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_posix.cc +159 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_posix.h +132 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/src/tzfile.h +122 -0
- data/third_party/abseil-cpp/absl/time/internal/cctz/src/zone_info_source.cc +115 -0
- data/third_party/abseil-cpp/absl/time/internal/get_current_time_chrono.inc +31 -0
- data/third_party/abseil-cpp/absl/time/internal/get_current_time_posix.inc +24 -0
- data/third_party/abseil-cpp/absl/time/time.cc +499 -0
- data/third_party/abseil-cpp/absl/time/time.h +1584 -0
- data/third_party/boringssl-with-bazel/err_data.c +329 -297
- data/third_party/boringssl-with-bazel/src/crypto/cipher_extra/derive_key.c +1 -1
- data/third_party/boringssl-with-bazel/src/crypto/cpu-arm-linux.c +7 -5
- data/third_party/boringssl-with-bazel/src/crypto/cpu-intel.c +13 -4
- data/third_party/boringssl-with-bazel/src/crypto/crypto.c +11 -0
- data/third_party/boringssl-with-bazel/src/{third_party/fiat → crypto/curve25519}/curve25519.c +18 -26
- data/third_party/boringssl-with-bazel/src/{third_party/fiat → crypto/curve25519}/curve25519_tables.h +13 -21
- data/third_party/boringssl-with-bazel/src/{third_party/fiat → crypto/curve25519}/internal.h +14 -22
- data/third_party/boringssl-with-bazel/src/crypto/curve25519/spake25519.c +1 -1
- data/third_party/boringssl-with-bazel/src/crypto/dh/dh.c +15 -0
- data/third_party/boringssl-with-bazel/src/crypto/dsa/dsa.c +10 -0
- data/third_party/boringssl-with-bazel/src/crypto/ec_extra/hash_to_curve.c +425 -0
- data/third_party/boringssl-with-bazel/src/crypto/ec_extra/internal.h +78 -0
- data/third_party/boringssl-with-bazel/src/crypto/ecdh_extra/ecdh_extra.c +2 -2
- data/third_party/boringssl-with-bazel/src/crypto/err/err.c +33 -32
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/aes/aes_nohw.c +1 -1
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bcm.c +2 -1
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/exponentiation.c +3 -3
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/internal.h +14 -11
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/montgomery.c +8 -8
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/mul.c +30 -154
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/digest/digests.c +16 -0
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/ec.c +289 -117
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/ec_key.c +13 -27
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/ec_montgomery.c +96 -55
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/felem.c +25 -7
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/internal.h +432 -160
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/oct.c +63 -71
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/p224-64.c +5 -14
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/p256-x86_64-table.h +9481 -9485
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/p256-x86_64.c +80 -99
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/p256.c +736 -0
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/p256_table.h +297 -0
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/scalar.c +90 -11
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/simple.c +125 -148
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/simple_mul.c +189 -3
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/wnaf.c +61 -18
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ecdh/ecdh.c +2 -2
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ecdsa/ecdsa.c +20 -5
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/fork_detect.c +137 -0
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/fork_detect.h +49 -0
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/getrandom_fillin.h +64 -0
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/internal.h +41 -5
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/rand.c +32 -17
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/urandom.c +24 -114
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/blinding.c +4 -0
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/internal.h +1 -0
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/rsa.c +51 -38
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/rsa_impl.c +15 -1
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/sha/sha512.c +44 -35
- data/third_party/boringssl-with-bazel/src/crypto/mem.c +29 -12
- data/third_party/boringssl-with-bazel/src/crypto/obj/obj_dat.h +15 -1
- data/third_party/boringssl-with-bazel/src/crypto/rand_extra/deterministic.c +6 -10
- data/third_party/boringssl-with-bazel/src/crypto/rand_extra/windows.c +16 -0
- data/third_party/boringssl-with-bazel/src/crypto/thread_pthread.c +4 -0
- data/third_party/boringssl-with-bazel/src/crypto/thread_win.c +4 -0
- data/third_party/boringssl-with-bazel/src/crypto/trust_token/internal.h +278 -0
- data/third_party/boringssl-with-bazel/src/crypto/trust_token/pmbtoken.c +1474 -0
- data/third_party/boringssl-with-bazel/src/crypto/trust_token/trust_token.c +720 -0
- data/third_party/boringssl-with-bazel/src/crypto/x509/x509_set.c +16 -0
- data/third_party/boringssl-with-bazel/src/crypto/x509/x509_vfy.c +5 -0
- data/third_party/boringssl-with-bazel/src/crypto/x509/x509name.c +4 -3
- data/third_party/boringssl-with-bazel/src/include/openssl/base.h +5 -1
- data/third_party/boringssl-with-bazel/src/include/openssl/crypto.h +9 -4
- data/third_party/boringssl-with-bazel/src/include/openssl/dh.h +20 -0
- data/third_party/boringssl-with-bazel/src/include/openssl/digest.h +1 -0
- data/third_party/boringssl-with-bazel/src/include/openssl/dsa.h +16 -0
- data/third_party/boringssl-with-bazel/src/include/openssl/ecdsa.h +6 -0
- data/third_party/boringssl-with-bazel/src/include/openssl/err.h +2 -0
- data/third_party/boringssl-with-bazel/src/include/openssl/nid.h +5 -0
- data/third_party/boringssl-with-bazel/src/include/openssl/rand.h +3 -17
- data/third_party/boringssl-with-bazel/src/include/openssl/rsa.h +31 -0
- data/third_party/boringssl-with-bazel/src/include/openssl/sha.h +26 -0
- data/third_party/boringssl-with-bazel/src/include/openssl/ssl.h +172 -77
- data/third_party/boringssl-with-bazel/src/include/openssl/tls1.h +1 -0
- data/third_party/boringssl-with-bazel/src/include/openssl/trust_token.h +291 -0
- data/third_party/boringssl-with-bazel/src/include/openssl/x509.h +5 -3
- data/third_party/boringssl-with-bazel/src/include/openssl/x509_vfy.h +1 -0
- data/third_party/boringssl-with-bazel/src/ssl/d1_both.cc +0 -4
- data/third_party/boringssl-with-bazel/src/ssl/d1_lib.cc +3 -3
- data/third_party/boringssl-with-bazel/src/ssl/dtls_method.cc +13 -4
- data/third_party/boringssl-with-bazel/src/ssl/handoff.cc +146 -57
- data/third_party/boringssl-with-bazel/src/ssl/handshake.cc +14 -3
- data/third_party/boringssl-with-bazel/src/ssl/handshake_client.cc +28 -20
- data/third_party/boringssl-with-bazel/src/ssl/handshake_server.cc +12 -4
- data/third_party/boringssl-with-bazel/src/ssl/internal.h +64 -47
- data/third_party/boringssl-with-bazel/src/ssl/s3_both.cc +10 -10
- data/third_party/boringssl-with-bazel/src/ssl/s3_lib.cc +2 -2
- data/third_party/boringssl-with-bazel/src/ssl/s3_pkt.cc +21 -21
- data/third_party/boringssl-with-bazel/src/ssl/ssl_asn1.cc +29 -0
- data/third_party/boringssl-with-bazel/src/ssl/ssl_cert.cc +4 -0
- data/third_party/boringssl-with-bazel/src/ssl/ssl_lib.cc +6 -1
- data/third_party/boringssl-with-bazel/src/ssl/ssl_privkey.cc +13 -2
- data/third_party/boringssl-with-bazel/src/ssl/ssl_session.cc +64 -5
- data/third_party/boringssl-with-bazel/src/ssl/ssl_stat.cc +6 -0
- data/third_party/boringssl-with-bazel/src/ssl/t1_enc.cc +6 -2
- data/third_party/boringssl-with-bazel/src/ssl/t1_lib.cc +47 -53
- data/third_party/boringssl-with-bazel/src/ssl/tls13_both.cc +1 -1
- data/third_party/boringssl-with-bazel/src/ssl/tls13_client.cc +98 -27
- data/third_party/boringssl-with-bazel/src/ssl/tls13_enc.cc +23 -75
- data/third_party/boringssl-with-bazel/src/ssl/tls13_server.cc +50 -20
- data/third_party/boringssl-with-bazel/src/ssl/tls_method.cc +63 -25
- data/third_party/boringssl-with-bazel/src/third_party/fiat/curve25519_32.h +245 -175
- data/third_party/boringssl-with-bazel/src/third_party/fiat/curve25519_64.h +135 -75
- data/third_party/boringssl-with-bazel/src/third_party/fiat/p256_32.h +1593 -1672
- data/third_party/boringssl-with-bazel/src/third_party/fiat/p256_64.h +512 -503
- metadata +115 -39
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc +0 -1754
- data/src/core/lib/gprpp/string_view.h +0 -60
- data/src/core/tsi/grpc_shadow_boringssl.h +0 -3311
- data/third_party/boringssl-with-bazel/src/third_party/fiat/p256.c +0 -1063
@@ -0,0 +1,720 @@
|
|
1
|
+
/* Copyright (c) 2019, 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/bytestring.h>
|
16
|
+
#include <openssl/err.h>
|
17
|
+
#include <openssl/evp.h>
|
18
|
+
#include <openssl/mem.h>
|
19
|
+
#include <openssl/sha.h>
|
20
|
+
#include <openssl/trust_token.h>
|
21
|
+
|
22
|
+
#include "internal.h"
|
23
|
+
|
24
|
+
|
25
|
+
// The Trust Token API is described in
|
26
|
+
// https://github.com/WICG/trust-token-api/blob/master/README.md and provides a
|
27
|
+
// protocol for issuing and redeeming tokens built on top of the PMBTokens
|
28
|
+
// construction.
|
29
|
+
|
30
|
+
const TRUST_TOKEN_METHOD *TRUST_TOKEN_experiment_v0(void) {
|
31
|
+
static const TRUST_TOKEN_METHOD kMethod = {
|
32
|
+
pmbtoken_exp0_generate_key,
|
33
|
+
pmbtoken_exp0_client_key_from_bytes,
|
34
|
+
pmbtoken_exp0_issuer_key_from_bytes,
|
35
|
+
pmbtoken_exp0_blind,
|
36
|
+
pmbtoken_exp0_sign,
|
37
|
+
pmbtoken_exp0_unblind,
|
38
|
+
pmbtoken_exp0_read,
|
39
|
+
0 /* don't use token hash */,
|
40
|
+
0 /* don't use batched proof */,
|
41
|
+
};
|
42
|
+
return &kMethod;
|
43
|
+
}
|
44
|
+
|
45
|
+
const TRUST_TOKEN_METHOD *TRUST_TOKEN_experiment_v1(void) {
|
46
|
+
static const TRUST_TOKEN_METHOD kMethod = {
|
47
|
+
pmbtoken_exp1_generate_key,
|
48
|
+
pmbtoken_exp1_client_key_from_bytes,
|
49
|
+
pmbtoken_exp1_issuer_key_from_bytes,
|
50
|
+
pmbtoken_exp1_blind,
|
51
|
+
pmbtoken_exp1_sign,
|
52
|
+
pmbtoken_exp1_unblind,
|
53
|
+
pmbtoken_exp1_read,
|
54
|
+
1 /* use token hash */,
|
55
|
+
1 /* use batched proof */,
|
56
|
+
};
|
57
|
+
return &kMethod;
|
58
|
+
}
|
59
|
+
|
60
|
+
TRUST_TOKEN *TRUST_TOKEN_new(const uint8_t *data, size_t len) {
|
61
|
+
TRUST_TOKEN *ret = OPENSSL_malloc(sizeof(TRUST_TOKEN));
|
62
|
+
if (ret == NULL) {
|
63
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
64
|
+
return NULL;
|
65
|
+
}
|
66
|
+
OPENSSL_memset(ret, 0, sizeof(TRUST_TOKEN));
|
67
|
+
ret->data = OPENSSL_memdup(data, len);
|
68
|
+
if (len != 0 && ret->data == NULL) {
|
69
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
70
|
+
OPENSSL_free(ret);
|
71
|
+
return NULL;
|
72
|
+
}
|
73
|
+
ret->len = len;
|
74
|
+
return ret;
|
75
|
+
}
|
76
|
+
|
77
|
+
void TRUST_TOKEN_free(TRUST_TOKEN *token) {
|
78
|
+
if (token == NULL) {
|
79
|
+
return;
|
80
|
+
}
|
81
|
+
OPENSSL_free(token->data);
|
82
|
+
OPENSSL_free(token);
|
83
|
+
}
|
84
|
+
|
85
|
+
int TRUST_TOKEN_generate_key(const TRUST_TOKEN_METHOD *method,
|
86
|
+
uint8_t *out_priv_key, size_t *out_priv_key_len,
|
87
|
+
size_t max_priv_key_len, uint8_t *out_pub_key,
|
88
|
+
size_t *out_pub_key_len, size_t max_pub_key_len,
|
89
|
+
uint32_t id) {
|
90
|
+
// Prepend the key ID in front of the PMBTokens format.
|
91
|
+
int ret = 0;
|
92
|
+
CBB priv_cbb, pub_cbb;
|
93
|
+
CBB_zero(&priv_cbb);
|
94
|
+
CBB_zero(&pub_cbb);
|
95
|
+
if (!CBB_init_fixed(&priv_cbb, out_priv_key, max_priv_key_len) ||
|
96
|
+
!CBB_init_fixed(&pub_cbb, out_pub_key, max_pub_key_len) ||
|
97
|
+
!CBB_add_u32(&priv_cbb, id) ||
|
98
|
+
!CBB_add_u32(&pub_cbb, id)) {
|
99
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_BUFFER_TOO_SMALL);
|
100
|
+
goto err;
|
101
|
+
}
|
102
|
+
|
103
|
+
if (!method->generate_key(&priv_cbb, &pub_cbb)) {
|
104
|
+
goto err;
|
105
|
+
}
|
106
|
+
|
107
|
+
if (!CBB_finish(&priv_cbb, NULL, out_priv_key_len) ||
|
108
|
+
!CBB_finish(&pub_cbb, NULL, out_pub_key_len)) {
|
109
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_BUFFER_TOO_SMALL);
|
110
|
+
goto err;
|
111
|
+
}
|
112
|
+
|
113
|
+
ret = 1;
|
114
|
+
|
115
|
+
err:
|
116
|
+
CBB_cleanup(&priv_cbb);
|
117
|
+
CBB_cleanup(&pub_cbb);
|
118
|
+
return ret;
|
119
|
+
}
|
120
|
+
|
121
|
+
TRUST_TOKEN_CLIENT *TRUST_TOKEN_CLIENT_new(const TRUST_TOKEN_METHOD *method,
|
122
|
+
size_t max_batchsize) {
|
123
|
+
if (max_batchsize > 0xffff) {
|
124
|
+
// The protocol supports only two-byte token counts.
|
125
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_OVERFLOW);
|
126
|
+
return NULL;
|
127
|
+
}
|
128
|
+
|
129
|
+
TRUST_TOKEN_CLIENT *ret = OPENSSL_malloc(sizeof(TRUST_TOKEN_CLIENT));
|
130
|
+
if (ret == NULL) {
|
131
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
132
|
+
return NULL;
|
133
|
+
}
|
134
|
+
OPENSSL_memset(ret, 0, sizeof(TRUST_TOKEN_CLIENT));
|
135
|
+
ret->method = method;
|
136
|
+
ret->max_batchsize = (uint16_t)max_batchsize;
|
137
|
+
return ret;
|
138
|
+
}
|
139
|
+
|
140
|
+
void TRUST_TOKEN_CLIENT_free(TRUST_TOKEN_CLIENT *ctx) {
|
141
|
+
if (ctx == NULL) {
|
142
|
+
return;
|
143
|
+
}
|
144
|
+
EVP_PKEY_free(ctx->srr_key);
|
145
|
+
sk_PMBTOKEN_PRETOKEN_pop_free(ctx->pretokens, PMBTOKEN_PRETOKEN_free);
|
146
|
+
OPENSSL_free(ctx);
|
147
|
+
}
|
148
|
+
|
149
|
+
int TRUST_TOKEN_CLIENT_add_key(TRUST_TOKEN_CLIENT *ctx, size_t *out_key_index,
|
150
|
+
const uint8_t *key, size_t key_len) {
|
151
|
+
if (ctx->num_keys == OPENSSL_ARRAY_SIZE(ctx->keys)) {
|
152
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_TOO_MANY_KEYS);
|
153
|
+
return 0;
|
154
|
+
}
|
155
|
+
|
156
|
+
struct trust_token_client_key_st *key_s = &ctx->keys[ctx->num_keys];
|
157
|
+
CBS cbs;
|
158
|
+
CBS_init(&cbs, key, key_len);
|
159
|
+
uint32_t key_id;
|
160
|
+
if (!CBS_get_u32(&cbs, &key_id) ||
|
161
|
+
!ctx->method->client_key_from_bytes(&key_s->key, CBS_data(&cbs),
|
162
|
+
CBS_len(&cbs))) {
|
163
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_DECODE_FAILURE);
|
164
|
+
return 0;
|
165
|
+
}
|
166
|
+
key_s->id = key_id;
|
167
|
+
*out_key_index = ctx->num_keys;
|
168
|
+
ctx->num_keys += 1;
|
169
|
+
return 1;
|
170
|
+
}
|
171
|
+
|
172
|
+
int TRUST_TOKEN_CLIENT_set_srr_key(TRUST_TOKEN_CLIENT *ctx, EVP_PKEY *key) {
|
173
|
+
EVP_PKEY_free(ctx->srr_key);
|
174
|
+
EVP_PKEY_up_ref(key);
|
175
|
+
ctx->srr_key = key;
|
176
|
+
return 1;
|
177
|
+
}
|
178
|
+
|
179
|
+
int TRUST_TOKEN_CLIENT_begin_issuance(TRUST_TOKEN_CLIENT *ctx, uint8_t **out,
|
180
|
+
size_t *out_len, size_t count) {
|
181
|
+
if (count > ctx->max_batchsize) {
|
182
|
+
count = ctx->max_batchsize;
|
183
|
+
}
|
184
|
+
|
185
|
+
int ret = 0;
|
186
|
+
CBB request;
|
187
|
+
STACK_OF(PMBTOKEN_PRETOKEN) *pretokens = NULL;
|
188
|
+
if (!CBB_init(&request, 0) ||
|
189
|
+
!CBB_add_u16(&request, count)) {
|
190
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
191
|
+
goto err;
|
192
|
+
}
|
193
|
+
|
194
|
+
pretokens = ctx->method->blind(&request, count);
|
195
|
+
if (pretokens == NULL) {
|
196
|
+
goto err;
|
197
|
+
}
|
198
|
+
|
199
|
+
if (!CBB_finish(&request, out, out_len)) {
|
200
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
201
|
+
goto err;
|
202
|
+
}
|
203
|
+
|
204
|
+
sk_PMBTOKEN_PRETOKEN_pop_free(ctx->pretokens, PMBTOKEN_PRETOKEN_free);
|
205
|
+
ctx->pretokens = pretokens;
|
206
|
+
pretokens = NULL;
|
207
|
+
ret = 1;
|
208
|
+
|
209
|
+
err:
|
210
|
+
CBB_cleanup(&request);
|
211
|
+
sk_PMBTOKEN_PRETOKEN_pop_free(pretokens, PMBTOKEN_PRETOKEN_free);
|
212
|
+
return ret;
|
213
|
+
}
|
214
|
+
|
215
|
+
STACK_OF(TRUST_TOKEN) *
|
216
|
+
TRUST_TOKEN_CLIENT_finish_issuance(TRUST_TOKEN_CLIENT *ctx,
|
217
|
+
size_t *out_key_index,
|
218
|
+
const uint8_t *response,
|
219
|
+
size_t response_len) {
|
220
|
+
CBS in;
|
221
|
+
CBS_init(&in, response, response_len);
|
222
|
+
uint16_t count;
|
223
|
+
uint32_t key_id;
|
224
|
+
if (!CBS_get_u16(&in, &count) ||
|
225
|
+
!CBS_get_u32(&in, &key_id)) {
|
226
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_DECODE_FAILURE);
|
227
|
+
return NULL;
|
228
|
+
}
|
229
|
+
|
230
|
+
size_t key_index = 0;
|
231
|
+
const struct trust_token_client_key_st *key = NULL;
|
232
|
+
for (size_t i = 0; i < ctx->num_keys; i++) {
|
233
|
+
if (ctx->keys[i].id == key_id) {
|
234
|
+
key_index = i;
|
235
|
+
key = &ctx->keys[i];
|
236
|
+
break;
|
237
|
+
}
|
238
|
+
}
|
239
|
+
|
240
|
+
if (key == NULL) {
|
241
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_INVALID_KEY_ID);
|
242
|
+
return NULL;
|
243
|
+
}
|
244
|
+
|
245
|
+
if (count > sk_PMBTOKEN_PRETOKEN_num(ctx->pretokens)) {
|
246
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_DECODE_FAILURE);
|
247
|
+
return NULL;
|
248
|
+
}
|
249
|
+
|
250
|
+
STACK_OF(TRUST_TOKEN) *tokens =
|
251
|
+
ctx->method->unblind(&key->key, ctx->pretokens, &in, count, key_id);
|
252
|
+
if (tokens == NULL) {
|
253
|
+
return NULL;
|
254
|
+
}
|
255
|
+
|
256
|
+
if (CBS_len(&in) != 0) {
|
257
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_DECODE_FAILURE);
|
258
|
+
sk_TRUST_TOKEN_pop_free(tokens, TRUST_TOKEN_free);
|
259
|
+
return NULL;
|
260
|
+
}
|
261
|
+
|
262
|
+
sk_PMBTOKEN_PRETOKEN_pop_free(ctx->pretokens, PMBTOKEN_PRETOKEN_free);
|
263
|
+
ctx->pretokens = NULL;
|
264
|
+
|
265
|
+
*out_key_index = key_index;
|
266
|
+
return tokens;
|
267
|
+
}
|
268
|
+
|
269
|
+
int TRUST_TOKEN_CLIENT_begin_redemption(TRUST_TOKEN_CLIENT *ctx, uint8_t **out,
|
270
|
+
size_t *out_len,
|
271
|
+
const TRUST_TOKEN *token,
|
272
|
+
const uint8_t *data, size_t data_len,
|
273
|
+
uint64_t time) {
|
274
|
+
CBB request, token_inner, inner;
|
275
|
+
if (!CBB_init(&request, 0) ||
|
276
|
+
!CBB_add_u16_length_prefixed(&request, &token_inner) ||
|
277
|
+
!CBB_add_bytes(&token_inner, token->data, token->len) ||
|
278
|
+
!CBB_add_u16_length_prefixed(&request, &inner) ||
|
279
|
+
!CBB_add_bytes(&inner, data, data_len) ||
|
280
|
+
!CBB_add_u64(&request, time) ||
|
281
|
+
!CBB_finish(&request, out, out_len)) {
|
282
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
283
|
+
CBB_cleanup(&request);
|
284
|
+
return 0;
|
285
|
+
}
|
286
|
+
return 1;
|
287
|
+
}
|
288
|
+
|
289
|
+
int TRUST_TOKEN_CLIENT_finish_redemption(TRUST_TOKEN_CLIENT *ctx,
|
290
|
+
uint8_t **out_srr, size_t *out_srr_len,
|
291
|
+
uint8_t **out_sig, size_t *out_sig_len,
|
292
|
+
const uint8_t *response,
|
293
|
+
size_t response_len) {
|
294
|
+
if (ctx->srr_key == NULL) {
|
295
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_NO_SRR_KEY_CONFIGURED);
|
296
|
+
return 0;
|
297
|
+
}
|
298
|
+
|
299
|
+
CBS in, srr, sig;
|
300
|
+
CBS_init(&in, response, response_len);
|
301
|
+
if (!CBS_get_u16_length_prefixed(&in, &srr) ||
|
302
|
+
!CBS_get_u16_length_prefixed(&in, &sig)) {
|
303
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_DECODE_ERROR);
|
304
|
+
return 0;
|
305
|
+
}
|
306
|
+
|
307
|
+
EVP_MD_CTX md_ctx;
|
308
|
+
EVP_MD_CTX_init(&md_ctx);
|
309
|
+
int sig_ok = EVP_DigestVerifyInit(&md_ctx, NULL, NULL, NULL, ctx->srr_key) &&
|
310
|
+
EVP_DigestVerify(&md_ctx, CBS_data(&sig), CBS_len(&sig),
|
311
|
+
CBS_data(&srr), CBS_len(&srr));
|
312
|
+
EVP_MD_CTX_cleanup(&md_ctx);
|
313
|
+
|
314
|
+
if (!sig_ok) {
|
315
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_SRR_SIGNATURE_ERROR);
|
316
|
+
return 0;
|
317
|
+
}
|
318
|
+
|
319
|
+
uint8_t *srr_buf = NULL, *sig_buf = NULL;
|
320
|
+
size_t srr_len, sig_len;
|
321
|
+
if (!CBS_stow(&srr, &srr_buf, &srr_len) ||
|
322
|
+
!CBS_stow(&sig, &sig_buf, &sig_len)) {
|
323
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
324
|
+
OPENSSL_free(srr_buf);
|
325
|
+
OPENSSL_free(sig_buf);
|
326
|
+
return 0;
|
327
|
+
}
|
328
|
+
|
329
|
+
*out_srr = srr_buf;
|
330
|
+
*out_srr_len = srr_len;
|
331
|
+
*out_sig = sig_buf;
|
332
|
+
*out_sig_len = sig_len;
|
333
|
+
return 1;
|
334
|
+
}
|
335
|
+
|
336
|
+
TRUST_TOKEN_ISSUER *TRUST_TOKEN_ISSUER_new(const TRUST_TOKEN_METHOD *method,
|
337
|
+
size_t max_batchsize) {
|
338
|
+
if (max_batchsize > 0xffff) {
|
339
|
+
// The protocol supports only two-byte token counts.
|
340
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_OVERFLOW);
|
341
|
+
return NULL;
|
342
|
+
}
|
343
|
+
|
344
|
+
TRUST_TOKEN_ISSUER *ret = OPENSSL_malloc(sizeof(TRUST_TOKEN_ISSUER));
|
345
|
+
if (ret == NULL) {
|
346
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
347
|
+
return NULL;
|
348
|
+
}
|
349
|
+
OPENSSL_memset(ret, 0, sizeof(TRUST_TOKEN_ISSUER));
|
350
|
+
ret->method = method;
|
351
|
+
ret->max_batchsize = (uint16_t)max_batchsize;
|
352
|
+
return ret;
|
353
|
+
}
|
354
|
+
|
355
|
+
void TRUST_TOKEN_ISSUER_free(TRUST_TOKEN_ISSUER *ctx) {
|
356
|
+
if (ctx == NULL) {
|
357
|
+
return;
|
358
|
+
}
|
359
|
+
EVP_PKEY_free(ctx->srr_key);
|
360
|
+
OPENSSL_free(ctx->metadata_key);
|
361
|
+
OPENSSL_free(ctx);
|
362
|
+
}
|
363
|
+
|
364
|
+
int TRUST_TOKEN_ISSUER_add_key(TRUST_TOKEN_ISSUER *ctx, const uint8_t *key,
|
365
|
+
size_t key_len) {
|
366
|
+
if (ctx->num_keys == OPENSSL_ARRAY_SIZE(ctx->keys)) {
|
367
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_TOO_MANY_KEYS);
|
368
|
+
return 0;
|
369
|
+
}
|
370
|
+
|
371
|
+
struct trust_token_issuer_key_st *key_s = &ctx->keys[ctx->num_keys];
|
372
|
+
CBS cbs;
|
373
|
+
CBS_init(&cbs, key, key_len);
|
374
|
+
uint32_t key_id;
|
375
|
+
if (!CBS_get_u32(&cbs, &key_id) ||
|
376
|
+
!ctx->method->issuer_key_from_bytes(&key_s->key, CBS_data(&cbs),
|
377
|
+
CBS_len(&cbs))) {
|
378
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_DECODE_FAILURE);
|
379
|
+
return 0;
|
380
|
+
}
|
381
|
+
|
382
|
+
key_s->id = key_id;
|
383
|
+
ctx->num_keys += 1;
|
384
|
+
return 1;
|
385
|
+
}
|
386
|
+
|
387
|
+
int TRUST_TOKEN_ISSUER_set_srr_key(TRUST_TOKEN_ISSUER *ctx, EVP_PKEY *key) {
|
388
|
+
EVP_PKEY_free(ctx->srr_key);
|
389
|
+
EVP_PKEY_up_ref(key);
|
390
|
+
ctx->srr_key = key;
|
391
|
+
return 1;
|
392
|
+
}
|
393
|
+
|
394
|
+
int TRUST_TOKEN_ISSUER_set_metadata_key(TRUST_TOKEN_ISSUER *ctx,
|
395
|
+
const uint8_t *key, size_t len) {
|
396
|
+
if (len < 32) {
|
397
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_INVALID_METADATA_KEY);
|
398
|
+
}
|
399
|
+
OPENSSL_free(ctx->metadata_key);
|
400
|
+
ctx->metadata_key_len = 0;
|
401
|
+
ctx->metadata_key = OPENSSL_memdup(key, len);
|
402
|
+
if (ctx->metadata_key == NULL) {
|
403
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
404
|
+
return 0;
|
405
|
+
}
|
406
|
+
ctx->metadata_key_len = len;
|
407
|
+
return 1;
|
408
|
+
}
|
409
|
+
|
410
|
+
static const struct trust_token_issuer_key_st *trust_token_issuer_get_key(
|
411
|
+
const TRUST_TOKEN_ISSUER *ctx, uint32_t key_id) {
|
412
|
+
for (size_t i = 0; i < ctx->num_keys; i++) {
|
413
|
+
if (ctx->keys[i].id == key_id) {
|
414
|
+
return &ctx->keys[i];
|
415
|
+
}
|
416
|
+
}
|
417
|
+
return NULL;
|
418
|
+
}
|
419
|
+
|
420
|
+
int TRUST_TOKEN_ISSUER_issue(const TRUST_TOKEN_ISSUER *ctx, uint8_t **out,
|
421
|
+
size_t *out_len, size_t *out_tokens_issued,
|
422
|
+
const uint8_t *request, size_t request_len,
|
423
|
+
uint32_t public_metadata, uint8_t private_metadata,
|
424
|
+
size_t max_issuance) {
|
425
|
+
if (max_issuance > ctx->max_batchsize) {
|
426
|
+
max_issuance = ctx->max_batchsize;
|
427
|
+
}
|
428
|
+
|
429
|
+
const struct trust_token_issuer_key_st *key =
|
430
|
+
trust_token_issuer_get_key(ctx, public_metadata);
|
431
|
+
if (key == NULL || private_metadata > 1) {
|
432
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_INVALID_METADATA);
|
433
|
+
return 0;
|
434
|
+
}
|
435
|
+
|
436
|
+
CBS in;
|
437
|
+
uint16_t num_requested;
|
438
|
+
CBS_init(&in, request, request_len);
|
439
|
+
if (!CBS_get_u16(&in, &num_requested)) {
|
440
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_DECODE_FAILURE);
|
441
|
+
return 0;
|
442
|
+
}
|
443
|
+
|
444
|
+
size_t num_to_issue = num_requested;
|
445
|
+
if (num_to_issue > max_issuance) {
|
446
|
+
num_to_issue = max_issuance;
|
447
|
+
}
|
448
|
+
|
449
|
+
int ret = 0;
|
450
|
+
CBB response;
|
451
|
+
if (!CBB_init(&response, 0) ||
|
452
|
+
!CBB_add_u16(&response, num_to_issue) ||
|
453
|
+
!CBB_add_u32(&response, public_metadata)) {
|
454
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
455
|
+
goto err;
|
456
|
+
}
|
457
|
+
|
458
|
+
if (!ctx->method->sign(&key->key, &response, &in, num_requested, num_to_issue,
|
459
|
+
private_metadata)) {
|
460
|
+
goto err;
|
461
|
+
}
|
462
|
+
|
463
|
+
if (CBS_len(&in) != 0) {
|
464
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_DECODE_FAILURE);
|
465
|
+
goto err;
|
466
|
+
}
|
467
|
+
|
468
|
+
if (!CBB_finish(&response, out, out_len)) {
|
469
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
470
|
+
goto err;
|
471
|
+
}
|
472
|
+
|
473
|
+
*out_tokens_issued = num_to_issue;
|
474
|
+
ret = 1;
|
475
|
+
|
476
|
+
err:
|
477
|
+
CBB_cleanup(&response);
|
478
|
+
return ret;
|
479
|
+
}
|
480
|
+
|
481
|
+
// https://tools.ietf.org/html/rfc7049#section-2.1
|
482
|
+
static int add_cbor_int_with_type(CBB *cbb, uint8_t major_type,
|
483
|
+
uint64_t value) {
|
484
|
+
if (value <= 23) {
|
485
|
+
return CBB_add_u8(cbb, value | major_type);
|
486
|
+
}
|
487
|
+
if (value <= 0xff) {
|
488
|
+
return CBB_add_u8(cbb, 0x18 | major_type) && CBB_add_u8(cbb, value);
|
489
|
+
}
|
490
|
+
if (value <= 0xffff) {
|
491
|
+
return CBB_add_u8(cbb, 0x19 | major_type) && CBB_add_u16(cbb, value);
|
492
|
+
}
|
493
|
+
if (value <= 0xffffffff) {
|
494
|
+
return CBB_add_u8(cbb, 0x1a | major_type) && CBB_add_u32(cbb, value);
|
495
|
+
}
|
496
|
+
if (value <= 0xffffffffffffffff) {
|
497
|
+
return CBB_add_u8(cbb, 0x1b | major_type) && CBB_add_u64(cbb, value);
|
498
|
+
}
|
499
|
+
|
500
|
+
return 0;
|
501
|
+
}
|
502
|
+
|
503
|
+
// https://tools.ietf.org/html/rfc7049#section-2.1
|
504
|
+
static int add_cbor_int(CBB *cbb, uint64_t value) {
|
505
|
+
return add_cbor_int_with_type(cbb, 0, value);
|
506
|
+
}
|
507
|
+
|
508
|
+
// https://tools.ietf.org/html/rfc7049#section-2.1
|
509
|
+
static int add_cbor_bytes(CBB *cbb, const uint8_t *data, size_t len) {
|
510
|
+
return add_cbor_int_with_type(cbb, 0x40, len) &&
|
511
|
+
CBB_add_bytes(cbb, data, len);
|
512
|
+
}
|
513
|
+
|
514
|
+
// https://tools.ietf.org/html/rfc7049#section-2.1
|
515
|
+
static int add_cbor_text(CBB *cbb, const char *data, size_t len) {
|
516
|
+
return add_cbor_int_with_type(cbb, 0x60, len) &&
|
517
|
+
CBB_add_bytes(cbb, (const uint8_t *)data, len);
|
518
|
+
}
|
519
|
+
|
520
|
+
// https://tools.ietf.org/html/rfc7049#section-2.1
|
521
|
+
static int add_cbor_map(CBB *cbb, uint8_t size) {
|
522
|
+
return add_cbor_int_with_type(cbb, 0xa0, size);
|
523
|
+
}
|
524
|
+
|
525
|
+
static uint8_t get_metadata_obfuscator(const uint8_t *key, size_t key_len,
|
526
|
+
const uint8_t *client_data,
|
527
|
+
size_t client_data_len) {
|
528
|
+
uint8_t metadata_obfuscator[SHA256_DIGEST_LENGTH];
|
529
|
+
SHA256_CTX sha_ctx;
|
530
|
+
SHA256_Init(&sha_ctx);
|
531
|
+
SHA256_Update(&sha_ctx, key, key_len);
|
532
|
+
SHA256_Update(&sha_ctx, client_data, client_data_len);
|
533
|
+
SHA256_Final(metadata_obfuscator, &sha_ctx);
|
534
|
+
return metadata_obfuscator[0] >> 7;
|
535
|
+
}
|
536
|
+
|
537
|
+
int TRUST_TOKEN_ISSUER_redeem(const TRUST_TOKEN_ISSUER *ctx, uint8_t **out,
|
538
|
+
size_t *out_len, TRUST_TOKEN **out_token,
|
539
|
+
uint8_t **out_client_data,
|
540
|
+
size_t *out_client_data_len,
|
541
|
+
uint64_t *out_redemption_time,
|
542
|
+
const uint8_t *request, size_t request_len,
|
543
|
+
uint64_t lifetime) {
|
544
|
+
CBS request_cbs, token_cbs;
|
545
|
+
CBS_init(&request_cbs, request, request_len);
|
546
|
+
if (!CBS_get_u16_length_prefixed(&request_cbs, &token_cbs)) {
|
547
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_DECODE_ERROR);
|
548
|
+
return 0;
|
549
|
+
}
|
550
|
+
|
551
|
+
uint32_t public_metadata = 0;
|
552
|
+
uint8_t private_metadata = 0;
|
553
|
+
|
554
|
+
CBS token_copy = token_cbs;
|
555
|
+
|
556
|
+
// Parse the token. If there is an error, treat it as an invalid token.
|
557
|
+
if (!CBS_get_u32(&token_cbs, &public_metadata)) {
|
558
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_INVALID_TOKEN);
|
559
|
+
return 0;
|
560
|
+
}
|
561
|
+
|
562
|
+
const struct trust_token_issuer_key_st *key =
|
563
|
+
trust_token_issuer_get_key(ctx, public_metadata);
|
564
|
+
uint8_t nonce[PMBTOKEN_NONCE_SIZE];
|
565
|
+
if (key == NULL ||
|
566
|
+
!ctx->method->read(&key->key, nonce, &private_metadata,
|
567
|
+
CBS_data(&token_cbs), CBS_len(&token_cbs))) {
|
568
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_INVALID_TOKEN);
|
569
|
+
return 0;
|
570
|
+
}
|
571
|
+
|
572
|
+
int ok = 0;
|
573
|
+
CBB response, srr;
|
574
|
+
uint8_t *srr_buf = NULL, *sig_buf = NULL, *client_data_buf = NULL;
|
575
|
+
size_t srr_len = 0, sig_len = 0, client_data_len = 0;
|
576
|
+
EVP_MD_CTX md_ctx;
|
577
|
+
EVP_MD_CTX_init(&md_ctx);
|
578
|
+
CBB_zero(&srr);
|
579
|
+
if (!CBB_init(&response, 0)) {
|
580
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
581
|
+
goto err;
|
582
|
+
}
|
583
|
+
|
584
|
+
CBS client_data;
|
585
|
+
uint64_t redemption_time;
|
586
|
+
if (!CBS_get_u16_length_prefixed(&request_cbs, &client_data) ||
|
587
|
+
!CBS_get_u64(&request_cbs, &redemption_time)) {
|
588
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_DECODE_ERROR);
|
589
|
+
goto err;
|
590
|
+
}
|
591
|
+
|
592
|
+
const uint8_t kTokenHashDSTLabel[] = "TrustTokenV0 TokenHash";
|
593
|
+
uint8_t token_hash[SHA256_DIGEST_LENGTH];
|
594
|
+
SHA256_CTX sha_ctx;
|
595
|
+
SHA256_Init(&sha_ctx);
|
596
|
+
SHA256_Update(&sha_ctx, kTokenHashDSTLabel, sizeof(kTokenHashDSTLabel));
|
597
|
+
SHA256_Update(&sha_ctx, CBS_data(&token_copy), CBS_len(&token_copy));
|
598
|
+
SHA256_Final(token_hash, &sha_ctx);
|
599
|
+
|
600
|
+
uint8_t metadata_obfuscator;
|
601
|
+
if (ctx->method->use_token_hash) {
|
602
|
+
metadata_obfuscator =
|
603
|
+
get_metadata_obfuscator(ctx->metadata_key, ctx->metadata_key_len,
|
604
|
+
token_hash, sizeof(token_hash));
|
605
|
+
} else {
|
606
|
+
metadata_obfuscator =
|
607
|
+
get_metadata_obfuscator(ctx->metadata_key, ctx->metadata_key_len,
|
608
|
+
CBS_data(&client_data), CBS_len(&client_data));
|
609
|
+
}
|
610
|
+
|
611
|
+
// The SRR is constructed as per the format described in
|
612
|
+
// https://docs.google.com/document/d/1TNnya6B8pyomDK2F1R9CL3dY10OAmqWlnCxsWyOBDVQ/edit#heading=h.7mkzvhpqb8l5
|
613
|
+
|
614
|
+
static const char kClientDataLabel[] = "client-data";
|
615
|
+
static const char kExpiryTimestampLabel[] = "expiry-timestamp";
|
616
|
+
static const char kMetadataLabel[] = "metadata";
|
617
|
+
static const char kPrivateLabel[] = "private";
|
618
|
+
static const char kPublicLabel[] = "public";
|
619
|
+
static const char kTokenHashLabel[] = "token-hash";
|
620
|
+
|
621
|
+
// CBOR requires map keys to be sorted by length then sorted lexically.
|
622
|
+
// https://tools.ietf.org/html/rfc7049#section-3.9
|
623
|
+
assert(strlen(kMetadataLabel) < strlen(kTokenHashLabel));
|
624
|
+
assert(strlen(kTokenHashLabel) < strlen(kClientDataLabel));
|
625
|
+
assert(strlen(kClientDataLabel) < strlen(kExpiryTimestampLabel));
|
626
|
+
assert(strlen(kPublicLabel) < strlen(kPrivateLabel));
|
627
|
+
|
628
|
+
size_t map_entries = 3;
|
629
|
+
if (ctx->method->use_token_hash) {
|
630
|
+
map_entries = 4;
|
631
|
+
}
|
632
|
+
|
633
|
+
if (!CBB_init(&srr, 0) ||
|
634
|
+
!add_cbor_map(&srr, map_entries) || // SRR map
|
635
|
+
!add_cbor_text(&srr, kMetadataLabel, strlen(kMetadataLabel)) ||
|
636
|
+
!add_cbor_map(&srr, 2) || // Metadata map
|
637
|
+
!add_cbor_text(&srr, kPublicLabel, strlen(kPublicLabel)) ||
|
638
|
+
!add_cbor_int(&srr, public_metadata) ||
|
639
|
+
!add_cbor_text(&srr, kPrivateLabel, strlen(kPrivateLabel)) ||
|
640
|
+
!add_cbor_int(&srr, private_metadata ^ metadata_obfuscator)) {
|
641
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
642
|
+
goto err;
|
643
|
+
}
|
644
|
+
|
645
|
+
if (ctx->method->use_token_hash) {
|
646
|
+
if (!add_cbor_text(&srr, kTokenHashLabel, strlen(kTokenHashLabel)) ||
|
647
|
+
!add_cbor_bytes(&srr, token_hash, sizeof(token_hash))) {
|
648
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
649
|
+
goto err;
|
650
|
+
}
|
651
|
+
}
|
652
|
+
|
653
|
+
if (!add_cbor_text(&srr, kClientDataLabel, strlen(kClientDataLabel)) ||
|
654
|
+
!CBB_add_bytes(&srr, CBS_data(&client_data), CBS_len(&client_data)) ||
|
655
|
+
!add_cbor_text(&srr, kExpiryTimestampLabel,
|
656
|
+
strlen(kExpiryTimestampLabel)) ||
|
657
|
+
!add_cbor_int(&srr, redemption_time + lifetime) ||
|
658
|
+
!CBB_finish(&srr, &srr_buf, &srr_len)) {
|
659
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
660
|
+
goto err;
|
661
|
+
}
|
662
|
+
|
663
|
+
if (!EVP_DigestSignInit(&md_ctx, NULL, NULL, NULL, ctx->srr_key) ||
|
664
|
+
!EVP_DigestSign(&md_ctx, NULL, &sig_len, srr_buf, srr_len)) {
|
665
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, TRUST_TOKEN_R_SRR_SIGNATURE_ERROR);
|
666
|
+
goto err;
|
667
|
+
}
|
668
|
+
|
669
|
+
CBB child;
|
670
|
+
uint8_t *ptr;
|
671
|
+
if (!CBB_add_u16_length_prefixed(&response, &child) ||
|
672
|
+
!CBB_add_bytes(&child, srr_buf, srr_len) ||
|
673
|
+
!CBB_add_u16_length_prefixed(&response, &child) ||
|
674
|
+
!CBB_reserve(&child, &ptr, sig_len) ||
|
675
|
+
!EVP_DigestSign(&md_ctx, ptr, &sig_len, srr_buf, srr_len) ||
|
676
|
+
!CBB_did_write(&child, sig_len)) {
|
677
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
678
|
+
goto err;
|
679
|
+
}
|
680
|
+
|
681
|
+
if (!CBS_stow(&client_data, &client_data_buf, &client_data_len) ||
|
682
|
+
!CBB_finish(&response, out, out_len)) {
|
683
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
684
|
+
goto err;
|
685
|
+
}
|
686
|
+
|
687
|
+
TRUST_TOKEN *token = TRUST_TOKEN_new(nonce, PMBTOKEN_NONCE_SIZE);
|
688
|
+
if (token == NULL) {
|
689
|
+
OPENSSL_PUT_ERROR(TRUST_TOKEN, ERR_R_MALLOC_FAILURE);
|
690
|
+
goto err;
|
691
|
+
}
|
692
|
+
*out_token = token;
|
693
|
+
*out_client_data = client_data_buf;
|
694
|
+
*out_client_data_len = client_data_len;
|
695
|
+
*out_redemption_time = redemption_time;
|
696
|
+
|
697
|
+
ok = 1;
|
698
|
+
|
699
|
+
err:
|
700
|
+
CBB_cleanup(&response);
|
701
|
+
CBB_cleanup(&srr);
|
702
|
+
OPENSSL_free(srr_buf);
|
703
|
+
OPENSSL_free(sig_buf);
|
704
|
+
EVP_MD_CTX_cleanup(&md_ctx);
|
705
|
+
if (!ok) {
|
706
|
+
OPENSSL_free(client_data_buf);
|
707
|
+
}
|
708
|
+
return ok;
|
709
|
+
}
|
710
|
+
|
711
|
+
int TRUST_TOKEN_decode_private_metadata(const TRUST_TOKEN_METHOD *method,
|
712
|
+
uint8_t *out_value, const uint8_t *key,
|
713
|
+
size_t key_len, const uint8_t *nonce,
|
714
|
+
size_t nonce_len,
|
715
|
+
uint8_t encrypted_bit) {
|
716
|
+
uint8_t metadata_obfuscator =
|
717
|
+
get_metadata_obfuscator(key, key_len, nonce, nonce_len);
|
718
|
+
*out_value = encrypted_bit ^ metadata_obfuscator;
|
719
|
+
return 1;
|
720
|
+
}
|