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
@@ -66,10 +66,52 @@
66
66
  #include "../../internal.h"
67
67
 
68
68
 
69
+ // EC_LOOSE_SCALAR is like |EC_SCALAR| but is bounded by 2^|BN_num_bits(order)|
70
+ // rather than |order|.
71
+ typedef union {
72
+ // bytes is the representation of the scalar in little-endian order.
73
+ uint8_t bytes[EC_MAX_SCALAR_BYTES];
74
+ BN_ULONG words[EC_MAX_SCALAR_WORDS];
75
+ } EC_LOOSE_SCALAR;
76
+
77
+ static void scalar_add_loose(const EC_GROUP *group, EC_LOOSE_SCALAR *r,
78
+ const EC_LOOSE_SCALAR *a, const EC_SCALAR *b) {
79
+ // Add and subtract one copy of |order| if necessary. We have:
80
+ // |a| + |b| < 2^BN_num_bits(order) + order
81
+ // so this leaves |r| < 2^BN_num_bits(order).
82
+ const BIGNUM *order = &group->order;
83
+ BN_ULONG carry = bn_add_words(r->words, a->words, b->words, order->width);
84
+ EC_LOOSE_SCALAR tmp;
85
+ BN_ULONG v =
86
+ bn_sub_words(tmp.words, r->words, order->d, order->width) - carry;
87
+ bn_select_words(r->words, 0u - v, r->words /* tmp < 0 */,
88
+ tmp.words /* tmp >= 0 */, order->width);
89
+ }
90
+
91
+ static int scalar_mod_mul_montgomery(const EC_GROUP *group, EC_SCALAR *r,
92
+ const EC_SCALAR *a, const EC_SCALAR *b) {
93
+ const BIGNUM *order = &group->order;
94
+ return bn_mod_mul_montgomery_small(r->words, order->width, a->words,
95
+ order->width, b->words, order->width,
96
+ group->order_mont);
97
+ }
98
+
99
+ static int scalar_mod_mul_montgomery_loose(const EC_GROUP *group, EC_SCALAR *r,
100
+ const EC_LOOSE_SCALAR *a,
101
+ const EC_SCALAR *b) {
102
+ // Although |a| is loose, |bn_mod_mul_montgomery_small| only requires the
103
+ // product not exceed R * |order|. |b| is fully reduced and |a| <
104
+ // 2^BN_num_bits(order) <= R, so this holds.
105
+ const BIGNUM *order = &group->order;
106
+ return bn_mod_mul_montgomery_small(r->words, order->width, a->words,
107
+ order->width, b->words, order->width,
108
+ group->order_mont);
109
+ }
110
+
69
111
  // digest_to_scalar interprets |digest_len| bytes from |digest| as a scalar for
70
112
  // ECDSA. Note this value is not fully reduced modulo the order, only the
71
113
  // correct number of bits.
72
- static void digest_to_scalar(const EC_GROUP *group, EC_SCALAR *out,
114
+ static void digest_to_scalar(const EC_GROUP *group, EC_LOOSE_SCALAR *out,
73
115
  const uint8_t *digest, size_t digest_len) {
74
116
  const BIGNUM *order = &group->order;
75
117
  size_t num_bits = BN_num_bits(order);
@@ -85,11 +127,11 @@ static void digest_to_scalar(const EC_GROUP *group, EC_SCALAR *out,
85
127
  // If still too long truncate remaining bits with a shift
86
128
  if (8 * digest_len > num_bits) {
87
129
  size_t shift = 8 - (num_bits & 0x7);
88
- for (int i = 0; i < order->top - 1; i++) {
130
+ for (int i = 0; i < order->width - 1; i++) {
89
131
  out->words[i] =
90
132
  (out->words[i] >> shift) | (out->words[i + 1] << (BN_BITS2 - shift));
91
133
  }
92
- out->words[order->top - 1] >>= shift;
134
+ out->words[order->width - 1] >>= shift;
93
135
  }
94
136
  }
95
137
 
@@ -195,15 +237,12 @@ int ECDSA_do_verify(const uint8_t *digest, size_t digest_len,
195
237
  goto err;
196
238
  }
197
239
 
198
- EC_SCALAR r, s, m, u1, u2, s_inv_mont;
240
+ EC_SCALAR r, s, u1, u2, s_inv_mont;
241
+ EC_LOOSE_SCALAR m;
199
242
  const BIGNUM *order = EC_GROUP_get0_order(group);
200
243
  if (BN_is_zero(sig->r) ||
201
- BN_is_negative(sig->r) ||
202
- BN_ucmp(sig->r, order) >= 0 ||
203
244
  !ec_bignum_to_scalar(group, &r, sig->r) ||
204
245
  BN_is_zero(sig->s) ||
205
- BN_is_negative(sig->s) ||
206
- BN_ucmp(sig->s, order) >= 0 ||
207
246
  !ec_bignum_to_scalar(group, &s, sig->s)) {
208
247
  OPENSSL_PUT_ERROR(ECDSA, ECDSA_R_BAD_SIGNATURE);
209
248
  goto err;
@@ -212,26 +251,21 @@ int ECDSA_do_verify(const uint8_t *digest, size_t digest_len,
212
251
  // the products below.
213
252
  int no_inverse;
214
253
  if (!BN_mod_inverse_odd(X, &no_inverse, sig->s, order, ctx) ||
215
- !ec_bignum_to_scalar(group, &s_inv_mont, X) ||
216
- !bn_to_montgomery_small(s_inv_mont.words, order->top, s_inv_mont.words,
217
- order->top, group->order_mont)) {
254
+ // TODO(davidben): Add a words version of |BN_mod_inverse_odd| and write
255
+ // into |s_inv_mont| directly.
256
+ !ec_bignum_to_scalar_unchecked(group, &s_inv_mont, X) ||
257
+ !bn_to_montgomery_small(s_inv_mont.words, order->width, s_inv_mont.words,
258
+ order->width, group->order_mont)) {
218
259
  goto err;
219
260
  }
220
- // u1 = m * s_inv_mont mod order
221
- // u2 = r * s_inv_mont mod order
261
+ // u1 = m * s^-1 mod order
262
+ // u2 = r * s^-1 mod order
222
263
  //
223
264
  // |s_inv_mont| is in Montgomery form while |m| and |r| are not, so |u1| and
224
- // |u2| will be taken out of Montgomery form, as desired. Note that, although
225
- // |m| is not fully reduced, |bn_mod_mul_montgomery_small| only requires the
226
- // product not exceed R * |order|. |s_inv_mont| is fully reduced and |m| <
227
- // 2^BN_num_bits(order) <= R, so this holds.
265
+ // |u2| will be taken out of Montgomery form, as desired.
228
266
  digest_to_scalar(group, &m, digest, digest_len);
229
- if (!bn_mod_mul_montgomery_small(u1.words, order->top, m.words, order->top,
230
- s_inv_mont.words, order->top,
231
- group->order_mont) ||
232
- !bn_mod_mul_montgomery_small(u2.words, order->top, r.words, order->top,
233
- s_inv_mont.words, order->top,
234
- group->order_mont)) {
267
+ if (!scalar_mod_mul_montgomery_loose(group, &u1, &m, &s_inv_mont) ||
268
+ !scalar_mod_mul_montgomery(group, &u2, &r, &s_inv_mont)) {
235
269
  goto err;
236
270
  }
237
271
 
@@ -240,7 +274,7 @@ int ECDSA_do_verify(const uint8_t *digest, size_t digest_len,
240
274
  OPENSSL_PUT_ERROR(ECDSA, ERR_R_MALLOC_FAILURE);
241
275
  goto err;
242
276
  }
243
- if (!ec_point_mul_scalar(group, point, &u1, pub_key, &u2, ctx)) {
277
+ if (!ec_point_mul_scalar_public(group, point, &u1, pub_key, &u2, ctx)) {
244
278
  OPENSSL_PUT_ERROR(ECDSA, ERR_R_EC_LIB);
245
279
  goto err;
246
280
  }
@@ -308,7 +342,7 @@ static int ecdsa_sign_setup(const EC_KEY *eckey, BN_CTX *ctx,
308
342
  SHA512_CTX sha;
309
343
  uint8_t additional_data[SHA512_DIGEST_LENGTH];
310
344
  SHA512_Init(&sha);
311
- SHA512_Update(&sha, priv_key->words, order->top * sizeof(BN_ULONG));
345
+ SHA512_Update(&sha, priv_key->words, order->width * sizeof(BN_ULONG));
312
346
  SHA512_Update(&sha, digest, digest_len);
313
347
  SHA512_Final(additional_data, &sha);
314
348
  if (!ec_random_nonzero_scalar(group, &k, additional_data)) {
@@ -318,10 +352,10 @@ static int ecdsa_sign_setup(const EC_KEY *eckey, BN_CTX *ctx,
318
352
 
319
353
  // Compute k^-1. We leave it in the Montgomery domain as an optimization for
320
354
  // later operations.
321
- if (!bn_to_montgomery_small(out_kinv_mont->words, order->top, k.words,
322
- order->top, group->order_mont) ||
323
- !bn_mod_inverse_prime_mont_small(out_kinv_mont->words, order->top,
324
- out_kinv_mont->words, order->top,
355
+ if (!bn_to_montgomery_small(out_kinv_mont->words, order->width, k.words,
356
+ order->width, group->order_mont) ||
357
+ !bn_mod_inverse_prime_mont_small(out_kinv_mont->words, order->width,
358
+ out_kinv_mont->words, order->width,
325
359
  group->order_mont)) {
326
360
  goto err;
327
361
  }
@@ -358,64 +392,47 @@ ECDSA_SIG *ECDSA_do_sign(const uint8_t *digest, size_t digest_len,
358
392
  }
359
393
 
360
394
  const EC_GROUP *group = EC_KEY_get0_group(eckey);
361
- const BIGNUM *priv_key_bn = EC_KEY_get0_private_key(eckey);
362
- if (group == NULL || priv_key_bn == NULL) {
395
+ if (group == NULL || eckey->priv_key == NULL) {
363
396
  OPENSSL_PUT_ERROR(ECDSA, ERR_R_PASSED_NULL_PARAMETER);
364
397
  return NULL;
365
398
  }
366
399
  const BIGNUM *order = EC_GROUP_get0_order(group);
400
+ const EC_SCALAR *priv_key = &eckey->priv_key->scalar;
367
401
 
368
402
  int ok = 0;
369
403
  ECDSA_SIG *ret = ECDSA_SIG_new();
370
404
  BN_CTX *ctx = BN_CTX_new();
371
- EC_SCALAR kinv_mont, priv_key, r_mont, s, tmp, m;
405
+ EC_SCALAR kinv_mont, r_mont, s;
406
+ EC_LOOSE_SCALAR m, tmp;
372
407
  if (ret == NULL || ctx == NULL) {
373
408
  OPENSSL_PUT_ERROR(ECDSA, ERR_R_MALLOC_FAILURE);
374
409
  return NULL;
375
410
  }
376
411
 
377
412
  digest_to_scalar(group, &m, digest, digest_len);
378
- if (!ec_bignum_to_scalar(group, &priv_key, priv_key_bn)) {
379
- goto err;
380
- }
381
413
  for (;;) {
382
414
  if (!ecdsa_sign_setup(eckey, ctx, &kinv_mont, &ret->r, digest, digest_len,
383
- &priv_key)) {
415
+ priv_key)) {
384
416
  goto err;
385
417
  }
386
418
 
387
419
  // Compute priv_key * r (mod order). Note if only one parameter is in the
388
- // Montgomery domain, |bn_mod_mul_montgomery_small| will compute the answer
389
- // in the normal domain.
420
+ // Montgomery domain, |scalar_mod_mul_montgomery| will compute the answer in
421
+ // the normal domain.
390
422
  if (!ec_bignum_to_scalar(group, &r_mont, ret->r) ||
391
- !bn_to_montgomery_small(r_mont.words, order->top, r_mont.words,
392
- order->top, group->order_mont) ||
393
- !bn_mod_mul_montgomery_small(s.words, order->top, priv_key.words,
394
- order->top, r_mont.words, order->top,
395
- group->order_mont)) {
423
+ !bn_to_montgomery_small(r_mont.words, order->width, r_mont.words,
424
+ order->width, group->order_mont) ||
425
+ !scalar_mod_mul_montgomery(group, &s, priv_key, &r_mont)) {
396
426
  goto err;
397
427
  }
398
428
 
399
- // Compute s += m in constant time. Reduce one copy of |order| if necessary.
400
- // Note this does not leave |s| fully reduced. We have
401
- // |m| < 2^BN_num_bits(order), so subtracting |order| leaves
402
- // 0 <= |s| < 2^BN_num_bits(order).
403
- BN_ULONG carry = bn_add_words(s.words, s.words, m.words, order->top);
404
- BN_ULONG v = bn_sub_words(tmp.words, s.words, order->d, order->top) - carry;
405
- v = 0u - v;
406
- for (int i = 0; i < order->top; i++) {
407
- s.words[i] = constant_time_select_w(v, s.words[i], tmp.words[i]);
408
- }
429
+ // Compute tmp = m + priv_key * r.
430
+ scalar_add_loose(group, &tmp, &m, &s);
409
431
 
410
432
  // Finally, multiply s by k^-1. That was retained in Montgomery form, so the
411
- // same technique as the previous multiplication works. Although the
412
- // previous step did not fully reduce |s|, |bn_mod_mul_montgomery_small|
413
- // only requires the product not exceed R * |order|. |kinv_mont| is fully
414
- // reduced and |s| < 2^BN_num_bits(order) <= R, so this holds.
415
- if (!bn_mod_mul_montgomery_small(s.words, order->top, s.words, order->top,
416
- kinv_mont.words, order->top,
417
- group->order_mont) ||
418
- !bn_set_words(ret->s, s.words, order->top)) {
433
+ // same technique as the previous multiplication works.
434
+ if (!scalar_mod_mul_montgomery_loose(group, &s, &tmp, &kinv_mont) ||
435
+ !bn_set_words(ret->s, s.words, order->width)) {
419
436
  goto err;
420
437
  }
421
438
  if (!BN_is_zero(ret->s)) {
@@ -433,7 +450,6 @@ err:
433
450
  }
434
451
  BN_CTX_free(ctx);
435
452
  OPENSSL_cleanse(&kinv_mont, sizeof(kinv_mont));
436
- OPENSSL_cleanse(&priv_key, sizeof(priv_key));
437
453
  OPENSSL_cleanse(&r_mont, sizeof(r_mont));
438
454
  OPENSSL_cleanse(&s, sizeof(s));
439
455
  OPENSSL_cleanse(&tmp, sizeof(tmp));
@@ -0,0 +1,256 @@
1
+ /* ====================================================================
2
+ * Copyright (c) 2011 The OpenSSL Project. All rights reserved.
3
+ *
4
+ * Redistribution and use in source and binary forms, with or without
5
+ * modification, are permitted provided that the following conditions
6
+ * are met:
7
+ *
8
+ * 1. Redistributions of source code must retain the above copyright
9
+ * notice, this list of conditions and the following disclaimer.
10
+ *
11
+ * 2. Redistributions in binary form must reproduce the above copyright
12
+ * notice, this list of conditions and the following disclaimer in
13
+ * the documentation and/or other materials provided with the
14
+ * distribution.
15
+ *
16
+ * 3. All advertising materials mentioning features or use of this
17
+ * software must display the following acknowledgment:
18
+ * "This product includes software developed by the OpenSSL Project
19
+ * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
20
+ *
21
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
22
+ * endorse or promote products derived from this software without
23
+ * prior written permission. For written permission, please contact
24
+ * openssl-core@openssl.org.
25
+ *
26
+ * 5. Products derived from this software may not be called "OpenSSL"
27
+ * nor may "OpenSSL" appear in their names without prior written
28
+ * permission of the OpenSSL Project.
29
+ *
30
+ * 6. Redistributions of any form whatsoever must retain the following
31
+ * acknowledgment:
32
+ * "This product includes software developed by the OpenSSL Project
33
+ * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
34
+ *
35
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
36
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
37
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
38
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
39
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
40
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
41
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
42
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
43
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
44
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
45
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
46
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
47
+ * ====================================================================
48
+ */
49
+
50
+ #include <assert.h>
51
+ #include <string.h>
52
+
53
+ #include <openssl/cpu.h>
54
+ #include <openssl/mem.h>
55
+
56
+ #include "../../internal.h"
57
+ #include "internal.h"
58
+
59
+
60
+ struct ccm128_state {
61
+ union {
62
+ uint64_t u[2];
63
+ uint8_t c[16];
64
+ } nonce, cmac;
65
+ };
66
+
67
+ int CRYPTO_ccm128_init(CCM128_CONTEXT *ctx, const void *key, block128_f block,
68
+ ctr128_f ctr, unsigned M, unsigned L) {
69
+ if (M < 4 || M > 16 || (M & 1) != 0 || L < 2 || L > 8) {
70
+ return 0;
71
+ }
72
+ ctx->block = block;
73
+ ctx->ctr = ctr;
74
+ ctx->M = M;
75
+ ctx->L = L;
76
+ return 1;
77
+ }
78
+
79
+ size_t CRYPTO_ccm128_max_input(const CCM128_CONTEXT *ctx) {
80
+ return ctx->L >= sizeof(size_t) ? (size_t)-1
81
+ : (((size_t)1) << (ctx->L * 8)) - 1;
82
+ }
83
+
84
+ static int ccm128_init_state(const CCM128_CONTEXT *ctx,
85
+ struct ccm128_state *state, const void *key,
86
+ const uint8_t *nonce, size_t nonce_len,
87
+ const uint8_t *aad, size_t aad_len,
88
+ size_t plaintext_len) {
89
+ const block128_f block = ctx->block;
90
+ const unsigned M = ctx->M;
91
+ const unsigned L = ctx->L;
92
+
93
+ // |L| determines the expected |nonce_len| and the limit for |plaintext_len|.
94
+ if (plaintext_len > CRYPTO_ccm128_max_input(ctx) ||
95
+ nonce_len != 15 - L) {
96
+ return 0;
97
+ }
98
+
99
+ // Assemble the first block for computing the MAC.
100
+ OPENSSL_memset(state, 0, sizeof(*state));
101
+ state->nonce.c[0] = (uint8_t)((L - 1) | ((M - 2) / 2) << 3);
102
+ if (aad_len != 0) {
103
+ state->nonce.c[0] |= 0x40; // Set AAD Flag
104
+ }
105
+ OPENSSL_memcpy(&state->nonce.c[1], nonce, nonce_len);
106
+ for (unsigned i = 0; i < L; i++) {
107
+ state->nonce.c[15 - i] = (uint8_t)(plaintext_len >> (8 * i));
108
+ }
109
+
110
+ (*block)(state->nonce.c, state->cmac.c, key);
111
+ size_t blocks = 1;
112
+
113
+ if (aad_len != 0) {
114
+ unsigned i;
115
+ // Cast to u64 to avoid the compiler complaining about invalid shifts.
116
+ uint64_t aad_len_u64 = aad_len;
117
+ if (aad_len_u64 < 0x10000 - 0x100) {
118
+ state->cmac.c[0] ^= (uint8_t)(aad_len_u64 >> 8);
119
+ state->cmac.c[1] ^= (uint8_t)aad_len_u64;
120
+ i = 2;
121
+ } else if (aad_len_u64 <= 0xffffffff) {
122
+ state->cmac.c[0] ^= 0xff;
123
+ state->cmac.c[1] ^= 0xfe;
124
+ state->cmac.c[2] ^= (uint8_t)(aad_len_u64 >> 24);
125
+ state->cmac.c[3] ^= (uint8_t)(aad_len_u64 >> 16);
126
+ state->cmac.c[4] ^= (uint8_t)(aad_len_u64 >> 8);
127
+ state->cmac.c[5] ^= (uint8_t)aad_len_u64;
128
+ i = 6;
129
+ } else {
130
+ state->cmac.c[0] ^= 0xff;
131
+ state->cmac.c[1] ^= 0xff;
132
+ state->cmac.c[2] ^= (uint8_t)(aad_len_u64 >> 56);
133
+ state->cmac.c[3] ^= (uint8_t)(aad_len_u64 >> 48);
134
+ state->cmac.c[4] ^= (uint8_t)(aad_len_u64 >> 40);
135
+ state->cmac.c[5] ^= (uint8_t)(aad_len_u64 >> 32);
136
+ state->cmac.c[6] ^= (uint8_t)(aad_len_u64 >> 24);
137
+ state->cmac.c[7] ^= (uint8_t)(aad_len_u64 >> 16);
138
+ state->cmac.c[8] ^= (uint8_t)(aad_len_u64 >> 8);
139
+ state->cmac.c[9] ^= (uint8_t)aad_len_u64;
140
+ i = 10;
141
+ }
142
+
143
+ do {
144
+ for (; i < 16 && aad_len != 0; i++) {
145
+ state->cmac.c[i] ^= *aad;
146
+ aad++;
147
+ aad_len--;
148
+ }
149
+ (*block)(state->cmac.c, state->cmac.c, key);
150
+ blocks++;
151
+ i = 0;
152
+ } while (aad_len != 0);
153
+ }
154
+
155
+ // Per RFC 3610, section 2.6, the total number of block cipher operations done
156
+ // must not exceed 2^61. There are two block cipher operations remaining per
157
+ // message block, plus one block at the end to encrypt the MAC.
158
+ size_t remaining_blocks = 2 * ((plaintext_len + 15) / 16) + 1;
159
+ if (plaintext_len + 15 < plaintext_len ||
160
+ remaining_blocks + blocks < blocks ||
161
+ (uint64_t) remaining_blocks + blocks > UINT64_C(1) << 61) {
162
+ return 0;
163
+ }
164
+
165
+ // Assemble the first block for encrypting and decrypting. The bottom |L|
166
+ // bytes are replaced with a counter and all bit the encoding of |L| is
167
+ // cleared in the first byte.
168
+ state->nonce.c[0] &= 7;
169
+ return 1;
170
+ }
171
+
172
+ static int ccm128_encrypt(const CCM128_CONTEXT *ctx, struct ccm128_state *state,
173
+ const void *key, uint8_t *out, const uint8_t *in,
174
+ size_t len) {
175
+ // The counter for encryption begins at one.
176
+ for (unsigned i = 0; i < ctx->L; i++) {
177
+ state->nonce.c[15 - i] = 0;
178
+ }
179
+ state->nonce.c[15] = 1;
180
+
181
+ uint8_t partial_buf[16];
182
+ unsigned num = 0;
183
+ if (ctx->ctr != NULL) {
184
+ CRYPTO_ctr128_encrypt_ctr32(in, out, len, key, state->nonce.c, partial_buf,
185
+ &num, ctx->ctr);
186
+ } else {
187
+ CRYPTO_ctr128_encrypt(in, out, len, key, state->nonce.c, partial_buf, &num,
188
+ ctx->block);
189
+ }
190
+ return 1;
191
+ }
192
+
193
+ static int ccm128_compute_mac(const CCM128_CONTEXT *ctx,
194
+ struct ccm128_state *state, const void *key,
195
+ uint8_t *out_tag, size_t tag_len,
196
+ const uint8_t *in, size_t len) {
197
+ block128_f block = ctx->block;
198
+ if (tag_len != ctx->M) {
199
+ return 0;
200
+ }
201
+
202
+ // Incorporate |in| into the MAC.
203
+ union {
204
+ uint64_t u[2];
205
+ uint8_t c[16];
206
+ } tmp;
207
+ while (len >= 16) {
208
+ OPENSSL_memcpy(tmp.c, in, 16);
209
+ state->cmac.u[0] ^= tmp.u[0];
210
+ state->cmac.u[1] ^= tmp.u[1];
211
+ (*block)(state->cmac.c, state->cmac.c, key);
212
+ in += 16;
213
+ len -= 16;
214
+ }
215
+ if (len > 0) {
216
+ for (size_t i = 0; i < len; i++) {
217
+ state->cmac.c[i] ^= in[i];
218
+ }
219
+ (*block)(state->cmac.c, state->cmac.c, key);
220
+ }
221
+
222
+ // Encrypt the MAC with counter zero.
223
+ for (unsigned i = 0; i < ctx->L; i++) {
224
+ state->nonce.c[15 - i] = 0;
225
+ }
226
+ (*block)(state->nonce.c, tmp.c, key);
227
+ state->cmac.u[0] ^= tmp.u[0];
228
+ state->cmac.u[1] ^= tmp.u[1];
229
+
230
+ OPENSSL_memcpy(out_tag, state->cmac.c, tag_len);
231
+ return 1;
232
+ }
233
+
234
+ int CRYPTO_ccm128_encrypt(const CCM128_CONTEXT *ctx, const void *key,
235
+ uint8_t *out, uint8_t *out_tag, size_t tag_len,
236
+ const uint8_t *nonce, size_t nonce_len,
237
+ const uint8_t *in, size_t len, const uint8_t *aad,
238
+ size_t aad_len) {
239
+ struct ccm128_state state;
240
+ return ccm128_init_state(ctx, &state, key, nonce, nonce_len, aad, aad_len,
241
+ len) &&
242
+ ccm128_compute_mac(ctx, &state, key, out_tag, tag_len, in, len) &&
243
+ ccm128_encrypt(ctx, &state, key, out, in, len);
244
+ }
245
+
246
+ int CRYPTO_ccm128_decrypt(const CCM128_CONTEXT *ctx, const void *key,
247
+ uint8_t *out, uint8_t *out_tag, size_t tag_len,
248
+ const uint8_t *nonce, size_t nonce_len,
249
+ const uint8_t *in, size_t len, const uint8_t *aad,
250
+ size_t aad_len) {
251
+ struct ccm128_state state;
252
+ return ccm128_init_state(ctx, &state, key, nonce, nonce_len, aad, aad_len,
253
+ len) &&
254
+ ccm128_encrypt(ctx, &state, key, out, in, len) &&
255
+ ccm128_compute_mac(ctx, &state, key, out_tag, tag_len, out, len);
256
+ }