grpc 1.41.0 → 1.42.0

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.

Files changed (519) hide show
  1. checksums.yaml +4 -4
  2. data/Makefile +57 -44
  3. data/etc/roots.pem +335 -326
  4. data/include/grpc/event_engine/event_engine.h +82 -42
  5. data/include/grpc/event_engine/internal/memory_allocator_impl.h +98 -0
  6. data/include/grpc/event_engine/memory_allocator.h +210 -0
  7. data/include/grpc/grpc.h +4 -0
  8. data/include/grpc/grpc_security.h +18 -0
  9. data/include/grpc/grpc_security_constants.h +1 -0
  10. data/include/grpc/impl/codegen/port_platform.h +7 -0
  11. data/src/core/ext/filters/client_channel/backend_metric.cc +18 -19
  12. data/src/core/ext/filters/client_channel/backup_poller.cc +2 -1
  13. data/src/core/ext/filters/client_channel/channel_connectivity.cc +71 -89
  14. data/src/core/ext/filters/client_channel/client_channel.cc +187 -252
  15. data/src/core/ext/filters/client_channel/client_channel.h +74 -27
  16. data/src/core/ext/filters/client_channel/client_channel_factory.cc +1 -1
  17. data/src/core/ext/filters/client_channel/client_channel_factory.h +17 -19
  18. data/src/core/ext/filters/client_channel/client_channel_plugin.cc +8 -14
  19. data/src/core/ext/filters/client_channel/config_selector.cc +1 -1
  20. data/src/core/ext/filters/client_channel/config_selector.h +4 -5
  21. data/src/core/ext/filters/client_channel/connector.h +18 -18
  22. data/src/core/ext/filters/client_channel/dynamic_filters.cc +1 -1
  23. data/src/core/ext/filters/client_channel/global_subchannel_pool.h +0 -1
  24. data/src/core/ext/filters/client_channel/health/health_check_client.cc +12 -11
  25. data/src/core/ext/filters/client_channel/http_connect_handshaker.h +1 -1
  26. data/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc +4 -0
  27. data/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc +6 -15
  28. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +166 -82
  29. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h +4 -0
  30. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc +1 -1
  31. data/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +2 -4
  32. data/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +23 -7
  33. data/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc +15 -10
  34. data/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc +2 -3
  35. data/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc +2502 -0
  36. data/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +6 -1
  37. data/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc +7 -1
  38. data/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc +6 -2
  39. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h +1 -1
  40. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc +5 -0
  41. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc +8 -1
  42. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc +7 -16
  43. data/src/core/ext/filters/client_channel/lb_policy.h +11 -1
  44. data/src/core/ext/filters/client_channel/lb_policy_factory.h +1 -0
  45. data/src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc +139 -0
  46. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +11 -5
  47. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +3 -3
  48. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +12 -39
  49. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h +21 -1
  50. data/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +6 -2
  51. data/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +3 -1
  52. data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc +77 -68
  53. data/src/core/ext/filters/client_channel/resolver.h +1 -1
  54. data/src/core/ext/filters/client_channel/resolver_factory.h +2 -0
  55. data/src/core/ext/filters/client_channel/resolver_registry.cc +6 -8
  56. data/src/core/ext/filters/client_channel/resolver_result_parsing.cc +1 -1
  57. data/src/core/ext/filters/client_channel/resolver_result_parsing.h +1 -1
  58. data/src/core/ext/filters/client_channel/retry_filter.cc +48 -86
  59. data/src/core/ext/filters/client_channel/retry_service_config.h +1 -1
  60. data/src/core/ext/filters/client_channel/retry_throttle.cc +17 -48
  61. data/src/core/ext/filters/client_channel/server_address.h +1 -1
  62. data/src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc +49 -36
  63. data/src/core/ext/filters/client_channel/subchannel.cc +85 -143
  64. data/src/core/ext/filters/client_channel/subchannel.h +29 -49
  65. data/src/core/ext/filters/client_channel/subchannel_pool_interface.cc +22 -7
  66. data/src/core/ext/filters/client_channel/subchannel_pool_interface.h +11 -2
  67. data/src/core/ext/filters/client_idle/client_idle_filter.cc +27 -210
  68. data/src/core/ext/filters/client_idle/idle_filter_state.cc +96 -0
  69. data/src/core/ext/filters/client_idle/idle_filter_state.h +66 -0
  70. data/src/core/ext/filters/deadline/deadline_filter.cc +23 -26
  71. data/src/core/ext/filters/fault_injection/fault_injection_filter.cc +19 -19
  72. data/src/core/ext/filters/fault_injection/service_config_parser.cc +0 -1
  73. data/src/core/ext/filters/fault_injection/service_config_parser.h +1 -1
  74. data/src/core/ext/filters/http/client/http_client_filter.cc +41 -44
  75. data/src/core/ext/filters/http/client_authority_filter.cc +14 -15
  76. data/src/core/ext/filters/http/http_filters_plugin.cc +53 -71
  77. data/src/core/ext/filters/http/message_compress/message_compress_filter.cc +17 -12
  78. data/src/core/ext/filters/http/message_compress/message_decompress_filter.cc +1 -1
  79. data/src/core/ext/filters/http/server/http_server_filter.cc +72 -69
  80. data/src/core/ext/filters/max_age/max_age_filter.cc +24 -26
  81. data/src/core/ext/filters/message_size/message_size_filter.cc +19 -16
  82. data/src/core/ext/filters/message_size/message_size_filter.h +1 -1
  83. data/src/core/ext/{filters/client_channel → service_config}/service_config.cc +2 -2
  84. data/src/core/ext/{filters/client_channel → service_config}/service_config.h +4 -4
  85. data/src/core/ext/service_config/service_config_call_data.h +72 -0
  86. data/src/core/ext/{filters/client_channel → service_config}/service_config_parser.cc +3 -3
  87. data/src/core/ext/{filters/client_channel → service_config}/service_config_parser.h +8 -6
  88. data/src/core/ext/transport/chttp2/client/chttp2_connector.cc +2 -5
  89. data/src/core/ext/transport/chttp2/client/insecure/channel_create.cc +19 -24
  90. data/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +27 -50
  91. data/src/core/ext/transport/chttp2/server/chttp2_server.cc +14 -16
  92. data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +59 -58
  93. data/src/core/ext/transport/chttp2/transport/flow_control.cc +19 -16
  94. data/src/core/ext/transport/chttp2/transport/flow_control.h +4 -4
  95. data/src/core/ext/transport/chttp2/transport/frame_data.cc +4 -4
  96. data/src/core/ext/transport/chttp2/transport/frame_goaway.cc +2 -1
  97. data/src/core/ext/transport/chttp2/transport/frame_ping.cc +2 -1
  98. data/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +2 -3
  99. data/src/core/ext/transport/chttp2/transport/frame_settings.cc +2 -2
  100. data/src/core/ext/transport/chttp2/transport/hpack_constants.h +1 -1
  101. data/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +41 -1
  102. data/src/core/ext/transport/chttp2/transport/hpack_encoder.h +8 -4
  103. data/src/core/ext/transport/chttp2/transport/hpack_encoder_index.h +1 -1
  104. data/src/core/ext/transport/chttp2/transport/hpack_parser.cc +136 -98
  105. data/src/core/ext/transport/chttp2/transport/hpack_parser.h +27 -8
  106. data/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc +12 -25
  107. data/src/core/ext/transport/chttp2/transport/hpack_parser_table.h +37 -30
  108. data/src/core/ext/transport/chttp2/transport/internal.h +4 -3
  109. data/src/core/ext/transport/chttp2/transport/parsing.cc +30 -173
  110. data/src/core/ext/transport/chttp2/transport/popularity_count.h +1 -1
  111. data/src/core/ext/transport/chttp2/transport/writing.cc +29 -22
  112. data/src/core/ext/transport/inproc/inproc_transport.cc +105 -109
  113. data/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c +68 -34
  114. data/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h +139 -1
  115. data/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c +16 -4
  116. data/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h +53 -4
  117. data/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c +3 -2
  118. data/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h +15 -0
  119. data/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c +13 -8
  120. data/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h +23 -0
  121. data/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c +0 -1
  122. data/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c +14 -11
  123. data/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h +17 -0
  124. data/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c +15 -12
  125. data/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h +49 -19
  126. data/src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c +55 -0
  127. data/src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.h +154 -0
  128. data/src/core/ext/upb-generated/udpa/annotations/security.upb.c +0 -2
  129. data/src/core/ext/upb-generated/xds/annotations/v3/status.upb.c +58 -0
  130. data/src/core/ext/upb-generated/xds/annotations/v3/status.upb.h +182 -0
  131. data/src/core/ext/upb-generated/xds/core/v3/authority.upb.c +1 -1
  132. data/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c +1 -1
  133. data/src/core/ext/upb-generated/xds/core/v3/context_params.upb.c +1 -1
  134. data/src/core/ext/upb-generated/xds/core/v3/resource.upb.c +1 -1
  135. data/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c +1 -1
  136. data/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c +1 -1
  137. data/src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c +58 -0
  138. data/src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.h +130 -0
  139. data/src/core/ext/upb-generated/{udpa/type/v1 → xds/type/v3}/typed_struct.upb.c +7 -7
  140. data/src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.h +83 -0
  141. data/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c +310 -286
  142. data/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h +10 -0
  143. data/src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c +101 -88
  144. data/src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h +5 -0
  145. data/src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c +59 -56
  146. data/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c +59 -46
  147. data/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c +78 -82
  148. data/src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c +323 -316
  149. data/src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c +5 -4
  150. data/src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c +19 -23
  151. data/src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c +4 -3
  152. data/src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c +5 -3
  153. data/src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c +5 -4
  154. data/src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c +75 -0
  155. data/src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.h +50 -0
  156. data/src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c +13 -12
  157. data/src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c +25 -24
  158. data/src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c +16 -15
  159. data/src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c +17 -16
  160. data/src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c +33 -32
  161. data/src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c +19 -18
  162. data/src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c +45 -0
  163. data/src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h +35 -0
  164. data/src/core/ext/xds/xds_api.cc +325 -362
  165. data/src/core/ext/xds/xds_api.h +134 -82
  166. data/src/core/ext/xds/xds_bootstrap.h +10 -0
  167. data/src/core/ext/xds/xds_certificate_provider.cc +3 -3
  168. data/src/core/ext/xds/xds_channel_stack_modifier.cc +113 -0
  169. data/src/core/ext/xds/xds_channel_stack_modifier.h +52 -0
  170. data/src/core/ext/xds/xds_client.cc +527 -314
  171. data/src/core/ext/xds/xds_client.h +42 -37
  172. data/src/core/ext/xds/xds_client_stats.h +1 -1
  173. data/src/core/ext/xds/xds_server_config_fetcher.cc +5 -7
  174. data/src/core/lib/address_utils/parse_address.cc +2 -0
  175. data/src/core/lib/avl/avl.cc +5 -5
  176. data/src/core/lib/backoff/backoff.cc +1 -1
  177. data/src/core/lib/channel/channel_args.cc +24 -6
  178. data/src/core/lib/channel/channel_args.h +9 -0
  179. data/src/core/lib/channel/channel_stack_builder.cc +3 -3
  180. data/src/core/lib/channel/channel_trace.cc +1 -1
  181. data/src/core/lib/channel/channel_trace.h +1 -1
  182. data/src/core/lib/channel/channelz.cc +3 -3
  183. data/src/core/lib/channel/channelz.h +2 -2
  184. data/src/core/lib/channel/channelz_registry.cc +1 -1
  185. data/src/core/lib/channel/channelz_registry.h +1 -1
  186. data/src/core/lib/channel/connected_channel.cc +1 -3
  187. data/src/core/lib/channel/connected_channel.h +1 -2
  188. data/src/core/lib/compression/compression.cc +2 -2
  189. data/src/core/lib/compression/compression_args.cc +6 -4
  190. data/src/core/lib/compression/compression_internal.cc +2 -2
  191. data/src/core/lib/compression/compression_internal.h +1 -1
  192. data/src/core/lib/config/core_configuration.cc +44 -2
  193. data/src/core/lib/config/core_configuration.h +39 -1
  194. data/src/core/lib/debug/stats.cc +1 -1
  195. data/src/core/lib/debug/stats_data.cc +13 -13
  196. data/src/core/lib/gpr/atm.cc +1 -1
  197. data/src/core/lib/gpr/cpu_posix.cc +1 -1
  198. data/src/core/lib/gpr/string.cc +2 -2
  199. data/src/core/lib/gpr/tls.h +1 -1
  200. data/src/core/lib/gpr/useful.h +79 -32
  201. data/src/core/lib/gprpp/arena.h +10 -0
  202. data/src/core/lib/gprpp/bitset.h +38 -16
  203. data/src/core/lib/gprpp/chunked_vector.h +211 -0
  204. data/src/core/lib/gprpp/construct_destruct.h +1 -1
  205. data/src/core/lib/gprpp/match.h +1 -1
  206. data/src/core/lib/gprpp/memory.h +6 -0
  207. data/src/core/lib/gprpp/overload.h +1 -1
  208. data/src/core/lib/gprpp/status_helper.cc +23 -3
  209. data/src/core/lib/gprpp/status_helper.h +12 -1
  210. data/src/core/lib/gprpp/table.h +411 -0
  211. data/src/core/lib/http/httpcli.cc +200 -182
  212. data/src/core/lib/http/parser.cc +2 -2
  213. data/src/core/lib/iomgr/call_combiner.cc +28 -10
  214. data/src/core/lib/iomgr/combiner.cc +6 -21
  215. data/src/core/lib/iomgr/endpoint_cfstream.cc +7 -6
  216. data/src/core/lib/iomgr/error.cc +113 -52
  217. data/src/core/lib/iomgr/error.h +50 -9
  218. data/src/core/lib/iomgr/error_cfstream.cc +5 -0
  219. data/src/core/lib/iomgr/ev_epoll1_linux.cc +3 -2
  220. data/src/core/lib/iomgr/ev_epollex_linux.cc +7 -7
  221. data/src/core/lib/iomgr/ev_poll_posix.cc +29 -20
  222. data/src/core/lib/iomgr/event_engine/closure.cc +41 -18
  223. data/src/core/lib/iomgr/event_engine/closure.h +10 -1
  224. data/src/core/lib/iomgr/event_engine/endpoint.cc +3 -3
  225. data/src/core/lib/iomgr/event_engine/iomgr.cc +1 -1
  226. data/src/core/lib/iomgr/event_engine/pollset.cc +5 -4
  227. data/src/core/lib/iomgr/event_engine/resolver.cc +10 -7
  228. data/src/core/lib/iomgr/event_engine/tcp.cc +9 -8
  229. data/src/core/lib/iomgr/event_engine/timer.cc +7 -2
  230. data/src/core/lib/iomgr/exec_ctx.cc +1 -9
  231. data/src/core/lib/iomgr/executor/mpmcqueue.cc +5 -7
  232. data/src/core/lib/iomgr/executor/mpmcqueue.h +3 -8
  233. data/src/core/lib/iomgr/executor.cc +6 -20
  234. data/src/core/lib/iomgr/iomgr.cc +3 -1
  235. data/src/core/lib/iomgr/iomgr_internal.cc +4 -9
  236. data/src/core/lib/iomgr/iomgr_internal.h +3 -2
  237. data/src/core/lib/iomgr/load_file.cc +2 -2
  238. data/src/core/lib/iomgr/lockfree_event.cc +18 -0
  239. data/src/core/lib/iomgr/pollset_custom.cc +1 -1
  240. data/src/core/lib/iomgr/pollset_custom.h +1 -1
  241. data/src/core/lib/iomgr/resolve_address_posix.cc +5 -7
  242. data/src/core/lib/iomgr/resource_quota.cc +13 -11
  243. data/src/core/lib/iomgr/socket_factory_posix.cc +2 -2
  244. data/src/core/lib/iomgr/socket_mutator.cc +2 -2
  245. data/src/core/lib/iomgr/socket_utils_common_posix.cc +1 -2
  246. data/src/core/lib/iomgr/tcp_client_cfstream.cc +5 -3
  247. data/src/core/lib/iomgr/tcp_client_custom.cc +1 -1
  248. data/src/core/lib/iomgr/tcp_client_posix.cc +9 -18
  249. data/src/core/lib/iomgr/tcp_client_windows.cc +2 -3
  250. data/src/core/lib/iomgr/tcp_posix.cc +4 -5
  251. data/src/core/lib/iomgr/tcp_server_custom.cc +2 -1
  252. data/src/core/lib/iomgr/tcp_server_posix.cc +3 -4
  253. data/src/core/lib/iomgr/tcp_server_windows.cc +4 -5
  254. data/src/core/lib/iomgr/tcp_windows.cc +2 -2
  255. data/src/core/lib/iomgr/timer_generic.cc +13 -13
  256. data/src/core/lib/iomgr/timer_heap.cc +1 -1
  257. data/src/core/lib/json/json_util.cc +68 -0
  258. data/src/core/lib/json/json_util.h +57 -99
  259. data/src/core/lib/json/json_writer.cc +0 -3
  260. data/src/core/lib/security/authorization/authorization_policy_provider.h +1 -1
  261. data/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc +1 -1
  262. data/src/core/lib/security/authorization/evaluate_args.cc +14 -12
  263. data/src/core/lib/security/authorization/sdk_server_authz_filter.cc +13 -1
  264. data/src/core/lib/security/context/security_context.cc +4 -2
  265. data/src/core/lib/security/credentials/composite/composite_credentials.cc +1 -1
  266. data/src/core/lib/security/credentials/credentials.cc +4 -2
  267. data/src/core/lib/security/credentials/credentials.h +6 -1
  268. data/src/core/lib/security/credentials/external/external_account_credentials.cc +47 -11
  269. data/src/core/lib/security/credentials/external/external_account_credentials.h +1 -0
  270. data/src/core/lib/security/credentials/google_default/google_default_credentials.cc +1 -1
  271. data/src/core/lib/security/credentials/jwt/jwt_verifier.cc +5 -9
  272. data/src/core/lib/security/credentials/plugin/plugin_credentials.cc +2 -2
  273. data/src/core/lib/security/security_connector/fake/fake_security_connector.cc +2 -2
  274. data/src/core/lib/security/security_connector/security_connector.cc +9 -4
  275. data/src/core/lib/security/security_connector/security_connector.h +1 -1
  276. data/src/core/lib/security/security_connector/ssl_utils.cc +1 -1
  277. data/src/core/lib/security/security_connector/tls/tls_security_connector.cc +1 -0
  278. data/src/core/lib/security/security_connector/tls/tls_security_connector.h +0 -2
  279. data/src/core/lib/security/transport/client_auth_filter.cc +5 -5
  280. data/src/core/lib/security/transport/security_handshaker.cc +73 -43
  281. data/src/core/lib/security/transport/server_auth_filter.cc +3 -5
  282. data/src/core/lib/security/transport/tsi_error.cc +3 -5
  283. data/src/core/lib/slice/slice.cc +0 -16
  284. data/src/core/lib/slice/slice_api.cc +39 -0
  285. data/src/core/lib/slice/slice_buffer.cc +5 -5
  286. data/src/core/lib/slice/slice_intern.cc +8 -13
  287. data/src/core/lib/slice/slice_internal.h +1 -244
  288. data/src/core/lib/slice/slice_refcount.cc +17 -0
  289. data/src/core/lib/slice/slice_refcount.h +121 -0
  290. data/src/core/lib/slice/slice_refcount_base.h +173 -0
  291. data/src/core/lib/slice/slice_split.cc +100 -0
  292. data/src/core/lib/slice/slice_split.h +40 -0
  293. data/src/core/lib/slice/slice_string_helpers.cc +0 -83
  294. data/src/core/lib/slice/slice_string_helpers.h +0 -11
  295. data/src/core/lib/slice/static_slice.cc +529 -0
  296. data/src/core/lib/slice/static_slice.h +331 -0
  297. data/src/core/lib/surface/builtins.cc +49 -0
  298. data/src/core/{ext/filters/workarounds/workaround_cronet_compression_filter.h → lib/surface/builtins.h} +8 -9
  299. data/src/core/lib/surface/call.cc +103 -120
  300. data/src/core/lib/surface/call.h +0 -6
  301. data/src/core/lib/surface/channel.cc +19 -32
  302. data/src/core/lib/surface/channel.h +0 -9
  303. data/src/core/lib/surface/channel_init.cc +23 -76
  304. data/src/core/lib/surface/channel_init.h +52 -44
  305. data/src/core/lib/surface/completion_queue.cc +6 -5
  306. data/src/core/lib/surface/init.cc +0 -39
  307. data/src/core/lib/surface/init_secure.cc +17 -14
  308. data/src/core/lib/surface/lame_client.cc +18 -11
  309. data/src/core/lib/surface/lame_client.h +1 -1
  310. data/src/core/lib/surface/server.cc +25 -17
  311. data/src/core/lib/surface/server.h +17 -10
  312. data/src/core/lib/surface/validate_metadata.cc +5 -2
  313. data/src/core/lib/surface/version.cc +2 -2
  314. data/src/core/lib/transport/bdp_estimator.cc +1 -1
  315. data/src/core/lib/transport/error_utils.cc +42 -17
  316. data/src/core/lib/transport/error_utils.h +1 -1
  317. data/src/core/lib/transport/metadata.cc +31 -10
  318. data/src/core/lib/transport/metadata.h +2 -1
  319. data/src/core/lib/transport/metadata_batch.cc +35 -371
  320. data/src/core/lib/transport/metadata_batch.h +905 -71
  321. data/src/core/lib/transport/parsed_metadata.h +263 -0
  322. data/src/core/lib/transport/pid_controller.cc +4 -4
  323. data/src/core/lib/transport/static_metadata.cc +714 -846
  324. data/src/core/lib/transport/static_metadata.h +115 -379
  325. data/src/core/lib/transport/status_metadata.cc +1 -0
  326. data/src/core/lib/transport/transport.cc +4 -5
  327. data/src/core/lib/transport/transport_op_string.cc +40 -20
  328. data/src/core/plugin_registry/grpc_plugin_registry.cc +64 -43
  329. data/src/core/tsi/alts/crypt/aes_gcm.cc +3 -1
  330. data/src/core/tsi/alts/frame_protector/alts_frame_protector.cc +13 -12
  331. data/src/core/tsi/alts/frame_protector/frame_handler.cc +10 -11
  332. data/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +1 -2
  333. data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +12 -2
  334. data/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc +1 -1
  335. data/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc +2 -2
  336. data/src/core/tsi/fake_transport_security.cc +15 -7
  337. data/src/core/tsi/local_transport_security.cc +36 -73
  338. data/src/core/tsi/ssl/session_cache/ssl_session_cache.cc +16 -50
  339. data/src/core/tsi/ssl/session_cache/ssl_session_cache.h +4 -3
  340. data/src/core/tsi/ssl_transport_security.cc +10 -2
  341. data/src/core/tsi/transport_security.cc +12 -0
  342. data/src/core/tsi/transport_security.h +16 -1
  343. data/src/core/tsi/transport_security_interface.h +26 -0
  344. data/src/ruby/ext/grpc/extconf.rb +12 -9
  345. data/src/ruby/ext/grpc/rb_grpc_imports.generated.c +4 -0
  346. data/src/ruby/ext/grpc/rb_grpc_imports.generated.h +6 -0
  347. data/src/ruby/lib/grpc/version.rb +1 -1
  348. data/src/ruby/pb/src/proto/grpc/testing/test_pb.rb +2 -2
  349. data/src/ruby/spec/client_server_spec.rb +1 -1
  350. data/third_party/abseil-cpp/absl/base/internal/thread_identity.cc +4 -4
  351. data/third_party/abseil-cpp/absl/base/internal/thread_identity.h +11 -6
  352. data/third_party/address_sorting/address_sorting_posix.c +1 -0
  353. data/third_party/boringssl-with-bazel/err_data.c +278 -272
  354. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_bool.c +21 -22
  355. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_d2i_fp.c +0 -2
  356. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_gentm.c +5 -0
  357. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_mbstr.c +15 -22
  358. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_object.c +13 -7
  359. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_print.c +19 -29
  360. data/third_party/boringssl-with-bazel/src/crypto/{x509 → asn1}/a_strex.c +268 -271
  361. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_strnid.c +106 -153
  362. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_time.c +2 -2
  363. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_utctm.c +0 -39
  364. data/third_party/boringssl-with-bazel/src/crypto/asn1/asn1_par.c +1 -1
  365. data/third_party/boringssl-with-bazel/src/crypto/{x509 → asn1}/charmap.h +0 -0
  366. data/third_party/boringssl-with-bazel/src/crypto/asn1/internal.h +38 -0
  367. data/third_party/boringssl-with-bazel/src/crypto/asn1/tasn_dec.c +8 -8
  368. data/third_party/boringssl-with-bazel/src/crypto/asn1/tasn_enc.c +289 -198
  369. data/third_party/boringssl-with-bazel/src/crypto/asn1/tasn_fre.c +8 -8
  370. data/third_party/boringssl-with-bazel/src/crypto/asn1/tasn_new.c +9 -13
  371. data/third_party/boringssl-with-bazel/src/crypto/asn1/tasn_utl.c +1 -0
  372. data/third_party/boringssl-with-bazel/src/crypto/base64/base64.c +11 -8
  373. data/third_party/boringssl-with-bazel/src/crypto/bio/bio_mem.c +1 -7
  374. data/third_party/boringssl-with-bazel/src/crypto/bio/connect.c +1 -5
  375. data/third_party/boringssl-with-bazel/src/crypto/bio/fd.c +0 -4
  376. data/third_party/boringssl-with-bazel/src/crypto/bio/file.c +1 -7
  377. data/third_party/boringssl-with-bazel/src/crypto/bio/pair.c +1 -6
  378. data/third_party/boringssl-with-bazel/src/crypto/bio/socket.c +3 -17
  379. data/third_party/boringssl-with-bazel/src/crypto/blake2/blake2.c +4 -6
  380. data/third_party/boringssl-with-bazel/src/crypto/bytestring/cbb.c +9 -0
  381. data/third_party/boringssl-with-bazel/src/crypto/bytestring/cbs.c +8 -0
  382. data/third_party/boringssl-with-bazel/src/crypto/chacha/chacha.c +38 -47
  383. data/third_party/boringssl-with-bazel/src/crypto/cipher_extra/cipher_extra.c +45 -65
  384. data/third_party/boringssl-with-bazel/src/crypto/digest_extra/digest_extra.c +1 -0
  385. data/third_party/boringssl-with-bazel/src/crypto/evp/scrypt.c +32 -34
  386. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/div.c +21 -3
  387. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/gcd_extra.c +3 -2
  388. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/internal.h +5 -2
  389. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/sqrt.c +5 -9
  390. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/cipher/e_aes.c +10 -0
  391. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/des/des.c +10 -11
  392. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/des/internal.h +1 -3
  393. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/md4/md4.c +4 -7
  394. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/md5/md5.c +4 -7
  395. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/modes/gcm_nohw.c +1 -1
  396. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/rand.c +1 -1
  397. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/rsa.c +24 -9
  398. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/rsa_impl.c +4 -2
  399. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/sha/sha1.c +35 -35
  400. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/sha/sha256.c +11 -10
  401. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/sha/sha512.c +10 -37
  402. data/third_party/boringssl-with-bazel/src/crypto/internal.h +39 -0
  403. data/third_party/boringssl-with-bazel/src/crypto/mem.c +12 -9
  404. data/third_party/boringssl-with-bazel/src/crypto/pem/pem_all.c +0 -9
  405. data/third_party/boringssl-with-bazel/src/crypto/pem/pem_info.c +0 -2
  406. data/third_party/boringssl-with-bazel/src/crypto/pem/pem_lib.c +0 -8
  407. data/third_party/boringssl-with-bazel/src/crypto/pem/pem_pk8.c +0 -2
  408. data/third_party/boringssl-with-bazel/src/crypto/pem/pem_pkey.c +0 -4
  409. data/third_party/boringssl-with-bazel/src/crypto/pkcs7/internal.h +16 -7
  410. data/third_party/boringssl-with-bazel/src/crypto/pkcs7/pkcs7.c +9 -4
  411. data/third_party/boringssl-with-bazel/src/crypto/pkcs7/pkcs7_x509.c +151 -12
  412. data/third_party/boringssl-with-bazel/src/crypto/pkcs8/pkcs8_x509.c +1 -1
  413. data/third_party/boringssl-with-bazel/src/crypto/siphash/siphash.c +6 -6
  414. data/third_party/boringssl-with-bazel/src/crypto/x509/by_file.c +2 -0
  415. data/third_party/boringssl-with-bazel/src/crypto/x509/internal.h +181 -1
  416. data/third_party/boringssl-with-bazel/src/crypto/x509/name_print.c +246 -0
  417. data/third_party/boringssl-with-bazel/src/crypto/x509/rsa_pss.c +11 -2
  418. data/third_party/boringssl-with-bazel/src/crypto/x509/t_crl.c +0 -2
  419. data/third_party/boringssl-with-bazel/src/crypto/x509/t_x509.c +0 -179
  420. data/third_party/boringssl-with-bazel/src/crypto/x509/t_x509a.c +4 -2
  421. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_lu.c +0 -5
  422. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_obj.c +1 -0
  423. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_vfy.c +11 -50
  424. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_vpm.c +1 -1
  425. data/third_party/boringssl-with-bazel/src/crypto/x509/x509name.c +2 -4
  426. data/third_party/boringssl-with-bazel/src/crypto/x509/x_all.c +0 -16
  427. data/third_party/boringssl-with-bazel/src/crypto/x509/x_name.c +22 -18
  428. data/third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c +11 -8
  429. data/third_party/boringssl-with-bazel/src/crypto/x509v3/internal.h +16 -0
  430. data/third_party/boringssl-with-bazel/src/crypto/x509v3/pcy_cache.c +1 -0
  431. data/third_party/boringssl-with-bazel/src/crypto/x509v3/pcy_data.c +1 -1
  432. data/third_party/boringssl-with-bazel/src/crypto/x509v3/pcy_int.h +1 -1
  433. data/third_party/boringssl-with-bazel/src/crypto/x509v3/pcy_map.c +1 -0
  434. data/third_party/boringssl-with-bazel/src/crypto/x509v3/pcy_tree.c +4 -3
  435. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_akey.c +24 -5
  436. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_alt.c +17 -8
  437. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_bitst.c +3 -0
  438. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_cpols.c +6 -6
  439. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_crld.c +4 -0
  440. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_enum.c +5 -0
  441. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ncons.c +112 -55
  442. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pci.c +2 -1
  443. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_prn.c +0 -2
  444. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_purp.c +1 -1
  445. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_utl.c +71 -26
  446. data/third_party/boringssl-with-bazel/src/include/openssl/asn1.h +366 -227
  447. data/third_party/boringssl-with-bazel/src/include/openssl/asn1t.h +2 -9
  448. data/third_party/boringssl-with-bazel/src/include/openssl/base.h +10 -4
  449. data/third_party/boringssl-with-bazel/src/include/openssl/bio.h +3 -1
  450. data/third_party/boringssl-with-bazel/src/include/openssl/bn.h +3 -3
  451. data/third_party/boringssl-with-bazel/src/include/openssl/bytestring.h +9 -0
  452. data/third_party/boringssl-with-bazel/src/include/openssl/cipher.h +8 -2
  453. data/third_party/boringssl-with-bazel/src/include/openssl/hkdf.h +4 -0
  454. data/third_party/boringssl-with-bazel/src/include/openssl/mem.h +9 -3
  455. data/third_party/boringssl-with-bazel/src/include/openssl/pem.h +0 -20
  456. data/third_party/boringssl-with-bazel/src/include/openssl/pkcs7.h +12 -5
  457. data/third_party/boringssl-with-bazel/src/include/openssl/rsa.h +5 -0
  458. data/third_party/boringssl-with-bazel/src/include/openssl/span.h +37 -15
  459. data/third_party/boringssl-with-bazel/src/include/openssl/ssl.h +28 -14
  460. data/third_party/boringssl-with-bazel/src/include/openssl/tls1.h +31 -32
  461. data/third_party/boringssl-with-bazel/src/include/openssl/x509.h +529 -91
  462. data/third_party/boringssl-with-bazel/src/include/openssl/x509_vfy.h +16 -695
  463. data/third_party/boringssl-with-bazel/src/include/openssl/x509v3.h +48 -8
  464. data/third_party/boringssl-with-bazel/src/ssl/encrypted_client_hello.cc +266 -357
  465. data/third_party/boringssl-with-bazel/src/ssl/extensions.cc +90 -152
  466. data/third_party/boringssl-with-bazel/src/ssl/handshake.cc +15 -13
  467. data/third_party/boringssl-with-bazel/src/ssl/handshake_client.cc +75 -79
  468. data/third_party/boringssl-with-bazel/src/ssl/handshake_server.cc +96 -97
  469. data/third_party/boringssl-with-bazel/src/ssl/internal.h +63 -43
  470. data/third_party/boringssl-with-bazel/src/ssl/ssl_cipher.cc +2 -2
  471. data/third_party/boringssl-with-bazel/src/ssl/ssl_lib.cc +2 -2
  472. data/third_party/boringssl-with-bazel/src/ssl/ssl_transcript.cc +6 -12
  473. data/third_party/boringssl-with-bazel/src/ssl/ssl_x509.cc +14 -17
  474. data/third_party/boringssl-with-bazel/src/ssl/tls13_both.cc +14 -27
  475. data/third_party/boringssl-with-bazel/src/ssl/tls13_client.cc +203 -203
  476. data/third_party/boringssl-with-bazel/src/ssl/tls13_enc.cc +30 -41
  477. data/third_party/boringssl-with-bazel/src/ssl/tls13_server.cc +47 -33
  478. data/third_party/re2/re2/compile.cc +91 -109
  479. data/third_party/re2/re2/dfa.cc +27 -39
  480. data/third_party/re2/re2/filtered_re2.cc +18 -2
  481. data/third_party/re2/re2/filtered_re2.h +10 -5
  482. data/third_party/re2/re2/nfa.cc +1 -1
  483. data/third_party/re2/re2/parse.cc +42 -23
  484. data/third_party/re2/re2/perl_groups.cc +34 -34
  485. data/third_party/re2/re2/prefilter.cc +3 -2
  486. data/third_party/re2/re2/prog.cc +182 -4
  487. data/third_party/re2/re2/prog.h +28 -9
  488. data/third_party/re2/re2/re2.cc +87 -118
  489. data/third_party/re2/re2/re2.h +156 -141
  490. data/third_party/re2/re2/regexp.cc +12 -5
  491. data/third_party/re2/re2/regexp.h +8 -2
  492. data/third_party/re2/re2/set.cc +31 -9
  493. data/third_party/re2/re2/set.h +9 -4
  494. data/third_party/re2/re2/simplify.cc +11 -3
  495. data/third_party/re2/re2/tostring.cc +1 -1
  496. data/third_party/re2/re2/walker-inl.h +1 -1
  497. data/third_party/re2/util/mutex.h +2 -2
  498. data/third_party/re2/util/pcre.h +3 -3
  499. metadata +77 -64
  500. data/include/grpc/event_engine/slice_allocator.h +0 -71
  501. data/src/core/ext/filters/client_channel/service_config_call_data.h +0 -126
  502. data/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc +0 -211
  503. data/src/core/ext/filters/workarounds/workaround_utils.cc +0 -53
  504. data/src/core/ext/filters/workarounds/workaround_utils.h +0 -39
  505. data/src/core/ext/transport/chttp2/client/authority.cc +0 -42
  506. data/src/core/ext/transport/chttp2/client/authority.h +0 -36
  507. data/src/core/ext/transport/chttp2/transport/chttp2_slice_allocator.cc +0 -67
  508. data/src/core/ext/transport/chttp2/transport/chttp2_slice_allocator.h +0 -74
  509. data/src/core/ext/transport/chttp2/transport/incoming_metadata.cc +0 -66
  510. data/src/core/ext/transport/chttp2/transport/incoming_metadata.h +0 -58
  511. data/src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c +0 -58
  512. data/src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h +0 -130
  513. data/src/core/ext/upb-generated/udpa/type/v1/typed_struct.upb.h +0 -83
  514. data/src/core/ext/upbdefs-generated/udpa/type/v1/typed_struct.upbdefs.c +0 -44
  515. data/src/core/ext/upbdefs-generated/udpa/type/v1/typed_struct.upbdefs.h +0 -35
  516. data/src/core/lib/iomgr/udp_server.cc +0 -747
  517. data/src/core/lib/iomgr/udp_server.h +0 -103
  518. data/src/core/lib/transport/authority_override.cc +0 -40
  519. data/src/core/lib/transport/authority_override.h +0 -37
@@ -31,12 +31,6 @@
31
31
  #include "internal.h"
32
32
 
33
33
 
34
- #if defined(OPENSSL_MSAN)
35
- #define NO_SANITIZE_MEMORY __attribute__((no_sanitize("memory")))
36
- #else
37
- #define NO_SANITIZE_MEMORY
38
- #endif
39
-
40
34
  BSSL_NAMESPACE_BEGIN
41
35
 
42
36
  // ECH reuses the extension code point for the version number.
@@ -84,16 +78,71 @@ static bool ssl_client_hello_write_without_extensions(
84
78
  return true;
85
79
  }
86
80
 
81
+ static bool is_valid_client_hello_inner(SSL *ssl, uint8_t *out_alert,
82
+ Span<const uint8_t> body) {
83
+ // See draft-ietf-tls-esni-13, section 7.1.
84
+ SSL_CLIENT_HELLO client_hello;
85
+ CBS extension;
86
+ if (!ssl_client_hello_init(ssl, &client_hello, body) ||
87
+ !ssl_client_hello_get_extension(&client_hello, &extension,
88
+ TLSEXT_TYPE_encrypted_client_hello) ||
89
+ CBS_len(&extension) != 1 || //
90
+ CBS_data(&extension)[0] != ECH_CLIENT_INNER ||
91
+ !ssl_client_hello_get_extension(&client_hello, &extension,
92
+ TLSEXT_TYPE_supported_versions)) {
93
+ *out_alert = SSL_AD_ILLEGAL_PARAMETER;
94
+ OPENSSL_PUT_ERROR(SSL, SSL_R_INVALID_CLIENT_HELLO_INNER);
95
+ return false;
96
+ }
97
+ // Parse supported_versions and reject TLS versions prior to TLS 1.3. Older
98
+ // versions are incompatible with ECH.
99
+ CBS versions;
100
+ if (!CBS_get_u8_length_prefixed(&extension, &versions) ||
101
+ CBS_len(&extension) != 0 || //
102
+ CBS_len(&versions) == 0) {
103
+ *out_alert = SSL_AD_DECODE_ERROR;
104
+ OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
105
+ return false;
106
+ }
107
+ while (CBS_len(&versions) != 0) {
108
+ uint16_t version;
109
+ if (!CBS_get_u16(&versions, &version)) {
110
+ *out_alert = SSL_AD_DECODE_ERROR;
111
+ OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
112
+ return false;
113
+ }
114
+ if (version == SSL3_VERSION || version == TLS1_VERSION ||
115
+ version == TLS1_1_VERSION || version == TLS1_2_VERSION ||
116
+ version == DTLS1_VERSION || version == DTLS1_2_VERSION) {
117
+ *out_alert = SSL_AD_ILLEGAL_PARAMETER;
118
+ OPENSSL_PUT_ERROR(SSL, SSL_R_INVALID_CLIENT_HELLO_INNER);
119
+ return false;
120
+ }
121
+ }
122
+ return true;
123
+ }
124
+
87
125
  bool ssl_decode_client_hello_inner(
88
126
  SSL *ssl, uint8_t *out_alert, Array<uint8_t> *out_client_hello_inner,
89
127
  Span<const uint8_t> encoded_client_hello_inner,
90
128
  const SSL_CLIENT_HELLO *client_hello_outer) {
91
129
  SSL_CLIENT_HELLO client_hello_inner;
92
- if (!ssl_client_hello_init(ssl, &client_hello_inner,
93
- encoded_client_hello_inner)) {
130
+ CBS cbs = encoded_client_hello_inner;
131
+ if (!ssl_parse_client_hello_with_trailing_data(ssl, &cbs,
132
+ &client_hello_inner)) {
94
133
  OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
95
134
  return false;
96
135
  }
136
+ // The remaining data is padding.
137
+ uint8_t padding;
138
+ while (CBS_get_u8(&cbs, &padding)) {
139
+ if (padding != 0) {
140
+ OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
141
+ *out_alert = SSL_AD_ILLEGAL_PARAMETER;
142
+ return false;
143
+ }
144
+ }
145
+
97
146
  // TLS 1.3 ClientHellos must have extensions, and EncodedClientHelloInners use
98
147
  // ClientHelloOuter's session_id.
99
148
  if (client_hello_inner.extensions_len == 0 ||
@@ -106,120 +155,84 @@ bool ssl_decode_client_hello_inner(
106
155
 
107
156
  // Begin serializing a message containing the ClientHelloInner in |cbb|.
108
157
  ScopedCBB cbb;
109
- CBB body, extensions;
158
+ CBB body, extensions_cbb;
110
159
  if (!ssl->method->init_message(ssl, cbb.get(), &body, SSL3_MT_CLIENT_HELLO) ||
111
160
  !ssl_client_hello_write_without_extensions(&client_hello_inner, &body) ||
112
- !CBB_add_u16_length_prefixed(&body, &extensions)) {
161
+ !CBB_add_u16_length_prefixed(&body, &extensions_cbb)) {
113
162
  OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
114
163
  return false;
115
164
  }
116
165
 
117
- // Sort the extensions in ClientHelloOuter, so ech_outer_extensions may be
118
- // processed in O(n*log(n)) time, rather than O(n^2).
119
- struct Extension {
120
- uint16_t extension = 0;
121
- Span<const uint8_t> body;
122
- bool copied = false;
123
- };
124
-
125
- // MSan's libc interceptors do not handle |bsearch|. See b/182583130.
126
- auto compare_extension = [](const void *a, const void *b)
127
- NO_SANITIZE_MEMORY -> int {
128
- const Extension *extension_a = reinterpret_cast<const Extension *>(a);
129
- const Extension *extension_b = reinterpret_cast<const Extension *>(b);
130
- if (extension_a->extension < extension_b->extension) {
131
- return -1;
132
- } else if (extension_a->extension > extension_b->extension) {
133
- return 1;
134
- }
135
- return 0;
136
- };
137
- GrowableArray<Extension> sorted_extensions;
138
- CBS unsorted_extensions(MakeConstSpan(client_hello_outer->extensions,
139
- client_hello_outer->extensions_len));
140
- while (CBS_len(&unsorted_extensions) > 0) {
141
- Extension extension;
142
- CBS extension_body;
143
- if (!CBS_get_u16(&unsorted_extensions, &extension.extension) ||
144
- !CBS_get_u16_length_prefixed(&unsorted_extensions, &extension_body)) {
166
+ auto inner_extensions = MakeConstSpan(client_hello_inner.extensions,
167
+ client_hello_inner.extensions_len);
168
+ CBS ext_list_wrapper;
169
+ if (!ssl_client_hello_get_extension(&client_hello_inner, &ext_list_wrapper,
170
+ TLSEXT_TYPE_ech_outer_extensions)) {
171
+ // No ech_outer_extensions. Copy everything.
172
+ if (!CBB_add_bytes(&extensions_cbb, inner_extensions.data(),
173
+ inner_extensions.size())) {
145
174
  OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
146
175
  return false;
147
176
  }
148
- extension.body = extension_body;
149
- if (!sorted_extensions.Push(extension)) {
150
- return false;
151
- }
152
- }
153
- qsort(sorted_extensions.data(), sorted_extensions.size(), sizeof(Extension),
154
- compare_extension);
155
-
156
- // Copy extensions from |client_hello_inner|, expanding ech_outer_extensions.
157
- CBS inner_extensions(MakeConstSpan(client_hello_inner.extensions,
158
- client_hello_inner.extensions_len));
159
- while (CBS_len(&inner_extensions) > 0) {
160
- uint16_t extension_id;
161
- CBS extension_body;
162
- if (!CBS_get_u16(&inner_extensions, &extension_id) ||
163
- !CBS_get_u16_length_prefixed(&inner_extensions, &extension_body)) {
164
- OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
177
+ } else {
178
+ const size_t offset = CBS_data(&ext_list_wrapper) - inner_extensions.data();
179
+ auto inner_extensions_before =
180
+ inner_extensions.subspan(0, offset - 4 /* extension header */);
181
+ auto inner_extensions_after =
182
+ inner_extensions.subspan(offset + CBS_len(&ext_list_wrapper));
183
+ if (!CBB_add_bytes(&extensions_cbb, inner_extensions_before.data(),
184
+ inner_extensions_before.size())) {
185
+ OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
165
186
  return false;
166
187
  }
167
- if (extension_id != TLSEXT_TYPE_ech_outer_extensions) {
168
- if (!CBB_add_u16(&extensions, extension_id) ||
169
- !CBB_add_u16(&extensions, CBS_len(&extension_body)) ||
170
- !CBB_add_bytes(&extensions, CBS_data(&extension_body),
171
- CBS_len(&extension_body))) {
172
- OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
173
- return false;
174
- }
175
- continue;
176
- }
177
188
 
178
- // Replace ech_outer_extensions with the corresponding outer extensions.
179
- CBS outer_extensions;
180
- if (!CBS_get_u8_length_prefixed(&extension_body, &outer_extensions) ||
181
- CBS_len(&extension_body) != 0) {
189
+ // Expand ech_outer_extensions. See draft-ietf-tls-esni-13, Appendix B.
190
+ CBS ext_list;
191
+ if (!CBS_get_u8_length_prefixed(&ext_list_wrapper, &ext_list) ||
192
+ CBS_len(&ext_list) == 0 || CBS_len(&ext_list_wrapper) != 0) {
182
193
  OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
183
194
  return false;
184
195
  }
185
- while (CBS_len(&outer_extensions) > 0) {
186
- uint16_t extension_needed;
187
- if (!CBS_get_u16(&outer_extensions, &extension_needed)) {
188
- OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
189
- return false;
190
- }
191
- if (extension_needed == TLSEXT_TYPE_encrypted_client_hello) {
192
- *out_alert = SSL_AD_ILLEGAL_PARAMETER;
196
+ CBS outer_extensions;
197
+ CBS_init(&outer_extensions, client_hello_outer->extensions,
198
+ client_hello_outer->extensions_len);
199
+ while (CBS_len(&ext_list) != 0) {
200
+ // Find the next extension to copy.
201
+ uint16_t want;
202
+ if (!CBS_get_u16(&ext_list, &want)) {
193
203
  OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
194
204
  return false;
195
205
  }
196
- // Find the referenced extension.
197
- Extension key;
198
- key.extension = extension_needed;
199
- Extension *result = reinterpret_cast<Extension *>(
200
- bsearch(&key, sorted_extensions.data(), sorted_extensions.size(),
201
- sizeof(Extension), compare_extension));
202
- if (result == nullptr) {
203
- *out_alert = SSL_AD_ILLEGAL_PARAMETER;
206
+ // Seek to |want| in |outer_extensions|. |ext_list| is required to match
207
+ // ClientHelloOuter in order.
208
+ uint16_t found;
209
+ CBS ext_body;
210
+ do {
211
+ if (CBS_len(&outer_extensions) == 0) {
212
+ *out_alert = SSL_AD_ILLEGAL_PARAMETER;
213
+ OPENSSL_PUT_ERROR(SSL, SSL_R_OUTER_EXTENSION_NOT_FOUND);
214
+ return false;
215
+ }
216
+ if (!CBS_get_u16(&outer_extensions, &found) ||
217
+ !CBS_get_u16_length_prefixed(&outer_extensions, &ext_body)) {
218
+ OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
219
+ return false;
220
+ }
221
+ } while (found != want);
222
+ // Copy the extension.
223
+ if (!CBB_add_u16(&extensions_cbb, found) ||
224
+ !CBB_add_u16(&extensions_cbb, CBS_len(&ext_body)) ||
225
+ !CBB_add_bytes(&extensions_cbb, CBS_data(&ext_body),
226
+ CBS_len(&ext_body))) {
204
227
  OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
205
228
  return false;
206
229
  }
230
+ }
207
231
 
208
- // Extensions may be referenced at most once, to bound the result size.
209
- if (result->copied) {
210
- *out_alert = SSL_AD_ILLEGAL_PARAMETER;
211
- OPENSSL_PUT_ERROR(SSL, SSL_R_DUPLICATE_EXTENSION);
212
- return false;
213
- }
214
- result->copied = true;
215
-
216
- if (!CBB_add_u16(&extensions, extension_needed) ||
217
- !CBB_add_u16(&extensions, result->body.size()) ||
218
- !CBB_add_bytes(&extensions, result->body.data(),
219
- result->body.size())) {
220
- OPENSSL_PUT_ERROR(SSL, ERR_R_MALLOC_FAILURE);
221
- return false;
222
- }
232
+ if (!CBB_add_bytes(&extensions_cbb, inner_extensions_after.data(),
233
+ inner_extensions_after.size())) {
234
+ OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
235
+ return false;
223
236
  }
224
237
  }
225
238
  if (!CBB_flush(&body)) {
@@ -227,46 +240,10 @@ bool ssl_decode_client_hello_inner(
227
240
  return false;
228
241
  }
229
242
 
230
- // See https://github.com/tlswg/draft-ietf-tls-esni/pull/411
231
- CBS extension;
232
- if (!ssl_client_hello_init(ssl, &client_hello_inner,
233
- MakeConstSpan(CBB_data(&body), CBB_len(&body))) ||
234
- !ssl_client_hello_get_extension(&client_hello_inner, &extension,
235
- TLSEXT_TYPE_ech_is_inner) ||
236
- CBS_len(&extension) != 0 ||
237
- ssl_client_hello_get_extension(&client_hello_inner, &extension,
238
- TLSEXT_TYPE_encrypted_client_hello) ||
239
- !ssl_client_hello_get_extension(&client_hello_inner, &extension,
240
- TLSEXT_TYPE_supported_versions)) {
241
- *out_alert = SSL_AD_ILLEGAL_PARAMETER;
242
- OPENSSL_PUT_ERROR(SSL, SSL_R_INVALID_CLIENT_HELLO_INNER);
243
- return false;
244
- }
245
- // Parse supported_versions and reject TLS versions prior to TLS 1.3. Older
246
- // versions are incompatible with ECH.
247
- CBS versions;
248
- if (!CBS_get_u8_length_prefixed(&extension, &versions) ||
249
- CBS_len(&extension) != 0 || //
250
- CBS_len(&versions) == 0) {
251
- *out_alert = SSL_AD_DECODE_ERROR;
252
- OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
243
+ if (!is_valid_client_hello_inner(
244
+ ssl, out_alert, MakeConstSpan(CBB_data(&body), CBB_len(&body)))) {
253
245
  return false;
254
246
  }
255
- while (CBS_len(&versions) != 0) {
256
- uint16_t version;
257
- if (!CBS_get_u16(&versions, &version)) {
258
- *out_alert = SSL_AD_DECODE_ERROR;
259
- OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
260
- return false;
261
- }
262
- if (version == SSL3_VERSION || version == TLS1_VERSION ||
263
- version == TLS1_1_VERSION || version == TLS1_2_VERSION ||
264
- version == DTLS1_VERSION || version == DTLS1_2_VERSION) {
265
- *out_alert = SSL_AD_ILLEGAL_PARAMETER;
266
- OPENSSL_PUT_ERROR(SSL, SSL_R_INVALID_CLIENT_HELLO_INNER);
267
- return false;
268
- }
269
- }
270
247
 
271
248
  if (!ssl->method->finish_message(ssl, cbb.get(), out_client_hello_inner)) {
272
249
  OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
@@ -275,56 +252,31 @@ bool ssl_decode_client_hello_inner(
275
252
  return true;
276
253
  }
277
254
 
278
- bool ssl_client_hello_decrypt(
279
- EVP_HPKE_CTX *hpke_ctx, Array<uint8_t> *out_encoded_client_hello_inner,
280
- bool *out_is_decrypt_error, const SSL_CLIENT_HELLO *client_hello_outer,
281
- uint16_t kdf_id, uint16_t aead_id, const uint8_t config_id,
282
- Span<const uint8_t> enc, Span<const uint8_t> payload) {
255
+ bool ssl_client_hello_decrypt(EVP_HPKE_CTX *hpke_ctx, Array<uint8_t> *out,
256
+ bool *out_is_decrypt_error,
257
+ const SSL_CLIENT_HELLO *client_hello_outer,
258
+ Span<const uint8_t> payload) {
283
259
  *out_is_decrypt_error = false;
284
260
 
285
- // Compute the ClientHello portion of the ClientHelloOuterAAD value. See
286
- // draft-ietf-tls-esni-10, section 5.2.
287
- ScopedCBB aad;
288
- CBB enc_cbb, outer_hello_cbb, extensions_cbb;
289
- if (!CBB_init(aad.get(), 256) ||
290
- !CBB_add_u16(aad.get(), kdf_id) ||
291
- !CBB_add_u16(aad.get(), aead_id) ||
292
- !CBB_add_u8(aad.get(), config_id) ||
293
- !CBB_add_u16_length_prefixed(aad.get(), &enc_cbb) ||
294
- !CBB_add_bytes(&enc_cbb, enc.data(), enc.size()) ||
295
- !CBB_add_u24_length_prefixed(aad.get(), &outer_hello_cbb) ||
296
- !ssl_client_hello_write_without_extensions(client_hello_outer,
297
- &outer_hello_cbb) ||
298
- !CBB_add_u16_length_prefixed(&outer_hello_cbb, &extensions_cbb)) {
299
- OPENSSL_PUT_ERROR(SSL, ERR_R_MALLOC_FAILURE);
261
+ // The ClientHelloOuterAAD is |client_hello_outer| with |payload| (which must
262
+ // point within |client_hello_outer->extensions|) replaced with zeros. See
263
+ // draft-ietf-tls-esni-13, section 5.2.
264
+ Array<uint8_t> aad;
265
+ if (!aad.CopyFrom(MakeConstSpan(client_hello_outer->client_hello,
266
+ client_hello_outer->client_hello_len))) {
300
267
  return false;
301
268
  }
302
269
 
303
- CBS extensions(MakeConstSpan(client_hello_outer->extensions,
304
- client_hello_outer->extensions_len));
305
- while (CBS_len(&extensions) > 0) {
306
- uint16_t extension_id;
307
- CBS extension_body;
308
- if (!CBS_get_u16(&extensions, &extension_id) ||
309
- !CBS_get_u16_length_prefixed(&extensions, &extension_body)) {
310
- OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
311
- return false;
312
- }
313
- if (extension_id == TLSEXT_TYPE_encrypted_client_hello) {
314
- continue;
315
- }
316
- if (!CBB_add_u16(&extensions_cbb, extension_id) ||
317
- !CBB_add_u16(&extensions_cbb, CBS_len(&extension_body)) ||
318
- !CBB_add_bytes(&extensions_cbb, CBS_data(&extension_body),
319
- CBS_len(&extension_body))) {
320
- OPENSSL_PUT_ERROR(SSL, ERR_R_MALLOC_FAILURE);
321
- return false;
322
- }
323
- }
324
- if (!CBB_flush(aad.get())) {
325
- OPENSSL_PUT_ERROR(SSL, ERR_R_MALLOC_FAILURE);
326
- return false;
327
- }
270
+ // We assert with |uintptr_t| because the comparison would be UB if they
271
+ // didn't alias.
272
+ assert(reinterpret_cast<uintptr_t>(client_hello_outer->extensions) <=
273
+ reinterpret_cast<uintptr_t>(payload.data()));
274
+ assert(reinterpret_cast<uintptr_t>(client_hello_outer->extensions +
275
+ client_hello_outer->extensions_len) >=
276
+ reinterpret_cast<uintptr_t>(payload.data() + payload.size()));
277
+ Span<uint8_t> payload_aad = MakeSpan(aad).subspan(
278
+ payload.data() - client_hello_outer->client_hello, payload.size());
279
+ OPENSSL_memset(payload_aad.data(), 0, payload_aad.size());
328
280
 
329
281
  #if defined(BORINGSSL_UNSAFE_FUZZER_MODE)
330
282
  // In fuzzer mode, disable encryption to improve coverage. We reserve a short
@@ -336,124 +288,75 @@ bool ssl_client_hello_decrypt(
336
288
  OPENSSL_PUT_ERROR(SSL, SSL_R_DECRYPTION_FAILED);
337
289
  return false;
338
290
  }
339
- if (!out_encoded_client_hello_inner->CopyFrom(payload)) {
291
+ if (!out->CopyFrom(payload)) {
340
292
  return false;
341
293
  }
342
294
  #else
343
- // Attempt to decrypt into |out_encoded_client_hello_inner|.
344
- if (!out_encoded_client_hello_inner->Init(payload.size())) {
295
+ // Attempt to decrypt into |out|.
296
+ if (!out->Init(payload.size())) {
345
297
  OPENSSL_PUT_ERROR(SSL, ERR_R_MALLOC_FAILURE);
346
298
  return false;
347
299
  }
348
- size_t encoded_client_hello_inner_len;
349
- if (!EVP_HPKE_CTX_open(hpke_ctx, out_encoded_client_hello_inner->data(),
350
- &encoded_client_hello_inner_len,
351
- out_encoded_client_hello_inner->size(), payload.data(),
352
- payload.size(), CBB_data(aad.get()),
353
- CBB_len(aad.get()))) {
300
+ size_t len;
301
+ if (!EVP_HPKE_CTX_open(hpke_ctx, out->data(), &len, out->size(),
302
+ payload.data(), payload.size(), aad.data(),
303
+ aad.size())) {
354
304
  *out_is_decrypt_error = true;
355
305
  OPENSSL_PUT_ERROR(SSL, SSL_R_DECRYPTION_FAILED);
356
306
  return false;
357
307
  }
358
- out_encoded_client_hello_inner->Shrink(encoded_client_hello_inner_len);
308
+ out->Shrink(len);
359
309
  #endif
360
310
  return true;
361
311
  }
362
312
 
363
- static bool parse_ipv4_number(Span<const uint8_t> in, uint32_t *out) {
364
- // See https://url.spec.whatwg.org/#ipv4-number-parser.
365
- uint32_t base = 10;
366
- if (in.size() >= 2 && in[0] == '0' && (in[1] == 'x' || in[1] == 'X')) {
367
- in = in.subspan(2);
368
- base = 16;
369
- } else if (in.size() >= 1 && in[0] == '0') {
370
- in = in.subspan(1);
371
- base = 8;
372
- }
373
- *out = 0;
374
- for (uint8_t c : in) {
375
- uint32_t d;
376
- if ('0' <= c && c <= '9') {
377
- d = c - '0';
378
- } else if ('a' <= c && c <= 'f') {
379
- d = c - 'a' + 10;
380
- } else if ('A' <= c && c <= 'F') {
381
- d = c - 'A' + 10;
382
- } else {
383
- return false;
384
- }
385
- if (d >= base ||
386
- *out > UINT32_MAX / base) {
387
- return false;
388
- }
389
- *out *= base;
390
- if (*out > UINT32_MAX - d) {
313
+ static bool is_hex_component(Span<const uint8_t> in) {
314
+ if (in.size() < 2 || in[0] != '0' || (in[1] != 'x' && in[1] != 'X')) {
315
+ return false;
316
+ }
317
+ for (uint8_t b : in.subspan(2)) {
318
+ if (!('0' <= b && b <= '9') && !('a' <= b && b <= 'f') &&
319
+ !('A' <= b && b <= 'F')) {
391
320
  return false;
392
321
  }
393
- *out += d;
394
322
  }
395
323
  return true;
396
324
  }
397
325
 
398
- static bool is_ipv4_address(Span<const uint8_t> in) {
399
- // See https://url.spec.whatwg.org/#concept-ipv4-parser
400
- uint32_t numbers[4];
401
- size_t num_numbers = 0;
402
- while (!in.empty()) {
403
- if (num_numbers == 4) {
404
- // Too many components.
405
- return false;
406
- }
407
- // Find the next dot-separated component.
408
- auto dot = std::find(in.begin(), in.end(), '.');
409
- if (dot == in.begin()) {
410
- // Empty components are not allowed.
411
- return false;
412
- }
413
- Span<const uint8_t> component;
414
- if (dot == in.end()) {
415
- component = in;
416
- in = Span<const uint8_t>();
417
- } else {
418
- component = in.subspan(0, dot - in.begin());
419
- in = in.subspan(dot - in.begin() + 1); // Skip the dot.
420
- }
421
- if (!parse_ipv4_number(component, &numbers[num_numbers])) {
422
- return false;
423
- }
424
- num_numbers++;
425
- }
426
- if (num_numbers == 0) {
326
+ static bool is_decimal_component(Span<const uint8_t> in) {
327
+ if (in.empty()) {
427
328
  return false;
428
329
  }
429
- for (size_t i = 0; i < num_numbers - 1; i++) {
430
- if (numbers[i] > 255) {
330
+ for (uint8_t b : in) {
331
+ if (!('0' <= b && b <= '9')) {
431
332
  return false;
432
333
  }
433
334
  }
434
- return num_numbers == 1 ||
435
- numbers[num_numbers - 1] < 1u << (8 * (5 - num_numbers));
335
+ return true;
436
336
  }
437
337
 
438
338
  bool ssl_is_valid_ech_public_name(Span<const uint8_t> public_name) {
439
- // See draft-ietf-tls-esni-11, Section 4 and RFC5890, Section 2.3.1. The
339
+ // See draft-ietf-tls-esni-13, Section 4 and RFC 5890, Section 2.3.1. The
440
340
  // public name must be a dot-separated sequence of LDH labels and not begin or
441
341
  // end with a dot.
442
- auto copy = public_name;
443
- if (copy.empty()) {
342
+ auto remaining = public_name;
343
+ if (remaining.empty()) {
444
344
  return false;
445
345
  }
446
- while (!copy.empty()) {
346
+ Span<const uint8_t> last;
347
+ while (!remaining.empty()) {
447
348
  // Find the next dot-separated component.
448
- auto dot = std::find(copy.begin(), copy.end(), '.');
349
+ auto dot = std::find(remaining.begin(), remaining.end(), '.');
449
350
  Span<const uint8_t> component;
450
- if (dot == copy.end()) {
451
- component = copy;
452
- copy = Span<const uint8_t>();
351
+ if (dot == remaining.end()) {
352
+ component = remaining;
353
+ last = component;
354
+ remaining = Span<const uint8_t>();
453
355
  } else {
454
- component = copy.subspan(0, dot - copy.begin());
455
- copy = copy.subspan(dot - copy.begin() + 1); // Skip the dot.
456
- if (copy.empty()) {
356
+ component = remaining.subspan(0, dot - remaining.begin());
357
+ // Skip the dot.
358
+ remaining = remaining.subspan(dot - remaining.begin() + 1);
359
+ if (remaining.empty()) {
457
360
  // Trailing dots are not allowed.
458
361
  return false;
459
362
  }
@@ -472,7 +375,15 @@ bool ssl_is_valid_ech_public_name(Span<const uint8_t> public_name) {
472
375
  }
473
376
  }
474
377
 
475
- return !is_ipv4_address(public_name);
378
+ // The WHATWG URL parser additionally does not allow any DNS names that end in
379
+ // a numeric component. See:
380
+ // https://url.spec.whatwg.org/#concept-host-parser
381
+ // https://url.spec.whatwg.org/#ends-in-a-number-checker
382
+ //
383
+ // The WHATWG parser is formulated in terms of parsing decimal, octal, and
384
+ // hex, along with a separate ASCII digits check. The ASCII digits check
385
+ // subsumes the decimal and octal check, so we only need to check two cases.
386
+ return !is_hex_component(last) && !is_decimal_component(last);
476
387
  }
477
388
 
478
389
  static bool parse_ech_config(CBS *cbs, ECHConfig *out, bool *out_supported,
@@ -508,8 +419,8 @@ static bool parse_ech_config(CBS *cbs, ECHConfig *out, bool *out_supported,
508
419
  CBS_len(&public_key) == 0 ||
509
420
  !CBS_get_u16_length_prefixed(&contents, &cipher_suites) ||
510
421
  CBS_len(&cipher_suites) == 0 || CBS_len(&cipher_suites) % 4 != 0 ||
511
- !CBS_get_u16(&contents, &out->maximum_name_length) ||
512
- !CBS_get_u16_length_prefixed(&contents, &public_name) ||
422
+ !CBS_get_u8(&contents, &out->maximum_name_length) ||
423
+ !CBS_get_u8_length_prefixed(&contents, &public_name) ||
513
424
  CBS_len(&public_name) == 0 ||
514
425
  !CBS_get_u16_length_prefixed(&contents, &extensions) ||
515
426
  CBS_len(&contents) != 0) {
@@ -773,15 +684,6 @@ static size_t aead_overhead(const EVP_HPKE_AEAD *aead) {
773
684
  #endif
774
685
  }
775
686
 
776
- static size_t compute_extension_length(const EVP_HPKE_AEAD *aead,
777
- size_t enc_len, size_t in_len) {
778
- size_t ret = 4; // HpkeSymmetricCipherSuite cipher_suite
779
- ret++; // uint8 config_id
780
- ret += 2 + enc_len; // opaque enc<1..2^16-1>
781
- ret += 2 + in_len + aead_overhead(aead); // opaque payload<1..2^16-1>
782
- return ret;
783
- }
784
-
785
687
  // random_size returns a random value between |min| and |max|, inclusive.
786
688
  static size_t random_size(size_t min, size_t max) {
787
689
  assert(min < max);
@@ -814,38 +716,32 @@ static bool setup_ech_grease(SSL_HANDSHAKE *hs) {
814
716
  // 2+32+1+2 version, random, legacy_session_id, legacy_compression_methods
815
717
  // 2+4*2 cipher_suites (three TLS 1.3 ciphers, GREASE)
816
718
  // 2 extensions prefix
817
- // 4 ech_is_inner
719
+ // 5 inner encrypted_client_hello
818
720
  // 4+1+2*2 supported_versions (TLS 1.3, GREASE)
819
721
  // 4+1+10*2 outer_extensions (key_share, sigalgs, sct, alpn,
820
722
  // supported_groups, status_request, psk_key_exchange_modes,
821
723
  // compress_certificate, GREASE x2)
822
724
  //
823
725
  // The server_name extension has an overhead of 9 bytes. For now, arbitrarily
824
- // estimate maximum_name_length to be between 32 and 100 bytes.
825
- //
826
- // TODO(https://crbug.com/boringssl/275): If the padding scheme changes to
827
- // also round the entire payload, adjust this to match. See
828
- // https://github.com/tlswg/draft-ietf-tls-esni/issues/433
829
- const size_t overhead = aead_overhead(aead);
830
- const size_t in_len = random_size(128, 196);
831
- const size_t extension_len =
832
- compute_extension_length(aead, sizeof(enc), in_len);
726
+ // estimate maximum_name_length to be between 32 and 100 bytes. Then round up
727
+ // to a multiple of 32, to match draft-ietf-tls-esni-13, section 6.1.3.
728
+ const size_t payload_len =
729
+ 32 * random_size(128 / 32, 224 / 32) + aead_overhead(aead);
833
730
  bssl::ScopedCBB cbb;
834
731
  CBB enc_cbb, payload_cbb;
835
732
  uint8_t *payload;
836
- if (!CBB_init(cbb.get(), extension_len) ||
733
+ if (!CBB_init(cbb.get(), 256) ||
837
734
  !CBB_add_u16(cbb.get(), kdf_id) ||
838
735
  !CBB_add_u16(cbb.get(), EVP_HPKE_AEAD_id(aead)) ||
839
736
  !CBB_add_u8(cbb.get(), config_id) ||
840
737
  !CBB_add_u16_length_prefixed(cbb.get(), &enc_cbb) ||
841
738
  !CBB_add_bytes(&enc_cbb, enc, sizeof(enc)) ||
842
739
  !CBB_add_u16_length_prefixed(cbb.get(), &payload_cbb) ||
843
- !CBB_add_space(&payload_cbb, &payload, in_len + overhead) ||
844
- !RAND_bytes(payload, in_len + overhead) ||
845
- !CBBFinishArray(cbb.get(), &hs->ech_client_bytes)) {
740
+ !CBB_add_space(&payload_cbb, &payload, payload_len) ||
741
+ !RAND_bytes(payload, payload_len) ||
742
+ !CBBFinishArray(cbb.get(), &hs->ech_client_outer)) {
846
743
  return false;
847
744
  }
848
- assert(hs->ech_client_bytes.size() == extension_len);
849
745
  return true;
850
746
  }
851
747
 
@@ -856,22 +752,22 @@ bool ssl_encrypt_client_hello(SSL_HANDSHAKE *hs, Span<const uint8_t> enc) {
856
752
  }
857
753
 
858
754
  // Construct ClientHelloInner and EncodedClientHelloInner. See
859
- // draft-ietf-tls-esni-10, sections 5.1 and 6.1.
860
- bssl::ScopedCBB cbb, encoded;
755
+ // draft-ietf-tls-esni-13, sections 5.1 and 6.1.
756
+ ScopedCBB cbb, encoded_cbb;
861
757
  CBB body;
862
758
  bool needs_psk_binder;
863
- bssl::Array<uint8_t> hello_inner;
759
+ Array<uint8_t> hello_inner;
864
760
  if (!ssl->method->init_message(ssl, cbb.get(), &body, SSL3_MT_CLIENT_HELLO) ||
865
- !CBB_init(encoded.get(), 256) ||
761
+ !CBB_init(encoded_cbb.get(), 256) ||
866
762
  !ssl_write_client_hello_without_extensions(hs, &body,
867
763
  ssl_client_hello_inner,
868
764
  /*empty_session_id=*/false) ||
869
- !ssl_write_client_hello_without_extensions(hs, encoded.get(),
765
+ !ssl_write_client_hello_without_extensions(hs, encoded_cbb.get(),
870
766
  ssl_client_hello_inner,
871
767
  /*empty_session_id=*/true) ||
872
- !ssl_add_clienthello_tlsext(hs, &body, encoded.get(), &needs_psk_binder,
873
- ssl_client_hello_inner, CBB_len(&body),
874
- /*omit_ech_len=*/0) ||
768
+ !ssl_add_clienthello_tlsext(hs, &body, encoded_cbb.get(),
769
+ &needs_psk_binder, ssl_client_hello_inner,
770
+ CBB_len(&body)) ||
875
771
  !ssl->method->finish_message(ssl, cbb.get(), &hello_inner)) {
876
772
  OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
877
773
  return false;
@@ -884,13 +780,12 @@ bool ssl_encrypt_client_hello(SSL_HANDSHAKE *hs, Span<const uint8_t> enc) {
884
780
  return false;
885
781
  }
886
782
  // Also update the EncodedClientHelloInner.
887
- if (CBB_len(encoded.get()) < binder_len) {
888
- OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
889
- return false;
890
- }
891
- OPENSSL_memcpy(const_cast<uint8_t *>(CBB_data(encoded.get())) +
892
- CBB_len(encoded.get()) - binder_len,
893
- hello_inner.data() + hello_inner.size() - binder_len,
783
+ auto encoded_binder =
784
+ MakeSpan(const_cast<uint8_t *>(CBB_data(encoded_cbb.get())),
785
+ CBB_len(encoded_cbb.get()))
786
+ .last(binder_len);
787
+ auto hello_inner_binder = MakeConstSpan(hello_inner).last(binder_len);
788
+ OPENSSL_memcpy(encoded_binder.data(), hello_inner_binder.data(),
894
789
  binder_len);
895
790
  }
896
791
 
@@ -898,74 +793,82 @@ bool ssl_encrypt_client_hello(SSL_HANDSHAKE *hs, Span<const uint8_t> enc) {
898
793
  return false;
899
794
  }
900
795
 
901
- // Construct ClientHelloOuterAAD. See draft-ietf-tls-esni-10, section 5.2.
902
- // TODO(https://crbug.com/boringssl/275): This ends up constructing the
903
- // ClientHelloOuter twice. Revisit this in the next draft, which uses a more
904
- // forgiving construction.
796
+ // Pad the EncodedClientHelloInner. See draft-ietf-tls-esni-13, section 6.1.3.
797
+ size_t padding_len = 0;
798
+ size_t maximum_name_length = hs->selected_ech_config->maximum_name_length;
799
+ if (ssl->hostname) {
800
+ size_t hostname_len = strlen(ssl->hostname.get());
801
+ if (hostname_len <= maximum_name_length) {
802
+ padding_len = maximum_name_length - hostname_len;
803
+ }
804
+ } else {
805
+ // No SNI. Pad up to |maximum_name_length|, including server_name extension
806
+ // overhead.
807
+ padding_len = 9 + maximum_name_length;
808
+ }
809
+ // Pad the whole thing to a multiple of 32 bytes.
810
+ padding_len += 31 - ((CBB_len(encoded_cbb.get()) + padding_len - 1) % 32);
811
+ Array<uint8_t> encoded;
812
+ if (!CBB_add_zeros(encoded_cbb.get(), padding_len) ||
813
+ !CBBFinishArray(encoded_cbb.get(), &encoded)) {
814
+ return false;
815
+ }
816
+
817
+ // Encrypt |encoded|. See draft-ietf-tls-esni-13, section 6.1.1. First,
818
+ // assemble the extension with a placeholder value for ClientHelloOuterAAD.
819
+ // See draft-ietf-tls-esni-13, section 5.2.
905
820
  const EVP_HPKE_KDF *kdf = EVP_HPKE_CTX_kdf(hs->ech_hpke_ctx.get());
906
821
  const EVP_HPKE_AEAD *aead = EVP_HPKE_CTX_aead(hs->ech_hpke_ctx.get());
907
- const size_t extension_len =
908
- compute_extension_length(aead, enc.size(), CBB_len(encoded.get()));
822
+ size_t payload_len = encoded.size() + aead_overhead(aead);
823
+ CBB enc_cbb, payload_cbb;
824
+ if (!CBB_init(cbb.get(), 256) ||
825
+ !CBB_add_u16(cbb.get(), EVP_HPKE_KDF_id(kdf)) ||
826
+ !CBB_add_u16(cbb.get(), EVP_HPKE_AEAD_id(aead)) ||
827
+ !CBB_add_u8(cbb.get(), hs->selected_ech_config->config_id) ||
828
+ !CBB_add_u16_length_prefixed(cbb.get(), &enc_cbb) ||
829
+ !CBB_add_bytes(&enc_cbb, enc.data(), enc.size()) ||
830
+ !CBB_add_u16_length_prefixed(cbb.get(), &payload_cbb) ||
831
+ !CBB_add_zeros(&payload_cbb, payload_len) ||
832
+ !CBBFinishArray(cbb.get(), &hs->ech_client_outer)) {
833
+ return false;
834
+ }
835
+
836
+ // Construct ClientHelloOuterAAD.
837
+ // TODO(https://crbug.com/boringssl/275): This ends up constructing the
838
+ // ClientHelloOuter twice. Instead, reuse |aad| for the ClientHello, now that
839
+ // draft-12 made the length prefixes match.
909
840
  bssl::ScopedCBB aad;
910
- CBB outer_hello;
911
- CBB enc_cbb;
912
841
  if (!CBB_init(aad.get(), 256) ||
913
- !CBB_add_u16(aad.get(), EVP_HPKE_KDF_id(kdf)) ||
914
- !CBB_add_u16(aad.get(), EVP_HPKE_AEAD_id(aead)) ||
915
- !CBB_add_u8(aad.get(), hs->selected_ech_config->config_id) ||
916
- !CBB_add_u16_length_prefixed(aad.get(), &enc_cbb) ||
917
- !CBB_add_bytes(&enc_cbb, enc.data(), enc.size()) ||
918
- !CBB_add_u24_length_prefixed(aad.get(), &outer_hello) ||
919
- !ssl_write_client_hello_without_extensions(hs, &outer_hello,
842
+ !ssl_write_client_hello_without_extensions(hs, aad.get(),
920
843
  ssl_client_hello_outer,
921
844
  /*empty_session_id=*/false) ||
922
- !ssl_add_clienthello_tlsext(hs, &outer_hello, /*out_encoded=*/nullptr,
845
+ !ssl_add_clienthello_tlsext(hs, aad.get(), /*out_encoded=*/nullptr,
923
846
  &needs_psk_binder, ssl_client_hello_outer,
924
- CBB_len(&outer_hello),
925
- /*omit_ech_len=*/4 + extension_len) ||
926
- !CBB_flush(aad.get())) {
847
+ CBB_len(aad.get()))) {
927
848
  OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
928
849
  return false;
929
850
  }
851
+
930
852
  // ClientHelloOuter may not require a PSK binder. Otherwise, we have a
931
853
  // circular dependency.
932
854
  assert(!needs_psk_binder);
933
855
 
934
- CBB payload_cbb;
935
- if (!CBB_init(cbb.get(), extension_len) ||
936
- !CBB_add_u16(cbb.get(), EVP_HPKE_KDF_id(kdf)) ||
937
- !CBB_add_u16(cbb.get(), EVP_HPKE_AEAD_id(aead)) ||
938
- !CBB_add_u8(cbb.get(), hs->selected_ech_config->config_id) ||
939
- !CBB_add_u16_length_prefixed(cbb.get(), &enc_cbb) ||
940
- !CBB_add_bytes(&enc_cbb, enc.data(), enc.size()) ||
941
- !CBB_add_u16_length_prefixed(cbb.get(), &payload_cbb)) {
942
- return false;
943
- }
856
+ // Replace the payload in |hs->ech_client_outer| with the encrypted value.
857
+ auto payload_span = MakeSpan(hs->ech_client_outer).last(payload_len);
944
858
  #if defined(BORINGSSL_UNSAFE_FUZZER_MODE)
945
859
  // In fuzzer mode, the server expects a cleartext payload.
946
- if (!CBB_add_bytes(&payload_cbb, CBB_data(encoded.get()),
947
- CBB_len(encoded.get()))) {
948
- return false;
949
- }
860
+ assert(payload_span.size() == encoded.size());
861
+ OPENSSL_memcpy(payload_span.data(), encoded.data(), encoded.size());
950
862
  #else
951
- uint8_t *payload;
952
- size_t payload_len =
953
- CBB_len(encoded.get()) + EVP_AEAD_max_overhead(EVP_HPKE_AEAD_aead(aead));
954
- if (!CBB_reserve(&payload_cbb, &payload, payload_len) ||
955
- !EVP_HPKE_CTX_seal(hs->ech_hpke_ctx.get(), payload, &payload_len,
956
- payload_len, CBB_data(encoded.get()),
957
- CBB_len(encoded.get()), CBB_data(aad.get()),
863
+ if (!EVP_HPKE_CTX_seal(hs->ech_hpke_ctx.get(), payload_span.data(),
864
+ &payload_len, payload_span.size(), encoded.data(),
865
+ encoded.size(), CBB_data(aad.get()),
958
866
  CBB_len(aad.get())) ||
959
- !CBB_did_write(&payload_cbb, payload_len)) {
867
+ payload_len != payload_span.size()) {
960
868
  return false;
961
869
  }
962
870
  #endif // BORINGSSL_UNSAFE_FUZZER_MODE
963
- if (!CBBFinishArray(cbb.get(), &hs->ech_client_bytes)) {
964
- return false;
965
- }
966
871
 
967
- // The |aad| calculation relies on |extension_length| being correct.
968
- assert(hs->ech_client_bytes.size() == extension_len);
969
872
  return true;
970
873
  }
971
874
 
@@ -1045,7 +948,13 @@ int SSL_marshal_ech_config(uint8_t **out, size_t *out_len, uint8_t config_id,
1045
948
  return 0;
1046
949
  }
1047
950
 
1048
- // See draft-ietf-tls-esni-10, section 4.
951
+ // The maximum name length is encoded in one byte.
952
+ if (max_name_len > 0xff) {
953
+ OPENSSL_PUT_ERROR(SSL, SSL_R_BAD_LENGTH);
954
+ return 0;
955
+ }
956
+
957
+ // See draft-ietf-tls-esni-13, section 4.
1049
958
  ScopedCBB cbb;
1050
959
  CBB contents, child;
1051
960
  uint8_t *public_key;
@@ -1066,8 +975,8 @@ int SSL_marshal_ech_config(uint8_t **out, size_t *out_len, uint8_t config_id,
1066
975
  !CBB_add_u16(&child, EVP_HPKE_AES_128_GCM) ||
1067
976
  !CBB_add_u16(&child, EVP_HPKE_HKDF_SHA256) ||
1068
977
  !CBB_add_u16(&child, EVP_HPKE_CHACHA20_POLY1305) ||
1069
- !CBB_add_u16(&contents, max_name_len) ||
1070
- !CBB_add_u16_length_prefixed(&contents, &child) ||
978
+ !CBB_add_u8(&contents, max_name_len) ||
979
+ !CBB_add_u8_length_prefixed(&contents, &child) ||
1071
980
  !CBB_add_bytes(&child, public_name_u8.data(), public_name_u8.size()) ||
1072
981
  // TODO(https://crbug.com/boringssl/275): Reserve some GREASE extensions
1073
982
  // and include some.