grpc 1.53.0.pre2 → 1.54.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of grpc might be problematic. Click here for more details.

Files changed (685) hide show
  1. checksums.yaml +4 -4
  2. data/Makefile +80 -66
  3. data/include/grpc/event_engine/event_engine.h +30 -14
  4. data/include/grpc/grpc_security.h +4 -0
  5. data/include/grpc/impl/grpc_types.h +11 -2
  6. data/include/grpc/support/port_platform.h +4 -4
  7. data/src/core/ext/filters/backend_metrics/backend_metric_filter.cc +11 -0
  8. data/src/core/ext/filters/client_channel/backend_metric.cc +6 -0
  9. data/src/core/ext/filters/client_channel/backup_poller.cc +2 -11
  10. data/src/core/ext/filters/client_channel/backup_poller.h +0 -3
  11. data/src/core/ext/filters/client_channel/client_channel.cc +848 -813
  12. data/src/core/ext/filters/client_channel/client_channel.h +131 -173
  13. data/src/core/ext/filters/client_channel/client_channel_internal.h +114 -0
  14. data/src/core/ext/filters/client_channel/config_selector.h +4 -3
  15. data/src/core/ext/filters/client_channel/http_proxy.cc +1 -1
  16. data/src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h +6 -1
  17. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +17 -18
  18. data/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc +134 -151
  19. data/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc +1 -15
  20. data/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +14 -10
  21. data/src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc +68 -30
  22. data/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc +13 -5
  23. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc +8 -1
  24. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc +2 -5
  25. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_override_host.cc +2 -2
  26. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +30 -38
  27. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +4 -4
  28. data/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +20 -26
  29. data/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc +31 -179
  30. data/src/core/ext/filters/client_channel/resolver/polling_resolver.cc +1 -2
  31. data/src/core/ext/filters/client_channel/resolver/polling_resolver.h +1 -2
  32. data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc +4 -2
  33. data/src/core/ext/filters/client_channel/retry_filter.cc +95 -102
  34. data/src/core/ext/filters/client_channel/subchannel.cc +2 -4
  35. data/src/core/ext/filters/client_channel/subchannel_stream_client.cc +26 -27
  36. data/src/core/ext/filters/client_channel/subchannel_stream_client.h +8 -5
  37. data/src/core/ext/filters/http/client/http_client_filter.cc +3 -3
  38. data/src/core/ext/filters/http/http_filters_plugin.cc +1 -12
  39. data/src/core/ext/filters/http/message_compress/compression_filter.cc +27 -11
  40. data/src/core/ext/filters/message_size/message_size_filter.cc +141 -224
  41. data/src/core/ext/filters/message_size/message_size_filter.h +48 -3
  42. data/src/core/ext/filters/stateful_session/stateful_session_filter.cc +7 -6
  43. data/src/core/ext/gcp/metadata_query.cc +142 -0
  44. data/src/core/ext/gcp/metadata_query.h +82 -0
  45. data/src/core/ext/transport/chttp2/server/chttp2_server.cc +70 -55
  46. data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +149 -60
  47. data/src/core/ext/transport/chttp2/transport/flow_control.cc +5 -2
  48. data/src/core/ext/transport/chttp2/transport/flow_control.h +2 -1
  49. data/src/core/ext/transport/chttp2/transport/frame_settings.cc +4 -1
  50. data/src/core/ext/transport/chttp2/transport/hpack_parser.cc +42 -23
  51. data/src/core/ext/transport/chttp2/transport/hpack_parser.h +5 -3
  52. data/src/core/ext/transport/chttp2/transport/internal.h +18 -3
  53. data/src/core/ext/transport/chttp2/transport/parsing.cc +9 -2
  54. data/src/core/ext/transport/chttp2/transport/writing.cc +10 -5
  55. data/src/core/ext/transport/inproc/inproc_transport.cc +20 -14
  56. data/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c +5 -3
  57. data/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h +22 -0
  58. data/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c +5 -3
  59. data/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h +22 -0
  60. data/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c +23 -5
  61. data/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h +94 -3
  62. data/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c +23 -2
  63. data/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h +120 -0
  64. data/src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c +6 -3
  65. data/src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.h +22 -0
  66. data/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c +24 -6
  67. data/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h +111 -12
  68. data/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c +9 -7
  69. data/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h +27 -9
  70. data/src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c +0 -1
  71. data/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c +11 -7
  72. data/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h +56 -12
  73. data/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c +5 -3
  74. data/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h +24 -0
  75. data/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c +5 -3
  76. data/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h +24 -0
  77. data/src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c +13 -2
  78. data/src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.h +49 -0
  79. data/src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c +24 -9
  80. data/src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.h +66 -12
  81. data/src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c +191 -187
  82. data/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c +139 -136
  83. data/src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c +31 -15
  84. data/src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.h +5 -0
  85. data/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c +12 -9
  86. data/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.h +15 -0
  87. data/src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c +54 -45
  88. data/src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c +135 -119
  89. data/src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.h +5 -0
  90. data/src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c +100 -97
  91. data/src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c +15 -18
  92. data/src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c +272 -264
  93. data/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c +117 -117
  94. data/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c +5 -5
  95. data/src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c +5 -5
  96. data/src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c +5 -5
  97. data/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c +12 -9
  98. data/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.h +5 -0
  99. data/src/core/ext/xds/xds_channel_stack_modifier.cc +1 -2
  100. data/src/core/ext/xds/xds_client_stats.cc +29 -15
  101. data/src/core/ext/xds/xds_client_stats.h +24 -20
  102. data/src/core/ext/xds/xds_endpoint.cc +5 -2
  103. data/src/core/ext/xds/xds_endpoint.h +9 -1
  104. data/src/core/ext/xds/xds_http_rbac_filter.cc +1 -1
  105. data/src/core/ext/xds/xds_lb_policy_registry.cc +13 -0
  106. data/src/core/ext/xds/xds_transport_grpc.cc +1 -1
  107. data/src/core/{ext/filters/client_channel/resolver/dns/dns_resolver_selection.h → lib/backoff/random_early_detection.cc} +14 -12
  108. data/src/core/lib/backoff/random_early_detection.h +59 -0
  109. data/src/core/lib/channel/call_finalization.h +1 -1
  110. data/src/core/lib/channel/call_tracer.cc +51 -0
  111. data/src/core/lib/channel/call_tracer.h +101 -38
  112. data/src/core/lib/channel/connected_channel.cc +483 -1050
  113. data/src/core/lib/channel/context.h +8 -1
  114. data/src/core/lib/channel/promise_based_filter.cc +106 -42
  115. data/src/core/lib/channel/promise_based_filter.h +27 -13
  116. data/src/core/lib/channel/server_call_tracer_filter.cc +110 -0
  117. data/src/core/lib/config/config_vars.cc +151 -0
  118. data/src/core/lib/config/config_vars.h +127 -0
  119. data/src/core/lib/config/config_vars_non_generated.cc +51 -0
  120. data/src/core/lib/config/load_config.cc +66 -0
  121. data/src/core/lib/config/load_config.h +49 -0
  122. data/src/core/lib/debug/trace.cc +5 -6
  123. data/src/core/lib/debug/trace.h +0 -5
  124. data/src/core/lib/event_engine/event_engine.cc +37 -2
  125. data/src/core/lib/event_engine/handle_containers.h +7 -22
  126. data/src/core/lib/event_engine/memory_allocator_factory.h +47 -0
  127. data/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc +0 -4
  128. data/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc +3 -9
  129. data/src/core/lib/event_engine/posix_engine/posix_endpoint.cc +48 -15
  130. data/src/core/lib/event_engine/posix_engine/posix_endpoint.h +8 -8
  131. data/src/core/lib/event_engine/posix_engine/posix_engine.cc +6 -5
  132. data/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc +6 -3
  133. data/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc +27 -18
  134. data/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h +0 -3
  135. data/src/core/lib/event_engine/resolved_address.cc +2 -1
  136. data/src/core/lib/event_engine/windows/win_socket.cc +0 -1
  137. data/src/core/lib/event_engine/windows/windows_endpoint.cc +129 -82
  138. data/src/core/lib/event_engine/windows/windows_endpoint.h +21 -5
  139. data/src/core/lib/event_engine/windows/windows_engine.cc +39 -18
  140. data/src/core/lib/event_engine/windows/windows_engine.h +2 -1
  141. data/src/core/lib/event_engine/windows/windows_listener.cc +370 -0
  142. data/src/core/lib/event_engine/windows/windows_listener.h +155 -0
  143. data/src/core/lib/experiments/config.cc +3 -10
  144. data/src/core/lib/experiments/experiments.cc +7 -0
  145. data/src/core/lib/experiments/experiments.h +9 -1
  146. data/src/core/lib/gpr/log.cc +15 -28
  147. data/src/core/lib/gprpp/fork.cc +8 -14
  148. data/src/core/lib/gprpp/orphanable.h +4 -3
  149. data/src/core/lib/gprpp/per_cpu.h +9 -3
  150. data/src/core/lib/gprpp/{thd_posix.cc → posix/thd.cc} +49 -37
  151. data/src/core/lib/gprpp/ref_counted.h +33 -34
  152. data/src/core/lib/gprpp/thd.h +16 -0
  153. data/src/core/lib/gprpp/time.cc +1 -0
  154. data/src/core/lib/gprpp/time.h +4 -4
  155. data/src/core/lib/gprpp/{thd_windows.cc → windows/thd.cc} +2 -2
  156. data/src/core/lib/iomgr/call_combiner.h +2 -2
  157. data/src/core/lib/iomgr/endpoint_cfstream.cc +4 -2
  158. data/src/core/lib/iomgr/endpoint_pair.h +2 -2
  159. data/src/core/lib/iomgr/endpoint_pair_posix.cc +2 -2
  160. data/src/core/lib/iomgr/endpoint_pair_windows.cc +1 -1
  161. data/src/core/lib/iomgr/ev_posix.cc +13 -53
  162. data/src/core/lib/iomgr/ev_posix.h +0 -3
  163. data/src/core/lib/iomgr/event_engine_shims/endpoint.cc +103 -76
  164. data/src/core/lib/iomgr/iomgr.cc +4 -8
  165. data/src/core/lib/iomgr/iomgr_windows.cc +8 -2
  166. data/src/core/lib/iomgr/pollset_set_windows.cc +9 -9
  167. data/src/core/lib/iomgr/pollset_windows.cc +1 -1
  168. data/src/core/lib/iomgr/socket_utils_common_posix.cc +16 -3
  169. data/src/core/lib/iomgr/tcp_client_windows.cc +2 -2
  170. data/src/core/lib/iomgr/tcp_posix.cc +0 -1
  171. data/src/core/lib/iomgr/tcp_server_posix.cc +5 -16
  172. data/src/core/lib/iomgr/tcp_server_windows.cc +176 -9
  173. data/src/core/lib/iomgr/tcp_windows.cc +12 -8
  174. data/src/core/lib/load_balancing/lb_policy.cc +9 -13
  175. data/src/core/lib/load_balancing/lb_policy.h +4 -2
  176. data/src/core/lib/promise/activity.cc +22 -6
  177. data/src/core/lib/promise/activity.h +61 -24
  178. data/src/core/lib/promise/cancel_callback.h +77 -0
  179. data/src/core/lib/promise/detail/basic_seq.h +1 -1
  180. data/src/core/lib/promise/detail/promise_factory.h +4 -0
  181. data/src/core/lib/promise/for_each.h +176 -0
  182. data/src/core/lib/promise/if.h +9 -0
  183. data/src/core/lib/promise/interceptor_list.h +23 -2
  184. data/src/core/lib/promise/latch.h +89 -3
  185. data/src/core/lib/promise/loop.h +13 -9
  186. data/src/core/lib/promise/map.h +7 -0
  187. data/src/core/lib/promise/party.cc +286 -0
  188. data/src/core/lib/promise/party.h +499 -0
  189. data/src/core/lib/promise/pipe.h +197 -57
  190. data/src/core/lib/promise/poll.h +48 -0
  191. data/src/core/lib/promise/promise.h +2 -2
  192. data/src/core/lib/resource_quota/arena.cc +19 -3
  193. data/src/core/lib/resource_quota/arena.h +119 -5
  194. data/src/core/lib/resource_quota/memory_quota.cc +1 -1
  195. data/src/core/lib/security/credentials/external/aws_external_account_credentials.cc +12 -35
  196. data/src/core/lib/security/credentials/external/aws_external_account_credentials.h +1 -0
  197. data/src/core/lib/security/credentials/google_default/google_default_credentials.cc +0 -59
  198. data/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +10 -5
  199. data/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +1 -1
  200. data/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc +13 -0
  201. data/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h +2 -0
  202. data/src/core/lib/security/security_connector/load_system_roots_supported.cc +5 -9
  203. data/src/core/lib/security/security_connector/ssl_utils.cc +11 -25
  204. data/src/core/lib/security/security_connector/tls/tls_security_connector.cc +12 -0
  205. data/src/core/lib/security/transport/secure_endpoint.cc +4 -2
  206. data/src/core/lib/security/transport/server_auth_filter.cc +20 -2
  207. data/src/core/lib/slice/slice.cc +1 -1
  208. data/src/core/lib/surface/builtins.cc +2 -0
  209. data/src/core/lib/surface/call.cc +926 -1024
  210. data/src/core/lib/surface/call.h +10 -0
  211. data/src/core/lib/surface/lame_client.cc +1 -0
  212. data/src/core/lib/surface/version.cc +2 -2
  213. data/src/core/lib/transport/batch_builder.cc +179 -0
  214. data/src/core/lib/transport/batch_builder.h +468 -0
  215. data/src/core/lib/transport/bdp_estimator.cc +7 -7
  216. data/src/core/lib/transport/bdp_estimator.h +10 -6
  217. data/src/core/lib/transport/custom_metadata.h +30 -0
  218. data/src/core/lib/transport/metadata_batch.cc +9 -6
  219. data/src/core/lib/transport/metadata_batch.h +58 -16
  220. data/src/core/lib/transport/parsed_metadata.h +3 -3
  221. data/src/core/lib/transport/timeout_encoding.cc +6 -1
  222. data/src/core/lib/transport/transport.cc +30 -2
  223. data/src/core/lib/transport/transport.h +70 -14
  224. data/src/core/lib/transport/transport_impl.h +7 -0
  225. data/src/core/lib/transport/transport_op_string.cc +52 -42
  226. data/src/core/plugin_registry/grpc_plugin_registry.cc +2 -2
  227. data/src/core/tsi/alts/frame_protector/alts_frame_protector.cc +1 -0
  228. data/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +21 -4
  229. data/src/core/tsi/alts/handshaker/alts_handshaker_client.h +5 -0
  230. data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +1 -1
  231. data/src/core/tsi/ssl_transport_security.cc +4 -2
  232. data/src/ruby/lib/grpc/version.rb +1 -1
  233. data/third_party/abseil-cpp/absl/base/config.h +1 -1
  234. data/third_party/abseil-cpp/absl/flags/commandlineflag.cc +34 -0
  235. data/third_party/abseil-cpp/absl/flags/commandlineflag.h +200 -0
  236. data/third_party/abseil-cpp/absl/flags/config.h +68 -0
  237. data/third_party/abseil-cpp/absl/flags/declare.h +73 -0
  238. data/third_party/abseil-cpp/absl/flags/flag.cc +38 -0
  239. data/third_party/abseil-cpp/absl/flags/flag.h +310 -0
  240. data/{src/core/lib/gprpp/global_config_custom.h → third_party/abseil-cpp/absl/flags/internal/commandlineflag.cc} +11 -14
  241. data/third_party/abseil-cpp/absl/flags/internal/commandlineflag.h +68 -0
  242. data/third_party/abseil-cpp/absl/flags/internal/flag.cc +615 -0
  243. data/third_party/abseil-cpp/absl/flags/internal/flag.h +800 -0
  244. data/third_party/abseil-cpp/absl/flags/internal/flag_msvc.inc +116 -0
  245. data/third_party/abseil-cpp/absl/flags/internal/path_util.h +62 -0
  246. data/third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.cc +65 -0
  247. data/third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.h +61 -0
  248. data/third_party/abseil-cpp/absl/flags/internal/program_name.cc +60 -0
  249. data/third_party/abseil-cpp/absl/flags/internal/program_name.h +50 -0
  250. data/third_party/abseil-cpp/absl/flags/internal/registry.h +97 -0
  251. data/third_party/abseil-cpp/absl/flags/internal/sequence_lock.h +187 -0
  252. data/third_party/abseil-cpp/absl/flags/marshalling.cc +241 -0
  253. data/third_party/abseil-cpp/absl/flags/marshalling.h +356 -0
  254. data/third_party/abseil-cpp/absl/flags/reflection.cc +354 -0
  255. data/third_party/abseil-cpp/absl/flags/reflection.h +90 -0
  256. data/third_party/abseil-cpp/absl/flags/usage_config.cc +165 -0
  257. data/third_party/abseil-cpp/absl/flags/usage_config.h +135 -0
  258. data/third_party/abseil-cpp/absl/strings/internal/cord_internal.h +12 -8
  259. data/third_party/boringssl-with-bazel/err_data.c +728 -712
  260. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_bitstr.c +177 -177
  261. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_bool.c +28 -55
  262. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_d2i_fp.c +21 -23
  263. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_dup.c +20 -23
  264. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_gentm.c +66 -185
  265. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_i2d_fp.c +18 -21
  266. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_int.c +356 -311
  267. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_mbstr.c +174 -194
  268. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_object.c +146 -210
  269. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_octet.c +6 -9
  270. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_strex.c +346 -526
  271. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_strnid.c +110 -131
  272. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_time.c +130 -116
  273. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_type.c +93 -60
  274. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_utctm.c +93 -181
  275. data/third_party/boringssl-with-bazel/src/crypto/asn1/asn1_lib.c +242 -305
  276. data/third_party/boringssl-with-bazel/src/crypto/asn1/asn1_par.c +41 -18
  277. data/third_party/boringssl-with-bazel/src/crypto/asn1/asn_pack.c +30 -33
  278. data/third_party/boringssl-with-bazel/src/crypto/asn1/f_int.c +36 -33
  279. data/third_party/boringssl-with-bazel/src/crypto/asn1/f_string.c +29 -26
  280. data/third_party/boringssl-with-bazel/src/crypto/asn1/internal.h +133 -88
  281. data/third_party/boringssl-with-bazel/src/crypto/asn1/posix_time.c +230 -0
  282. data/third_party/boringssl-with-bazel/src/crypto/asn1/tasn_dec.c +791 -791
  283. data/third_party/boringssl-with-bazel/src/crypto/asn1/tasn_enc.c +526 -526
  284. data/third_party/boringssl-with-bazel/src/crypto/asn1/tasn_fre.c +114 -135
  285. data/third_party/boringssl-with-bazel/src/crypto/asn1/tasn_new.c +201 -207
  286. data/third_party/boringssl-with-bazel/src/crypto/asn1/tasn_typ.c +21 -26
  287. data/third_party/boringssl-with-bazel/src/crypto/asn1/tasn_utl.c +55 -68
  288. data/third_party/boringssl-with-bazel/src/crypto/base64/base64.c +2 -4
  289. data/third_party/boringssl-with-bazel/src/crypto/bio/bio.c +11 -7
  290. data/third_party/boringssl-with-bazel/src/crypto/bio/bio_mem.c +4 -4
  291. data/third_party/boringssl-with-bazel/src/crypto/bio/connect.c +15 -9
  292. data/third_party/boringssl-with-bazel/src/crypto/bio/fd.c +4 -4
  293. data/third_party/boringssl-with-bazel/src/crypto/bio/file.c +17 -10
  294. data/third_party/boringssl-with-bazel/src/crypto/bio/pair.c +1 -3
  295. data/third_party/boringssl-with-bazel/src/crypto/bio/printf.c +0 -13
  296. data/third_party/boringssl-with-bazel/src/crypto/bio/socket.c +3 -6
  297. data/third_party/boringssl-with-bazel/src/crypto/bio/socket_helper.c +2 -0
  298. data/third_party/boringssl-with-bazel/src/crypto/blake2/blake2.c +9 -5
  299. data/third_party/boringssl-with-bazel/src/crypto/bn_extra/convert.c +10 -23
  300. data/third_party/boringssl-with-bazel/src/crypto/buf/buf.c +2 -6
  301. data/third_party/boringssl-with-bazel/src/crypto/bytestring/asn1_compat.c +2 -1
  302. data/third_party/boringssl-with-bazel/src/crypto/bytestring/ber.c +29 -28
  303. data/third_party/boringssl-with-bazel/src/crypto/bytestring/cbb.c +161 -201
  304. data/third_party/boringssl-with-bazel/src/crypto/bytestring/cbs.c +254 -39
  305. data/third_party/boringssl-with-bazel/src/crypto/bytestring/internal.h +2 -2
  306. data/third_party/boringssl-with-bazel/src/crypto/chacha/chacha.c +0 -2
  307. data/third_party/boringssl-with-bazel/src/crypto/cipher_extra/derive_key.c +4 -4
  308. data/third_party/boringssl-with-bazel/src/crypto/cipher_extra/e_aesctrhmac.c +9 -8
  309. data/third_party/boringssl-with-bazel/src/crypto/cipher_extra/e_aesgcmsiv.c +37 -75
  310. data/third_party/boringssl-with-bazel/src/crypto/cipher_extra/e_chacha20poly1305.c +8 -10
  311. data/third_party/boringssl-with-bazel/src/crypto/{fipsmodule/cipher → cipher_extra}/e_des.c +100 -78
  312. data/third_party/boringssl-with-bazel/src/crypto/cipher_extra/e_null.c +1 -0
  313. data/third_party/boringssl-with-bazel/src/crypto/cipher_extra/e_rc2.c +1 -0
  314. data/third_party/boringssl-with-bazel/src/crypto/cipher_extra/e_rc4.c +2 -0
  315. data/third_party/boringssl-with-bazel/src/crypto/cipher_extra/e_tls.c +6 -12
  316. data/third_party/boringssl-with-bazel/src/crypto/cipher_extra/internal.h +14 -11
  317. data/third_party/boringssl-with-bazel/src/crypto/conf/conf.c +6 -10
  318. data/third_party/boringssl-with-bazel/src/crypto/conf/conf_def.h +0 -1
  319. data/third_party/boringssl-with-bazel/src/crypto/conf/internal.h +12 -0
  320. data/third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_apple.c +74 -0
  321. data/third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_freebsd.c +62 -0
  322. data/third_party/boringssl-with-bazel/src/crypto/{cpu-aarch64-fuchsia.c → cpu_aarch64_fuchsia.c} +8 -7
  323. data/third_party/boringssl-with-bazel/src/crypto/{cpu-aarch64-linux.c → cpu_aarch64_linux.c} +6 -4
  324. data/third_party/boringssl-with-bazel/src/crypto/{cpu-aarch64-win.c → cpu_aarch64_win.c} +4 -4
  325. data/third_party/boringssl-with-bazel/src/crypto/{cpu-arm.c → cpu_arm.c} +1 -1
  326. data/third_party/boringssl-with-bazel/src/crypto/cpu_arm_freebsd.c +55 -0
  327. data/third_party/boringssl-with-bazel/src/crypto/{cpu-arm-linux.c → cpu_arm_linux.c} +11 -90
  328. data/third_party/boringssl-with-bazel/src/crypto/{cpu-arm-linux.h → cpu_arm_linux.h} +0 -38
  329. data/third_party/boringssl-with-bazel/src/crypto/{cpu-intel.c → cpu_intel.c} +1 -2
  330. data/third_party/boringssl-with-bazel/src/crypto/crypto.c +25 -20
  331. data/third_party/boringssl-with-bazel/src/crypto/curve25519/curve25519.c +16 -27
  332. data/third_party/boringssl-with-bazel/src/crypto/curve25519/spake25519.c +17 -32
  333. data/third_party/boringssl-with-bazel/src/crypto/{fipsmodule/des → des}/des.c +232 -232
  334. data/third_party/boringssl-with-bazel/src/crypto/{fipsmodule/des → des}/internal.h +1 -1
  335. data/third_party/boringssl-with-bazel/src/crypto/dh_extra/dh_asn1.c +1 -0
  336. data/third_party/boringssl-with-bazel/src/crypto/dh_extra/params.c +232 -29
  337. data/third_party/boringssl-with-bazel/src/crypto/digest_extra/digest_extra.c +0 -3
  338. data/third_party/boringssl-with-bazel/src/crypto/dsa/dsa.c +39 -16
  339. data/third_party/boringssl-with-bazel/src/crypto/dsa/dsa_asn1.c +37 -7
  340. data/third_party/boringssl-with-bazel/src/crypto/dsa/internal.h +3 -3
  341. data/third_party/boringssl-with-bazel/src/crypto/ec_extra/ec_asn1.c +11 -36
  342. data/third_party/boringssl-with-bazel/src/crypto/ec_extra/hash_to_curve.c +214 -99
  343. data/third_party/boringssl-with-bazel/src/crypto/ec_extra/internal.h +21 -5
  344. data/third_party/boringssl-with-bazel/src/crypto/ecdsa_extra/ecdsa_asn1.c +2 -4
  345. data/third_party/boringssl-with-bazel/src/crypto/err/err.c +83 -60
  346. data/third_party/boringssl-with-bazel/src/crypto/evp/evp.c +46 -12
  347. data/third_party/boringssl-with-bazel/src/crypto/evp/evp_asn1.c +3 -3
  348. data/third_party/boringssl-with-bazel/src/crypto/evp/evp_ctx.c +25 -23
  349. data/third_party/boringssl-with-bazel/src/crypto/evp/internal.h +43 -9
  350. data/third_party/boringssl-with-bazel/src/crypto/evp/p_dsa_asn1.c +75 -44
  351. data/third_party/boringssl-with-bazel/src/crypto/evp/p_ec.c +19 -25
  352. data/third_party/boringssl-with-bazel/src/crypto/evp/p_ec_asn1.c +96 -45
  353. data/third_party/boringssl-with-bazel/src/crypto/evp/p_ed25519.c +7 -8
  354. data/third_party/boringssl-with-bazel/src/crypto/evp/p_ed25519_asn1.c +26 -23
  355. data/third_party/boringssl-with-bazel/src/crypto/evp/p_hkdf.c +233 -0
  356. data/third_party/boringssl-with-bazel/src/crypto/evp/p_rsa.c +5 -5
  357. data/third_party/boringssl-with-bazel/src/crypto/evp/p_rsa_asn1.c +42 -25
  358. data/third_party/boringssl-with-bazel/src/crypto/evp/p_x25519.c +4 -5
  359. data/third_party/boringssl-with-bazel/src/crypto/evp/p_x25519_asn1.c +35 -47
  360. data/third_party/boringssl-with-bazel/src/crypto/evp/print.c +135 -244
  361. data/third_party/boringssl-with-bazel/src/crypto/evp/scrypt.c +2 -4
  362. data/third_party/boringssl-with-bazel/src/crypto/evp/sign.c +15 -10
  363. data/third_party/boringssl-with-bazel/src/crypto/ex_data.c +29 -15
  364. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/aes/aes.c +0 -2
  365. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/aes/aes_nohw.c +13 -14
  366. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/aes/internal.h +3 -13
  367. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/aes/key_wrap.c +13 -7
  368. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/aes/mode_wrappers.c +9 -7
  369. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bcm.c +35 -27
  370. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/bn.c +16 -26
  371. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/bytes.c +88 -60
  372. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/cmp.c +4 -3
  373. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/ctx.c +0 -2
  374. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/div.c +1 -1
  375. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/div_extra.c +1 -1
  376. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/exponentiation.c +99 -113
  377. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/gcd.c +0 -1
  378. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/gcd_extra.c +5 -3
  379. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/generic.c +112 -168
  380. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/internal.h +86 -31
  381. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/montgomery.c +11 -6
  382. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/montgomery_inv.c +4 -5
  383. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/mul.c +4 -5
  384. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/prime.c +13 -0
  385. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/random.c +13 -5
  386. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/rsaz_exp.c +19 -108
  387. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/rsaz_exp.h +19 -15
  388. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/shift.c +15 -16
  389. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/sqrt.c +22 -21
  390. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/cipher/aead.c +3 -0
  391. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/cipher/cipher.c +79 -19
  392. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/cipher/e_aes.c +102 -99
  393. data/third_party/boringssl-with-bazel/src/crypto/{cipher_extra → fipsmodule/cipher}/e_aesccm.c +52 -46
  394. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/cipher/internal.h +39 -0
  395. data/third_party/boringssl-with-bazel/src/crypto/{cmac → fipsmodule/cmac}/cmac.c +55 -11
  396. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/dh/check.c +2 -3
  397. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/dh/dh.c +21 -6
  398. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/dh/internal.h +56 -0
  399. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/digest/digest.c +5 -3
  400. data/third_party/boringssl-with-bazel/src/crypto/{evp → fipsmodule/digestsign}/digestsign.c +51 -15
  401. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/ec.c +25 -25
  402. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/ec_key.c +91 -17
  403. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/ec_montgomery.c +5 -5
  404. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/internal.h +34 -12
  405. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/oct.c +54 -23
  406. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/p224-64.c +44 -60
  407. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/{p256-x86_64-table.h → p256-nistz-table.h} +1 -1
  408. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/{p256-x86_64.c → p256-nistz.c} +60 -53
  409. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/{p256-x86_64.h → p256-nistz.h} +5 -13
  410. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/p256.c +48 -36
  411. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/scalar.c +2 -8
  412. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/simple.c +2 -7
  413. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/simple_mul.c +2 -3
  414. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/wnaf.c +0 -1
  415. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ecdh/ecdh.c +8 -0
  416. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ecdsa/ecdsa.c +42 -14
  417. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ecdsa/internal.h +6 -0
  418. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/hmac/hmac.c +52 -24
  419. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/modes/cbc.c +9 -15
  420. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/modes/cfb.c +1 -4
  421. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/modes/ctr.c +2 -4
  422. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/modes/gcm.c +71 -43
  423. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/modes/internal.h +14 -16
  424. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/modes/ofb.c +1 -4
  425. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/ctrdrbg.c +31 -13
  426. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/fork_detect.c +16 -8
  427. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/fork_detect.h +3 -2
  428. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/getrandom_fillin.h +2 -2
  429. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/internal.h +9 -38
  430. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/rand.c +73 -59
  431. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/urandom.c +11 -45
  432. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/blinding.c +0 -1
  433. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/internal.h +22 -0
  434. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/padding.c +63 -52
  435. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/rsa.c +107 -62
  436. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/rsa_impl.c +58 -31
  437. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/self_check/fips.c +41 -0
  438. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/self_check/self_check.c +523 -422
  439. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/service_indicator/internal.h +89 -0
  440. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/service_indicator/service_indicator.c +334 -0
  441. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/sha/internal.h +3 -12
  442. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/sha/sha1.c +2 -0
  443. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/sha/sha256.c +12 -8
  444. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/sha/sha512.c +14 -12
  445. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/tls/kdf.c +19 -6
  446. data/third_party/boringssl-with-bazel/src/crypto/hpke/hpke.c +32 -14
  447. data/third_party/boringssl-with-bazel/src/crypto/hrss/hrss.c +65 -29
  448. data/third_party/boringssl-with-bazel/src/crypto/internal.h +373 -18
  449. data/third_party/boringssl-with-bazel/src/crypto/kyber/internal.h +61 -0
  450. data/third_party/boringssl-with-bazel/src/crypto/kyber/keccak.c +205 -0
  451. data/third_party/boringssl-with-bazel/src/crypto/lhash/internal.h +13 -1
  452. data/third_party/boringssl-with-bazel/src/crypto/mem.c +220 -13
  453. data/third_party/boringssl-with-bazel/src/crypto/obj/obj.c +19 -7
  454. data/third_party/boringssl-with-bazel/src/crypto/obj/obj_dat.h +13 -1
  455. data/third_party/boringssl-with-bazel/src/crypto/pem/pem_all.c +81 -90
  456. data/third_party/boringssl-with-bazel/src/crypto/pem/pem_info.c +150 -245
  457. data/third_party/boringssl-with-bazel/src/crypto/pem/pem_lib.c +629 -613
  458. data/third_party/boringssl-with-bazel/src/crypto/pem/pem_oth.c +17 -17
  459. data/third_party/boringssl-with-bazel/src/crypto/pem/pem_pk8.c +142 -149
  460. data/third_party/boringssl-with-bazel/src/crypto/pem/pem_pkey.c +99 -131
  461. data/third_party/boringssl-with-bazel/src/crypto/pem/pem_x509.c +0 -1
  462. data/third_party/boringssl-with-bazel/src/crypto/pem/pem_xaux.c +0 -1
  463. data/third_party/boringssl-with-bazel/src/crypto/pkcs7/pkcs7_x509.c +0 -1
  464. data/third_party/boringssl-with-bazel/src/crypto/pkcs8/pkcs8.c +0 -3
  465. data/third_party/boringssl-with-bazel/src/crypto/pkcs8/pkcs8_x509.c +36 -66
  466. data/third_party/boringssl-with-bazel/src/crypto/poly1305/poly1305.c +31 -38
  467. data/third_party/boringssl-with-bazel/src/crypto/poly1305/poly1305_arm.c +2 -1
  468. data/third_party/boringssl-with-bazel/src/crypto/poly1305/poly1305_vec.c +18 -31
  469. data/third_party/boringssl-with-bazel/src/crypto/pool/internal.h +1 -0
  470. data/third_party/boringssl-with-bazel/src/crypto/pool/pool.c +8 -1
  471. data/third_party/boringssl-with-bazel/src/crypto/rand_extra/passive.c +129 -5
  472. data/third_party/boringssl-with-bazel/src/crypto/refcount_c11.c +0 -2
  473. data/third_party/boringssl-with-bazel/src/crypto/refcount_lock.c +3 -4
  474. data/third_party/boringssl-with-bazel/src/crypto/siphash/siphash.c +8 -11
  475. data/third_party/boringssl-with-bazel/src/crypto/stack/stack.c +61 -27
  476. data/third_party/boringssl-with-bazel/src/crypto/thread_pthread.c +10 -13
  477. data/third_party/boringssl-with-bazel/src/crypto/thread_win.c +10 -13
  478. data/third_party/boringssl-with-bazel/src/crypto/trust_token/internal.h +66 -34
  479. data/third_party/boringssl-with-bazel/src/crypto/trust_token/pmbtoken.c +190 -77
  480. data/third_party/boringssl-with-bazel/src/crypto/trust_token/trust_token.c +81 -284
  481. data/third_party/boringssl-with-bazel/src/crypto/trust_token/voprf.c +109 -42
  482. data/third_party/boringssl-with-bazel/src/crypto/x509/a_digest.c +22 -24
  483. data/third_party/boringssl-with-bazel/src/crypto/x509/a_sign.c +54 -55
  484. data/third_party/boringssl-with-bazel/src/crypto/x509/a_verify.c +32 -34
  485. data/third_party/boringssl-with-bazel/src/crypto/x509/algorithm.c +32 -16
  486. data/third_party/boringssl-with-bazel/src/crypto/x509/asn1_gen.c +465 -704
  487. data/third_party/boringssl-with-bazel/src/crypto/x509/by_dir.c +284 -331
  488. data/third_party/boringssl-with-bazel/src/crypto/x509/by_file.c +183 -178
  489. data/third_party/boringssl-with-bazel/src/crypto/x509/i2d_pr.c +11 -15
  490. data/third_party/boringssl-with-bazel/src/crypto/x509/internal.h +67 -50
  491. data/third_party/boringssl-with-bazel/src/crypto/x509/name_print.c +153 -150
  492. data/third_party/boringssl-with-bazel/src/crypto/x509/policy.c +786 -0
  493. data/third_party/boringssl-with-bazel/src/crypto/x509/rsa_pss.c +95 -102
  494. data/third_party/boringssl-with-bazel/src/crypto/x509/t_crl.c +72 -57
  495. data/third_party/boringssl-with-bazel/src/crypto/x509/t_req.c +12 -10
  496. data/third_party/boringssl-with-bazel/src/crypto/x509/t_x509.c +227 -252
  497. data/third_party/boringssl-with-bazel/src/crypto/x509/t_x509a.c +52 -47
  498. data/third_party/boringssl-with-bazel/src/crypto/x509/x509.c +3 -4
  499. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_att.c +230 -224
  500. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_cmp.c +161 -327
  501. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_d2.c +37 -33
  502. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_def.c +14 -31
  503. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_ext.c +55 -85
  504. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_lu.c +534 -618
  505. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_obj.c +129 -122
  506. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_req.c +116 -182
  507. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_set.c +132 -132
  508. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_trs.c +181 -202
  509. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_txt.c +64 -79
  510. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_v3.c +175 -160
  511. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_vfy.c +1865 -2050
  512. data/third_party/boringssl-with-bazel/src/crypto/x509/x509_vpm.c +433 -462
  513. data/third_party/boringssl-with-bazel/src/crypto/x509/x509cset.c +156 -163
  514. data/third_party/boringssl-with-bazel/src/crypto/x509/x509name.c +267 -263
  515. data/third_party/boringssl-with-bazel/src/crypto/x509/x509rset.c +40 -15
  516. data/third_party/boringssl-with-bazel/src/crypto/x509/x509spki.c +59 -63
  517. data/third_party/boringssl-with-bazel/src/crypto/x509/x_algor.c +63 -67
  518. data/third_party/boringssl-with-bazel/src/crypto/x509/x_all.c +114 -144
  519. data/third_party/boringssl-with-bazel/src/crypto/x509/x_attrib.c +25 -26
  520. data/third_party/boringssl-with-bazel/src/crypto/x509/x_crl.c +326 -415
  521. data/third_party/boringssl-with-bazel/src/crypto/x509/x_exten.c +8 -7
  522. data/third_party/boringssl-with-bazel/src/crypto/x509/x_info.c +30 -28
  523. data/third_party/boringssl-with-bazel/src/crypto/x509/x_name.c +354 -370
  524. data/third_party/boringssl-with-bazel/src/crypto/x509/x_pkey.c +37 -32
  525. data/third_party/boringssl-with-bazel/src/crypto/x509/x_pubkey.c +116 -119
  526. data/third_party/boringssl-with-bazel/src/crypto/x509/x_req.c +36 -26
  527. data/third_party/boringssl-with-bazel/src/crypto/x509/x_sig.c +3 -4
  528. data/third_party/boringssl-with-bazel/src/crypto/x509/x_spki.c +10 -13
  529. data/third_party/boringssl-with-bazel/src/crypto/x509/x_val.c +3 -4
  530. data/third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c +419 -261
  531. data/third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c +113 -105
  532. data/third_party/boringssl-with-bazel/src/crypto/x509v3/ext_dat.h +11 -15
  533. data/third_party/boringssl-with-bazel/src/crypto/x509v3/internal.h +78 -170
  534. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_akey.c +126 -131
  535. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_akeya.c +3 -4
  536. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_alt.c +465 -469
  537. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_bcons.c +56 -54
  538. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_bitst.c +46 -49
  539. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_conf.c +309 -346
  540. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_cpols.c +341 -365
  541. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_crld.c +429 -393
  542. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_enum.c +29 -24
  543. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_extku.c +65 -59
  544. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_genn.c +125 -121
  545. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ia5.c +43 -42
  546. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_info.c +122 -125
  547. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_int.c +50 -20
  548. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_lib.c +247 -253
  549. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ncons.c +386 -389
  550. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ocsp.c +45 -32
  551. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pcons.c +57 -54
  552. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pmaps.c +63 -67
  553. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_prn.c +143 -136
  554. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_purp.c +664 -707
  555. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_skey.c +83 -75
  556. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_utl.c +1062 -1146
  557. data/third_party/boringssl-with-bazel/src/include/openssl/aead.h +8 -4
  558. data/third_party/boringssl-with-bazel/src/include/openssl/arm_arch.h +28 -48
  559. data/third_party/boringssl-with-bazel/src/include/openssl/asn1.h +211 -187
  560. data/third_party/boringssl-with-bazel/src/include/openssl/asn1t.h +26 -78
  561. data/third_party/boringssl-with-bazel/src/include/openssl/base.h +19 -14
  562. data/third_party/boringssl-with-bazel/src/include/openssl/bio.h +21 -2
  563. data/third_party/boringssl-with-bazel/src/include/openssl/bn.h +49 -17
  564. data/third_party/boringssl-with-bazel/src/include/openssl/bytestring.h +99 -29
  565. data/third_party/boringssl-with-bazel/src/include/openssl/cipher.h +49 -60
  566. data/third_party/boringssl-with-bazel/src/include/openssl/conf.h +2 -15
  567. data/third_party/boringssl-with-bazel/src/include/openssl/cpu.h +16 -200
  568. data/third_party/boringssl-with-bazel/src/include/openssl/crypto.h +34 -0
  569. data/third_party/boringssl-with-bazel/src/include/openssl/ctrdrbg.h +82 -0
  570. data/third_party/boringssl-with-bazel/src/include/openssl/dh.h +32 -30
  571. data/third_party/boringssl-with-bazel/src/include/openssl/digest.h +7 -0
  572. data/third_party/boringssl-with-bazel/src/include/openssl/dsa.h +4 -0
  573. data/third_party/boringssl-with-bazel/src/include/openssl/ec.h +48 -5
  574. data/third_party/boringssl-with-bazel/src/include/openssl/ec_key.h +37 -8
  575. data/third_party/boringssl-with-bazel/src/include/openssl/ecdsa.h +1 -0
  576. data/third_party/boringssl-with-bazel/src/include/openssl/err.h +33 -5
  577. data/third_party/boringssl-with-bazel/src/include/openssl/evp.h +22 -30
  578. data/third_party/boringssl-with-bazel/src/include/openssl/ex_data.h +1 -1
  579. data/third_party/boringssl-with-bazel/src/include/openssl/hmac.h +7 -0
  580. data/third_party/boringssl-with-bazel/src/include/openssl/hpke.h +41 -16
  581. data/third_party/boringssl-with-bazel/src/include/openssl/kdf.h +91 -0
  582. data/third_party/boringssl-with-bazel/src/include/openssl/mem.h +74 -8
  583. data/third_party/boringssl-with-bazel/src/include/openssl/nid.h +13 -0
  584. data/third_party/boringssl-with-bazel/src/include/openssl/opensslconf.h +1 -0
  585. data/third_party/boringssl-with-bazel/src/include/openssl/pem.h +11 -15
  586. data/third_party/boringssl-with-bazel/src/include/openssl/pkcs8.h +8 -0
  587. data/third_party/boringssl-with-bazel/src/include/openssl/rand.h +12 -1
  588. data/third_party/boringssl-with-bazel/src/include/openssl/rsa.h +7 -4
  589. data/third_party/boringssl-with-bazel/src/include/openssl/service_indicator.h +96 -0
  590. data/third_party/boringssl-with-bazel/src/include/openssl/span.h +13 -21
  591. data/third_party/boringssl-with-bazel/src/include/openssl/ssl.h +139 -75
  592. data/third_party/boringssl-with-bazel/src/include/openssl/ssl3.h +1 -6
  593. data/third_party/boringssl-with-bazel/src/include/openssl/stack.h +384 -286
  594. data/third_party/boringssl-with-bazel/src/include/openssl/thread.h +5 -6
  595. data/third_party/boringssl-with-bazel/src/include/openssl/time.h +41 -0
  596. data/third_party/boringssl-with-bazel/src/include/openssl/tls1.h +18 -7
  597. data/third_party/boringssl-with-bazel/src/include/openssl/trust_token.h +49 -23
  598. data/third_party/boringssl-with-bazel/src/include/openssl/type_check.h +0 -11
  599. data/third_party/boringssl-with-bazel/src/include/openssl/x509.h +1592 -1074
  600. data/third_party/boringssl-with-bazel/src/include/openssl/x509v3.h +202 -205
  601. data/third_party/boringssl-with-bazel/src/ssl/bio_ssl.cc +2 -2
  602. data/third_party/boringssl-with-bazel/src/ssl/d1_both.cc +6 -13
  603. data/third_party/boringssl-with-bazel/src/ssl/d1_pkt.cc +17 -18
  604. data/third_party/boringssl-with-bazel/src/ssl/dtls_method.cc +4 -5
  605. data/third_party/boringssl-with-bazel/src/ssl/dtls_record.cc +25 -33
  606. data/third_party/boringssl-with-bazel/src/ssl/encrypted_client_hello.cc +34 -20
  607. data/third_party/boringssl-with-bazel/src/ssl/extensions.cc +65 -34
  608. data/third_party/boringssl-with-bazel/src/ssl/handoff.cc +198 -54
  609. data/third_party/boringssl-with-bazel/src/ssl/handshake.cc +5 -5
  610. data/third_party/boringssl-with-bazel/src/ssl/handshake_client.cc +32 -28
  611. data/third_party/boringssl-with-bazel/src/ssl/handshake_server.cc +76 -44
  612. data/third_party/boringssl-with-bazel/src/ssl/internal.h +130 -98
  613. data/third_party/boringssl-with-bazel/src/ssl/s3_both.cc +27 -11
  614. data/third_party/boringssl-with-bazel/src/ssl/s3_lib.cc +2 -2
  615. data/third_party/boringssl-with-bazel/src/ssl/s3_pkt.cc +91 -75
  616. data/third_party/boringssl-with-bazel/src/ssl/ssl_aead_ctx.cc +8 -10
  617. data/third_party/boringssl-with-bazel/src/ssl/ssl_asn1.cc +39 -65
  618. data/third_party/boringssl-with-bazel/src/ssl/ssl_buffer.cc +1 -0
  619. data/third_party/boringssl-with-bazel/src/ssl/ssl_cert.cc +5 -9
  620. data/third_party/boringssl-with-bazel/src/ssl/ssl_cipher.cc +30 -33
  621. data/third_party/boringssl-with-bazel/src/ssl/ssl_file.cc +77 -100
  622. data/third_party/boringssl-with-bazel/src/ssl/ssl_key_share.cc +120 -107
  623. data/third_party/boringssl-with-bazel/src/ssl/ssl_lib.cc +164 -30
  624. data/third_party/boringssl-with-bazel/src/ssl/ssl_privkey.cc +150 -60
  625. data/third_party/boringssl-with-bazel/src/ssl/ssl_session.cc +22 -11
  626. data/third_party/boringssl-with-bazel/src/ssl/ssl_x509.cc +22 -6
  627. data/third_party/boringssl-with-bazel/src/ssl/t1_enc.cc +15 -13
  628. data/third_party/boringssl-with-bazel/src/ssl/tls13_both.cc +5 -43
  629. data/third_party/boringssl-with-bazel/src/ssl/tls13_client.cc +7 -4
  630. data/third_party/boringssl-with-bazel/src/ssl/tls13_enc.cc +2 -2
  631. data/third_party/boringssl-with-bazel/src/ssl/tls13_server.cc +22 -34
  632. data/third_party/boringssl-with-bazel/src/ssl/tls_method.cc +2 -2
  633. data/third_party/boringssl-with-bazel/src/ssl/tls_record.cc +16 -98
  634. data/third_party/boringssl-with-bazel/src/third_party/fiat/curve25519_32.h +1241 -657
  635. data/third_party/boringssl-with-bazel/src/third_party/fiat/curve25519_64.h +751 -398
  636. data/third_party/boringssl-with-bazel/src/third_party/fiat/p256_32.h +3551 -1938
  637. data/third_party/boringssl-with-bazel/src/third_party/fiat/p256_64.h +1272 -487
  638. metadata +107 -72
  639. data/src/core/ext/filters/client_channel/lb_call_state_internal.h +0 -39
  640. data/src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.cc +0 -30
  641. data/src/core/lib/gprpp/global_config.h +0 -93
  642. data/src/core/lib/gprpp/global_config_env.cc +0 -140
  643. data/src/core/lib/gprpp/global_config_env.h +0 -133
  644. data/src/core/lib/gprpp/global_config_generic.h +0 -40
  645. data/src/core/lib/promise/intra_activity_waiter.h +0 -55
  646. data/src/core/lib/security/security_connector/ssl_utils_config.cc +0 -32
  647. data/src/core/lib/security/security_connector/ssl_utils_config.h +0 -29
  648. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_enum.c +0 -195
  649. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_print.c +0 -83
  650. data/third_party/boringssl-with-bazel/src/crypto/asn1/a_utf8.c +0 -236
  651. data/third_party/boringssl-with-bazel/src/crypto/asn1/charmap.h +0 -15
  652. data/third_party/boringssl-with-bazel/src/crypto/asn1/time_support.c +0 -206
  653. data/third_party/boringssl-with-bazel/src/crypto/cpu-ppc64le.c +0 -38
  654. data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/sha/sha1-altivec.c +0 -361
  655. data/third_party/boringssl-with-bazel/src/crypto/x509v3/pcy_cache.c +0 -287
  656. data/third_party/boringssl-with-bazel/src/crypto/x509v3/pcy_data.c +0 -132
  657. data/third_party/boringssl-with-bazel/src/crypto/x509v3/pcy_lib.c +0 -155
  658. data/third_party/boringssl-with-bazel/src/crypto/x509v3/pcy_map.c +0 -131
  659. data/third_party/boringssl-with-bazel/src/crypto/x509v3/pcy_node.c +0 -189
  660. data/third_party/boringssl-with-bazel/src/crypto/x509v3/pcy_tree.c +0 -843
  661. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pci.c +0 -289
  662. data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_pcia.c +0 -57
  663. /data/src/core/lib/gpr/{log_android.cc → android/log.cc} +0 -0
  664. /data/src/core/lib/gpr/{cpu_iphone.cc → iphone/cpu.cc} +0 -0
  665. /data/src/core/lib/gpr/{cpu_linux.cc → linux/cpu.cc} +0 -0
  666. /data/src/core/lib/gpr/{log_linux.cc → linux/log.cc} +0 -0
  667. /data/src/core/lib/gpr/{tmpfile_msys.cc → msys/tmpfile.cc} +0 -0
  668. /data/src/core/lib/gpr/{cpu_posix.cc → posix/cpu.cc} +0 -0
  669. /data/src/core/lib/gpr/{log_posix.cc → posix/log.cc} +0 -0
  670. /data/src/core/lib/gpr/{string_posix.cc → posix/string.cc} +0 -0
  671. /data/src/core/lib/gpr/{sync_posix.cc → posix/sync.cc} +0 -0
  672. /data/src/core/lib/gpr/{time_posix.cc → posix/time.cc} +0 -0
  673. /data/src/core/lib/gpr/{tmpfile_posix.cc → posix/tmpfile.cc} +0 -0
  674. /data/src/core/lib/gpr/{cpu_windows.cc → windows/cpu.cc} +0 -0
  675. /data/src/core/lib/gpr/{log_windows.cc → windows/log.cc} +0 -0
  676. /data/src/core/lib/gpr/{string_windows.cc → windows/string.cc} +0 -0
  677. /data/src/core/lib/gpr/{string_util_windows.cc → windows/string_util.cc} +0 -0
  678. /data/src/core/lib/gpr/{sync_windows.cc → windows/sync.cc} +0 -0
  679. /data/src/core/lib/gpr/{time_windows.cc → windows/time.cc} +0 -0
  680. /data/src/core/lib/gpr/{tmpfile_windows.cc → windows/tmpfile.cc} +0 -0
  681. /data/src/core/lib/gprpp/{env_linux.cc → linux/env.cc} +0 -0
  682. /data/src/core/lib/gprpp/{env_posix.cc → posix/env.cc} +0 -0
  683. /data/src/core/lib/gprpp/{stat_posix.cc → posix/stat.cc} +0 -0
  684. /data/src/core/lib/gprpp/{env_windows.cc → windows/env.cc} +0 -0
  685. /data/src/core/lib/gprpp/{stat_windows.cc → windows/stat.cc} +0 -0
@@ -1,4 +1,3 @@
1
- /* v3_alt.c */
2
1
  /*
3
2
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
4
3
  * project.
@@ -68,573 +67,570 @@
68
67
  #include "internal.h"
69
68
 
70
69
 
71
- static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
72
- X509V3_CTX *ctx,
73
- STACK_OF(CONF_VALUE) *nval);
74
- static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
75
- X509V3_CTX *ctx,
76
- STACK_OF(CONF_VALUE) *nval);
77
- static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p);
78
- static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens);
79
- static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx);
80
- static int do_dirname(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx);
70
+ static void *v2i_subject_alt(const X509V3_EXT_METHOD *method,
71
+ const X509V3_CTX *ctx,
72
+ const STACK_OF(CONF_VALUE) *nval);
73
+ static void *v2i_issuer_alt(const X509V3_EXT_METHOD *method,
74
+ const X509V3_CTX *ctx,
75
+ const STACK_OF(CONF_VALUE) *nval);
76
+ static int copy_email(const X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p);
77
+ static int copy_issuer(const X509V3_CTX *ctx, GENERAL_NAMES *gens);
78
+ static int do_othername(GENERAL_NAME *gen, const char *value,
79
+ const X509V3_CTX *ctx);
80
+ static int do_dirname(GENERAL_NAME *gen, const char *value,
81
+ const X509V3_CTX *ctx);
82
+
83
+ static STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES_cb(
84
+ const X509V3_EXT_METHOD *method, void *ext, STACK_OF(CONF_VALUE) *ret) {
85
+ return i2v_GENERAL_NAMES(method, ext, ret);
86
+ }
81
87
 
82
88
  const X509V3_EXT_METHOD v3_alt[] = {
83
- {NID_subject_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
84
- 0, 0, 0, 0,
85
- 0, 0,
86
- (X509V3_EXT_I2V) i2v_GENERAL_NAMES,
87
- (X509V3_EXT_V2I)v2i_subject_alt,
88
- NULL, NULL, NULL},
89
-
90
- {NID_issuer_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
91
- 0, 0, 0, 0,
92
- 0, 0,
93
- (X509V3_EXT_I2V) i2v_GENERAL_NAMES,
94
- (X509V3_EXT_V2I)v2i_issuer_alt,
95
- NULL, NULL, NULL},
96
-
97
- {NID_certificate_issuer, 0, ASN1_ITEM_ref(GENERAL_NAMES),
98
- 0, 0, 0, 0,
99
- 0, 0,
100
- (X509V3_EXT_I2V) i2v_GENERAL_NAMES,
101
- NULL, NULL, NULL, NULL},
89
+ {NID_subject_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES), 0, 0, 0, 0, 0, 0,
90
+ i2v_GENERAL_NAMES_cb, v2i_subject_alt, NULL, NULL, NULL},
91
+
92
+ {NID_issuer_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES), 0, 0, 0, 0, 0, 0,
93
+ i2v_GENERAL_NAMES_cb, v2i_issuer_alt, NULL, NULL, NULL},
94
+
95
+ {NID_certificate_issuer, 0, ASN1_ITEM_ref(GENERAL_NAMES), 0, 0, 0, 0, 0, 0,
96
+ i2v_GENERAL_NAMES_cb, NULL, NULL, NULL, NULL},
102
97
  };
103
98
 
104
- STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
105
- GENERAL_NAMES *gens,
106
- STACK_OF(CONF_VALUE) *ret)
107
- {
108
- int ret_was_null = ret == NULL;
109
- for (size_t i = 0; i < sk_GENERAL_NAME_num(gens); i++) {
110
- GENERAL_NAME *gen = sk_GENERAL_NAME_value(gens, i);
111
- STACK_OF(CONF_VALUE) *tmp = i2v_GENERAL_NAME(method, gen, ret);
112
- if (tmp == NULL) {
113
- if (ret_was_null) {
114
- sk_CONF_VALUE_pop_free(ret, X509V3_conf_free);
115
- }
116
- return NULL;
117
- }
118
- ret = tmp;
99
+ STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
100
+ const GENERAL_NAMES *gens,
101
+ STACK_OF(CONF_VALUE) *ret) {
102
+ int ret_was_null = ret == NULL;
103
+ for (size_t i = 0; i < sk_GENERAL_NAME_num(gens); i++) {
104
+ const GENERAL_NAME *gen = sk_GENERAL_NAME_value(gens, i);
105
+ STACK_OF(CONF_VALUE) *tmp = i2v_GENERAL_NAME(method, gen, ret);
106
+ if (tmp == NULL) {
107
+ if (ret_was_null) {
108
+ sk_CONF_VALUE_pop_free(ret, X509V3_conf_free);
109
+ }
110
+ return NULL;
119
111
  }
120
- if (!ret)
121
- return sk_CONF_VALUE_new_null();
122
- return ret;
112
+ ret = tmp;
113
+ }
114
+ if (!ret) {
115
+ return sk_CONF_VALUE_new_null();
116
+ }
117
+ return ret;
123
118
  }
124
119
 
125
- STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
126
- GENERAL_NAME *gen,
127
- STACK_OF(CONF_VALUE) *ret)
128
- {
129
- /* Note the error-handling for this function relies on there being at most
130
- * one |X509V3_add_value| call. If there were two and the second failed, we
131
- * would need to sometimes free the first call's result. */
132
- unsigned char *p;
133
- char oline[256], htmp[5];
134
- int i;
135
- switch (gen->type) {
120
+ STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(const X509V3_EXT_METHOD *method,
121
+ const GENERAL_NAME *gen,
122
+ STACK_OF(CONF_VALUE) *ret) {
123
+ // Note the error-handling for this function relies on there being at most
124
+ // one |X509V3_add_value| call. If there were two and the second failed, we
125
+ // would need to sometimes free the first call's result.
126
+ unsigned char *p;
127
+ char oline[256], htmp[5];
128
+ int i;
129
+ switch (gen->type) {
136
130
  case GEN_OTHERNAME:
137
- if (!X509V3_add_value("othername", "<unsupported>", &ret))
138
- return NULL;
139
- break;
131
+ if (!X509V3_add_value("othername", "<unsupported>", &ret)) {
132
+ return NULL;
133
+ }
134
+ break;
140
135
 
141
136
  case GEN_X400:
142
- if (!X509V3_add_value("X400Name", "<unsupported>", &ret))
143
- return NULL;
144
- break;
137
+ if (!X509V3_add_value("X400Name", "<unsupported>", &ret)) {
138
+ return NULL;
139
+ }
140
+ break;
145
141
 
146
142
  case GEN_EDIPARTY:
147
- if (!X509V3_add_value("EdiPartyName", "<unsupported>", &ret))
148
- return NULL;
149
- break;
143
+ if (!X509V3_add_value("EdiPartyName", "<unsupported>", &ret)) {
144
+ return NULL;
145
+ }
146
+ break;
150
147
 
151
148
  case GEN_EMAIL:
152
- if (!x509V3_add_value_asn1_string("email", gen->d.ia5, &ret))
153
- return NULL;
154
- break;
149
+ if (!x509V3_add_value_asn1_string("email", gen->d.ia5, &ret)) {
150
+ return NULL;
151
+ }
152
+ break;
155
153
 
156
154
  case GEN_DNS:
157
- if (!x509V3_add_value_asn1_string("DNS", gen->d.ia5, &ret))
158
- return NULL;
159
- break;
155
+ if (!x509V3_add_value_asn1_string("DNS", gen->d.ia5, &ret)) {
156
+ return NULL;
157
+ }
158
+ break;
160
159
 
161
160
  case GEN_URI:
162
- if (!x509V3_add_value_asn1_string("URI", gen->d.ia5, &ret))
163
- return NULL;
164
- break;
161
+ if (!x509V3_add_value_asn1_string("URI", gen->d.ia5, &ret)) {
162
+ return NULL;
163
+ }
164
+ break;
165
165
 
166
166
  case GEN_DIRNAME:
167
- if (X509_NAME_oneline(gen->d.dirn, oline, 256) == NULL
168
- || !X509V3_add_value("DirName", oline, &ret))
169
- return NULL;
170
- break;
167
+ if (X509_NAME_oneline(gen->d.dirn, oline, 256) == NULL ||
168
+ !X509V3_add_value("DirName", oline, &ret)) {
169
+ return NULL;
170
+ }
171
+ break;
171
172
 
172
173
  case GEN_IPADD:
173
- p = gen->d.ip->data;
174
- if (gen->d.ip->length == 4)
175
- BIO_snprintf(oline, sizeof oline,
176
- "%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
177
- else if (gen->d.ip->length == 16) {
178
- oline[0] = 0;
179
- for (i = 0; i < 8; i++) {
180
- BIO_snprintf(htmp, sizeof htmp, "%X", p[0] << 8 | p[1]);
181
- p += 2;
182
- OPENSSL_strlcat(oline, htmp, sizeof(oline));
183
- if (i != 7)
184
- OPENSSL_strlcat(oline, ":", sizeof(oline));
185
- }
186
- } else {
187
- if (!X509V3_add_value("IP Address", "<invalid>", &ret))
188
- return NULL;
189
- break;
174
+ p = gen->d.ip->data;
175
+ if (gen->d.ip->length == 4) {
176
+ BIO_snprintf(oline, sizeof(oline), "%d.%d.%d.%d", p[0], p[1], p[2],
177
+ p[3]);
178
+ } else if (gen->d.ip->length == 16) {
179
+ oline[0] = 0;
180
+ for (i = 0; i < 8; i++) {
181
+ uint16_t v = ((uint16_t)p[0] << 8) | p[1];
182
+ BIO_snprintf(htmp, sizeof(htmp), "%X", v);
183
+ p += 2;
184
+ OPENSSL_strlcat(oline, htmp, sizeof(oline));
185
+ if (i != 7) {
186
+ OPENSSL_strlcat(oline, ":", sizeof(oline));
187
+ }
188
+ }
189
+ } else {
190
+ if (!X509V3_add_value("IP Address", "<invalid>", &ret)) {
191
+ return NULL;
190
192
  }
191
- if (!X509V3_add_value("IP Address", oline, &ret))
192
- return NULL;
193
193
  break;
194
+ }
195
+ if (!X509V3_add_value("IP Address", oline, &ret)) {
196
+ return NULL;
197
+ }
198
+ break;
194
199
 
195
200
  case GEN_RID:
196
- i2t_ASN1_OBJECT(oline, 256, gen->d.rid);
197
- if (!X509V3_add_value("Registered ID", oline, &ret))
198
- return NULL;
199
- break;
200
- }
201
- return ret;
201
+ i2t_ASN1_OBJECT(oline, 256, gen->d.rid);
202
+ if (!X509V3_add_value("Registered ID", oline, &ret)) {
203
+ return NULL;
204
+ }
205
+ break;
206
+ }
207
+ return ret;
202
208
  }
203
209
 
204
- int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen)
205
- {
206
- unsigned char *p;
207
- int i;
208
- switch (gen->type) {
210
+ int GENERAL_NAME_print(BIO *out, const GENERAL_NAME *gen) {
211
+ switch (gen->type) {
209
212
  case GEN_OTHERNAME:
210
- BIO_printf(out, "othername:<unsupported>");
211
- break;
213
+ BIO_printf(out, "othername:<unsupported>");
214
+ break;
212
215
 
213
216
  case GEN_X400:
214
- BIO_printf(out, "X400Name:<unsupported>");
215
- break;
217
+ BIO_printf(out, "X400Name:<unsupported>");
218
+ break;
216
219
 
217
220
  case GEN_EDIPARTY:
218
- /* Maybe fix this: it is supported now */
219
- BIO_printf(out, "EdiPartyName:<unsupported>");
220
- break;
221
+ // Maybe fix this: it is supported now
222
+ BIO_printf(out, "EdiPartyName:<unsupported>");
223
+ break;
221
224
 
222
225
  case GEN_EMAIL:
223
- BIO_printf(out, "email:");
224
- ASN1_STRING_print(out, gen->d.ia5);
225
- break;
226
+ BIO_printf(out, "email:");
227
+ ASN1_STRING_print(out, gen->d.ia5);
228
+ break;
226
229
 
227
230
  case GEN_DNS:
228
- BIO_printf(out, "DNS:");
229
- ASN1_STRING_print(out, gen->d.ia5);
230
- break;
231
+ BIO_printf(out, "DNS:");
232
+ ASN1_STRING_print(out, gen->d.ia5);
233
+ break;
231
234
 
232
235
  case GEN_URI:
233
- BIO_printf(out, "URI:");
234
- ASN1_STRING_print(out, gen->d.ia5);
235
- break;
236
+ BIO_printf(out, "URI:");
237
+ ASN1_STRING_print(out, gen->d.ia5);
238
+ break;
236
239
 
237
240
  case GEN_DIRNAME:
238
- BIO_printf(out, "DirName: ");
239
- X509_NAME_print_ex(out, gen->d.dirn, 0, XN_FLAG_ONELINE);
240
- break;
241
-
242
- case GEN_IPADD:
243
- p = gen->d.ip->data;
244
- if (gen->d.ip->length == 4)
245
- BIO_printf(out, "IP Address:%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
246
- else if (gen->d.ip->length == 16) {
247
- BIO_printf(out, "IP Address");
248
- for (i = 0; i < 8; i++) {
249
- BIO_printf(out, ":%X", p[0] << 8 | p[1]);
250
- p += 2;
251
- }
252
- BIO_puts(out, "\n");
253
- } else {
254
- BIO_printf(out, "IP Address:<invalid>");
255
- break;
241
+ BIO_printf(out, "DirName: ");
242
+ X509_NAME_print_ex(out, gen->d.dirn, 0, XN_FLAG_ONELINE);
243
+ break;
244
+
245
+ case GEN_IPADD: {
246
+ const unsigned char *p = gen->d.ip->data;
247
+ if (gen->d.ip->length == 4) {
248
+ BIO_printf(out, "IP Address:%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
249
+ } else if (gen->d.ip->length == 16) {
250
+ BIO_printf(out, "IP Address");
251
+ for (int i = 0; i < 8; i++) {
252
+ uint16_t v = ((uint16_t)p[0] << 8) | p[1];
253
+ BIO_printf(out, ":%X", v);
254
+ p += 2;
256
255
  }
256
+ BIO_puts(out, "\n");
257
+ } else {
258
+ BIO_printf(out, "IP Address:<invalid>");
257
259
  break;
260
+ }
261
+ break;
262
+ }
258
263
 
259
264
  case GEN_RID:
260
- BIO_printf(out, "Registered ID");
261
- i2a_ASN1_OBJECT(out, gen->d.rid);
262
- break;
263
- }
264
- return 1;
265
+ BIO_printf(out, "Registered ID");
266
+ i2a_ASN1_OBJECT(out, gen->d.rid);
267
+ break;
268
+ }
269
+ return 1;
265
270
  }
266
271
 
267
- static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
268
- X509V3_CTX *ctx,
269
- STACK_OF(CONF_VALUE) *nval)
270
- {
271
- GENERAL_NAMES *gens = NULL;
272
- CONF_VALUE *cnf;
273
- size_t i;
274
- if (!(gens = sk_GENERAL_NAME_new_null())) {
275
- OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
276
- return NULL;
277
- }
278
- for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
279
- cnf = sk_CONF_VALUE_value(nval, i);
280
- if (!x509v3_name_cmp(cnf->name, "issuer") && cnf->value &&
281
- !strcmp(cnf->value, "copy")) {
282
- if (!copy_issuer(ctx, gens))
283
- goto err;
284
- } else {
285
- GENERAL_NAME *gen;
286
- if (!(gen = v2i_GENERAL_NAME(method, ctx, cnf)))
287
- goto err;
288
- sk_GENERAL_NAME_push(gens, gen);
289
- }
290
- }
291
- return gens;
292
- err:
293
- sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
272
+ static void *v2i_issuer_alt(const X509V3_EXT_METHOD *method,
273
+ const X509V3_CTX *ctx,
274
+ const STACK_OF(CONF_VALUE) *nval) {
275
+ GENERAL_NAMES *gens = sk_GENERAL_NAME_new_null();
276
+ if (gens == NULL) {
294
277
  return NULL;
295
- }
296
-
297
- /* Append subject altname of issuer to issuer alt name of subject */
298
-
299
- static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens)
300
- {
301
- if (ctx && (ctx->flags == CTX_TEST))
302
- return 1;
303
- if (!ctx || !ctx->issuer_cert) {
304
- OPENSSL_PUT_ERROR(X509V3, X509V3_R_NO_ISSUER_DETAILS);
305
- return 0;
306
- }
307
- int i = X509_get_ext_by_NID(ctx->issuer_cert, NID_subject_alt_name, -1);
308
- if (i < 0)
309
- return 1;
310
-
311
- int ret = 0;
312
- GENERAL_NAMES *ialt = NULL;
313
- X509_EXTENSION *ext;
314
- if (!(ext = X509_get_ext(ctx->issuer_cert, i)) ||
315
- !(ialt = X509V3_EXT_d2i(ext))) {
316
- OPENSSL_PUT_ERROR(X509V3, X509V3_R_ISSUER_DECODE_ERROR);
278
+ }
279
+ for (size_t i = 0; i < sk_CONF_VALUE_num(nval); i++) {
280
+ const CONF_VALUE *cnf = sk_CONF_VALUE_value(nval, i);
281
+ if (x509v3_conf_name_matches(cnf->name, "issuer") && cnf->value &&
282
+ !strcmp(cnf->value, "copy")) {
283
+ if (!copy_issuer(ctx, gens)) {
284
+ goto err;
285
+ }
286
+ } else {
287
+ GENERAL_NAME *gen = v2i_GENERAL_NAME(method, ctx, cnf);
288
+ if (gen == NULL || !sk_GENERAL_NAME_push(gens, gen)) {
289
+ GENERAL_NAME_free(gen);
317
290
  goto err;
291
+ }
318
292
  }
293
+ }
294
+ return gens;
295
+ err:
296
+ sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
297
+ return NULL;
298
+ }
319
299
 
320
- for (size_t j = 0; j < sk_GENERAL_NAME_num(ialt); j++) {
321
- GENERAL_NAME *gen = sk_GENERAL_NAME_value(ialt, j);
322
- if (!sk_GENERAL_NAME_push(gens, gen)) {
323
- OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
324
- goto err;
325
- }
326
- /* Ownership of |gen| has moved from |ialt| to |gens|. */
327
- sk_GENERAL_NAME_set(ialt, j, NULL);
300
+ // Append subject altname of issuer to issuer alt name of subject
301
+
302
+ static int copy_issuer(const X509V3_CTX *ctx, GENERAL_NAMES *gens) {
303
+ if (ctx && (ctx->flags == X509V3_CTX_TEST)) {
304
+ return 1;
305
+ }
306
+ if (!ctx || !ctx->issuer_cert) {
307
+ OPENSSL_PUT_ERROR(X509V3, X509V3_R_NO_ISSUER_DETAILS);
308
+ return 0;
309
+ }
310
+ int i = X509_get_ext_by_NID(ctx->issuer_cert, NID_subject_alt_name, -1);
311
+ if (i < 0) {
312
+ return 1;
313
+ }
314
+
315
+ int ret = 0;
316
+ GENERAL_NAMES *ialt = NULL;
317
+ X509_EXTENSION *ext;
318
+ if (!(ext = X509_get_ext(ctx->issuer_cert, i)) ||
319
+ !(ialt = X509V3_EXT_d2i(ext))) {
320
+ OPENSSL_PUT_ERROR(X509V3, X509V3_R_ISSUER_DECODE_ERROR);
321
+ goto err;
322
+ }
323
+
324
+ for (size_t j = 0; j < sk_GENERAL_NAME_num(ialt); j++) {
325
+ GENERAL_NAME *gen = sk_GENERAL_NAME_value(ialt, j);
326
+ if (!sk_GENERAL_NAME_push(gens, gen)) {
327
+ goto err;
328
328
  }
329
+ // Ownership of |gen| has moved from |ialt| to |gens|.
330
+ sk_GENERAL_NAME_set(ialt, j, NULL);
331
+ }
329
332
 
330
- ret = 1;
333
+ ret = 1;
331
334
 
332
335
  err:
333
- GENERAL_NAMES_free(ialt);
334
- return ret;
336
+ GENERAL_NAMES_free(ialt);
337
+ return ret;
335
338
  }
336
339
 
337
- static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
338
- X509V3_CTX *ctx,
339
- STACK_OF(CONF_VALUE) *nval)
340
- {
341
- GENERAL_NAMES *gens = NULL;
342
- CONF_VALUE *cnf;
343
- size_t i;
344
- if (!(gens = sk_GENERAL_NAME_new_null())) {
345
- OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
346
- return NULL;
347
- }
348
- for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
349
- cnf = sk_CONF_VALUE_value(nval, i);
350
- if (!x509v3_name_cmp(cnf->name, "email") && cnf->value &&
351
- !strcmp(cnf->value, "copy")) {
352
- if (!copy_email(ctx, gens, 0))
353
- goto err;
354
- } else if (!x509v3_name_cmp(cnf->name, "email") && cnf->value &&
355
- !strcmp(cnf->value, "move")) {
356
- if (!copy_email(ctx, gens, 1))
357
- goto err;
358
- } else {
359
- GENERAL_NAME *gen;
360
- if (!(gen = v2i_GENERAL_NAME(method, ctx, cnf)))
361
- goto err;
362
- sk_GENERAL_NAME_push(gens, gen);
363
- }
364
- }
365
- return gens;
366
- err:
367
- sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
340
+ static void *v2i_subject_alt(const X509V3_EXT_METHOD *method,
341
+ const X509V3_CTX *ctx,
342
+ const STACK_OF(CONF_VALUE) *nval) {
343
+ GENERAL_NAMES *gens = sk_GENERAL_NAME_new_null();
344
+ if (gens == NULL) {
368
345
  return NULL;
346
+ }
347
+ for (size_t i = 0; i < sk_CONF_VALUE_num(nval); i++) {
348
+ const CONF_VALUE *cnf = sk_CONF_VALUE_value(nval, i);
349
+ if (x509v3_conf_name_matches(cnf->name, "email") && cnf->value &&
350
+ !strcmp(cnf->value, "copy")) {
351
+ if (!copy_email(ctx, gens, 0)) {
352
+ goto err;
353
+ }
354
+ } else if (x509v3_conf_name_matches(cnf->name, "email") && cnf->value &&
355
+ !strcmp(cnf->value, "move")) {
356
+ if (!copy_email(ctx, gens, 1)) {
357
+ goto err;
358
+ }
359
+ } else {
360
+ GENERAL_NAME *gen = v2i_GENERAL_NAME(method, ctx, cnf);
361
+ if (gen == NULL || !sk_GENERAL_NAME_push(gens, gen)) {
362
+ GENERAL_NAME_free(gen);
363
+ goto err;
364
+ }
365
+ }
366
+ }
367
+ return gens;
368
+ err:
369
+ sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
370
+ return NULL;
369
371
  }
370
372
 
371
- /*
372
- * Copy any email addresses in a certificate or request to GENERAL_NAMES
373
- */
373
+ // Copy any email addresses in a certificate or request to GENERAL_NAMES
374
374
 
375
- static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
376
- {
377
- X509_NAME *nm;
378
- ASN1_IA5STRING *email = NULL;
379
- X509_NAME_ENTRY *ne;
380
- GENERAL_NAME *gen = NULL;
381
- int i;
382
- if (ctx != NULL && ctx->flags == CTX_TEST)
383
- return 1;
384
- if (!ctx || (!ctx->subject_cert && !ctx->subject_req)) {
385
- OPENSSL_PUT_ERROR(X509V3, X509V3_R_NO_SUBJECT_DETAILS);
386
- goto err;
375
+ static int copy_email(const X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p) {
376
+ X509_NAME *nm;
377
+ ASN1_IA5STRING *email = NULL;
378
+ X509_NAME_ENTRY *ne;
379
+ GENERAL_NAME *gen = NULL;
380
+ int i;
381
+ if (ctx != NULL && ctx->flags == X509V3_CTX_TEST) {
382
+ return 1;
383
+ }
384
+ if (!ctx || (!ctx->subject_cert && !ctx->subject_req)) {
385
+ OPENSSL_PUT_ERROR(X509V3, X509V3_R_NO_SUBJECT_DETAILS);
386
+ goto err;
387
+ }
388
+ // Find the subject name
389
+ if (ctx->subject_cert) {
390
+ nm = X509_get_subject_name(ctx->subject_cert);
391
+ } else {
392
+ nm = X509_REQ_get_subject_name(ctx->subject_req);
393
+ }
394
+
395
+ // Now add any email address(es) to STACK
396
+ i = -1;
397
+ while ((i = X509_NAME_get_index_by_NID(nm, NID_pkcs9_emailAddress, i)) >= 0) {
398
+ ne = X509_NAME_get_entry(nm, i);
399
+ email = ASN1_STRING_dup(X509_NAME_ENTRY_get_data(ne));
400
+ if (move_p) {
401
+ X509_NAME_delete_entry(nm, i);
402
+ X509_NAME_ENTRY_free(ne);
403
+ i--;
387
404
  }
388
- /* Find the subject name */
389
- if (ctx->subject_cert)
390
- nm = X509_get_subject_name(ctx->subject_cert);
391
- else
392
- nm = X509_REQ_get_subject_name(ctx->subject_req);
393
-
394
- /* Now add any email address(es) to STACK */
395
- i = -1;
396
- while ((i = X509_NAME_get_index_by_NID(nm,
397
- NID_pkcs9_emailAddress, i)) >= 0) {
398
- ne = X509_NAME_get_entry(nm, i);
399
- email = ASN1_STRING_dup(X509_NAME_ENTRY_get_data(ne));
400
- if (move_p) {
401
- X509_NAME_delete_entry(nm, i);
402
- X509_NAME_ENTRY_free(ne);
403
- i--;
404
- }
405
- if (!email || !(gen = GENERAL_NAME_new())) {
406
- OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
407
- goto err;
408
- }
409
- gen->d.ia5 = email;
410
- email = NULL;
411
- gen->type = GEN_EMAIL;
412
- if (!sk_GENERAL_NAME_push(gens, gen)) {
413
- OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
414
- goto err;
415
- }
416
- gen = NULL;
405
+ if (!email || !(gen = GENERAL_NAME_new())) {
406
+ goto err;
417
407
  }
408
+ gen->d.ia5 = email;
409
+ email = NULL;
410
+ gen->type = GEN_EMAIL;
411
+ if (!sk_GENERAL_NAME_push(gens, gen)) {
412
+ goto err;
413
+ }
414
+ gen = NULL;
415
+ }
418
416
 
419
- return 1;
420
-
421
- err:
422
- GENERAL_NAME_free(gen);
423
- ASN1_IA5STRING_free(email);
424
- return 0;
417
+ return 1;
425
418
 
419
+ err:
420
+ GENERAL_NAME_free(gen);
421
+ ASN1_IA5STRING_free(email);
422
+ return 0;
426
423
  }
427
424
 
428
425
  GENERAL_NAMES *v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
429
- X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
430
- {
431
- GENERAL_NAME *gen;
432
- GENERAL_NAMES *gens = NULL;
433
- CONF_VALUE *cnf;
434
- size_t i;
435
- if (!(gens = sk_GENERAL_NAME_new_null())) {
436
- OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
437
- return NULL;
438
- }
439
- for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
440
- cnf = sk_CONF_VALUE_value(nval, i);
441
- if (!(gen = v2i_GENERAL_NAME(method, ctx, cnf)))
442
- goto err;
443
- sk_GENERAL_NAME_push(gens, gen);
444
- }
445
- return gens;
446
- err:
447
- sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
426
+ const X509V3_CTX *ctx,
427
+ const STACK_OF(CONF_VALUE) *nval) {
428
+ GENERAL_NAMES *gens = sk_GENERAL_NAME_new_null();
429
+ if (gens == NULL) {
448
430
  return NULL;
431
+ }
432
+ for (size_t i = 0; i < sk_CONF_VALUE_num(nval); i++) {
433
+ const CONF_VALUE *cnf = sk_CONF_VALUE_value(nval, i);
434
+ GENERAL_NAME *gen = v2i_GENERAL_NAME(method, ctx, cnf);
435
+ if (gen == NULL || !sk_GENERAL_NAME_push(gens, gen)) {
436
+ GENERAL_NAME_free(gen);
437
+ goto err;
438
+ }
439
+ }
440
+ return gens;
441
+ err:
442
+ sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
443
+ return NULL;
449
444
  }
450
445
 
451
446
  GENERAL_NAME *v2i_GENERAL_NAME(const X509V3_EXT_METHOD *method,
452
- X509V3_CTX *ctx, CONF_VALUE *cnf)
453
- {
454
- return v2i_GENERAL_NAME_ex(NULL, method, ctx, cnf, 0);
447
+ const X509V3_CTX *ctx, const CONF_VALUE *cnf) {
448
+ return v2i_GENERAL_NAME_ex(NULL, method, ctx, cnf, 0);
455
449
  }
456
450
 
457
451
  GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
458
452
  const X509V3_EXT_METHOD *method,
459
- X509V3_CTX *ctx, int gen_type,
460
- const char *value, int is_nc)
461
- {
462
- char is_string = 0;
463
- GENERAL_NAME *gen = NULL;
464
-
465
- if (!value) {
466
- OPENSSL_PUT_ERROR(X509V3, X509V3_R_MISSING_VALUE);
467
- return NULL;
468
- }
469
-
470
- if (out)
471
- gen = out;
472
- else {
473
- gen = GENERAL_NAME_new();
474
- if (gen == NULL) {
475
- OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
476
- return NULL;
477
- }
453
+ const X509V3_CTX *ctx, int gen_type,
454
+ const char *value, int is_nc) {
455
+ if (!value) {
456
+ OPENSSL_PUT_ERROR(X509V3, X509V3_R_MISSING_VALUE);
457
+ return NULL;
458
+ }
459
+
460
+ GENERAL_NAME *gen = NULL;
461
+ if (out) {
462
+ gen = out;
463
+ } else {
464
+ gen = GENERAL_NAME_new();
465
+ if (gen == NULL) {
466
+ return NULL;
478
467
  }
468
+ }
479
469
 
480
- switch (gen_type) {
470
+ switch (gen_type) {
481
471
  case GEN_URI:
482
472
  case GEN_EMAIL:
483
- case GEN_DNS:
484
- is_string = 1;
485
- break;
473
+ case GEN_DNS: {
474
+ ASN1_IA5STRING *str = ASN1_IA5STRING_new();
475
+ if (str == NULL || !ASN1_STRING_set(str, value, strlen(value))) {
476
+ ASN1_STRING_free(str);
477
+ goto err;
478
+ }
479
+ gen->type = gen_type;
480
+ gen->d.ia5 = str;
481
+ break;
482
+ }
486
483
 
487
- case GEN_RID:
488
- {
489
- ASN1_OBJECT *obj;
490
- if (!(obj = OBJ_txt2obj(value, 0))) {
491
- OPENSSL_PUT_ERROR(X509V3, X509V3_R_BAD_OBJECT);
492
- ERR_add_error_data(2, "value=", value);
493
- goto err;
494
- }
495
- gen->d.rid = obj;
496
- }
497
- break;
484
+ case GEN_RID: {
485
+ ASN1_OBJECT *obj;
486
+ if (!(obj = OBJ_txt2obj(value, 0))) {
487
+ OPENSSL_PUT_ERROR(X509V3, X509V3_R_BAD_OBJECT);
488
+ ERR_add_error_data(2, "value=", value);
489
+ goto err;
490
+ }
491
+ gen->type = GEN_RID;
492
+ gen->d.rid = obj;
493
+ break;
494
+ }
498
495
 
499
496
  case GEN_IPADD:
500
- if (is_nc)
501
- gen->d.ip = a2i_IPADDRESS_NC(value);
502
- else
503
- gen->d.ip = a2i_IPADDRESS(value);
504
- if (gen->d.ip == NULL) {
505
- OPENSSL_PUT_ERROR(X509V3, X509V3_R_BAD_IP_ADDRESS);
506
- ERR_add_error_data(2, "value=", value);
507
- goto err;
508
- }
509
- break;
497
+ gen->type = GEN_IPADD;
498
+ if (is_nc) {
499
+ gen->d.ip = a2i_IPADDRESS_NC(value);
500
+ } else {
501
+ gen->d.ip = a2i_IPADDRESS(value);
502
+ }
503
+ if (gen->d.ip == NULL) {
504
+ OPENSSL_PUT_ERROR(X509V3, X509V3_R_BAD_IP_ADDRESS);
505
+ ERR_add_error_data(2, "value=", value);
506
+ goto err;
507
+ }
508
+ break;
510
509
 
511
510
  case GEN_DIRNAME:
512
- if (!do_dirname(gen, value, ctx)) {
513
- OPENSSL_PUT_ERROR(X509V3, X509V3_R_DIRNAME_ERROR);
514
- goto err;
515
- }
516
- break;
511
+ if (!do_dirname(gen, value, ctx)) {
512
+ OPENSSL_PUT_ERROR(X509V3, X509V3_R_DIRNAME_ERROR);
513
+ goto err;
514
+ }
515
+ break;
517
516
 
518
517
  case GEN_OTHERNAME:
519
- if (!do_othername(gen, value, ctx)) {
520
- OPENSSL_PUT_ERROR(X509V3, X509V3_R_OTHERNAME_ERROR);
521
- goto err;
522
- }
523
- break;
524
- default:
525
- OPENSSL_PUT_ERROR(X509V3, X509V3_R_UNSUPPORTED_TYPE);
518
+ if (!do_othername(gen, value, ctx)) {
519
+ OPENSSL_PUT_ERROR(X509V3, X509V3_R_OTHERNAME_ERROR);
526
520
  goto err;
527
- }
528
-
529
- if (is_string) {
530
- if (!(gen->d.ia5 = ASN1_IA5STRING_new()) ||
531
- !ASN1_STRING_set(gen->d.ia5, (unsigned char *)value,
532
- strlen(value))) {
533
- OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
534
- goto err;
535
- }
536
- }
537
-
538
- gen->type = gen_type;
521
+ }
522
+ break;
523
+ default:
524
+ OPENSSL_PUT_ERROR(X509V3, X509V3_R_UNSUPPORTED_TYPE);
525
+ goto err;
526
+ }
539
527
 
540
- return gen;
528
+ return gen;
541
529
 
542
- err:
543
- if (!out)
544
- GENERAL_NAME_free(gen);
545
- return NULL;
530
+ err:
531
+ if (!out) {
532
+ GENERAL_NAME_free(gen);
533
+ }
534
+ return NULL;
546
535
  }
547
536
 
548
537
  GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
549
538
  const X509V3_EXT_METHOD *method,
550
- X509V3_CTX *ctx, CONF_VALUE *cnf, int is_nc)
551
- {
552
- int type;
553
-
554
- char *name, *value;
555
-
556
- name = cnf->name;
557
- value = cnf->value;
539
+ const X509V3_CTX *ctx, const CONF_VALUE *cnf,
540
+ int is_nc) {
541
+ const char *name = cnf->name;
542
+ const char *value = cnf->value;
543
+ if (!value) {
544
+ OPENSSL_PUT_ERROR(X509V3, X509V3_R_MISSING_VALUE);
545
+ return NULL;
546
+ }
547
+
548
+ int type;
549
+ if (x509v3_conf_name_matches(name, "email")) {
550
+ type = GEN_EMAIL;
551
+ } else if (x509v3_conf_name_matches(name, "URI")) {
552
+ type = GEN_URI;
553
+ } else if (x509v3_conf_name_matches(name, "DNS")) {
554
+ type = GEN_DNS;
555
+ } else if (x509v3_conf_name_matches(name, "RID")) {
556
+ type = GEN_RID;
557
+ } else if (x509v3_conf_name_matches(name, "IP")) {
558
+ type = GEN_IPADD;
559
+ } else if (x509v3_conf_name_matches(name, "dirName")) {
560
+ type = GEN_DIRNAME;
561
+ } else if (x509v3_conf_name_matches(name, "otherName")) {
562
+ type = GEN_OTHERNAME;
563
+ } else {
564
+ OPENSSL_PUT_ERROR(X509V3, X509V3_R_UNSUPPORTED_OPTION);
565
+ ERR_add_error_data(2, "name=", name);
566
+ return NULL;
567
+ }
558
568
 
559
- if (!value) {
560
- OPENSSL_PUT_ERROR(X509V3, X509V3_R_MISSING_VALUE);
561
- return NULL;
562
- }
569
+ return a2i_GENERAL_NAME(out, method, ctx, type, value, is_nc);
570
+ }
563
571
 
564
- if (!x509v3_name_cmp(name, "email"))
565
- type = GEN_EMAIL;
566
- else if (!x509v3_name_cmp(name, "URI"))
567
- type = GEN_URI;
568
- else if (!x509v3_name_cmp(name, "DNS"))
569
- type = GEN_DNS;
570
- else if (!x509v3_name_cmp(name, "RID"))
571
- type = GEN_RID;
572
- else if (!x509v3_name_cmp(name, "IP"))
573
- type = GEN_IPADD;
574
- else if (!x509v3_name_cmp(name, "dirName"))
575
- type = GEN_DIRNAME;
576
- else if (!x509v3_name_cmp(name, "otherName"))
577
- type = GEN_OTHERNAME;
578
- else {
579
- OPENSSL_PUT_ERROR(X509V3, X509V3_R_UNSUPPORTED_OPTION);
580
- ERR_add_error_data(2, "name=", name);
581
- return NULL;
582
- }
572
+ static int do_othername(GENERAL_NAME *gen, const char *value,
573
+ const X509V3_CTX *ctx) {
574
+ const char *semicolon = strchr(value, ';');
575
+ if (semicolon == NULL) {
576
+ return 0;
577
+ }
583
578
 
584
- return a2i_GENERAL_NAME(out, method, ctx, type, value, is_nc);
579
+ OTHERNAME *name = OTHERNAME_new();
580
+ if (name == NULL) {
581
+ return 0;
582
+ }
583
+
584
+ char *objtmp = OPENSSL_strndup(value, semicolon - value);
585
+ if (objtmp == NULL) {
586
+ goto err;
587
+ }
588
+ ASN1_OBJECT_free(name->type_id);
589
+ name->type_id = OBJ_txt2obj(objtmp, /*dont_search_names=*/0);
590
+ OPENSSL_free(objtmp);
591
+ if (name->type_id == NULL) {
592
+ goto err;
593
+ }
594
+
595
+ ASN1_TYPE_free(name->value);
596
+ name->value = ASN1_generate_v3(semicolon + 1, ctx);
597
+ if (name->value == NULL) {
598
+ goto err;
599
+ }
600
+
601
+ gen->type = GEN_OTHERNAME;
602
+ gen->d.otherName = name;
603
+ return 1;
585
604
 
605
+ err:
606
+ OTHERNAME_free(name);
607
+ return 0;
586
608
  }
587
609
 
588
- static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)
589
- {
590
- char *objtmp = NULL;
591
- const char *p;
592
- int objlen;
593
- if (!(p = strchr(value, ';')))
594
- return 0;
595
- if (!(gen->d.otherName = OTHERNAME_new()))
596
- return 0;
597
- /*
598
- * Free this up because we will overwrite it. no need to free type_id
599
- * because it is static
600
- */
601
- ASN1_TYPE_free(gen->d.otherName->value);
602
- if (!(gen->d.otherName->value = ASN1_generate_v3(p + 1, ctx)))
603
- return 0;
604
- objlen = p - value;
605
- objtmp = OPENSSL_malloc(objlen + 1);
606
- if (objtmp == NULL)
607
- return 0;
608
- OPENSSL_strlcpy(objtmp, value, objlen + 1);
609
- gen->d.otherName->type_id = OBJ_txt2obj(objtmp, 0);
610
- OPENSSL_free(objtmp);
611
- if (!gen->d.otherName->type_id)
612
- return 0;
613
- return 1;
614
- }
610
+ static int do_dirname(GENERAL_NAME *gen, const char *value,
611
+ const X509V3_CTX *ctx) {
612
+ int ret = 0;
613
+ X509_NAME *nm = X509_NAME_new();
614
+ if (nm == NULL) {
615
+ goto err;
616
+ }
617
+ const STACK_OF(CONF_VALUE) *sk = X509V3_get_section(ctx, value);
618
+ if (sk == NULL) {
619
+ OPENSSL_PUT_ERROR(X509V3, X509V3_R_SECTION_NOT_FOUND);
620
+ ERR_add_error_data(2, "section=", value);
621
+ goto err;
622
+ }
623
+ // FIXME: should allow other character types...
624
+ if (!X509V3_NAME_from_section(nm, sk, MBSTRING_ASC)) {
625
+ goto err;
626
+ }
627
+ gen->type = GEN_DIRNAME;
628
+ gen->d.dirn = nm;
629
+ ret = 1;
615
630
 
616
- static int do_dirname(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)
617
- {
618
- int ret = 0;
619
- STACK_OF(CONF_VALUE) *sk = NULL;
620
- X509_NAME *nm = X509_NAME_new();
621
- if (nm == NULL)
622
- goto err;
623
- sk = X509V3_get_section(ctx, value);
624
- if (sk == NULL) {
625
- OPENSSL_PUT_ERROR(X509V3, X509V3_R_SECTION_NOT_FOUND);
626
- ERR_add_error_data(2, "section=", value);
627
- goto err;
628
- }
629
- /* FIXME: should allow other character types... */
630
- if (!X509V3_NAME_from_section(nm, sk, MBSTRING_ASC))
631
- goto err;
632
- gen->d.dirn = nm;
633
- ret = 1;
634
-
635
- err:
636
- if (!ret)
637
- X509_NAME_free(nm);
638
- X509V3_section_free(ctx, sk);
639
- return ret;
631
+ err:
632
+ if (!ret) {
633
+ X509_NAME_free(nm);
634
+ }
635
+ return ret;
640
636
  }