grpc-flamingo 1.11.0 → 1.15.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (452) hide show
  1. checksums.yaml +4 -4
  2. data/Makefile +1150 -176
  3. data/etc/roots.pem +40 -196
  4. data/include/grpc/grpc.h +49 -8
  5. data/include/grpc/grpc_security.h +123 -2
  6. data/include/grpc/grpc_security_constants.h +6 -0
  7. data/include/grpc/impl/codegen/fork.h +4 -4
  8. data/include/grpc/impl/codegen/grpc_types.h +26 -5
  9. data/include/grpc/impl/codegen/log.h +112 -0
  10. data/include/grpc/impl/codegen/port_platform.h +55 -4
  11. data/include/grpc/module.modulemap +2 -0
  12. data/include/grpc/support/log.h +2 -80
  13. data/include/grpc/support/string_util.h +2 -0
  14. data/include/grpc/support/sync.h +0 -16
  15. data/src/boringssl/err_data.c +602 -588
  16. data/src/core/ext/{census → filters/census}/grpc_context.cc +0 -0
  17. data/src/core/ext/filters/client_channel/channel_connectivity.cc +1 -1
  18. data/src/core/ext/filters/client_channel/client_channel.cc +1234 -1070
  19. data/src/core/ext/filters/client_channel/client_channel.h +5 -0
  20. data/src/core/ext/filters/client_channel/client_channel_channelz.cc +113 -0
  21. data/src/core/ext/filters/client_channel/client_channel_channelz.h +71 -0
  22. data/src/core/ext/filters/client_channel/client_channel_plugin.cc +9 -0
  23. data/src/core/ext/filters/client_channel/http_connect_handshaker.cc +1 -1
  24. data/src/core/ext/filters/client_channel/http_proxy.cc +22 -5
  25. data/src/core/ext/filters/client_channel/lb_policy.cc +2 -2
  26. data/src/core/ext/filters/client_channel/lb_policy.h +30 -10
  27. data/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc +11 -9
  28. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +120 -127
  29. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h +36 -0
  30. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc +36 -102
  31. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h +37 -32
  32. data/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +25 -22
  33. data/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h +4 -2
  34. data/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c +19 -0
  35. data/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.h +54 -0
  36. data/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c +19 -0
  37. data/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.h +54 -0
  38. data/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c +4 -17
  39. data/src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h +37 -63
  40. data/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +306 -239
  41. data/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +444 -392
  42. data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +538 -98
  43. data/src/core/ext/filters/client_channel/lb_policy_factory.cc +8 -0
  44. data/src/core/ext/filters/client_channel/lb_policy_factory.h +4 -0
  45. data/src/core/ext/filters/client_channel/method_params.h +4 -0
  46. data/src/core/ext/filters/client_channel/resolver.h +10 -0
  47. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +36 -19
  48. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc +320 -0
  49. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h +62 -9
  50. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +49 -294
  51. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +537 -0
  52. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +112 -87
  53. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h +17 -2
  54. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc +6 -5
  55. data/src/core/ext/filters/{load_reporting/server_load_reporting_filter.h → client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc} +7 -8
  56. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc +29 -0
  57. data/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +32 -15
  58. data/src/core/ext/filters/client_channel/retry_throttle.h +4 -0
  59. data/src/core/ext/filters/client_channel/subchannel.cc +58 -15
  60. data/src/core/ext/filters/client_channel/subchannel.h +11 -0
  61. data/src/core/ext/filters/deadline/deadline_filter.cc +18 -15
  62. data/src/core/ext/filters/deadline/deadline_filter.h +5 -5
  63. data/src/core/ext/filters/http/client/http_client_filter.cc +10 -9
  64. data/src/core/ext/filters/http/client_authority_filter.cc +6 -5
  65. data/src/core/ext/filters/http/message_compress/message_compress_filter.cc +6 -6
  66. data/src/core/ext/filters/http/server/http_server_filter.cc +123 -131
  67. data/src/core/ext/filters/http/server/http_server_filter.h +1 -1
  68. data/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc +1 -1
  69. data/src/core/ext/transport/chttp2/server/chttp2_server.cc +1 -1
  70. data/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc +3 -2
  71. data/src/core/ext/transport/chttp2/transport/bin_decoder.cc +9 -8
  72. data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +97 -48
  73. data/src/core/ext/transport/chttp2/transport/flow_control.cc +10 -7
  74. data/src/core/ext/transport/chttp2/transport/frame_settings.cc +3 -3
  75. data/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +12 -8
  76. data/src/core/ext/transport/chttp2/transport/hpack_encoder.h +4 -3
  77. data/src/core/ext/transport/chttp2/transport/hpack_parser.cc +2 -2
  78. data/src/core/ext/transport/chttp2/transport/hpack_table.cc +2 -2
  79. data/src/core/ext/transport/chttp2/transport/parsing.cc +14 -12
  80. data/src/core/ext/transport/chttp2/transport/stream_lists.cc +3 -3
  81. data/src/core/ext/transport/chttp2/transport/writing.cc +32 -27
  82. data/src/core/ext/transport/inproc/inproc_transport.cc +87 -49
  83. data/src/core/lib/channel/channel_args.cc +28 -0
  84. data/src/core/lib/channel/channel_args.h +4 -0
  85. data/src/core/lib/channel/channel_stack.cc +22 -29
  86. data/src/core/lib/channel/channel_stack.h +2 -2
  87. data/src/core/lib/channel/channel_stack_builder.cc +0 -3
  88. data/src/core/lib/channel/channel_stack_builder.h +0 -2
  89. data/src/core/lib/channel/channel_trace.cc +28 -63
  90. data/src/core/lib/channel/channel_trace.h +13 -17
  91. data/src/core/lib/channel/channelz.cc +153 -0
  92. data/src/core/lib/channel/channelz.h +133 -0
  93. data/src/core/lib/channel/channelz_registry.cc +145 -0
  94. data/src/core/lib/channel/channelz_registry.h +120 -0
  95. data/src/core/lib/channel/connected_channel.cc +8 -1
  96. data/src/core/lib/channel/handshaker.cc +71 -0
  97. data/src/core/lib/channel/handshaker.h +4 -0
  98. data/src/core/lib/debug/stats.h +7 -0
  99. data/src/core/lib/debug/stats_data.cc +5 -0
  100. data/src/core/lib/debug/stats_data.h +120 -0
  101. data/src/core/lib/debug/trace.cc +2 -1
  102. data/src/core/lib/debug/trace.h +12 -1
  103. data/src/core/lib/gpr/alloc.h +28 -0
  104. data/src/core/lib/gpr/arena.cc +38 -45
  105. data/src/core/lib/gpr/log.cc +8 -2
  106. data/src/core/lib/gpr/log_android.cc +4 -0
  107. data/src/core/lib/gpr/log_linux.cc +4 -0
  108. data/src/core/lib/gpr/log_posix.cc +4 -0
  109. data/src/core/lib/gpr/log_windows.cc +5 -0
  110. data/src/core/lib/gpr/string.cc +28 -0
  111. data/src/core/lib/gpr/string.h +10 -0
  112. data/src/core/lib/gprpp/abstract.h +5 -2
  113. data/src/core/lib/gprpp/fork.cc +268 -0
  114. data/src/core/lib/gprpp/fork.h +88 -0
  115. data/src/core/lib/gprpp/inlined_vector.h +87 -37
  116. data/src/core/lib/gprpp/memory.h +12 -0
  117. data/src/core/lib/gprpp/mutex_lock.h +42 -0
  118. data/src/core/lib/gprpp/orphanable.h +10 -12
  119. data/src/core/lib/gprpp/ref_counted.h +10 -12
  120. data/src/core/lib/gprpp/ref_counted_ptr.h +65 -8
  121. data/src/core/lib/gprpp/thd.h +0 -3
  122. data/src/core/lib/gprpp/thd_posix.cc +5 -54
  123. data/src/core/lib/gprpp/thd_windows.cc +0 -7
  124. data/src/core/lib/http/httpcli_security_connector.cc +1 -3
  125. data/src/core/lib/iomgr/call_combiner.cc +13 -13
  126. data/src/core/lib/iomgr/call_combiner.h +84 -1
  127. data/src/core/lib/iomgr/closure.h +6 -5
  128. data/src/core/lib/iomgr/combiner.cc +30 -13
  129. data/src/core/lib/iomgr/combiner.h +1 -1
  130. data/src/core/lib/iomgr/endpoint_pair_posix.cc +2 -2
  131. data/src/core/lib/iomgr/error.cc +12 -0
  132. data/src/core/lib/iomgr/error.h +5 -0
  133. data/src/core/lib/iomgr/ev_epoll1_linux.cc +138 -51
  134. data/src/core/lib/iomgr/ev_epollex_linux.cc +276 -93
  135. data/src/core/lib/iomgr/ev_epollsig_linux.cc +58 -50
  136. data/src/core/lib/iomgr/ev_poll_posix.cc +163 -42
  137. data/src/core/lib/iomgr/ev_posix.cc +88 -24
  138. data/src/core/lib/iomgr/ev_posix.h +48 -12
  139. data/src/core/lib/iomgr/exec_ctx.cc +15 -9
  140. data/src/core/lib/iomgr/exec_ctx.h +48 -20
  141. data/src/core/lib/iomgr/executor.cc +274 -142
  142. data/src/core/lib/iomgr/executor.h +82 -16
  143. data/src/core/lib/iomgr/fork_posix.cc +42 -19
  144. data/src/core/lib/iomgr/iocp_windows.cc +9 -4
  145. data/src/core/lib/iomgr/iomgr.cc +2 -0
  146. data/src/core/lib/iomgr/iomgr.h +5 -0
  147. data/src/core/lib/iomgr/iomgr_posix.cc +2 -2
  148. data/src/core/lib/iomgr/is_epollexclusive_available.cc +1 -0
  149. data/src/core/lib/iomgr/lockfree_event.cc +5 -1
  150. data/src/core/lib/iomgr/polling_entity.cc +11 -2
  151. data/src/core/lib/iomgr/pollset_custom.cc +2 -2
  152. data/src/core/lib/iomgr/port.h +51 -1
  153. data/src/core/lib/iomgr/resolve_address.h +1 -1
  154. data/src/core/lib/iomgr/resolve_address_posix.cc +4 -3
  155. data/src/core/lib/iomgr/resolve_address_windows.cc +3 -2
  156. data/src/core/lib/iomgr/resource_quota.cc +89 -12
  157. data/src/core/lib/iomgr/resource_quota.h +16 -0
  158. data/src/core/lib/iomgr/sockaddr_posix.h +1 -1
  159. data/src/core/lib/iomgr/socket_factory_posix.cc +1 -1
  160. data/src/core/lib/iomgr/socket_mutator.cc +1 -1
  161. data/src/core/lib/iomgr/socket_mutator.h +1 -1
  162. data/src/core/lib/iomgr/socket_utils.h +9 -0
  163. data/src/core/lib/iomgr/socket_utils_common_posix.cc +29 -1
  164. data/src/core/lib/iomgr/socket_utils_linux.cc +0 -1
  165. data/src/core/lib/iomgr/socket_utils_posix.cc +2 -3
  166. data/src/core/lib/iomgr/socket_utils_posix.h +3 -0
  167. data/src/core/lib/iomgr/socket_utils_uv.cc +4 -0
  168. data/src/core/lib/iomgr/socket_utils_windows.cc +4 -0
  169. data/src/core/lib/iomgr/socket_windows.cc +33 -0
  170. data/src/core/lib/iomgr/socket_windows.h +6 -0
  171. data/src/core/lib/iomgr/tcp_client_custom.cc +5 -5
  172. data/src/core/lib/iomgr/tcp_client_posix.cc +10 -11
  173. data/src/core/lib/iomgr/tcp_custom.cc +11 -11
  174. data/src/core/lib/iomgr/tcp_posix.cc +49 -36
  175. data/src/core/lib/iomgr/tcp_server_custom.cc +5 -5
  176. data/src/core/lib/iomgr/tcp_server_posix.cc +16 -36
  177. data/src/core/lib/iomgr/tcp_server_utils_posix.h +1 -1
  178. data/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +17 -5
  179. data/src/core/lib/iomgr/tcp_server_windows.cc +1 -0
  180. data/src/core/lib/iomgr/tcp_uv.cc +3 -0
  181. data/src/core/lib/iomgr/tcp_windows.cc +18 -2
  182. data/src/core/lib/iomgr/tcp_windows.h +2 -0
  183. data/src/core/lib/iomgr/timer.h +4 -3
  184. data/src/core/lib/iomgr/timer_generic.cc +133 -51
  185. data/src/core/lib/iomgr/timer_manager.cc +12 -14
  186. data/src/core/lib/iomgr/timer_uv.cc +3 -0
  187. data/src/core/lib/iomgr/udp_server.cc +106 -52
  188. data/src/core/lib/iomgr/udp_server.h +8 -4
  189. data/src/core/lib/json/json.cc +12 -1
  190. data/src/core/lib/json/json.h +5 -0
  191. data/src/core/lib/profiling/basic_timers.cc +1 -0
  192. data/src/core/lib/security/context/security_context.cc +8 -8
  193. data/src/core/lib/security/context/security_context.h +6 -2
  194. data/src/core/lib/security/credentials/alts/alts_credentials.h +0 -20
  195. data/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc +3 -2
  196. data/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc +7 -7
  197. data/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h +1 -38
  198. data/src/core/lib/security/credentials/credentials.h +1 -0
  199. data/src/core/lib/security/credentials/google_default/google_default_credentials.cc +89 -115
  200. data/src/core/lib/security/credentials/google_default/google_default_credentials.h +16 -0
  201. data/src/core/lib/security/credentials/jwt/json_token.h +2 -0
  202. data/src/core/lib/security/credentials/jwt/jwt_verifier.cc +2 -0
  203. data/src/core/lib/security/credentials/local/local_credentials.cc +77 -0
  204. data/src/core/lib/security/credentials/local/local_credentials.h +40 -0
  205. data/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +11 -7
  206. data/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +1 -1
  207. data/src/core/lib/security/credentials/ssl/ssl_credentials.cc +17 -3
  208. data/src/core/lib/security/security_connector/alts_security_connector.cc +2 -1
  209. data/src/core/lib/security/security_connector/load_system_roots.h +29 -0
  210. data/src/core/lib/{gpr/fork.h → security/security_connector/load_system_roots_fallback.cc} +10 -13
  211. data/src/core/lib/security/security_connector/load_system_roots_linux.cc +165 -0
  212. data/src/core/lib/security/security_connector/load_system_roots_linux.h +44 -0
  213. data/src/core/lib/security/security_connector/local_security_connector.cc +245 -0
  214. data/src/core/lib/security/security_connector/local_security_connector.h +58 -0
  215. data/src/core/lib/security/security_connector/security_connector.cc +79 -32
  216. data/src/core/lib/security/security_connector/security_connector.h +5 -3
  217. data/src/core/lib/security/transport/client_auth_filter.cc +5 -5
  218. data/src/core/lib/security/transport/secure_endpoint.cc +2 -2
  219. data/src/core/lib/security/transport/security_handshaker.cc +7 -2
  220. data/src/core/lib/security/transport/server_auth_filter.cc +4 -7
  221. data/src/core/lib/security/util/json_util.cc +4 -0
  222. data/src/core/lib/slice/slice.cc +6 -2
  223. data/src/core/lib/slice/slice_buffer.cc +27 -7
  224. data/src/core/lib/slice/slice_hash_table.h +4 -0
  225. data/src/core/lib/slice/slice_weak_hash_table.h +4 -0
  226. data/src/core/lib/surface/call.cc +119 -58
  227. data/src/core/lib/surface/call.h +7 -0
  228. data/src/core/lib/surface/channel.cc +50 -18
  229. data/src/core/lib/surface/channel.h +4 -0
  230. data/src/core/lib/surface/completion_queue.cc +153 -18
  231. data/src/core/lib/surface/completion_queue.h +20 -2
  232. data/src/core/lib/surface/completion_queue_factory.cc +13 -4
  233. data/src/core/lib/surface/init.cc +7 -8
  234. data/src/core/lib/surface/init.h +0 -1
  235. data/src/core/lib/surface/server.cc +16 -0
  236. data/src/core/lib/surface/version.cc +1 -1
  237. data/src/core/lib/transport/bdp_estimator.cc +3 -3
  238. data/src/core/lib/transport/bdp_estimator.h +2 -2
  239. data/src/core/lib/transport/byte_stream.cc +1 -1
  240. data/src/core/lib/transport/connectivity_state.cc +6 -7
  241. data/src/core/lib/transport/service_config.cc +2 -2
  242. data/src/core/lib/transport/service_config.h +3 -3
  243. data/src/core/lib/transport/transport.cc +22 -10
  244. data/src/core/lib/transport/transport.h +18 -18
  245. data/src/core/lib/transport/transport_op_string.cc +1 -8
  246. data/src/core/plugin_registry/grpc_plugin_registry.cc +0 -4
  247. data/src/core/tsi/alts/crypt/aes_gcm.cc +2 -0
  248. data/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +19 -7
  249. data/src/core/tsi/alts/handshaker/alts_handshaker_client.h +10 -0
  250. data/src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.h +2 -2
  251. data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +38 -3
  252. data/src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h +3 -0
  253. data/src/core/tsi/alts/handshaker/altscontext.pb.c +0 -1
  254. data/src/core/tsi/alts/handshaker/altscontext.pb.h +1 -2
  255. data/src/core/tsi/alts/handshaker/handshaker.pb.c +0 -1
  256. data/src/core/tsi/alts/handshaker/handshaker.pb.h +1 -2
  257. data/src/core/tsi/alts/handshaker/transport_security_common.pb.c +0 -1
  258. data/src/core/tsi/alts/handshaker/transport_security_common.pb.h +1 -1
  259. data/src/core/tsi/alts/handshaker/transport_security_common_api.h +2 -2
  260. data/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc +47 -1
  261. data/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h +3 -1
  262. data/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc +12 -11
  263. data/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h +7 -2
  264. data/src/core/tsi/fake_transport_security.cc +1 -0
  265. data/src/core/tsi/grpc_shadow_boringssl.h +3006 -0
  266. data/src/core/tsi/local_transport_security.cc +209 -0
  267. data/src/core/tsi/local_transport_security.h +51 -0
  268. data/src/core/tsi/ssl/session_cache/ssl_session.h +2 -0
  269. data/src/core/tsi/ssl/session_cache/ssl_session_cache.cc +5 -5
  270. data/src/core/tsi/ssl/session_cache/ssl_session_cache.h +6 -0
  271. data/src/core/tsi/ssl_transport_security.cc +245 -116
  272. data/src/core/tsi/ssl_types.h +2 -0
  273. data/src/core/tsi/transport_security.cc +14 -0
  274. data/src/core/tsi/transport_security.h +2 -0
  275. data/src/core/tsi/transport_security_interface.h +11 -1
  276. data/src/ruby/bin/math_client.rb +17 -9
  277. data/src/ruby/ext/grpc/extconf.rb +1 -26
  278. data/src/ruby/ext/grpc/rb_channel_credentials.c +3 -3
  279. data/src/ruby/ext/grpc/rb_grpc_imports.generated.c +42 -16
  280. data/src/ruby/ext/grpc/rb_grpc_imports.generated.h +65 -26
  281. data/src/ruby/lib/grpc/generic/active_call.rb +19 -23
  282. data/src/ruby/lib/grpc/generic/rpc_server.rb +2 -1
  283. data/src/ruby/lib/grpc/version.rb +1 -1
  284. data/src/ruby/pb/generate_proto_ruby.sh +7 -1
  285. data/src/ruby/pb/grpc/health/v1/health_services_pb.rb +4 -1
  286. data/src/ruby/spec/call_credentials_spec.rb +1 -1
  287. data/src/ruby/spec/call_spec.rb +1 -1
  288. data/src/ruby/spec/channel_credentials_spec.rb +1 -1
  289. data/src/ruby/spec/channel_spec.rb +1 -1
  290. data/src/ruby/spec/client_auth_spec.rb +1 -12
  291. data/src/ruby/spec/client_server_spec.rb +1 -1
  292. data/src/ruby/spec/compression_options_spec.rb +1 -1
  293. data/src/ruby/spec/error_sanity_spec.rb +1 -1
  294. data/src/ruby/spec/generic/client_stub_spec.rb +16 -4
  295. data/src/ruby/spec/generic/rpc_desc_spec.rb +1 -1
  296. data/src/ruby/spec/generic/rpc_server_pool_spec.rb +1 -1
  297. data/src/ruby/spec/generic/service_spec.rb +1 -1
  298. data/src/ruby/spec/google_rpc_status_utils_spec.rb +1 -12
  299. data/src/ruby/spec/pb/duplicate/codegen_spec.rb +1 -0
  300. data/src/ruby/spec/pb/health/checker_spec.rb +1 -1
  301. data/src/ruby/spec/server_credentials_spec.rb +1 -1
  302. data/src/ruby/spec/server_spec.rb +1 -1
  303. data/src/ruby/spec/spec_helper.rb +1 -0
  304. data/src/ruby/spec/support/services.rb +1 -1
  305. data/src/ruby/spec/time_consts_spec.rb +1 -1
  306. data/third_party/address_sorting/address_sorting.c +17 -11
  307. data/third_party/address_sorting/address_sorting_windows.c +43 -3
  308. data/third_party/address_sorting/include/address_sorting/address_sorting.h +3 -0
  309. data/third_party/boringssl/crypto/asn1/a_int.c +33 -28
  310. data/third_party/boringssl/crypto/asn1/a_mbstr.c +24 -22
  311. data/third_party/boringssl/crypto/asn1/a_utf8.c +13 -11
  312. data/third_party/boringssl/crypto/asn1/asn1_locl.h +3 -0
  313. data/third_party/boringssl/crypto/asn1/tasn_dec.c +40 -19
  314. data/third_party/boringssl/crypto/bio/fd.c +1 -0
  315. data/third_party/boringssl/crypto/bio/file.c +2 -0
  316. data/third_party/boringssl/crypto/bn_extra/convert.c +6 -5
  317. data/third_party/boringssl/crypto/bytestring/ber.c +1 -4
  318. data/third_party/boringssl/crypto/bytestring/cbb.c +116 -16
  319. data/third_party/boringssl/crypto/bytestring/cbs.c +151 -20
  320. data/third_party/boringssl/crypto/cipher_extra/e_aesccm.c +203 -0
  321. data/third_party/boringssl/crypto/cipher_extra/e_rc2.c +2 -0
  322. data/third_party/boringssl/crypto/cipher_extra/e_tls.c +1 -2
  323. data/third_party/boringssl/crypto/cpu-aarch64-fuchsia.c +55 -0
  324. data/third_party/boringssl/crypto/cpu-aarch64-linux.c +2 -1
  325. data/third_party/boringssl/crypto/dsa/dsa.c +16 -54
  326. data/third_party/boringssl/crypto/ec_extra/ec_asn1.c +9 -10
  327. data/third_party/boringssl/crypto/ecdh/ecdh.c +4 -3
  328. data/third_party/boringssl/crypto/fipsmodule/bcm.c +11 -542
  329. data/third_party/boringssl/crypto/fipsmodule/bn/add.c +57 -112
  330. data/third_party/boringssl/crypto/fipsmodule/bn/asm/x86_64-gcc.c +4 -3
  331. data/third_party/boringssl/crypto/fipsmodule/bn/bn.c +128 -70
  332. data/third_party/boringssl/crypto/fipsmodule/bn/bytes.c +32 -71
  333. data/third_party/boringssl/crypto/fipsmodule/bn/cmp.c +64 -118
  334. data/third_party/boringssl/crypto/fipsmodule/bn/div.c +284 -122
  335. data/third_party/boringssl/crypto/fipsmodule/bn/exponentiation.c +31 -65
  336. data/third_party/boringssl/crypto/fipsmodule/bn/gcd.c +274 -218
  337. data/third_party/boringssl/crypto/fipsmodule/bn/generic.c +2 -1
  338. data/third_party/boringssl/crypto/fipsmodule/bn/internal.h +187 -27
  339. data/third_party/boringssl/crypto/fipsmodule/bn/jacobi.c +1 -1
  340. data/third_party/boringssl/crypto/fipsmodule/bn/montgomery.c +124 -81
  341. data/third_party/boringssl/crypto/fipsmodule/bn/montgomery_inv.c +8 -30
  342. data/third_party/boringssl/crypto/fipsmodule/bn/mul.c +321 -347
  343. data/third_party/boringssl/crypto/fipsmodule/bn/prime.c +326 -66
  344. data/third_party/boringssl/crypto/fipsmodule/bn/random.c +77 -25
  345. data/third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.c +199 -222
  346. data/third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.h +27 -47
  347. data/third_party/boringssl/crypto/fipsmodule/bn/shift.c +155 -96
  348. data/third_party/boringssl/crypto/fipsmodule/bn/sqrt.c +1 -1
  349. data/third_party/boringssl/crypto/fipsmodule/cipher/e_aes.c +10 -10
  350. data/third_party/boringssl/crypto/fipsmodule/des/internal.h +2 -0
  351. data/third_party/boringssl/crypto/fipsmodule/ec/ec.c +78 -47
  352. data/third_party/boringssl/crypto/fipsmodule/ec/ec_key.c +99 -163
  353. data/third_party/boringssl/crypto/fipsmodule/ec/ec_montgomery.c +3 -10
  354. data/third_party/boringssl/crypto/fipsmodule/ec/internal.h +44 -23
  355. data/third_party/boringssl/crypto/fipsmodule/ec/oct.c +59 -90
  356. data/third_party/boringssl/crypto/fipsmodule/ec/p224-64.c +38 -65
  357. data/third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64-table.h +5378 -5418
  358. data/third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.c +17 -26
  359. data/third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.h +15 -11
  360. data/third_party/boringssl/crypto/fipsmodule/ec/simple.c +45 -51
  361. data/third_party/boringssl/crypto/fipsmodule/ec/{util-64.c → util.c} +0 -5
  362. data/third_party/boringssl/crypto/fipsmodule/ec/wnaf.c +144 -264
  363. data/third_party/boringssl/crypto/fipsmodule/ecdsa/ecdsa.c +78 -62
  364. data/third_party/boringssl/crypto/fipsmodule/modes/ccm.c +256 -0
  365. data/third_party/boringssl/crypto/fipsmodule/modes/internal.h +36 -32
  366. data/third_party/boringssl/crypto/fipsmodule/rand/ctrdrbg.c +9 -7
  367. data/third_party/boringssl/crypto/fipsmodule/rsa/blinding.c +16 -40
  368. data/third_party/boringssl/crypto/fipsmodule/rsa/internal.h +1 -6
  369. data/third_party/boringssl/crypto/fipsmodule/rsa/rsa.c +57 -39
  370. data/third_party/boringssl/crypto/fipsmodule/rsa/rsa_impl.c +309 -142
  371. data/third_party/boringssl/crypto/fipsmodule/self_check/self_check.c +581 -0
  372. data/third_party/boringssl/crypto/fipsmodule/tls/internal.h +39 -0
  373. data/third_party/boringssl/crypto/fipsmodule/tls/kdf.c +165 -0
  374. data/third_party/boringssl/crypto/internal.h +65 -2
  375. data/third_party/boringssl/crypto/mem.c +0 -2
  376. data/third_party/boringssl/crypto/obj/obj.c +6 -73
  377. data/third_party/boringssl/crypto/thread_pthread.c +35 -5
  378. data/third_party/boringssl/crypto/x509/a_strex.c +11 -11
  379. data/third_party/boringssl/crypto/x509/vpm_int.h +1 -0
  380. data/third_party/boringssl/crypto/x509/x509_vfy.c +4 -0
  381. data/third_party/boringssl/crypto/x509/x509_vpm.c +44 -22
  382. data/third_party/boringssl/crypto/x509/x_name.c +13 -0
  383. data/third_party/boringssl/include/openssl/aead.h +10 -0
  384. data/third_party/boringssl/include/openssl/asn1.h +2 -3
  385. data/third_party/boringssl/include/openssl/base.h +5 -14
  386. data/third_party/boringssl/include/openssl/bio.h +1 -1
  387. data/third_party/boringssl/include/openssl/bn.h +62 -18
  388. data/third_party/boringssl/include/openssl/bytestring.h +53 -28
  389. data/third_party/boringssl/include/openssl/crypto.h +4 -0
  390. data/third_party/boringssl/include/openssl/ec.h +10 -4
  391. data/third_party/boringssl/include/openssl/ec_key.h +7 -6
  392. data/third_party/boringssl/include/openssl/err.h +9 -9
  393. data/third_party/boringssl/include/openssl/evp.h +1 -1
  394. data/third_party/boringssl/include/openssl/rsa.h +35 -10
  395. data/third_party/boringssl/include/openssl/ssl.h +167 -19
  396. data/third_party/boringssl/include/openssl/ssl3.h +0 -1
  397. data/third_party/boringssl/include/openssl/stack.h +1 -1
  398. data/third_party/boringssl/include/openssl/tls1.h +10 -2
  399. data/third_party/boringssl/include/openssl/x509.h +4 -0
  400. data/third_party/boringssl/include/openssl/x509v3.h +1 -0
  401. data/third_party/boringssl/ssl/d1_both.cc +16 -2
  402. data/third_party/boringssl/ssl/dtls_method.cc +1 -1
  403. data/third_party/boringssl/ssl/handoff.cc +285 -0
  404. data/third_party/boringssl/ssl/handshake.cc +26 -12
  405. data/third_party/boringssl/ssl/handshake_client.cc +101 -95
  406. data/third_party/boringssl/ssl/handshake_server.cc +14 -2
  407. data/third_party/boringssl/ssl/internal.h +132 -79
  408. data/third_party/boringssl/ssl/s3_both.cc +2 -2
  409. data/third_party/boringssl/ssl/s3_lib.cc +3 -1
  410. data/third_party/boringssl/ssl/s3_pkt.cc +0 -18
  411. data/third_party/boringssl/ssl/ssl_aead_ctx.cc +1 -4
  412. data/third_party/boringssl/ssl/ssl_asn1.cc +47 -43
  413. data/third_party/boringssl/ssl/ssl_cipher.cc +12 -8
  414. data/third_party/boringssl/ssl/ssl_key_share.cc +3 -1
  415. data/third_party/boringssl/ssl/ssl_lib.cc +83 -14
  416. data/third_party/boringssl/ssl/ssl_privkey.cc +6 -0
  417. data/third_party/boringssl/ssl/ssl_stat.cc +6 -6
  418. data/third_party/boringssl/ssl/ssl_versions.cc +12 -85
  419. data/third_party/boringssl/ssl/ssl_x509.cc +59 -61
  420. data/third_party/boringssl/ssl/t1_enc.cc +73 -124
  421. data/third_party/boringssl/ssl/t1_lib.cc +367 -41
  422. data/third_party/boringssl/ssl/tls13_both.cc +8 -0
  423. data/third_party/boringssl/ssl/tls13_client.cc +98 -184
  424. data/third_party/boringssl/ssl/tls13_enc.cc +88 -158
  425. data/third_party/boringssl/ssl/tls13_server.cc +91 -137
  426. data/third_party/boringssl/ssl/tls_method.cc +0 -17
  427. data/third_party/boringssl/ssl/tls_record.cc +1 -10
  428. data/third_party/boringssl/third_party/fiat/curve25519.c +921 -2753
  429. data/third_party/boringssl/third_party/fiat/curve25519_tables.h +7880 -0
  430. data/third_party/boringssl/third_party/fiat/internal.h +32 -20
  431. data/third_party/boringssl/third_party/fiat/p256.c +1824 -0
  432. metadata +86 -71
  433. data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc +0 -253
  434. data/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +0 -222
  435. data/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc +0 -71
  436. data/src/core/ext/filters/load_reporting/server_load_reporting_plugin.h +0 -61
  437. data/src/core/lib/channel/channel_trace_registry.cc +0 -80
  438. data/src/core/lib/channel/channel_trace_registry.h +0 -43
  439. data/src/core/lib/gpr/fork.cc +0 -78
  440. data/src/core/tsi/transport_security_adapter.cc +0 -235
  441. data/src/core/tsi/transport_security_adapter.h +0 -41
  442. data/src/ruby/bin/apis/google/protobuf/empty.rb +0 -29
  443. data/src/ruby/bin/apis/pubsub_demo.rb +0 -241
  444. data/src/ruby/bin/apis/tech/pubsub/proto/pubsub.rb +0 -159
  445. data/src/ruby/bin/apis/tech/pubsub/proto/pubsub_services.rb +0 -88
  446. data/src/ruby/pb/test/client.rb +0 -764
  447. data/src/ruby/pb/test/server.rb +0 -252
  448. data/src/ruby/spec/pb/package_with_underscore/checker_spec.rb +0 -54
  449. data/src/ruby/spec/pb/package_with_underscore/data.proto +0 -23
  450. data/src/ruby/spec/pb/package_with_underscore/service.proto +0 -23
  451. data/third_party/boringssl/crypto/curve25519/x25519-x86_64.c +0 -247
  452. data/third_party/boringssl/crypto/fipsmodule/ec/p256-64.c +0 -1674
@@ -300,7 +300,6 @@ OPENSSL_COMPILE_ASSERT(
300
300
  #define SSL3_MT_SERVER_HELLO 2
301
301
  #define SSL3_MT_NEW_SESSION_TICKET 4
302
302
  #define SSL3_MT_END_OF_EARLY_DATA 5
303
- #define SSL3_MT_HELLO_RETRY_REQUEST 6
304
303
  #define SSL3_MT_ENCRYPTED_EXTENSIONS 8
305
304
  #define SSL3_MT_CERTIFICATE 11
306
305
  #define SSL3_MT_SERVER_KEY_EXCHANGE 12
@@ -344,7 +344,7 @@ struct StackTraits {};
344
344
  sk_##name##_deep_copy(const STACK_OF(name) *sk, \
345
345
  ptrtype(*copy_func)(ptrtype), \
346
346
  void (*free_func)(ptrtype)) { \
347
- return (STACK_OF(name) *)sk_deep_copy((_STACK *)sk, \
347
+ return (STACK_OF(name) *)sk_deep_copy((const _STACK *)sk, \
348
348
  (void *(*)(void *))copy_func, \
349
349
  (void (*)(void *))free_func); \
350
350
  }
@@ -202,19 +202,24 @@ extern "C" {
202
202
  // ExtensionType value from RFC7627
203
203
  #define TLSEXT_TYPE_extended_master_secret 23
204
204
 
205
+ // ExtensionType value from draft-ietf-tokbind-negotiation-10
206
+ #define TLSEXT_TYPE_token_binding 24
207
+
208
+ // ExtensionType value from draft-ietf-quic-tls
209
+ #define TLSEXT_TYPE_quic_transport_parameters 26
210
+
205
211
  // ExtensionType value from RFC4507
206
212
  #define TLSEXT_TYPE_session_ticket 35
207
213
 
208
214
  // ExtensionType values from draft-ietf-tls-tls13-18
209
215
  #define TLSEXT_TYPE_supported_groups 10
210
- #define TLSEXT_TYPE_key_share 40
211
216
  #define TLSEXT_TYPE_pre_shared_key 41
212
217
  #define TLSEXT_TYPE_early_data 42
213
218
  #define TLSEXT_TYPE_supported_versions 43
214
219
  #define TLSEXT_TYPE_cookie 44
215
220
  #define TLSEXT_TYPE_psk_key_exchange_modes 45
216
- #define TLSEXT_TYPE_ticket_early_data_info 46
217
221
  #define TLSEXT_TYPE_certificate_authorities 47
222
+ #define TLSEXT_TYPE_key_share 51
218
223
 
219
224
  // ExtensionType value from RFC5746
220
225
  #define TLSEXT_TYPE_renegotiate 0xff01
@@ -228,6 +233,9 @@ extern "C" {
228
233
  // This is not an IANA defined extension number
229
234
  #define TLSEXT_TYPE_channel_id 30032
230
235
 
236
+ // This is not an IANA defined extension number
237
+ #define TLSEXT_TYPE_dummy_pq_padding 54537
238
+
231
239
  // status request value from RFC 3546
232
240
  #define TLSEXT_STATUSTYPE_ocsp 1
233
241
 
@@ -690,6 +690,9 @@ OPENSSL_EXPORT X509_NAME *X509_NAME_dup(X509_NAME *xn);
690
690
  OPENSSL_EXPORT X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne);
691
691
  OPENSSL_EXPORT int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne);
692
692
 
693
+ OPENSSL_EXPORT int X509_NAME_get0_der(X509_NAME *nm, const unsigned char **pder,
694
+ size_t *pderlen);
695
+
693
696
  OPENSSL_EXPORT int X509_cmp_time(const ASN1_TIME *s, time_t *t);
694
697
  OPENSSL_EXPORT int X509_cmp_current_time(const ASN1_TIME *s);
695
698
  OPENSSL_EXPORT ASN1_TIME * X509_time_adj(ASN1_TIME *s, long adj, time_t *t);
@@ -1107,6 +1110,7 @@ extern "C++" {
1107
1110
  namespace bssl {
1108
1111
 
1109
1112
  BORINGSSL_MAKE_DELETER(NETSCAPE_SPKI, NETSCAPE_SPKI_free)
1113
+ BORINGSSL_MAKE_DELETER(RSA_PSS_PARAMS, RSA_PSS_PARAMS_free)
1110
1114
  BORINGSSL_MAKE_DELETER(X509, X509_free)
1111
1115
  BORINGSSL_MAKE_DELETER(X509_ALGOR, X509_ALGOR_free)
1112
1116
  BORINGSSL_MAKE_DELETER(X509_CRL, X509_CRL_free)
@@ -748,6 +748,7 @@ extern "C++" {
748
748
 
749
749
  namespace bssl {
750
750
 
751
+ BORINGSSL_MAKE_DELETER(AUTHORITY_INFO_ACCESS, AUTHORITY_INFO_ACCESS_free)
751
752
  BORINGSSL_MAKE_DELETER(AUTHORITY_KEYID, AUTHORITY_KEYID_free)
752
753
  BORINGSSL_MAKE_DELETER(BASIC_CONSTRAINTS, BASIC_CONSTRAINTS_free)
753
754
  BORINGSSL_MAKE_DELETER(DIST_POINT, DIST_POINT_free)
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  * DTLS implementation written by Nagendra Modadugu
3
- * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
3
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
4
4
  */
5
5
  /* ====================================================================
6
6
  * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
@@ -536,6 +536,20 @@ bool dtls1_finish_message(SSL *ssl, CBB *cbb, Array<uint8_t> *out_msg) {
536
536
  return true;
537
537
  }
538
538
 
539
+ // ssl_size_t_greater_than_32_bits returns whether |v| exceeds the bounds of a
540
+ // 32-bit value. The obvious thing doesn't work because, in some 32-bit build
541
+ // configurations, the compiler warns that the test is always false and breaks
542
+ // the build.
543
+ static bool ssl_size_t_greater_than_32_bits(size_t v) {
544
+ #if defined(OPENSSL_64_BIT)
545
+ return v > 0xffffffff;
546
+ #elif defined(OPENSSL_32_BIT)
547
+ return false;
548
+ #else
549
+ #error "Building for neither 32- nor 64-bits."
550
+ #endif
551
+ }
552
+
539
553
  // add_outgoing adds a new handshake message or ChangeCipherSpec to the current
540
554
  // outgoing flight. It returns true on success and false on error.
541
555
  static bool add_outgoing(SSL *ssl, bool is_ccs, Array<uint8_t> data) {
@@ -550,7 +564,7 @@ static bool add_outgoing(SSL *ssl, bool is_ccs, Array<uint8_t> data) {
550
564
  (1 << 8 * sizeof(ssl->d1->outgoing_messages_len)),
551
565
  "outgoing_messages_len is too small");
552
566
  if (ssl->d1->outgoing_messages_len >= SSL_MAX_HANDSHAKE_FLIGHT ||
553
- data.size() > 0xffffffff) {
567
+ ssl_size_t_greater_than_32_bits(data.size())) {
554
568
  assert(false);
555
569
  OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
556
570
  return false;
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  * DTLS implementation written by Nagendra Modadugu
3
- * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
3
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
4
4
  */
5
5
  /* ====================================================================
6
6
  * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved.
@@ -0,0 +1,285 @@
1
+ /* Copyright (c) 2018, Google Inc.
2
+ *
3
+ * Permission to use, copy, modify, and/or distribute this software for any
4
+ * purpose with or without fee is hereby granted, provided that the above
5
+ * copyright notice and this permission notice appear in all copies.
6
+ *
7
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
8
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
9
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
10
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
11
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
12
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
13
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
14
+
15
+ #include <openssl/ssl.h>
16
+
17
+ #include <openssl/bytestring.h>
18
+
19
+ #include "internal.h"
20
+
21
+
22
+ namespace bssl {
23
+
24
+ constexpr int kHandoffVersion = 0;
25
+ constexpr int kHandbackVersion = 0;
26
+
27
+ bool SSL_serialize_handoff(const SSL *ssl, CBB *out) {
28
+ const SSL3_STATE *const s3 = ssl->s3;
29
+ if (!ssl->server ||
30
+ s3->hs == nullptr ||
31
+ s3->rwstate != SSL_HANDOFF) {
32
+ return false;
33
+ }
34
+
35
+ CBB seq;
36
+ Span<const uint8_t> transcript = s3->hs->transcript.buffer();
37
+ if (!CBB_add_asn1(out, &seq, CBS_ASN1_SEQUENCE) ||
38
+ !CBB_add_asn1_uint64(&seq, kHandoffVersion) ||
39
+ !CBB_add_asn1_octet_string(&seq, transcript.data(), transcript.size()) ||
40
+ !CBB_add_asn1_octet_string(&seq,
41
+ reinterpret_cast<uint8_t *>(s3->hs_buf->data),
42
+ s3->hs_buf->length) ||
43
+ !CBB_flush(out)) {
44
+ return false;
45
+ }
46
+
47
+ return true;
48
+ }
49
+
50
+ bool SSL_decline_handoff(SSL *ssl) {
51
+ const SSL3_STATE *const s3 = ssl->s3;
52
+ if (!ssl->server ||
53
+ s3->hs == nullptr ||
54
+ s3->rwstate != SSL_HANDOFF) {
55
+ return false;
56
+ }
57
+
58
+ ssl->handoff = false;
59
+ return true;
60
+ }
61
+
62
+ bool SSL_apply_handoff(SSL *ssl, Span<const uint8_t> handoff) {
63
+ if (ssl->method->is_dtls) {
64
+ return false;
65
+ }
66
+
67
+ CBS seq, handoff_cbs(handoff);
68
+ uint64_t handoff_version;
69
+ if (!CBS_get_asn1(&handoff_cbs, &seq, CBS_ASN1_SEQUENCE) ||
70
+ !CBS_get_asn1_uint64(&seq, &handoff_version) ||
71
+ handoff_version != kHandoffVersion) {
72
+ return false;
73
+ }
74
+
75
+ CBS transcript, hs_buf;
76
+ if (!CBS_get_asn1(&seq, &transcript, CBS_ASN1_OCTETSTRING) ||
77
+ !CBS_get_asn1(&seq, &hs_buf, CBS_ASN1_OCTETSTRING)) {
78
+ return false;
79
+ }
80
+
81
+ SSL_set_accept_state(ssl);
82
+
83
+ SSL3_STATE *const s3 = ssl->s3;
84
+ s3->v2_hello_done = true;
85
+ s3->has_message = true;
86
+
87
+ s3->hs_buf.reset(BUF_MEM_new());
88
+ if (!s3->hs_buf ||
89
+ !BUF_MEM_append(s3->hs_buf.get(), CBS_data(&hs_buf), CBS_len(&hs_buf))) {
90
+ return false;
91
+ }
92
+
93
+ if (CBS_len(&transcript) != 0) {
94
+ s3->hs->transcript.Update(transcript);
95
+ s3->is_v2_hello = true;
96
+ ssl_do_msg_callback(ssl, 0 /* read */, 0 /* V2ClientHello */, transcript);
97
+ }
98
+
99
+ return true;
100
+ }
101
+
102
+ bool SSL_serialize_handback(const SSL *ssl, CBB *out) {
103
+ if (!ssl->server ||
104
+ !ssl->s3->initial_handshake_complete ||
105
+ ssl->method->is_dtls ||
106
+ ssl->version < TLS1_VERSION) {
107
+ return false;
108
+ }
109
+
110
+ const SSL3_STATE *const s3 = ssl->s3;
111
+ size_t hostname_len = 0;
112
+ if (s3->hostname) {
113
+ hostname_len = strlen(s3->hostname.get());
114
+ }
115
+
116
+ size_t iv_len = 0;
117
+ const uint8_t *read_iv = nullptr, *write_iv = nullptr;
118
+ if (ssl->version == TLS1_VERSION &&
119
+ SSL_CIPHER_is_block_cipher(s3->aead_read_ctx->cipher()) &&
120
+ (!s3->aead_read_ctx->GetIV(&read_iv, &iv_len) ||
121
+ !s3->aead_write_ctx->GetIV(&write_iv, &iv_len))) {
122
+ return false;
123
+ }
124
+
125
+ CBB seq;
126
+ if (!CBB_add_asn1(out, &seq, CBS_ASN1_SEQUENCE) ||
127
+ !CBB_add_asn1_uint64(&seq, kHandbackVersion) ||
128
+ !CBB_add_asn1_uint64(&seq, ssl->version) ||
129
+ !CBB_add_asn1_uint64(&seq, ssl->conf_max_version) ||
130
+ !CBB_add_asn1_uint64(&seq, ssl->conf_min_version) ||
131
+ !CBB_add_asn1_uint64(&seq, ssl->max_send_fragment) ||
132
+ !CBB_add_asn1_octet_string(&seq, s3->read_sequence,
133
+ sizeof(s3->read_sequence)) ||
134
+ !CBB_add_asn1_octet_string(&seq, s3->write_sequence,
135
+ sizeof(s3->write_sequence)) ||
136
+ !CBB_add_asn1_octet_string(&seq, s3->server_random,
137
+ sizeof(s3->server_random)) ||
138
+ !CBB_add_asn1_octet_string(&seq, s3->client_random,
139
+ sizeof(s3->client_random)) ||
140
+ !CBB_add_asn1_octet_string(&seq, read_iv, iv_len) ||
141
+ !CBB_add_asn1_octet_string(&seq, write_iv, iv_len) ||
142
+ !CBB_add_asn1_bool(&seq, s3->session_reused) ||
143
+ !CBB_add_asn1_bool(&seq, s3->send_connection_binding) ||
144
+ !CBB_add_asn1_bool(&seq, s3->tlsext_channel_id_valid) ||
145
+ !ssl_session_serialize(s3->established_session.get(), &seq) ||
146
+ !CBB_add_asn1_octet_string(&seq, s3->next_proto_negotiated.data(),
147
+ s3->next_proto_negotiated.size()) ||
148
+ !CBB_add_asn1_octet_string(&seq, s3->alpn_selected.data(),
149
+ s3->alpn_selected.size()) ||
150
+ !CBB_add_asn1_octet_string(
151
+ &seq, reinterpret_cast<uint8_t *>(s3->hostname.get()),
152
+ hostname_len) ||
153
+ !CBB_add_asn1_octet_string(&seq, s3->tlsext_channel_id,
154
+ sizeof(s3->tlsext_channel_id)) ||
155
+ !CBB_add_asn1_uint64(&seq, ssl->options) ||
156
+ !CBB_add_asn1_uint64(&seq, ssl->mode) ||
157
+ !CBB_add_asn1_uint64(&seq, ssl->max_cert_list) ||
158
+ !CBB_add_asn1_bool(&seq, ssl->quiet_shutdown) ||
159
+ !CBB_add_asn1_bool(&seq, ssl->tlsext_channel_id_enabled) ||
160
+ !CBB_add_asn1_bool(&seq, ssl->retain_only_sha256_of_client_certs) ||
161
+ !CBB_flush(out)) {
162
+ return false;
163
+ }
164
+
165
+ return true;
166
+ }
167
+
168
+ bool SSL_apply_handback(SSL *ssl, Span<const uint8_t> handback) {
169
+ if (ssl->do_handshake != nullptr ||
170
+ ssl->method->is_dtls) {
171
+ return false;
172
+ }
173
+
174
+ SSL3_STATE *const s3 = ssl->s3;
175
+ uint64_t handback_version, version, conf_max_version, conf_min_version,
176
+ max_send_fragment, options, mode, max_cert_list;
177
+ CBS seq, read_seq, write_seq, server_rand, client_rand, read_iv, write_iv,
178
+ next_proto, alpn, hostname, channel_id;
179
+ int session_reused, send_connection_binding, channel_id_valid,
180
+ quiet_shutdown, channel_id_enabled, retain_only_sha256;
181
+
182
+ CBS handback_cbs(handback);
183
+ if (!CBS_get_asn1(&handback_cbs, &seq, CBS_ASN1_SEQUENCE) ||
184
+ !CBS_get_asn1_uint64(&seq, &handback_version) ||
185
+ handback_version != kHandbackVersion) {
186
+ return false;
187
+ }
188
+
189
+ if (!CBS_get_asn1_uint64(&seq, &version) ||
190
+ !CBS_get_asn1_uint64(&seq, &conf_max_version) ||
191
+ !CBS_get_asn1_uint64(&seq, &conf_min_version) ||
192
+ !CBS_get_asn1_uint64(&seq, &max_send_fragment) ||
193
+ !CBS_get_asn1(&seq, &read_seq, CBS_ASN1_OCTETSTRING) ||
194
+ CBS_len(&read_seq) != sizeof(s3->read_sequence) ||
195
+ !CBS_get_asn1(&seq, &write_seq, CBS_ASN1_OCTETSTRING) ||
196
+ CBS_len(&write_seq) != sizeof(s3->write_sequence) ||
197
+ !CBS_get_asn1(&seq, &server_rand, CBS_ASN1_OCTETSTRING) ||
198
+ CBS_len(&server_rand) != sizeof(s3->server_random) ||
199
+ !CBS_copy_bytes(&server_rand, s3->server_random,
200
+ sizeof(s3->server_random)) ||
201
+ !CBS_get_asn1(&seq, &client_rand, CBS_ASN1_OCTETSTRING) ||
202
+ CBS_len(&client_rand) != sizeof(s3->client_random) ||
203
+ !CBS_copy_bytes(&client_rand, s3->client_random,
204
+ sizeof(s3->client_random)) ||
205
+ !CBS_get_asn1(&seq, &read_iv, CBS_ASN1_OCTETSTRING) ||
206
+ !CBS_get_asn1(&seq, &write_iv, CBS_ASN1_OCTETSTRING) ||
207
+ !CBS_get_asn1_bool(&seq, &session_reused) ||
208
+ !CBS_get_asn1_bool(&seq, &send_connection_binding) ||
209
+ !CBS_get_asn1_bool(&seq, &channel_id_valid)) {
210
+ return false;
211
+ }
212
+
213
+ s3->established_session =
214
+ SSL_SESSION_parse(&seq, ssl->ctx->x509_method, ssl->ctx->pool);
215
+
216
+ if (!s3->established_session ||
217
+ !CBS_get_asn1(&seq, &next_proto, CBS_ASN1_OCTETSTRING) ||
218
+ !CBS_get_asn1(&seq, &alpn, CBS_ASN1_OCTETSTRING) ||
219
+ !CBS_get_asn1(&seq, &hostname, CBS_ASN1_OCTETSTRING) ||
220
+ !CBS_get_asn1(&seq, &channel_id, CBS_ASN1_OCTETSTRING) ||
221
+ CBS_len(&channel_id) != sizeof(s3->tlsext_channel_id) ||
222
+ !CBS_copy_bytes(&channel_id, s3->tlsext_channel_id,
223
+ sizeof(s3->tlsext_channel_id)) ||
224
+ !CBS_get_asn1_uint64(&seq, &options) ||
225
+ !CBS_get_asn1_uint64(&seq, &mode) ||
226
+ !CBS_get_asn1_uint64(&seq, &max_cert_list) ||
227
+ !CBS_get_asn1_bool(&seq, &quiet_shutdown) ||
228
+ !CBS_get_asn1_bool(&seq, &channel_id_enabled) ||
229
+ !CBS_get_asn1_bool(&seq, &retain_only_sha256)) {
230
+ return false;
231
+ }
232
+
233
+ ssl->version = version;
234
+ ssl->conf_max_version = conf_max_version;
235
+ ssl->conf_min_version = conf_min_version;
236
+ ssl->max_send_fragment = max_send_fragment;
237
+ ssl->do_handshake = ssl_server_handshake;
238
+ ssl->server = true;
239
+ ssl->options = options;
240
+ ssl->mode = mode;
241
+ ssl->max_cert_list = max_cert_list;
242
+
243
+ s3->hs.reset();
244
+ s3->have_version = true;
245
+ s3->initial_handshake_complete = true;
246
+ s3->session_reused = session_reused;
247
+ s3->send_connection_binding = send_connection_binding;
248
+ s3->tlsext_channel_id_valid = channel_id_valid;
249
+ s3->next_proto_negotiated.CopyFrom(next_proto);
250
+ s3->alpn_selected.CopyFrom(alpn);
251
+
252
+ const size_t hostname_len = CBS_len(&hostname);
253
+ if (hostname_len == 0) {
254
+ s3->hostname.reset();
255
+ } else {
256
+ char *hostname_str = nullptr;
257
+ if (!CBS_strdup(&hostname, &hostname_str)) {
258
+ return false;
259
+ }
260
+ s3->hostname.reset(hostname_str);
261
+ }
262
+
263
+ ssl->quiet_shutdown = quiet_shutdown;
264
+ ssl->tlsext_channel_id_enabled = channel_id_enabled;
265
+ ssl->retain_only_sha256_of_client_certs = retain_only_sha256;
266
+
267
+ Array<uint8_t> key_block;
268
+ if (!tls1_configure_aead(ssl, evp_aead_open, &key_block,
269
+ s3->established_session->cipher, read_iv) ||
270
+ !tls1_configure_aead(ssl, evp_aead_seal, &key_block,
271
+ s3->established_session->cipher, write_iv)) {
272
+ return false;
273
+ }
274
+
275
+ if (!CBS_copy_bytes(&read_seq, s3->read_sequence,
276
+ sizeof(s3->read_sequence)) ||
277
+ !CBS_copy_bytes(&write_seq, s3->write_sequence,
278
+ sizeof(s3->write_sequence))) {
279
+ return false;
280
+ }
281
+
282
+ return true;
283
+ }
284
+
285
+ } // namespace bssl
@@ -116,6 +116,8 @@
116
116
 
117
117
  #include <utility>
118
118
 
119
+ #include <openssl/rand.h>
120
+
119
121
  #include "../crypto/internal.h"
120
122
  #include "internal.h"
121
123
 
@@ -143,7 +145,8 @@ SSL_HANDSHAKE::SSL_HANDSHAKE(SSL *ssl_arg)
143
145
  next_proto_neg_seen(false),
144
146
  ticket_expected(false),
145
147
  extended_master_secret(false),
146
- pending_private_key_op(false) {
148
+ pending_private_key_op(false),
149
+ grease_seeded(false) {
147
150
  }
148
151
 
149
152
  SSL_HANDSHAKE::~SSL_HANDSHAKE() {
@@ -331,6 +334,11 @@ enum ssl_verify_result_t ssl_verify_peer_cert(SSL_HANDSHAKE *hs) {
331
334
  hs->new_session->verify_result = X509_V_OK;
332
335
  break;
333
336
  case ssl_verify_invalid:
337
+ // If |SSL_VERIFY_NONE|, the error is non-fatal, but we keep the result.
338
+ if (ssl->verify_mode == SSL_VERIFY_NONE) {
339
+ ERR_clear_error();
340
+ ret = ssl_verify_ok;
341
+ }
334
342
  hs->new_session->verify_result = X509_V_ERR_APPLICATION_VERIFICATION;
335
343
  break;
336
344
  case ssl_verify_retry:
@@ -351,18 +359,19 @@ enum ssl_verify_result_t ssl_verify_peer_cert(SSL_HANDSHAKE *hs) {
351
359
  return ret;
352
360
  }
353
361
 
354
- uint16_t ssl_get_grease_value(const SSL *ssl, enum ssl_grease_index_t index) {
355
- // Use the client_random or server_random for entropy. This both avoids
356
- // calling |RAND_bytes| on a single byte repeatedly and ensures the values are
357
- // deterministic. This allows the same ClientHello be sent twice for a
358
- // HelloRetryRequest or the same group be advertised in both supported_groups
359
- // and key_shares.
360
- uint16_t ret = ssl->server ? ssl->s3->server_random[index]
361
- : ssl->s3->client_random[index];
362
- // The first four bytes of server_random are a timestamp prior to TLS 1.3, but
363
- // servers have no fields to GREASE until TLS 1.3.
364
- assert(!ssl->server || ssl_protocol_version(ssl) >= TLS1_3_VERSION);
362
+ uint16_t ssl_get_grease_value(SSL_HANDSHAKE *hs,
363
+ enum ssl_grease_index_t index) {
364
+ // Draw entropy for all GREASE values at once. This avoids calling
365
+ // |RAND_bytes| repeatedly and makes the values consistent within a
366
+ // connection. The latter is so the second ClientHello matches after
367
+ // HelloRetryRequest and so supported_groups and key_shares are consistent.
368
+ if (!hs->grease_seeded) {
369
+ RAND_bytes(hs->grease_seed, sizeof(hs->grease_seed));
370
+ hs->grease_seeded = true;
371
+ }
372
+
365
373
  // This generates a random value of the form 0xωaωa, for all 0 ≤ ω < 16.
374
+ uint16_t ret = hs->grease_seed[index];
366
375
  ret = (ret & 0xf0) | 0x0a;
367
376
  ret |= ret << 8;
368
377
  return ret;
@@ -551,6 +560,11 @@ int ssl_run_handshake(SSL_HANDSHAKE *hs, bool *out_early_return) {
551
560
  hs->wait = ssl_hs_ok;
552
561
  return -1;
553
562
 
563
+ case ssl_hs_handoff:
564
+ ssl->s3->rwstate = SSL_HANDOFF;
565
+ hs->wait = ssl_hs_ok;
566
+ return -1;
567
+
554
568
  case ssl_hs_x509_lookup:
555
569
  ssl->s3->rwstate = SSL_X509_LOOKUP;
556
570
  hs->wait = ssl_hs_ok;