grpc 1.56.2 → 1.57.0.pre1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (383) hide show
  1. checksums.yaml +4 -4
  2. data/Makefile +29 -22
  3. data/include/grpc/event_engine/event_engine.h +22 -32
  4. data/include/grpc/impl/grpc_types.h +3 -0
  5. data/include/grpc/support/port_platform.h +29 -23
  6. data/src/core/ext/filters/client_channel/client_channel.cc +44 -8
  7. data/src/core/ext/filters/client_channel/dynamic_filters.h +3 -3
  8. data/src/core/ext/filters/client_channel/http_proxy.cc +5 -0
  9. data/src/core/ext/filters/client_channel/lb_policy/address_filtering.cc +21 -52
  10. data/src/core/ext/filters/client_channel/lb_policy/address_filtering.h +19 -7
  11. data/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc +25 -35
  12. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +78 -132
  13. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc +2 -1
  14. data/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +4 -3
  15. data/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h +3 -1
  16. data/src/core/ext/filters/client_channel/lb_policy/health_check_client.cc +38 -15
  17. data/src/core/ext/filters/client_channel/lb_policy/health_check_client.h +3 -5
  18. data/src/core/ext/filters/client_channel/lb_policy/health_check_client_internal.h +22 -6
  19. data/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric_internal.h +2 -0
  20. data/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc +97 -71
  21. data/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h +2 -16
  22. data/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +56 -11
  23. data/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h +25 -0
  24. data/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc +6 -32
  25. data/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc +4 -6
  26. data/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc +20 -79
  27. data/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +1 -1
  28. data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +31 -19
  29. data/src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc +1 -1
  30. data/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc +7 -41
  31. data/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc +3 -67
  32. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h +8 -0
  33. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc +31 -74
  34. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc +7 -51
  35. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc +16 -87
  36. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc +16 -50
  37. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_wrr_locality.cc +12 -74
  38. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +1 -4
  39. data/src/core/ext/filters/client_channel/resolver/dns/event_engine/event_engine_client_channel_resolver.cc +69 -59
  40. data/src/core/ext/filters/client_channel/resolver/polling_resolver.cc +7 -2
  41. data/src/core/ext/filters/client_channel/resolver/polling_resolver.h +1 -0
  42. data/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc +25 -13
  43. data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc +366 -311
  44. data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.h +17 -1
  45. data/src/core/ext/filters/client_channel/retry_filter.cc +39 -2498
  46. data/src/core/ext/filters/client_channel/retry_filter.h +91 -1
  47. data/src/core/ext/filters/client_channel/retry_filter_legacy_call_data.cc +2052 -0
  48. data/src/core/ext/filters/client_channel/retry_filter_legacy_call_data.h +442 -0
  49. data/src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc +38 -58
  50. data/src/core/ext/filters/client_channel/subchannel.h +3 -3
  51. data/src/core/ext/filters/client_channel/subchannel_interface_internal.h +3 -0
  52. data/src/core/ext/filters/rbac/rbac_filter.cc +40 -111
  53. data/src/core/ext/filters/rbac/rbac_filter.h +12 -30
  54. data/src/core/ext/filters/stateful_session/stateful_session_filter.cc +162 -86
  55. data/src/core/ext/filters/stateful_session/stateful_session_filter.h +0 -6
  56. data/src/core/ext/transport/chttp2/server/chttp2_server.cc +7 -4
  57. data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +131 -186
  58. data/src/core/ext/transport/chttp2/transport/decode_huff.cc +6569 -174
  59. data/src/core/ext/transport/chttp2/transport/decode_huff.h +2278 -441
  60. data/src/core/ext/transport/chttp2/transport/frame_ping.cc +2 -3
  61. data/src/core/ext/transport/chttp2/transport/hpack_parse_result.h +4 -3
  62. data/src/core/ext/transport/chttp2/transport/hpack_parser.cc +9 -8
  63. data/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc +4 -4
  64. data/src/core/ext/transport/chttp2/transport/hpack_parser_table.h +3 -2
  65. data/src/core/ext/transport/chttp2/transport/internal.h +8 -4
  66. data/src/core/ext/transport/chttp2/transport/parsing.cc +15 -3
  67. data/src/core/ext/transport/chttp2/transport/writing.cc +2 -3
  68. data/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c +27 -6
  69. data/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h +143 -0
  70. data/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c +2 -9
  71. data/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h +0 -39
  72. data/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c +13 -8
  73. data/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h +35 -6
  74. data/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c +17 -13
  75. data/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h +85 -20
  76. data/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c +26 -7
  77. data/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h +45 -3
  78. data/src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c +4 -3
  79. data/src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.h +21 -0
  80. data/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c +30 -6
  81. data/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h +180 -0
  82. data/src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c +558 -0
  83. data/src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.h +2710 -0
  84. data/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c +30 -11
  85. data/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h +53 -24
  86. data/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c +30 -5
  87. data/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h +110 -0
  88. data/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c +41 -15
  89. data/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h +150 -27
  90. data/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c +1 -0
  91. data/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c +47 -0
  92. data/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h +93 -0
  93. data/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c +88 -76
  94. data/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.h +5 -0
  95. data/src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c +11 -12
  96. data/src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.h +0 -5
  97. data/src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c +162 -160
  98. data/src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c +129 -118
  99. data/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c +141 -135
  100. data/src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c +19 -12
  101. data/src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c +38 -30
  102. data/src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h +5 -0
  103. data/src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c +402 -0
  104. data/src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.h +111 -0
  105. data/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c +80 -74
  106. data/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c +63 -47
  107. data/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h +5 -0
  108. data/src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c +315 -293
  109. data/src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h +5 -0
  110. data/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c +29 -29
  111. data/src/core/ext/xds/xds_bootstrap_grpc.cc +33 -30
  112. data/src/core/ext/xds/xds_bootstrap_grpc.h +5 -13
  113. data/src/core/ext/xds/xds_client_grpc.cc +11 -6
  114. data/src/core/ext/xds/xds_client_grpc.h +16 -2
  115. data/src/core/ext/xds/xds_client_stats.h +10 -0
  116. data/src/core/ext/xds/xds_cluster.cc +26 -16
  117. data/src/core/ext/xds/xds_endpoint.cc +4 -7
  118. data/src/core/ext/xds/xds_health_status.cc +0 -17
  119. data/src/core/ext/xds/xds_health_status.h +5 -25
  120. data/src/core/ext/xds/xds_lb_policy_registry.cc +39 -0
  121. data/src/core/ext/xds/xds_route_config.cc +4 -0
  122. data/src/core/ext/xds/xds_transport_grpc.cc +1 -3
  123. data/src/core/lib/address_utils/parse_address.cc +63 -1
  124. data/src/core/lib/address_utils/parse_address.h +8 -0
  125. data/src/core/lib/address_utils/sockaddr_utils.cc +46 -1
  126. data/src/core/lib/address_utils/sockaddr_utils.h +2 -2
  127. data/src/core/lib/channel/channel_args.cc +21 -10
  128. data/src/core/lib/channel/channel_args.h +3 -0
  129. data/src/core/lib/channel/connected_channel.cc +4 -1
  130. data/src/core/lib/channel/promise_based_filter.h +1 -0
  131. data/src/core/lib/debug/trace.cc +1 -4
  132. data/src/core/lib/event_engine/cf_engine/cf_engine.cc +2 -1
  133. data/src/core/lib/event_engine/cf_engine/cf_engine.h +1 -1
  134. data/src/core/lib/event_engine/event_engine.cc +0 -12
  135. data/src/core/lib/event_engine/forkable.cc +47 -42
  136. data/src/core/lib/event_engine/handle_containers.h +0 -4
  137. data/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc +4 -6
  138. data/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc +4 -6
  139. data/src/core/lib/event_engine/posix_engine/posix_endpoint.cc +25 -11
  140. data/src/core/lib/event_engine/posix_engine/posix_endpoint.h +3 -1
  141. data/src/core/lib/event_engine/posix_engine/posix_engine.cc +2 -1
  142. data/src/core/lib/event_engine/posix_engine/posix_engine.h +8 -12
  143. data/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc +37 -27
  144. data/src/core/lib/event_engine/posix_engine/posix_engine_listener.h +2 -0
  145. data/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc +4 -2
  146. data/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc +42 -2
  147. data/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h +6 -0
  148. data/src/core/lib/event_engine/posix_engine/timer.h +10 -37
  149. data/src/core/lib/event_engine/tcp_socket_utils.cc +67 -7
  150. data/src/core/lib/event_engine/tcp_socket_utils.h +3 -0
  151. data/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc +90 -37
  152. data/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h +32 -12
  153. data/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc +12 -21
  154. data/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h +8 -12
  155. data/src/core/lib/event_engine/windows/windows_endpoint.cc +55 -54
  156. data/src/core/lib/event_engine/windows/windows_endpoint.h +15 -12
  157. data/src/core/lib/event_engine/windows/windows_engine.cc +2 -1
  158. data/src/core/lib/event_engine/windows/windows_engine.h +8 -12
  159. data/src/core/lib/experiments/config.cc +60 -22
  160. data/src/core/lib/experiments/config.h +20 -8
  161. data/src/core/lib/experiments/experiments.cc +278 -0
  162. data/src/core/lib/experiments/experiments.h +59 -1
  163. data/src/core/lib/gprpp/dual_ref_counted.h +9 -9
  164. data/src/core/lib/gprpp/fork.cc +8 -9
  165. data/src/core/lib/gprpp/fork.h +6 -5
  166. data/src/core/lib/gprpp/if_list.h +4530 -0
  167. data/src/core/lib/gprpp/orphanable.h +3 -3
  168. data/src/core/lib/gprpp/ref_counted.h +6 -6
  169. data/src/core/lib/gprpp/sorted_pack.h +3 -12
  170. data/src/core/lib/gprpp/status_helper.h +16 -15
  171. data/src/core/lib/gprpp/time.h +12 -0
  172. data/src/core/lib/gprpp/type_list.h +32 -0
  173. data/src/core/lib/http/httpcli.h +6 -9
  174. data/src/core/lib/iomgr/error.cc +32 -2
  175. data/src/core/lib/iomgr/error.h +9 -10
  176. data/src/core/lib/iomgr/ev_epoll1_linux.cc +5 -7
  177. data/src/core/lib/iomgr/ev_poll_posix.cc +6 -5
  178. data/src/core/lib/iomgr/exec_ctx.h +11 -0
  179. data/src/core/lib/iomgr/pollset.h +4 -5
  180. data/src/core/lib/iomgr/port.h +10 -0
  181. data/src/core/lib/iomgr/resolve_address.cc +13 -1
  182. data/src/core/lib/iomgr/resolve_address.h +17 -3
  183. data/src/core/lib/iomgr/sockaddr_posix.h +7 -0
  184. data/src/core/lib/iomgr/socket_utils_common_posix.cc +29 -0
  185. data/src/core/lib/iomgr/socket_utils_posix.cc +2 -0
  186. data/src/core/lib/iomgr/socket_utils_posix.h +6 -0
  187. data/src/core/lib/iomgr/tcp_client_posix.cc +4 -1
  188. data/src/core/lib/iomgr/tcp_posix.cc +21 -4
  189. data/src/core/lib/iomgr/tcp_server_posix.cc +3 -2
  190. data/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +5 -2
  191. data/src/core/lib/iomgr/tcp_windows.cc +1 -3
  192. data/src/core/lib/iomgr/vsock.cc +59 -0
  193. data/src/core/lib/iomgr/vsock.h +38 -0
  194. data/src/core/lib/iomgr/wakeup_fd_posix.h +3 -6
  195. data/src/core/lib/load_balancing/delegating_helper.h +115 -0
  196. data/src/core/lib/load_balancing/lb_policy.h +20 -0
  197. data/src/core/lib/load_balancing/subchannel_interface.h +6 -0
  198. data/src/core/lib/promise/party.h +1 -1
  199. data/src/core/lib/resolver/resolver_factory.h +3 -2
  200. data/src/core/lib/resolver/server_address.cc +9 -94
  201. data/src/core/lib/resolver/server_address.h +10 -64
  202. data/src/core/lib/resource_quota/memory_quota.h +1 -1
  203. data/src/core/lib/security/credentials/channel_creds_registry.h +51 -27
  204. data/src/core/lib/security/credentials/channel_creds_registry_init.cc +169 -9
  205. data/src/core/lib/security/credentials/composite/composite_credentials.cc +1 -1
  206. data/src/core/lib/security/credentials/composite/composite_credentials.h +3 -1
  207. data/src/core/lib/security/credentials/external/external_account_credentials.cc +40 -1
  208. data/src/core/lib/security/credentials/external/external_account_credentials.h +6 -0
  209. data/src/core/lib/security/credentials/fake/fake_credentials.cc +30 -38
  210. data/src/core/lib/security/credentials/fake/fake_credentials.h +28 -0
  211. data/src/core/lib/security/credentials/tls/tls_credentials.cc +1 -1
  212. data/src/core/lib/security/credentials/tls/tls_credentials.h +3 -1
  213. data/src/core/lib/service_config/service_config_call_data.h +5 -0
  214. data/src/core/lib/slice/slice.h +16 -0
  215. data/src/core/lib/surface/call.cc +31 -29
  216. data/src/core/lib/surface/server.h +2 -2
  217. data/src/core/lib/surface/version.cc +2 -2
  218. data/src/core/lib/transport/metadata_batch.cc +7 -7
  219. data/src/core/lib/transport/metadata_batch.h +86 -48
  220. data/src/core/lib/transport/parsed_metadata.h +34 -20
  221. data/src/core/lib/transport/simple_slice_based_metadata.h +9 -2
  222. data/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc +4 -6
  223. data/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc +1 -2
  224. data/src/core/tsi/ssl_transport_security.cc +28 -7
  225. data/src/ruby/bin/math_pb.rb +24 -18
  226. data/src/ruby/ext/grpc/extconf.rb +19 -18
  227. data/src/ruby/ext/grpc/rb_call.c +62 -39
  228. data/src/ruby/ext/grpc/rb_call_credentials.c +0 -1
  229. data/src/ruby/ext/grpc/rb_channel.c +126 -49
  230. data/src/ruby/ext/grpc/rb_channel.h +1 -0
  231. data/src/ruby/ext/grpc/rb_channel_args.c +16 -2
  232. data/src/ruby/ext/grpc/rb_channel_args.h +4 -0
  233. data/src/ruby/ext/grpc/rb_channel_credentials.c +0 -1
  234. data/src/ruby/ext/grpc/rb_compression_options.c +0 -1
  235. data/src/ruby/ext/grpc/rb_event_thread.c +22 -6
  236. data/src/ruby/ext/grpc/rb_event_thread.h +1 -0
  237. data/src/ruby/ext/grpc/rb_grpc.c +192 -30
  238. data/src/ruby/ext/grpc/rb_grpc.h +8 -2
  239. data/src/ruby/ext/grpc/rb_server.c +62 -45
  240. data/src/ruby/ext/grpc/rb_server_credentials.c +0 -1
  241. data/src/ruby/ext/grpc/rb_xds_channel_credentials.c +0 -1
  242. data/src/ruby/ext/grpc/rb_xds_server_credentials.c +0 -1
  243. data/src/ruby/lib/grpc/generic/bidi_call.rb +2 -0
  244. data/src/ruby/lib/grpc/version.rb +1 -1
  245. data/src/ruby/pb/grpc/health/v1/health_pb.rb +24 -13
  246. data/src/ruby/pb/src/proto/grpc/testing/empty_pb.rb +24 -3
  247. data/src/ruby/pb/src/proto/grpc/testing/messages_pb.rb +25 -111
  248. data/src/ruby/pb/src/proto/grpc/testing/test_pb.rb +25 -2
  249. data/third_party/boringssl-with-bazel/err_data.c +552 -552
  250. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_strnid.c +5 -5
  251. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_time.c +34 -1
  252. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_utctm.c +4 -1
  253. data/third_party/boringssl-with-bazel/src/crypto/bio/bio.c +3 -3
  254. data/third_party/boringssl-with-bazel/src/crypto/bio/bio_mem.c +7 -8
  255. data/third_party/boringssl-with-bazel/src/crypto/bio/connect.c +2 -2
  256. data/third_party/boringssl-with-bazel/src/crypto/bio/fd.c +2 -2
  257. data/third_party/boringssl-with-bazel/src/crypto/bio/file.c +8 -8
  258. data/third_party/boringssl-with-bazel/src/crypto/bio/socket.c +2 -2
  259. data/third_party/boringssl-with-bazel/src/crypto/bio/socket_helper.c +2 -2
  260. data/third_party/boringssl-with-bazel/src/crypto/chacha/chacha.c +19 -1
  261. data/third_party/boringssl-with-bazel/src/crypto/chacha/internal.h +8 -1
  262. data/third_party/boringssl-with-bazel/src/crypto/conf/conf.c +28 -185
  263. data/third_party/boringssl-with-bazel/src/crypto/conf/conf_def.h +3 -7
  264. data/third_party/boringssl-with-bazel/src/crypto/conf/internal.h +8 -0
  265. data/third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_apple.c +3 -0
  266. data/third_party/boringssl-with-bazel/src/crypto/curve25519/curve25519.c +49 -46
  267. data/third_party/boringssl-with-bazel/src/crypto/curve25519/curve25519_64_adx.c +18 -0
  268. data/third_party/boringssl-with-bazel/src/crypto/curve25519/curve25519_tables.h +2809 -7417
  269. data/third_party/boringssl-with-bazel/src/crypto/curve25519/internal.h +27 -5
  270. data/third_party/boringssl-with-bazel/src/crypto/dsa/internal.h +20 -0
  271. data/third_party/boringssl-with-bazel/src/crypto/ec_extra/ec_asn1.c +110 -72
  272. data/third_party/boringssl-with-bazel/src/crypto/ec_extra/ec_derive.c +4 -3
  273. data/third_party/boringssl-with-bazel/src/crypto/ec_extra/hash_to_curve.c +15 -14
  274. data/third_party/boringssl-with-bazel/src/crypto/err/err.c +13 -10
  275. data/third_party/boringssl-with-bazel/src/crypto/evp/evp.c +35 -12
  276. data/third_party/boringssl-with-bazel/src/crypto/evp/p_ec.c +2 -4
  277. data/third_party/boringssl-with-bazel/src/crypto/evp/p_ec_asn1.c +3 -7
  278. data/third_party/boringssl-with-bazel/src/crypto/evp/pbkdf.c +3 -3
  279. data/third_party/boringssl-with-bazel/src/crypto/evp/print.c +7 -6
  280. data/third_party/boringssl-with-bazel/src/crypto/ex_data.c +34 -72
  281. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bcm.c +1 -1
  282. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/div.c +12 -5
  283. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/gcd.c +5 -6
  284. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/internal.h +12 -6
  285. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/montgomery.c +17 -18
  286. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/montgomery_inv.c +51 -15
  287. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/rsaz_exp.c +7 -7
  288. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/delocate.h +5 -6
  289. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/dh/internal.h +2 -0
  290. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/builtin_curves.h +277 -0
  291. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/ec.c +180 -404
  292. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/ec_key.c +3 -3
  293. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/ec_montgomery.c +24 -57
  294. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/felem.c +17 -13
  295. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/internal.h +33 -71
  296. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/oct.c +18 -17
  297. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/p224-64.c +5 -7
  298. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/p256-nistz.c +15 -18
  299. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/p256.c +9 -11
  300. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/scalar.c +24 -24
  301. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/simple.c +11 -27
  302. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/simple_mul.c +8 -8
  303. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/wnaf.c +4 -4
  304. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ecdsa/ecdsa.c +9 -3
  305. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/hkdf/hkdf.c +1 -1
  306. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/fork_detect.c +40 -26
  307. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/internal.h +21 -7
  308. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/rand.c +38 -19
  309. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/urandom.c +2 -29
  310. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/internal.h +55 -0
  311. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/rsa_impl.c +33 -52
  312. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/self_check/self_check.c +3 -8
  313. data/third_party/boringssl-with-bazel/src/crypto/internal.h +198 -79
  314. data/third_party/boringssl-with-bazel/src/crypto/kyber/kyber.c +5 -4
  315. data/third_party/boringssl-with-bazel/src/crypto/mem.c +7 -8
  316. data/third_party/boringssl-with-bazel/src/crypto/obj/obj.c +19 -23
  317. data/third_party/boringssl-with-bazel/src/crypto/pkcs8/internal.h +3 -3
  318. data/third_party/boringssl-with-bazel/src/crypto/pkcs8/p5_pbev2.c +3 -3
  319. data/third_party/boringssl-with-bazel/src/crypto/pkcs8/pkcs8.c +7 -7
  320. data/third_party/boringssl-with-bazel/src/crypto/pkcs8/pkcs8_x509.c +8 -5
  321. data/third_party/boringssl-with-bazel/src/crypto/pool/internal.h +1 -0
  322. data/third_party/boringssl-with-bazel/src/crypto/rand_extra/deterministic.c +7 -6
  323. data/third_party/boringssl-with-bazel/src/crypto/rand_extra/forkunsafe.c +6 -12
  324. data/third_party/boringssl-with-bazel/src/crypto/rand_extra/getentropy.c +48 -0
  325. data/third_party/boringssl-with-bazel/src/crypto/rand_extra/{fuchsia.c → ios.c} +8 -8
  326. data/third_party/boringssl-with-bazel/src/crypto/{refcount_no_threads.c → rand_extra/trusty.c} +15 -19
  327. data/third_party/boringssl-with-bazel/src/crypto/rand_extra/windows.c +41 -19
  328. data/third_party/boringssl-with-bazel/src/crypto/{refcount_c11.c → refcount.c} +11 -17
  329. data/third_party/boringssl-with-bazel/src/crypto/stack/stack.c +147 -72
  330. data/third_party/boringssl-with-bazel/src/crypto/thread_none.c +0 -8
  331. data/third_party/boringssl-with-bazel/src/crypto/thread_pthread.c +6 -35
  332. data/third_party/boringssl-with-bazel/src/crypto/thread_win.c +5 -26
  333. data/third_party/boringssl-with-bazel/src/crypto/trust_token/pmbtoken.c +14 -18
  334. data/third_party/boringssl-with-bazel/src/crypto/trust_token/voprf.c +54 -143
  335. data/third_party/boringssl-with-bazel/src/crypto/x509/by_dir.c +7 -13
  336. data/third_party/boringssl-with-bazel/src/crypto/x509/internal.h +1 -1
  337. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_att.c +1 -1
  338. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_lu.c +2 -4
  339. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_req.c +2 -2
  340. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_trs.c +1 -1
  341. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_v3.c +8 -12
  342. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_vfy.c +19 -20
  343. data/third_party/boringssl-with-bazel/src/crypto/x509/x509name.c +11 -15
  344. data/third_party/boringssl-with-bazel/src/crypto/x509/x_crl.c +5 -5
  345. data/third_party/boringssl-with-bazel/src/crypto/x509/x_name.c +1 -1
  346. data/third_party/boringssl-with-bazel/src/crypto/x509/x_pubkey.c +7 -7
  347. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_lib.c +2 -3
  348. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_purp.c +4 -6
  349. data/third_party/boringssl-with-bazel/src/include/openssl/arm_arch.h +4 -119
  350. data/third_party/boringssl-with-bazel/src/include/openssl/asm_base.h +207 -0
  351. data/third_party/boringssl-with-bazel/src/include/openssl/asn1.h +5 -0
  352. data/third_party/boringssl-with-bazel/src/include/openssl/base.h +2 -116
  353. data/third_party/boringssl-with-bazel/src/include/openssl/bn.h +0 -2
  354. data/third_party/boringssl-with-bazel/src/include/openssl/chacha.h +6 -0
  355. data/third_party/boringssl-with-bazel/src/include/openssl/conf.h +5 -1
  356. data/third_party/boringssl-with-bazel/src/include/openssl/dsa.h +0 -21
  357. data/third_party/boringssl-with-bazel/src/include/openssl/ec.h +21 -2
  358. data/third_party/boringssl-with-bazel/src/include/openssl/ec_key.h +19 -6
  359. data/third_party/boringssl-with-bazel/src/include/openssl/evp.h +11 -7
  360. data/third_party/boringssl-with-bazel/src/include/openssl/rand.h +13 -14
  361. data/third_party/boringssl-with-bazel/src/include/openssl/rsa.h +0 -61
  362. data/third_party/boringssl-with-bazel/src/include/openssl/ssl.h +127 -81
  363. data/third_party/boringssl-with-bazel/src/include/openssl/stack.h +224 -209
  364. data/third_party/boringssl-with-bazel/src/include/openssl/target.h +154 -0
  365. data/third_party/boringssl-with-bazel/src/include/openssl/thread.h +1 -29
  366. data/third_party/boringssl-with-bazel/src/include/openssl/x509.h +4 -4
  367. data/third_party/boringssl-with-bazel/src/include/openssl/x509v3.h +3 -2
  368. data/third_party/boringssl-with-bazel/src/ssl/extensions.cc +9 -65
  369. data/third_party/boringssl-with-bazel/src/ssl/handoff.cc +20 -20
  370. data/third_party/boringssl-with-bazel/src/ssl/handshake_server.cc +1 -1
  371. data/third_party/boringssl-with-bazel/src/ssl/internal.h +4 -11
  372. data/third_party/boringssl-with-bazel/src/ssl/ssl_cipher.cc +24 -18
  373. data/third_party/boringssl-with-bazel/src/ssl/ssl_key_share.cc +37 -30
  374. data/third_party/boringssl-with-bazel/src/ssl/ssl_lib.cc +125 -26
  375. data/third_party/boringssl-with-bazel/src/ssl/tls13_client.cc +2 -3
  376. data/third_party/boringssl-with-bazel/src/third_party/fiat/curve25519_64_adx.h +691 -0
  377. data/third_party/upb/upb/collections/map.c +3 -3
  378. metadata +27 -12
  379. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_attributes.cc +0 -42
  380. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_attributes.h +0 -64
  381. data/src/core/ext/transport/chttp2/transport/stream_map.cc +0 -177
  382. data/src/core/ext/transport/chttp2/transport/stream_map.h +0 -68
  383. data/third_party/boringssl-with-bazel/src/crypto/refcount_win.c +0 -89
@@ -0,0 +1,691 @@
1
+ #include <stdbool.h>
2
+ #include <stdint.h>
3
+ #include <immintrin.h>
4
+ #include <string.h>
5
+
6
+ typedef uint64_t fe4[4];
7
+ typedef uint8_t fiat_uint1;
8
+ typedef int8_t fiat_int1;
9
+
10
+ static __inline__ uint64_t fiat_value_barrier_u64(uint64_t a) {
11
+ __asm__("" : "+r"(a) : /* no inputs */);
12
+ return a;
13
+ }
14
+
15
+ __attribute__((target("adx,bmi2")))
16
+ static inline void fe4_mul(fe4 out, const fe4 x, const fe4 y) { fiat_curve25519_adx_mul(out, x, y); }
17
+
18
+ __attribute__((target("adx,bmi2")))
19
+ static inline void fe4_sq(fe4 out, const fe4 x) { fiat_curve25519_adx_square(out, x); }
20
+
21
+ /*
22
+ * The function fiat_mulx_u64 is a multiplication, returning the full double-width result.
23
+ *
24
+ * Postconditions:
25
+ * out1 = (arg1 * arg2) mod 2^64
26
+ * out2 = ⌊arg1 * arg2 / 2^64⌋
27
+ *
28
+ * Input Bounds:
29
+ * arg1: [0x0 ~> 0xffffffffffffffff]
30
+ * arg2: [0x0 ~> 0xffffffffffffffff]
31
+ * Output Bounds:
32
+ * out1: [0x0 ~> 0xffffffffffffffff]
33
+ * out2: [0x0 ~> 0xffffffffffffffff]
34
+ */
35
+ __attribute__((target("adx,bmi2")))
36
+ static inline void fiat_mulx_u64(uint64_t* out1, uint64_t* out2, uint64_t arg1, uint64_t arg2) {
37
+ // NOTE: edited after generation
38
+ #if defined(_M_X64)
39
+ unsigned long long t;
40
+ *out1 = _umul128(arg1, arg2, &t);
41
+ *out2 = t;
42
+ #elif defined(_M_ARM64)
43
+ *out1 = arg1 * arg2;
44
+ *out2 = __umulh(arg1, arg2);
45
+ #else
46
+ unsigned __int128 t = (unsigned __int128)arg1 * arg2;
47
+ *out1 = t;
48
+ *out2 = (t >> 64);
49
+ #endif
50
+ }
51
+
52
+ /*
53
+ * The function fiat_addcarryx_u64 is an addition with carry.
54
+ *
55
+ * Postconditions:
56
+ * out1 = (arg1 + arg2 + arg3) mod 2^64
57
+ * out2 = ⌊(arg1 + arg2 + arg3) / 2^64⌋
58
+ *
59
+ * Input Bounds:
60
+ * arg1: [0x0 ~> 0x1]
61
+ * arg2: [0x0 ~> 0xffffffffffffffff]
62
+ * arg3: [0x0 ~> 0xffffffffffffffff]
63
+ * Output Bounds:
64
+ * out1: [0x0 ~> 0xffffffffffffffff]
65
+ * out2: [0x0 ~> 0x1]
66
+ */
67
+ __attribute__((target("adx,bmi2")))
68
+ static inline void fiat_addcarryx_u64(uint64_t* out1, fiat_uint1* out2, fiat_uint1 arg1, uint64_t arg2, uint64_t arg3) {
69
+ // NOTE: edited after generation
70
+ #if defined(__has_builtin)
71
+ # if __has_builtin(__builtin_ia32_addcarryx_u64)
72
+ # define addcarry64 __builtin_ia32_addcarryx_u64
73
+ # endif
74
+ #endif
75
+ #if defined(addcarry64)
76
+ long long unsigned int t;
77
+ *out2 = addcarry64(arg1, arg2, arg3, &t);
78
+ *out1 = t;
79
+ #elif defined(_M_X64)
80
+ long long unsigned int t;
81
+ *out2 = _addcarry_u64(arg1, arg2, arg3, out1);
82
+ *out1 = t;
83
+ #else
84
+ arg2 += arg1;
85
+ arg1 = arg2 < arg1;
86
+ uint64_t ret = arg2 + arg3;
87
+ arg1 += ret < arg2;
88
+ *out1 = ret;
89
+ *out2 = arg1;
90
+ #endif
91
+ #undef addcarry64
92
+ }
93
+
94
+ /*
95
+ * The function fiat_subborrowx_u64 is a subtraction with borrow.
96
+ *
97
+ * Postconditions:
98
+ * out1 = (-arg1 + arg2 + -arg3) mod 2^64
99
+ * out2 = -⌊(-arg1 + arg2 + -arg3) / 2^64⌋
100
+ *
101
+ * Input Bounds:
102
+ * arg1: [0x0 ~> 0x1]
103
+ * arg2: [0x0 ~> 0xffffffffffffffff]
104
+ * arg3: [0x0 ~> 0xffffffffffffffff]
105
+ * Output Bounds:
106
+ * out1: [0x0 ~> 0xffffffffffffffff]
107
+ * out2: [0x0 ~> 0x1]
108
+ */
109
+ __attribute__((target("adx,bmi2")))
110
+ static inline void fiat_subborrowx_u64(uint64_t* out1, fiat_uint1* out2, fiat_uint1 arg1, uint64_t arg2, uint64_t arg3) {
111
+ #if defined(__has_builtin)
112
+ # if __has_builtin(__builtin_ia32_subborrow_u64)
113
+ # define subborrow64 __builtin_ia32_subborrow_u64
114
+ # endif
115
+ #endif
116
+ #if defined(subborrow64)
117
+ long long unsigned int t;
118
+ *out2 = subborrow64(arg1, arg2, arg3, &t);
119
+ *out1 = t;
120
+ #elif defined(_M_X64)
121
+ long long unsigned int t;
122
+ *out2 = _subborrow_u64(arg1, arg2, arg3, &t); // NOTE: edited after generation
123
+ *out1 = t;
124
+ #else
125
+ *out1 = arg2 - arg3 - arg1;
126
+ *out2 = (arg2 < arg3) | ((arg2 == arg3) & arg1);
127
+ #endif
128
+ #undef subborrow64
129
+ }
130
+
131
+ /*
132
+ * The function fiat_cmovznz_u64 is a single-word conditional move.
133
+ *
134
+ * Postconditions:
135
+ * out1 = (if arg1 = 0 then arg2 else arg3)
136
+ *
137
+ * Input Bounds:
138
+ * arg1: [0x0 ~> 0x1]
139
+ * arg2: [0x0 ~> 0xffffffffffffffff]
140
+ * arg3: [0x0 ~> 0xffffffffffffffff]
141
+ * Output Bounds:
142
+ * out1: [0x0 ~> 0xffffffffffffffff]
143
+ */
144
+ __attribute__((target("adx,bmi2")))
145
+ static inline void fiat_cmovznz_u64(uint64_t* out1, fiat_uint1 arg1, uint64_t arg2, uint64_t arg3) {
146
+ fiat_uint1 x1;
147
+ uint64_t x2;
148
+ uint64_t x3;
149
+ x1 = (!(!arg1));
150
+ x2 = ((fiat_int1)(0x0 - x1) & UINT64_C(0xffffffffffffffff));
151
+ x3 = ((fiat_value_barrier_u64(x2) & arg3) | (fiat_value_barrier_u64((~x2)) & arg2));
152
+ *out1 = x3;
153
+ }
154
+
155
+ /*
156
+ * Input Bounds:
157
+ * arg1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
158
+ * arg2: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
159
+ * Output Bounds:
160
+ * out1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
161
+ */
162
+ __attribute__((target("adx,bmi2")))
163
+ static void fe4_add(uint64_t out1[4], const uint64_t arg1[4], const uint64_t arg2[4]) {
164
+ uint64_t x1;
165
+ fiat_uint1 x2;
166
+ uint64_t x3;
167
+ fiat_uint1 x4;
168
+ uint64_t x5;
169
+ fiat_uint1 x6;
170
+ uint64_t x7;
171
+ fiat_uint1 x8;
172
+ uint64_t x9;
173
+ uint64_t x10;
174
+ fiat_uint1 x11;
175
+ uint64_t x12;
176
+ fiat_uint1 x13;
177
+ uint64_t x14;
178
+ fiat_uint1 x15;
179
+ uint64_t x16;
180
+ fiat_uint1 x17;
181
+ uint64_t x18;
182
+ uint64_t x19;
183
+ fiat_uint1 x20;
184
+ fiat_addcarryx_u64(&x1, &x2, 0x0, (arg1[0]), (arg2[0]));
185
+ fiat_addcarryx_u64(&x3, &x4, x2, (arg1[1]), (arg2[1]));
186
+ fiat_addcarryx_u64(&x5, &x6, x4, (arg1[2]), (arg2[2]));
187
+ fiat_addcarryx_u64(&x7, &x8, x6, (arg1[3]), (arg2[3]));
188
+ fiat_cmovznz_u64(&x9, x8, 0x0, UINT8_C(0x26)); // NOTE: clang 14 for Zen 2 uses sbb, and
189
+ fiat_addcarryx_u64(&x10, &x11, 0x0, x1, x9);
190
+ fiat_addcarryx_u64(&x12, &x13, x11, x3, 0x0);
191
+ fiat_addcarryx_u64(&x14, &x15, x13, x5, 0x0);
192
+ fiat_addcarryx_u64(&x16, &x17, x15, x7, 0x0);
193
+ fiat_cmovznz_u64(&x18, x17, 0x0, UINT8_C(0x26)); // NOTE: clang 14 for Zen 2 uses sbb, and
194
+ fiat_addcarryx_u64(&x19, &x20, 0x0, x10, x18);
195
+ out1[0] = x19;
196
+ out1[1] = x12;
197
+ out1[2] = x14;
198
+ out1[3] = x16;
199
+ }
200
+
201
+ /*
202
+ * Input Bounds:
203
+ * arg1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
204
+ * arg2: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
205
+ * Output Bounds:
206
+ * out1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
207
+ */
208
+ __attribute__((target("adx,bmi2")))
209
+ static void fe4_sub(uint64_t out1[4], const uint64_t arg1[4], const uint64_t arg2[4]) {
210
+ uint64_t x1;
211
+ uint64_t x2;
212
+ fiat_uint1 x3;
213
+ uint64_t x4;
214
+ uint64_t x5;
215
+ fiat_uint1 x6;
216
+ uint64_t x7;
217
+ uint64_t x8;
218
+ fiat_uint1 x9;
219
+ uint64_t x10;
220
+ uint64_t x11;
221
+ fiat_uint1 x12;
222
+ uint64_t x13;
223
+ uint64_t x14;
224
+ fiat_uint1 x15;
225
+ uint64_t x16;
226
+ fiat_uint1 x17;
227
+ uint64_t x18;
228
+ fiat_uint1 x19;
229
+ uint64_t x20;
230
+ fiat_uint1 x21;
231
+ uint64_t x22;
232
+ uint64_t x23;
233
+ fiat_uint1 x24;
234
+ x1 = (arg2[0]);
235
+ fiat_subborrowx_u64(&x2, &x3, 0x0, (arg1[0]), x1);
236
+ x4 = (arg2[1]);
237
+ fiat_subborrowx_u64(&x5, &x6, x3, (arg1[1]), x4);
238
+ x7 = (arg2[2]);
239
+ fiat_subborrowx_u64(&x8, &x9, x6, (arg1[2]), x7);
240
+ x10 = (arg2[3]);
241
+ fiat_subborrowx_u64(&x11, &x12, x9, (arg1[3]), x10);
242
+ fiat_cmovznz_u64(&x13, x12, 0x0, UINT8_C(0x26)); // NOTE: clang 14 for Zen 2 uses sbb, and
243
+ fiat_subborrowx_u64(&x14, &x15, 0x0, x2, x13);
244
+ fiat_subborrowx_u64(&x16, &x17, x15, x5, 0x0);
245
+ fiat_subborrowx_u64(&x18, &x19, x17, x8, 0x0);
246
+ fiat_subborrowx_u64(&x20, &x21, x19, x11, 0x0);
247
+ fiat_cmovznz_u64(&x22, x21, 0x0, UINT8_C(0x26)); // NOTE: clang 14 for Zen 2 uses sbb, and
248
+ fiat_subborrowx_u64(&x23, &x24, 0x0, x14, x22);
249
+ out1[0] = x23;
250
+ out1[1] = x16;
251
+ out1[2] = x18;
252
+ out1[3] = x20;
253
+ }
254
+
255
+ /*
256
+ * Input Bounds:
257
+ * arg1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
258
+ * arg2: [0x0 ~> 0x3ffffffffffffff] // NOTE: this is not any uint64!
259
+ * Output Bounds:
260
+ * out1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
261
+ */
262
+ __attribute__((target("adx,bmi2")))
263
+ static void fe4_scmul(uint64_t out1[4], const uint64_t arg1[4], uint64_t arg2) {
264
+ uint64_t x1;
265
+ uint64_t x2;
266
+ uint64_t x3;
267
+ uint64_t x4;
268
+ uint64_t x5;
269
+ fiat_uint1 x6;
270
+ uint64_t x7;
271
+ uint64_t x8;
272
+ uint64_t x9;
273
+ fiat_uint1 x10;
274
+ uint64_t x11;
275
+ uint64_t x12;
276
+ uint64_t x13;
277
+ fiat_uint1 x14;
278
+ uint64_t x15;
279
+ uint64_t x16;
280
+ uint64_t x17;
281
+ fiat_uint1 x18;
282
+ uint64_t x19;
283
+ fiat_uint1 x20;
284
+ uint64_t x21;
285
+ fiat_uint1 x22;
286
+ uint64_t x23;
287
+ fiat_uint1 x24;
288
+ uint64_t x25;
289
+ uint64_t x26;
290
+ fiat_uint1 x27;
291
+ fiat_mulx_u64(&x1, &x2, (arg1[0]), arg2);
292
+ fiat_mulx_u64(&x3, &x4, (arg1[1]), arg2);
293
+ fiat_addcarryx_u64(&x5, &x6, 0x0, x2, x3);
294
+ fiat_mulx_u64(&x7, &x8, (arg1[2]), arg2);
295
+ fiat_addcarryx_u64(&x9, &x10, x6, x4, x7);
296
+ fiat_mulx_u64(&x11, &x12, (arg1[3]), arg2);
297
+ fiat_addcarryx_u64(&x13, &x14, x10, x8, x11);
298
+ fiat_mulx_u64(&x15, &x16, (x12 + (uint64_t)x14), UINT8_C(0x26));
299
+ fiat_addcarryx_u64(&x17, &x18, 0x0, x1, x15);
300
+ fiat_addcarryx_u64(&x19, &x20, x18, x5, 0x0);
301
+ fiat_addcarryx_u64(&x21, &x22, x20, x9, 0x0);
302
+ fiat_addcarryx_u64(&x23, &x24, x22, x13, 0x0);
303
+ fiat_cmovznz_u64(&x25, x24, 0x0, UINT8_C(0x26)); // NOTE: clang 14 for Zen 2 uses sbb, and
304
+ fiat_addcarryx_u64(&x26, &x27, 0x0, x17, x25);
305
+ out1[0] = x26;
306
+ out1[1] = x19;
307
+ out1[2] = x21;
308
+ out1[3] = x23;
309
+ }
310
+
311
+ /*
312
+ * Input Bounds:
313
+ * arg1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
314
+ * Output Bounds:
315
+ * out1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
316
+ */
317
+ __attribute__((target("adx,bmi2")))
318
+ static void fe4_canon(uint64_t out1[4], const uint64_t arg1[4]) {
319
+ uint64_t x1;
320
+ fiat_uint1 x2;
321
+ uint64_t x3;
322
+ fiat_uint1 x4;
323
+ uint64_t x5;
324
+ fiat_uint1 x6;
325
+ uint64_t x7;
326
+ fiat_uint1 x8;
327
+ uint64_t x9;
328
+ uint64_t x10;
329
+ uint64_t x11;
330
+ uint64_t x12;
331
+ uint64_t x13;
332
+ fiat_uint1 x14;
333
+ uint64_t x15;
334
+ fiat_uint1 x16;
335
+ uint64_t x17;
336
+ fiat_uint1 x18;
337
+ uint64_t x19;
338
+ fiat_uint1 x20;
339
+ uint64_t x21;
340
+ uint64_t x22;
341
+ uint64_t x23;
342
+ uint64_t x24;
343
+ fiat_subborrowx_u64(&x1, &x2, 0x0, (arg1[0]), UINT64_C(0xffffffffffffffed));
344
+ fiat_subborrowx_u64(&x3, &x4, x2, (arg1[1]), UINT64_C(0xffffffffffffffff));
345
+ fiat_subborrowx_u64(&x5, &x6, x4, (arg1[2]), UINT64_C(0xffffffffffffffff));
346
+ fiat_subborrowx_u64(&x7, &x8, x6, (arg1[3]), UINT64_C(0x7fffffffffffffff));
347
+ fiat_cmovznz_u64(&x9, x8, x1, (arg1[0]));
348
+ fiat_cmovznz_u64(&x10, x8, x3, (arg1[1]));
349
+ fiat_cmovznz_u64(&x11, x8, x5, (arg1[2]));
350
+ fiat_cmovznz_u64(&x12, x8, x7, (arg1[3]));
351
+ fiat_subborrowx_u64(&x13, &x14, 0x0, x9, UINT64_C(0xffffffffffffffed));
352
+ fiat_subborrowx_u64(&x15, &x16, x14, x10, UINT64_C(0xffffffffffffffff));
353
+ fiat_subborrowx_u64(&x17, &x18, x16, x11, UINT64_C(0xffffffffffffffff));
354
+ fiat_subborrowx_u64(&x19, &x20, x18, x12, UINT64_C(0x7fffffffffffffff));
355
+ fiat_cmovznz_u64(&x21, x20, x13, x9);
356
+ fiat_cmovznz_u64(&x22, x20, x15, x10);
357
+ fiat_cmovznz_u64(&x23, x20, x17, x11);
358
+ fiat_cmovznz_u64(&x24, x20, x19, x12);
359
+ out1[0] = x21;
360
+ out1[1] = x22;
361
+ out1[2] = x23;
362
+ out1[3] = x24;
363
+ }
364
+
365
+ /*
366
+ * Input Bounds:
367
+ * arg1: [0x0 ~> 0x1]
368
+ * arg2: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
369
+ * arg3: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
370
+ * Output Bounds:
371
+ * out1: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
372
+ * out2: [[0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff], [0x0 ~> 0xffffffffffffffff]]
373
+ */
374
+ __attribute__((target("adx,bmi2")))
375
+ static void fe4_cswap(uint64_t out1[4], uint64_t out2[4], fiat_uint1 arg1, const uint64_t arg2[4], const uint64_t arg3[4]) {
376
+ uint64_t x1;
377
+ uint64_t x2;
378
+ uint64_t x3;
379
+ uint64_t x4;
380
+ uint64_t x5;
381
+ uint64_t x6;
382
+ uint64_t x7;
383
+ uint64_t x8;
384
+ // NOTE: clang 14 for Zen 2 uses YMM registers
385
+ fiat_cmovznz_u64(&x1, arg1, (arg2[0]), (arg3[0]));
386
+ fiat_cmovznz_u64(&x2, arg1, (arg2[1]), (arg3[1]));
387
+ fiat_cmovznz_u64(&x3, arg1, (arg2[2]), (arg3[2]));
388
+ fiat_cmovznz_u64(&x4, arg1, (arg2[3]), (arg3[3]));
389
+ fiat_cmovznz_u64(&x5, arg1, (arg3[0]), (arg2[0]));
390
+ fiat_cmovznz_u64(&x6, arg1, (arg3[1]), (arg2[1]));
391
+ fiat_cmovznz_u64(&x7, arg1, (arg3[2]), (arg2[2]));
392
+ fiat_cmovznz_u64(&x8, arg1, (arg3[3]), (arg2[3]));
393
+ out1[0] = x1;
394
+ out1[1] = x2;
395
+ out1[2] = x3;
396
+ out1[3] = x4;
397
+ out2[0] = x5;
398
+ out2[1] = x6;
399
+ out2[2] = x7;
400
+ out2[3] = x8;
401
+ }
402
+
403
+ // The following functions are adaped from crypto/curve25519/curve25519.c
404
+ // It would be desirable to share the code, but with the current field
405
+ // implementations both 4-limb and 5-limb versions of the curve-level code need
406
+ // to be included in builds targetting an unknown variant of x86_64.
407
+
408
+ __attribute__((target("adx,bmi2")))
409
+ static void fe4_invert(fe4 out, const fe4 z) {
410
+ fe4 t0;
411
+ fe4 t1;
412
+ fe4 t2;
413
+ fe4 t3;
414
+ int i;
415
+
416
+ fe4_sq(t0, z);
417
+ fe4_sq(t1, t0);
418
+ for (i = 1; i < 2; ++i) {
419
+ fe4_sq(t1, t1);
420
+ }
421
+ fe4_mul(t1, z, t1);
422
+ fe4_mul(t0, t0, t1);
423
+ fe4_sq(t2, t0);
424
+ fe4_mul(t1, t1, t2);
425
+ fe4_sq(t2, t1);
426
+ for (i = 1; i < 5; ++i) {
427
+ fe4_sq(t2, t2);
428
+ }
429
+ fe4_mul(t1, t2, t1);
430
+ fe4_sq(t2, t1);
431
+ for (i = 1; i < 10; ++i) {
432
+ fe4_sq(t2, t2);
433
+ }
434
+ fe4_mul(t2, t2, t1);
435
+ fe4_sq(t3, t2);
436
+ for (i = 1; i < 20; ++i) {
437
+ fe4_sq(t3, t3);
438
+ }
439
+ fe4_mul(t2, t3, t2);
440
+ fe4_sq(t2, t2);
441
+ for (i = 1; i < 10; ++i) {
442
+ fe4_sq(t2, t2);
443
+ }
444
+ fe4_mul(t1, t2, t1);
445
+ fe4_sq(t2, t1);
446
+ for (i = 1; i < 50; ++i) {
447
+ fe4_sq(t2, t2);
448
+ }
449
+ fe4_mul(t2, t2, t1);
450
+ fe4_sq(t3, t2);
451
+ for (i = 1; i < 100; ++i) {
452
+ fe4_sq(t3, t3);
453
+ }
454
+ fe4_mul(t2, t3, t2);
455
+ fe4_sq(t2, t2);
456
+ for (i = 1; i < 50; ++i) {
457
+ fe4_sq(t2, t2);
458
+ }
459
+ fe4_mul(t1, t2, t1);
460
+ fe4_sq(t1, t1);
461
+ for (i = 1; i < 5; ++i) {
462
+ fe4_sq(t1, t1);
463
+ }
464
+ fe4_mul(out, t1, t0);
465
+ }
466
+
467
+ __attribute__((target("adx,bmi2")))
468
+ void x25519_scalar_mult_adx(uint8_t out[32], const uint8_t scalar[32],
469
+ const uint8_t point[32]) {
470
+ uint8_t e[32];
471
+ memcpy(e, scalar, 32);
472
+ e[0] &= 248;
473
+ e[31] &= 127;
474
+ e[31] |= 64;
475
+
476
+ // The following implementation was transcribed to Coq and proven to
477
+ // correspond to unary scalar multiplication in affine coordinates given that
478
+ // x1 != 0 is the x coordinate of some point on the curve. It was also checked
479
+ // in Coq that doing a ladderstep with x1 = x3 = 0 gives z2' = z3' = 0, and z2
480
+ // = z3 = 0 gives z2' = z3' = 0. The statement was quantified over the
481
+ // underlying field, so it applies to Curve25519 itself and the quadratic
482
+ // twist of Curve25519. It was not proven in Coq that prime-field arithmetic
483
+ // correctly simulates extension-field arithmetic on prime-field values.
484
+ // The decoding of the byte array representation of e was not considered.
485
+ // Specification of Montgomery curves in affine coordinates:
486
+ // <https://github.com/mit-plv/fiat-crypto/blob/2456d821825521f7e03e65882cc3521795b0320f/src/Spec/MontgomeryCurve.v#L27>
487
+ // Proof that these form a group that is isomorphic to a Weierstrass curve:
488
+ // <https://github.com/mit-plv/fiat-crypto/blob/2456d821825521f7e03e65882cc3521795b0320f/src/Curves/Montgomery/AffineProofs.v#L35>
489
+ // Coq transcription and correctness proof of the loop (where scalarbits=255):
490
+ // <https://github.com/mit-plv/fiat-crypto/blob/2456d821825521f7e03e65882cc3521795b0320f/src/Curves/Montgomery/XZ.v#L118>
491
+ // <https://github.com/mit-plv/fiat-crypto/blob/2456d821825521f7e03e65882cc3521795b0320f/src/Curves/Montgomery/XZProofs.v#L278>
492
+ // preconditions: 0 <= e < 2^255 (not necessarily e < order), fe_invert(0) = 0
493
+ fe4 x1, x2 = {1}, z2 = {0}, x3, z3 = {1}, tmp0, tmp1;
494
+ OPENSSL_memcpy(x1, point, sizeof(fe4));
495
+ x1[3] &= (uint64_t)(-1)>>1;
496
+ OPENSSL_memcpy(x3, x1, sizeof(fe4));
497
+
498
+ unsigned swap = 0;
499
+ int pos;
500
+ for (pos = 254; pos >= 0; --pos) {
501
+ // loop invariant as of right before the test, for the case where x1 != 0:
502
+ // pos >= -1; if z2 = 0 then x2 is nonzero; if z3 = 0 then x3 is nonzero
503
+ // let r := e >> (pos+1) in the following equalities of projective points:
504
+ // to_xz (r*P) === if swap then (x3, z3) else (x2, z2)
505
+ // to_xz ((r+1)*P) === if swap then (x2, z2) else (x3, z3)
506
+ // x1 is the nonzero x coordinate of the nonzero point (r*P-(r+1)*P)
507
+ unsigned b = 1 & (e[pos / 8] >> (pos & 7));
508
+ swap ^= b;
509
+ fe4_cswap(x2, x3, swap, x2, x3);
510
+ fe4_cswap(z2, z3, swap, z2, z3);
511
+ swap = b;
512
+ // Coq transcription of ladderstep formula (called from transcribed loop):
513
+ // <https://github.com/mit-plv/fiat-crypto/blob/2456d821825521f7e03e65882cc3521795b0320f/src/Curves/Montgomery/XZ.v#L89>
514
+ // <https://github.com/mit-plv/fiat-crypto/blob/2456d821825521f7e03e65882cc3521795b0320f/src/Curves/Montgomery/XZProofs.v#L131>
515
+ // x1 != 0 <https://github.com/mit-plv/fiat-crypto/blob/2456d821825521f7e03e65882cc3521795b0320f/src/Curves/Montgomery/XZProofs.v#L217>
516
+ // x1 = 0 <https://github.com/mit-plv/fiat-crypto/blob/2456d821825521f7e03e65882cc3521795b0320f/src/Curves/Montgomery/XZProofs.v#L147>
517
+ fe4_sub(tmp0, x3, z3);
518
+ fe4_sub(tmp1, x2, z2);
519
+ fe4_add(x2, x2, z2);
520
+ fe4_add(z2, x3, z3);
521
+ fe4_mul(z3, tmp0, x2);
522
+ fe4_mul(z2, z2, tmp1);
523
+ fe4_sq(tmp0, tmp1);
524
+ fe4_sq(tmp1, x2);
525
+ fe4_add(x3, z3, z2);
526
+ fe4_sub(z2, z3, z2);
527
+ fe4_mul(x2, tmp1, tmp0);
528
+ fe4_sub(tmp1, tmp1, tmp0);
529
+ fe4_sq(z2, z2);
530
+ fe4_scmul(z3, tmp1, 121666);
531
+ fe4_sq(x3, x3);
532
+ fe4_add(tmp0, tmp0, z3);
533
+ fe4_mul(z3, x1, z2);
534
+ fe4_mul(z2, tmp1, tmp0);
535
+ }
536
+ // here pos=-1, so r=e, so to_xz (e*P) === if swap then (x3, z3) else (x2, z2)
537
+ fe4_cswap(x2, x3, swap, x2, x3);
538
+ fe4_cswap(z2, z3, swap, z2, z3);
539
+
540
+ fe4_invert(z2, z2);
541
+ fe4_mul(x2, x2, z2);
542
+ fe4_canon(x2, x2);
543
+ OPENSSL_memcpy(out, x2, sizeof(fe4));
544
+ }
545
+
546
+ typedef struct {
547
+ fe4 X;
548
+ fe4 Y;
549
+ fe4 Z;
550
+ fe4 T;
551
+ } ge_p3_4;
552
+
553
+ typedef struct {
554
+ fe4 yplusx;
555
+ fe4 yminusx;
556
+ fe4 xy2d;
557
+ } ge_precomp_4;
558
+
559
+ __attribute__((target("adx,bmi2")))
560
+ static void inline_x25519_ge_dbl_4(ge_p3_4 *r, const ge_p3_4 *p, bool skip_t) {
561
+ // Transcribed from a Coq function proven against affine coordinates.
562
+ // https://github.com/mit-plv/fiat-crypto/blob/9943ba9e7d8f3e1c0054b2c94a5edca46ea73ef8/src/Curves/Edwards/XYZT/Basic.v#L136-L165
563
+ fe4 trX, trZ, trT, t0, cX, cY, cZ, cT;
564
+ fe4_sq(trX, p->X);
565
+ fe4_sq(trZ, p->Y);
566
+ fe4_sq(trT, p->Z);
567
+ fe4_add(trT, trT, trT);
568
+ fe4_add(cY, p->X, p->Y);
569
+ fe4_sq(t0, cY);
570
+ fe4_add(cY, trZ, trX);
571
+ fe4_sub(cZ, trZ, trX);
572
+ fe4_sub(cX, t0, cY);
573
+ fe4_sub(cT, trT, cZ);
574
+ fe4_mul(r->X, cX, cT);
575
+ fe4_mul(r->Y, cY, cZ);
576
+ fe4_mul(r->Z, cZ, cT);
577
+ if (!skip_t) {
578
+ fe4_mul(r->T, cX, cY);
579
+ }
580
+ }
581
+
582
+ __attribute__((target("adx,bmi2")))
583
+ __attribute__((always_inline)) // 4% speedup with clang14 and zen2
584
+ static inline void
585
+ ge_p3_add_p3_precomp_4(ge_p3_4 *r, const ge_p3_4 *p, const ge_precomp_4 *q) {
586
+ fe4 A, B, C, YplusX, YminusX, D, X3, Y3, Z3, T3;
587
+ // Transcribed from a Coq function proven against affine coordinates.
588
+ // https://github.com/mit-plv/fiat-crypto/blob/a36568d1d73aff5d7accc79fd28be672882f9c17/src/Curves/Edwards/XYZT/Precomputed.v#L38-L56
589
+ fe4_add(YplusX, p->Y, p->X);
590
+ fe4_sub(YminusX, p->Y, p->X);
591
+ fe4_mul(A, YplusX, q->yplusx);
592
+ fe4_mul(B, YminusX, q->yminusx);
593
+ fe4_mul(C, q->xy2d, p->T);
594
+ fe4_add(D, p->Z, p->Z);
595
+ fe4_sub(X3, A, B);
596
+ fe4_add(Y3, A, B);
597
+ fe4_add(Z3, D, C);
598
+ fe4_sub(T3, D, C);
599
+ fe4_mul(r->X, X3, T3);
600
+ fe4_mul(r->Y, Y3, Z3);
601
+ fe4_mul(r->Z, Z3, T3);
602
+ fe4_mul(r->T, X3, Y3);
603
+ }
604
+
605
+ __attribute__((always_inline)) // 25% speedup with clang14 and zen2
606
+ static inline void table_select_4(ge_precomp_4 *t, const int pos,
607
+ const signed char b) {
608
+ uint8_t bnegative = constant_time_msb_w(b);
609
+ uint8_t babs = b - ((bnegative & b) << 1);
610
+
611
+ uint8_t t_bytes[3][32] = {
612
+ {constant_time_is_zero_w(b) & 1}, {constant_time_is_zero_w(b) & 1}, {0}};
613
+ #if defined(__clang__)
614
+ __asm__("" : "+m" (t_bytes) : /*no inputs*/);
615
+ #endif
616
+ static_assert(sizeof(t_bytes) == sizeof(k25519Precomp[pos][0]), "");
617
+ for (int i = 0; i < 8; i++) {
618
+ constant_time_conditional_memxor(t_bytes, k25519Precomp[pos][i],
619
+ sizeof(t_bytes),
620
+ constant_time_eq_w(babs, 1 + i));
621
+ }
622
+
623
+ static_assert(sizeof(t_bytes) == sizeof(ge_precomp_4), "");
624
+
625
+ // fe4 uses saturated 64-bit limbs, so converting from bytes is just a copy.
626
+ OPENSSL_memcpy(t, t_bytes, sizeof(ge_precomp_4));
627
+
628
+ fe4 xy2d_neg = {0};
629
+ fe4_sub(xy2d_neg, xy2d_neg, t->xy2d);
630
+ constant_time_conditional_memcpy(t->yplusx, t_bytes[1], sizeof(fe4),
631
+ bnegative);
632
+ constant_time_conditional_memcpy(t->yminusx, t_bytes[0], sizeof(fe4),
633
+ bnegative);
634
+ constant_time_conditional_memcpy(t->xy2d, xy2d_neg, sizeof(fe4), bnegative);
635
+ }
636
+
637
+ // h = a * B
638
+ // where a = a[0]+256*a[1]+...+256^31 a[31]
639
+ // B is the Ed25519 base point (x,4/5) with x positive.
640
+ //
641
+ // Preconditions:
642
+ // a[31] <= 127
643
+ __attribute__((target("adx,bmi2")))
644
+ void x25519_ge_scalarmult_base_adx(uint8_t h[4][32], const uint8_t a[32]) {
645
+ signed char e[64];
646
+ signed char carry;
647
+
648
+ for (unsigned i = 0; i < 32; ++i) {
649
+ e[2 * i + 0] = (a[i] >> 0) & 15;
650
+ e[2 * i + 1] = (a[i] >> 4) & 15;
651
+ }
652
+ // each e[i] is between 0 and 15
653
+ // e[63] is between 0 and 7
654
+
655
+ carry = 0;
656
+ for (unsigned i = 0; i < 63; ++i) {
657
+ e[i] += carry;
658
+ carry = e[i] + 8;
659
+ carry >>= 4;
660
+ e[i] -= carry << 4;
661
+ }
662
+ e[63] += carry;
663
+ // each e[i] is between -8 and 8
664
+
665
+ ge_p3_4 r = {{0}, {1}, {1}, {0}};
666
+ for (unsigned i = 1; i < 64; i += 2) {
667
+ ge_precomp_4 t;
668
+ table_select_4(&t, i / 2, e[i]);
669
+ ge_p3_add_p3_precomp_4(&r, &r, &t);
670
+ }
671
+
672
+ inline_x25519_ge_dbl_4(&r, &r, /*skip_t=*/true);
673
+ inline_x25519_ge_dbl_4(&r, &r, /*skip_t=*/true);
674
+ inline_x25519_ge_dbl_4(&r, &r, /*skip_t=*/true);
675
+ inline_x25519_ge_dbl_4(&r, &r, /*skip_t=*/false);
676
+
677
+ for (unsigned i = 0; i < 64; i += 2) {
678
+ ge_precomp_4 t;
679
+ table_select_4(&t, i / 2, e[i]);
680
+ ge_p3_add_p3_precomp_4(&r, &r, &t);
681
+ }
682
+
683
+ // fe4 uses saturated 64-bit limbs, so converting to bytes is just a copy.
684
+ // Satisfy stated precondition of fiat_25519_from_bytes; tests pass either way
685
+ fe4_canon(r.X, r.X);
686
+ fe4_canon(r.Y, r.Y);
687
+ fe4_canon(r.Z, r.Z);
688
+ fe4_canon(r.T, r.T);
689
+ static_assert(sizeof(ge_p3_4) == sizeof(uint8_t[4][32]), "");
690
+ OPENSSL_memcpy(h, &r, sizeof(ge_p3_4));
691
+ }
@@ -73,9 +73,9 @@ upb_MapInsertStatus upb_Map_Insert(upb_Map* map, upb_MessageValue key,
73
73
 
74
74
  bool upb_Map_Delete(upb_Map* map, upb_MessageValue key, upb_MessageValue* val) {
75
75
  upb_value v;
76
- const bool ok = _upb_Map_Delete(map, &key, map->key_size, &v);
77
- if (val) val->uint64_val = v.val;
78
- return ok;
76
+ const bool removed = _upb_Map_Delete(map, &key, map->key_size, &v);
77
+ if (val) _upb_map_fromvalue(v, val, map->val_size);
78
+ return removed;
79
79
  }
80
80
 
81
81
  bool upb_Map_Next(const upb_Map* map, upb_MessageValue* key,