grpc 0.13.1 → 0.14.1.pre1

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 (724) hide show
  1. checksums.yaml +4 -4
  2. data/Makefile +2098 -828
  3. data/include/grpc/byte_buffer.h +1 -1
  4. data/include/grpc/byte_buffer_reader.h +1 -20
  5. data/include/grpc/census.h +4 -4
  6. data/include/grpc/compression.h +6 -5
  7. data/include/grpc/grpc.h +31 -20
  8. data/include/grpc/grpc_security.h +17 -31
  9. data/include/grpc/grpc_security_constants.h +114 -0
  10. data/include/grpc/grpc_zookeeper.h +1 -1
  11. data/include/grpc/impl/codegen/alloc.h +1 -1
  12. data/include/grpc/impl/codegen/atm.h +1 -1
  13. data/include/grpc/impl/codegen/atm_gcc_atomic.h +1 -1
  14. data/include/grpc/impl/codegen/atm_gcc_sync.h +1 -1
  15. data/include/grpc/impl/codegen/atm_win32.h +1 -1
  16. data/include/grpc/impl/codegen/byte_buffer.h +1 -1
  17. data/{src/core/client_config/lb_policies/round_robin.h → include/grpc/impl/codegen/byte_buffer_reader.h} +19 -8
  18. data/include/grpc/impl/codegen/grpc_types.h +20 -3
  19. data/include/grpc/impl/codegen/log.h +9 -2
  20. data/include/grpc/impl/codegen/port_platform.h +102 -17
  21. data/include/grpc/impl/codegen/propagation_bits.h +3 -3
  22. data/include/grpc/impl/codegen/slice.h +3 -3
  23. data/include/grpc/impl/codegen/slice_buffer.h +3 -3
  24. data/include/grpc/impl/codegen/status.h +1 -1
  25. data/include/grpc/impl/codegen/sync_generic.h +1 -1
  26. data/include/grpc/impl/codegen/sync_posix.h +1 -1
  27. data/include/grpc/impl/codegen/sync_win32.h +1 -1
  28. data/include/grpc/impl/codegen/time.h +3 -3
  29. data/include/grpc/status.h +1 -1
  30. data/include/grpc/support/alloc.h +1 -1
  31. data/include/grpc/support/atm.h +1 -1
  32. data/include/grpc/support/atm_gcc_atomic.h +4 -4
  33. data/include/grpc/support/atm_gcc_sync.h +1 -1
  34. data/include/grpc/support/atm_win32.h +1 -1
  35. data/include/grpc/support/avl.h +1 -1
  36. data/include/grpc/support/cmdline.h +1 -1
  37. data/include/grpc/support/cpu.h +1 -1
  38. data/include/grpc/support/histogram.h +1 -1
  39. data/include/grpc/support/host_port.h +1 -1
  40. data/include/grpc/support/log.h +1 -1
  41. data/include/grpc/support/log_win32.h +1 -1
  42. data/include/grpc/support/port_platform.h +1 -1
  43. data/include/grpc/support/slice.h +1 -1
  44. data/include/grpc/support/slice_buffer.h +1 -1
  45. data/include/grpc/support/string_util.h +3 -1
  46. data/include/grpc/support/subprocess.h +2 -2
  47. data/include/grpc/support/sync.h +1 -1
  48. data/include/grpc/support/sync_generic.h +1 -1
  49. data/include/grpc/support/sync_posix.h +1 -1
  50. data/include/grpc/support/sync_win32.h +1 -1
  51. data/include/grpc/support/thd.h +1 -1
  52. data/include/grpc/support/time.h +1 -1
  53. data/include/grpc/support/tls.h +1 -1
  54. data/include/grpc/support/tls_gcc.h +45 -1
  55. data/include/grpc/support/tls_msvc.h +3 -3
  56. data/include/grpc/support/tls_pthread.h +1 -1
  57. data/include/grpc/support/useful.h +1 -1
  58. data/src/boringssl/err_data.c +258 -252
  59. data/src/core/{census → ext/census}/aggregation.h +3 -3
  60. data/src/core/{statistics → ext/census}/census_interface.h +3 -3
  61. data/src/core/{statistics → ext/census}/census_rpc_stats.h +4 -4
  62. data/src/core/{census → ext/census}/context.c +2 -2
  63. data/src/core/{census → ext/census}/grpc_context.c +2 -2
  64. data/src/core/{census → ext/census}/grpc_filter.c +30 -16
  65. data/src/core/{census → ext/census}/grpc_filter.h +4 -4
  66. data/src/core/ext/census/grpc_plugin.c +82 -0
  67. data/src/core/{census → ext/census}/initialize.c +1 -1
  68. data/src/core/{census → ext/census}/mlog.c +2 -2
  69. data/src/core/{census → ext/census}/mlog.h +4 -4
  70. data/src/core/{census → ext/census}/operation.c +0 -0
  71. data/src/core/{census → ext/census}/placeholders.c +0 -0
  72. data/src/core/{census → ext/census}/rpc_metric_id.h +3 -3
  73. data/src/core/{census → ext/census}/tracing.c +0 -0
  74. data/src/core/{surface → ext/client_config}/channel_connectivity.c +8 -21
  75. data/src/core/{channel → ext/client_config}/client_channel.c +80 -35
  76. data/src/core/{channel → ext/client_config}/client_channel.h +5 -5
  77. data/src/core/{client_config/subchannel_factory.c → ext/client_config/client_channel_factory.c} +14 -6
  78. data/src/core/ext/client_config/client_channel_factory.h +85 -0
  79. data/src/core/{client_config → ext/client_config}/client_config.c +4 -2
  80. data/src/core/{client_config → ext/client_config}/client_config.h +4 -4
  81. data/src/core/ext/client_config/client_config_plugin.c +95 -0
  82. data/src/core/{client_config → ext/client_config}/connector.c +2 -2
  83. data/src/core/{client_config → ext/client_config}/connector.h +7 -10
  84. data/src/core/{client_config → ext/client_config}/default_initial_connect_string.c +1 -1
  85. data/src/core/{client_config → ext/client_config}/initial_connect_string.c +1 -1
  86. data/src/core/{client_config → ext/client_config}/initial_connect_string.h +4 -4
  87. data/src/core/{client_config → ext/client_config}/lb_policy.c +12 -3
  88. data/src/core/{client_config → ext/client_config}/lb_policy.h +19 -6
  89. data/src/core/{client_config → ext/client_config}/lb_policy_factory.c +4 -3
  90. data/src/core/{client_config → ext/client_config}/lb_policy_factory.h +14 -9
  91. data/src/core/{client_config → ext/client_config}/lb_policy_registry.c +4 -9
  92. data/src/core/{client_config → ext/client_config}/lb_policy_registry.h +7 -6
  93. data/src/core/ext/client_config/parse_address.c +137 -0
  94. data/src/core/ext/client_config/parse_address.h +56 -0
  95. data/src/core/{client_config → ext/client_config}/resolver.c +1 -1
  96. data/src/core/{client_config → ext/client_config}/resolver.h +6 -6
  97. data/src/core/{client_config → ext/client_config}/resolver_factory.c +1 -1
  98. data/src/core/{client_config → ext/client_config}/resolver_factory.h +7 -7
  99. data/src/core/{client_config → ext/client_config}/resolver_registry.c +25 -11
  100. data/src/core/{client_config → ext/client_config}/resolver_registry.h +9 -5
  101. data/src/core/{client_config → ext/client_config}/subchannel.c +90 -126
  102. data/src/core/{client_config → ext/client_config}/subchannel.h +15 -15
  103. data/src/core/{channel → ext/client_config}/subchannel_call_holder.c +9 -8
  104. data/src/core/{channel → ext/client_config}/subchannel_call_holder.h +7 -7
  105. data/src/core/{client_config → ext/client_config}/subchannel_index.c +3 -2
  106. data/src/core/{client_config → ext/client_config}/subchannel_index.h +5 -5
  107. data/src/core/{client_config → ext/client_config}/uri_parser.c +69 -1
  108. data/src/core/{client_config → ext/client_config}/uri_parser.h +15 -3
  109. data/src/core/{client_config/lb_policies → ext/lb_policy/grpclb}/load_balancer_api.c +18 -9
  110. data/src/core/{client_config/lb_policies → ext/lb_policy/grpclb}/load_balancer_api.h +5 -5
  111. data/src/core/{proto → ext/lb_policy/grpclb/proto}/grpc/lb/v0/load_balancer.pb.c +1 -1
  112. data/src/core/{proto → ext/lb_policy/grpclb/proto}/grpc/lb/v0/load_balancer.pb.h +0 -0
  113. data/src/core/{client_config/lb_policies → ext/lb_policy/pick_first}/pick_first.c +95 -32
  114. data/src/core/{client_config/lb_policies → ext/lb_policy/round_robin}/round_robin.c +98 -34
  115. data/src/core/{client_config/resolvers → ext/resolver/dns/native}/dns_resolver.c +83 -39
  116. data/src/core/{client_config/resolvers → ext/resolver/sockaddr}/sockaddr_resolver.c +66 -169
  117. data/src/core/{transport/chttp2 → ext/transport/chttp2/alpn}/alpn.c +1 -1
  118. data/src/core/{transport/chttp2 → ext/transport/chttp2/alpn}/alpn.h +3 -3
  119. data/src/core/{surface → ext/transport/chttp2/client/insecure}/channel_create.c +65 -59
  120. data/src/core/{surface → ext/transport/chttp2/client/secure}/secure_channel_create.c +77 -69
  121. data/src/core/{surface → ext/transport/chttp2/server/insecure}/server_chttp2.c +8 -11
  122. data/src/core/{security → ext/transport/chttp2/server/secure}/server_secure_chttp2.c +14 -17
  123. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/bin_encoder.c +28 -74
  124. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/bin_encoder.h +5 -5
  125. data/src/core/ext/transport/chttp2/transport/chttp2_plugin.c +46 -0
  126. data/src/core/{transport → ext/transport/chttp2/transport}/chttp2_transport.c +551 -310
  127. data/src/core/{transport → ext/transport/chttp2/transport}/chttp2_transport.h +5 -5
  128. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame.h +3 -3
  129. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_data.c +30 -14
  130. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_data.h +10 -7
  131. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_goaway.c +2 -2
  132. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_goaway.h +5 -5
  133. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_ping.c +2 -2
  134. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_ping.h +5 -5
  135. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_rst_stream.c +9 -5
  136. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_rst_stream.h +8 -6
  137. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_settings.c +6 -6
  138. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_settings.h +5 -5
  139. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_window_update.c +11 -5
  140. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_window_update.h +8 -6
  141. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/hpack_encoder.c +21 -12
  142. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/hpack_encoder.h +8 -6
  143. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/hpack_parser.c +42 -25
  144. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/hpack_parser.h +7 -7
  145. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/hpack_table.c +21 -11
  146. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/hpack_table.h +4 -4
  147. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/http2_errors.h +3 -3
  148. data/src/core/ext/transport/chttp2/transport/huffsyms.c +105 -0
  149. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/huffsyms.h +3 -3
  150. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/incoming_metadata.c +2 -2
  151. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/incoming_metadata.h +4 -4
  152. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/internal.h +81 -37
  153. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/parsing.c +54 -21
  154. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/status_conversion.c +1 -1
  155. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/status_conversion.h +4 -4
  156. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/stream_lists.c +10 -2
  157. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/stream_map.c +1 -1
  158. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/stream_map.h +3 -3
  159. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/timeout_encoding.c +4 -4
  160. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/timeout_encoding.h +4 -4
  161. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/varint.c +1 -1
  162. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/varint.h +3 -3
  163. data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/writing.c +30 -20
  164. data/src/core/{channel → lib/channel}/channel_args.c +3 -15
  165. data/src/core/{channel → lib/channel}/channel_args.h +11 -15
  166. data/src/core/{channel → lib/channel}/channel_stack.c +5 -3
  167. data/src/core/{channel → lib/channel}/channel_stack.h +13 -8
  168. data/src/core/lib/channel/channel_stack_builder.c +277 -0
  169. data/src/core/lib/channel/channel_stack_builder.h +161 -0
  170. data/src/core/{channel → lib/channel}/compress_filter.c +51 -16
  171. data/src/core/{channel → lib/channel}/compress_filter.h +6 -4
  172. data/src/core/{channel → lib/channel}/connected_channel.c +34 -24
  173. data/src/core/lib/channel/connected_channel.h +42 -0
  174. data/src/core/{channel → lib/channel}/context.h +3 -3
  175. data/src/core/{channel → lib/channel}/http_client_filter.c +24 -13
  176. data/src/core/{channel → lib/channel}/http_client_filter.h +4 -4
  177. data/src/core/{channel → lib/channel}/http_server_filter.c +39 -19
  178. data/src/core/{channel → lib/channel}/http_server_filter.h +4 -4
  179. data/src/core/{compression → lib/compression}/algorithm_metadata.h +4 -4
  180. data/src/core/{compression → lib/compression}/compression_algorithm.c +46 -9
  181. data/src/core/{compression → lib/compression}/message_compress.c +1 -1
  182. data/src/core/{compression → lib/compression}/message_compress.h +3 -3
  183. data/src/core/{debug → lib/debug}/trace.c +2 -2
  184. data/src/core/{debug → lib/debug}/trace.h +3 -3
  185. data/src/core/{httpcli → lib/http}/format_request.c +8 -8
  186. data/src/core/{httpcli → lib/http}/format_request.h +4 -4
  187. data/src/core/{httpcli → lib/http}/httpcli.c +24 -19
  188. data/src/core/{httpcli → lib/http}/httpcli.h +14 -33
  189. data/src/core/{httpcli → lib/http}/httpcli_security_connector.c +5 -5
  190. data/src/core/lib/http/parser.c +341 -0
  191. data/src/core/lib/http/parser.h +119 -0
  192. data/src/core/{iomgr → lib/iomgr}/closure.c +8 -2
  193. data/src/core/{iomgr → lib/iomgr}/closure.h +7 -4
  194. data/src/core/{iomgr → lib/iomgr}/endpoint.c +1 -1
  195. data/src/core/{iomgr → lib/iomgr}/endpoint.h +5 -5
  196. data/src/core/{iomgr → lib/iomgr}/endpoint_pair.h +4 -4
  197. data/src/core/{iomgr → lib/iomgr}/endpoint_pair_posix.c +8 -7
  198. data/src/core/{iomgr → lib/iomgr}/endpoint_pair_windows.c +4 -4
  199. data/src/core/lib/iomgr/ev_poll_and_epoll_posix.c +1936 -0
  200. data/src/core/lib/iomgr/ev_poll_and_epoll_posix.h +41 -0
  201. data/src/core/lib/iomgr/ev_posix.c +164 -0
  202. data/src/core/lib/iomgr/ev_posix.h +158 -0
  203. data/src/core/{iomgr → lib/iomgr}/exec_ctx.c +78 -3
  204. data/src/core/{iomgr → lib/iomgr}/exec_ctx.h +25 -10
  205. data/src/core/{iomgr → lib/iomgr}/executor.c +3 -3
  206. data/src/core/{iomgr → lib/iomgr}/executor.h +5 -5
  207. data/src/core/{iomgr → lib/iomgr}/iocp_windows.c +6 -6
  208. data/src/core/{iomgr → lib/iomgr}/iocp_windows.h +5 -5
  209. data/src/core/{iomgr → lib/iomgr}/iomgr.c +13 -10
  210. data/src/core/{iomgr → lib/iomgr}/iomgr.h +3 -3
  211. data/src/core/{iomgr → lib/iomgr}/iomgr_internal.h +5 -9
  212. data/src/core/{iomgr → lib/iomgr}/iomgr_posix.c +6 -6
  213. data/src/core/{iomgr → lib/iomgr}/iomgr_posix.h +4 -4
  214. data/src/core/{iomgr → lib/iomgr}/iomgr_windows.c +7 -4
  215. data/src/core/{iomgr → lib/iomgr}/pollset.h +11 -11
  216. data/src/core/{iomgr → lib/iomgr}/pollset_set.h +5 -5
  217. data/src/core/{iomgr → lib/iomgr}/pollset_set_windows.c +2 -2
  218. data/src/core/lib/iomgr/pollset_set_windows.h +39 -0
  219. data/src/core/{iomgr → lib/iomgr}/pollset_windows.c +7 -7
  220. data/src/core/{iomgr → lib/iomgr}/pollset_windows.h +8 -5
  221. data/src/core/{iomgr → lib/iomgr}/resolve_address.h +10 -9
  222. data/src/core/{iomgr → lib/iomgr}/resolve_address_posix.c +22 -22
  223. data/src/core/{iomgr → lib/iomgr}/resolve_address_windows.c +20 -12
  224. data/src/core/{iomgr → lib/iomgr}/sockaddr.h +5 -5
  225. data/src/core/{iomgr → lib/iomgr}/sockaddr_posix.h +5 -5
  226. data/src/core/{iomgr → lib/iomgr}/sockaddr_utils.c +9 -16
  227. data/src/core/{iomgr → lib/iomgr}/sockaddr_utils.h +4 -4
  228. data/src/core/{iomgr → lib/iomgr}/sockaddr_win32.h +6 -4
  229. data/src/core/{iomgr → lib/iomgr}/socket_utils_common_posix.c +29 -7
  230. data/src/core/{iomgr → lib/iomgr}/socket_utils_linux.c +2 -2
  231. data/src/core/{iomgr → lib/iomgr}/socket_utils_posix.c +1 -1
  232. data/src/core/{iomgr → lib/iomgr}/socket_utils_posix.h +14 -4
  233. data/src/core/{iomgr → lib/iomgr}/socket_windows.c +7 -5
  234. data/src/core/{iomgr → lib/iomgr}/socket_windows.h +6 -6
  235. data/src/core/{iomgr → lib/iomgr}/tcp_client.h +6 -6
  236. data/src/core/{iomgr → lib/iomgr}/tcp_client_posix.c +33 -18
  237. data/src/core/{iomgr → lib/iomgr}/tcp_client_windows.c +30 -20
  238. data/src/core/{iomgr → lib/iomgr}/tcp_posix.c +9 -10
  239. data/src/core/{iomgr → lib/iomgr}/tcp_posix.h +6 -6
  240. data/src/core/{iomgr → lib/iomgr}/tcp_server.h +6 -6
  241. data/src/core/{iomgr → lib/iomgr}/tcp_server_posix.c +24 -37
  242. data/src/core/{iomgr → lib/iomgr}/tcp_server_windows.c +8 -36
  243. data/src/core/{iomgr → lib/iomgr}/tcp_windows.c +27 -17
  244. data/src/core/{iomgr → lib/iomgr}/tcp_windows.h +5 -5
  245. data/src/core/{iomgr → lib/iomgr}/time_averaged_stats.c +1 -1
  246. data/src/core/{iomgr → lib/iomgr}/time_averaged_stats.h +3 -3
  247. data/src/core/{iomgr → lib/iomgr}/timer.c +31 -4
  248. data/src/core/{iomgr → lib/iomgr}/timer.h +6 -7
  249. data/src/core/{iomgr → lib/iomgr}/timer_heap.c +2 -2
  250. data/src/core/{iomgr → lib/iomgr}/timer_heap.h +4 -4
  251. data/src/core/{iomgr → lib/iomgr}/udp_server.c +13 -37
  252. data/src/core/{iomgr → lib/iomgr}/udp_server.h +11 -10
  253. data/src/core/lib/iomgr/unix_sockets_posix.c +89 -0
  254. data/src/core/{client_config/resolvers/sockaddr_resolver.h → lib/iomgr/unix_sockets_posix.h} +15 -11
  255. data/src/core/lib/iomgr/unix_sockets_posix_noop.c +59 -0
  256. data/src/core/{iomgr → lib/iomgr}/wakeup_fd_eventfd.c +2 -2
  257. data/src/core/{iomgr → lib/iomgr}/wakeup_fd_nospecial.c +1 -1
  258. data/src/core/{iomgr → lib/iomgr}/wakeup_fd_pipe.c +8 -3
  259. data/src/core/{iomgr → lib/iomgr}/wakeup_fd_pipe.h +4 -4
  260. data/src/core/{iomgr → lib/iomgr}/wakeup_fd_posix.c +2 -2
  261. data/src/core/{iomgr → lib/iomgr}/wakeup_fd_posix.h +3 -3
  262. data/src/core/{iomgr → lib/iomgr}/workqueue.h +10 -10
  263. data/src/core/{iomgr → lib/iomgr}/workqueue_posix.c +5 -6
  264. data/src/core/{iomgr → lib/iomgr}/workqueue_posix.h +5 -5
  265. data/src/core/{iomgr → lib/iomgr}/workqueue_windows.c +1 -1
  266. data/src/core/{iomgr → lib/iomgr}/workqueue_windows.h +3 -3
  267. data/src/core/{json → lib/json}/json.c +1 -1
  268. data/src/core/{json → lib/json}/json.h +4 -4
  269. data/src/core/{json → lib/json}/json_common.h +3 -3
  270. data/src/core/{json → lib/json}/json_reader.c +16 -4
  271. data/src/core/{json → lib/json}/json_reader.h +4 -4
  272. data/src/core/{json → lib/json}/json_string.c +4 -4
  273. data/src/core/{json → lib/json}/json_writer.c +1 -1
  274. data/src/core/{json → lib/json}/json_writer.h +4 -4
  275. data/src/core/{profiling → lib/profiling}/basic_timers.c +3 -2
  276. data/src/core/{profiling → lib/profiling}/stap_timers.c +2 -2
  277. data/src/core/{profiling → lib/profiling}/timers.h +3 -3
  278. data/src/core/{security → lib/security}/auth_filters.h +4 -4
  279. data/src/core/{security → lib/security}/b64.c +2 -2
  280. data/src/core/{security → lib/security}/b64.h +4 -4
  281. data/src/core/{security → lib/security}/client_auth_filter.c +16 -16
  282. data/src/core/{security → lib/security}/credentials.c +42 -26
  283. data/src/core/{security → lib/security}/credentials.h +11 -10
  284. data/src/core/{security → lib/security}/credentials_metadata.c +1 -1
  285. data/src/core/{security → lib/security}/credentials_posix.c +3 -3
  286. data/src/core/{security → lib/security}/credentials_win32.c +3 -3
  287. data/src/core/{security → lib/security}/google_default_credentials.c +10 -9
  288. data/src/core/{security → lib/security}/handshake.c +4 -4
  289. data/src/core/{security → lib/security}/handshake.h +6 -6
  290. data/src/core/{security → lib/security}/json_token.c +4 -4
  291. data/src/core/{security → lib/security}/json_token.h +4 -4
  292. data/src/core/{security → lib/security}/jwt_verifier.c +14 -14
  293. data/src/core/{security → lib/security}/jwt_verifier.h +5 -5
  294. data/src/core/{security → lib/security}/secure_endpoint.c +9 -8
  295. data/src/core/{security → lib/security}/secure_endpoint.h +4 -4
  296. data/src/core/{security → lib/security}/security_connector.c +53 -21
  297. data/src/core/{security → lib/security}/security_connector.h +8 -8
  298. data/src/core/{security → lib/security}/security_context.c +5 -5
  299. data/src/core/{security → lib/security}/security_context.h +5 -5
  300. data/src/core/{security → lib/security}/server_auth_filter.c +9 -9
  301. data/src/core/{support → lib/support}/alloc.c +5 -3
  302. data/src/core/{support → lib/support}/avl.c +1 -1
  303. data/src/core/lib/support/backoff.c +76 -0
  304. data/src/core/lib/support/backoff.h +68 -0
  305. data/src/core/{support → lib/support}/block_annotate.h +3 -3
  306. data/src/core/{support → lib/support}/cmdline.c +1 -1
  307. data/src/core/{support → lib/support}/cpu_iphone.c +0 -0
  308. data/src/core/{support → lib/support}/cpu_linux.c +2 -2
  309. data/src/core/{support → lib/support}/cpu_posix.c +2 -2
  310. data/src/core/{support → lib/support}/cpu_windows.c +0 -0
  311. data/src/core/{support → lib/support}/env.h +3 -3
  312. data/src/core/{support → lib/support}/env_linux.c +3 -3
  313. data/src/core/{support → lib/support}/env_posix.c +2 -2
  314. data/src/core/{support → lib/support}/env_win32.c +27 -21
  315. data/src/core/{support → lib/support}/histogram.c +1 -1
  316. data/src/core/{support → lib/support}/host_port.c +1 -1
  317. data/src/core/{support → lib/support}/load_file.c +4 -4
  318. data/src/core/{support → lib/support}/load_file.h +4 -4
  319. data/src/core/{support → lib/support}/log.c +33 -0
  320. data/src/core/{support → lib/support}/log_android.c +2 -2
  321. data/src/core/{support → lib/support}/log_linux.c +6 -5
  322. data/src/core/{support → lib/support}/log_posix.c +3 -3
  323. data/src/core/{support → lib/support}/log_win32.c +8 -22
  324. data/src/core/{support → lib/support}/murmur_hash.c +1 -1
  325. data/src/core/{support → lib/support}/murmur_hash.h +3 -3
  326. data/src/core/{support → lib/support}/slice.c +0 -0
  327. data/src/core/{support → lib/support}/slice_buffer.c +0 -0
  328. data/src/core/{support → lib/support}/stack_lockfree.c +7 -7
  329. data/src/core/{support → lib/support}/stack_lockfree.h +3 -3
  330. data/src/core/{support → lib/support}/string.c +1 -1
  331. data/src/core/{support → lib/support}/string.h +4 -4
  332. data/src/core/{support → lib/support}/string_posix.c +1 -1
  333. data/src/core/{support/string_win32.c → lib/support/string_util_win32.c} +23 -38
  334. data/src/core/lib/support/string_win32.c +83 -0
  335. data/src/core/{support → lib/support}/string_win32.h +3 -3
  336. data/src/core/{support → lib/support}/subprocess_posix.c +3 -3
  337. data/src/core/{support → lib/support}/subprocess_windows.c +3 -3
  338. data/src/core/{support → lib/support}/sync.c +2 -2
  339. data/src/core/{support → lib/support}/sync_posix.c +3 -3
  340. data/src/core/{support → lib/support}/sync_win32.c +1 -1
  341. data/src/core/{support → lib/support}/thd.c +0 -0
  342. data/src/core/{support → lib/support}/thd_internal.h +3 -3
  343. data/src/core/{support → lib/support}/thd_posix.c +4 -3
  344. data/src/core/{support → lib/support}/thd_win32.c +1 -1
  345. data/src/core/{support → lib/support}/time.c +2 -2
  346. data/src/core/{support → lib/support}/time_posix.c +12 -6
  347. data/src/core/{support → lib/support}/time_precise.c +0 -0
  348. data/src/core/{support → lib/support}/time_precise.h +3 -3
  349. data/src/core/{support → lib/support}/time_win32.c +7 -7
  350. data/src/core/{support → lib/support}/tls_pthread.c +0 -0
  351. data/src/core/{support → lib/support}/tmpfile.h +4 -4
  352. data/src/core/lib/support/tmpfile_msys.c +73 -0
  353. data/src/core/{support → lib/support}/tmpfile_posix.c +5 -5
  354. data/src/core/{support → lib/support}/tmpfile_win32.c +5 -5
  355. data/src/core/{support → lib/support}/wrap_memcpy.c +0 -0
  356. data/src/core/{surface → lib/surface}/alarm.c +3 -3
  357. data/src/core/{surface → lib/surface}/api_trace.c +1 -1
  358. data/src/core/{surface → lib/surface}/api_trace.h +4 -4
  359. data/src/core/{surface → lib/surface}/byte_buffer.c +3 -3
  360. data/src/core/{surface → lib/surface}/byte_buffer_reader.c +3 -3
  361. data/src/core/{surface → lib/surface}/call.c +145 -73
  362. data/src/core/{surface → lib/surface}/call.h +14 -7
  363. data/src/core/{surface → lib/surface}/call_details.c +1 -1
  364. data/src/core/{surface → lib/surface}/call_log_batch.c +2 -2
  365. data/src/core/{surface → lib/surface}/call_test_only.h +3 -3
  366. data/src/core/{surface → lib/surface}/channel.c +33 -34
  367. data/src/core/{surface → lib/surface}/channel.h +9 -9
  368. data/src/core/lib/surface/channel_init.c +140 -0
  369. data/src/core/lib/surface/channel_init.h +87 -0
  370. data/src/core/{surface → lib/surface}/channel_ping.c +4 -4
  371. data/src/core/lib/surface/channel_stack_type.c +54 -0
  372. data/src/core/{httpcli/parser.h → lib/surface/channel_stack_type.h} +22 -28
  373. data/src/core/{surface → lib/surface}/completion_queue.c +15 -11
  374. data/src/core/{surface → lib/surface}/completion_queue.h +4 -4
  375. data/src/core/{surface → lib/surface}/event_string.c +2 -2
  376. data/src/core/{surface → lib/surface}/event_string.h +3 -3
  377. data/src/core/lib/surface/init.c +217 -0
  378. data/src/core/{surface → lib/surface}/init.h +4 -3
  379. data/src/core/lib/surface/init_secure.c +89 -0
  380. data/src/core/{surface → lib/surface}/lame_client.c +31 -19
  381. data/src/core/{iomgr/pollset_set_windows.h → lib/surface/lame_client.h} +7 -5
  382. data/src/core/{surface → lib/surface}/metadata_array.c +1 -1
  383. data/src/core/{surface → lib/surface}/server.c +208 -183
  384. data/src/core/{surface → lib/surface}/server.h +6 -11
  385. data/src/core/{surface → lib/surface}/surface_trace.h +5 -5
  386. data/src/core/{surface → lib/surface}/validate_metadata.c +1 -1
  387. data/src/core/{surface → lib/surface}/version.c +2 -2
  388. data/src/core/{transport → lib/transport}/byte_stream.c +1 -1
  389. data/src/core/{transport → lib/transport}/byte_stream.h +4 -4
  390. data/src/core/{transport → lib/transport}/connectivity_state.c +2 -2
  391. data/src/core/{transport → lib/transport}/connectivity_state.h +4 -4
  392. data/src/core/{transport → lib/transport}/metadata.c +71 -19
  393. data/src/core/{transport → lib/transport}/metadata.h +11 -4
  394. data/src/core/{transport → lib/transport}/metadata_batch.c +2 -2
  395. data/src/core/{transport → lib/transport}/metadata_batch.h +4 -4
  396. data/src/core/{transport → lib/transport}/static_metadata.c +100 -32
  397. data/src/core/{transport → lib/transport}/static_metadata.h +58 -58
  398. data/src/core/{transport → lib/transport}/transport.c +25 -5
  399. data/src/core/{transport → lib/transport}/transport.h +41 -16
  400. data/src/core/{transport → lib/transport}/transport_impl.h +8 -5
  401. data/src/core/{transport → lib/transport}/transport_op_string.c +2 -2
  402. data/src/core/{tsi → lib/tsi}/fake_transport_security.c +18 -14
  403. data/src/core/{tsi → lib/tsi}/fake_transport_security.h +4 -4
  404. data/src/core/{tsi → lib/tsi}/ssl_transport_security.c +173 -63
  405. data/src/core/{tsi → lib/tsi}/ssl_transport_security.h +24 -6
  406. data/src/core/{tsi → lib/tsi}/ssl_types.h +3 -3
  407. data/src/core/{tsi → lib/tsi}/transport_security.c +12 -28
  408. data/src/core/{tsi → lib/tsi}/transport_security.h +4 -4
  409. data/src/core/{tsi → lib/tsi}/transport_security_interface.h +12 -3
  410. data/src/core/plugin_registry/grpc_plugin_registry.c +66 -0
  411. data/src/ruby/ext/grpc/extconf.rb +14 -20
  412. data/src/ruby/ext/grpc/rb_byte_buffer.c +2 -3
  413. data/src/ruby/ext/grpc/rb_call.c +37 -4
  414. data/src/ruby/ext/grpc/rb_call_credentials.c +13 -3
  415. data/src/ruby/ext/grpc/rb_channel.c +2 -3
  416. data/src/ruby/ext/grpc/rb_channel_args.c +2 -3
  417. data/src/ruby/ext/grpc/rb_channel_credentials.c +31 -3
  418. data/src/ruby/ext/grpc/rb_completion_queue.c +2 -2
  419. data/src/ruby/ext/grpc/rb_event_thread.c +1 -1
  420. data/src/ruby/ext/grpc/rb_grpc.c +4 -2
  421. data/src/ruby/ext/grpc/rb_grpc_imports.generated.c +8 -0
  422. data/src/ruby/ext/grpc/rb_grpc_imports.generated.h +14 -2
  423. data/src/ruby/ext/grpc/rb_server.c +2 -3
  424. data/src/ruby/ext/grpc/rb_server_credentials.c +16 -13
  425. data/src/ruby/ext/grpc/rb_signal.c +70 -0
  426. data/src/ruby/ext/grpc/rb_signal.h +39 -0
  427. data/src/ruby/lib/grpc.rb +21 -13
  428. data/src/ruby/lib/grpc/core/time_consts.rb +2 -2
  429. data/src/ruby/lib/grpc/errors.rb +2 -2
  430. data/src/ruby/lib/grpc/generic/active_call.rb +10 -3
  431. data/src/ruby/lib/grpc/generic/bidi_call.rb +2 -2
  432. data/src/ruby/lib/grpc/generic/client_stub.rb +10 -7
  433. data/src/ruby/lib/grpc/generic/rpc_desc.rb +2 -2
  434. data/src/ruby/lib/grpc/generic/rpc_server.rb +21 -61
  435. data/src/ruby/lib/grpc/generic/service.rb +5 -15
  436. data/src/ruby/lib/grpc/grpc.rb +3 -3
  437. data/src/ruby/{bin/interop/interop_server.rb → lib/grpc/signals.rb} +39 -20
  438. data/src/ruby/lib/grpc/version.rb +2 -2
  439. data/src/ruby/pb/generate_proto_ruby.sh +9 -2
  440. data/src/ruby/pb/grpc/health/checker.rb +1 -1
  441. data/src/ruby/pb/grpc/testing/duplicate/echo_duplicate_services.rb +28 -0
  442. data/src/ruby/pb/grpc/testing/metrics.rb +28 -0
  443. data/src/ruby/pb/grpc/testing/metrics_services.rb +27 -0
  444. data/src/ruby/pb/test/client.rb +12 -23
  445. data/src/ruby/pb/test/server.rb +1 -1
  446. data/src/ruby/spec/client_server_spec.rb +1 -1
  447. data/src/ruby/spec/generic/client_stub_spec.rb +18 -17
  448. data/src/ruby/spec/generic/rpc_server_spec.rb +23 -7
  449. data/src/ruby/spec/generic/service_spec.rb +0 -69
  450. data/src/ruby/{bin/interop/interop_client.rb → spec/pb/duplicate/codegen_spec.rb} +41 -21
  451. data/src/ruby/spec/pb/health/checker_spec.rb +1 -1
  452. data/third_party/boringssl/crypto/asn1/a_bitstr.c +184 -176
  453. data/third_party/boringssl/crypto/asn1/a_bool.c +42 -44
  454. data/third_party/boringssl/crypto/asn1/a_bytes.c +236 -245
  455. data/third_party/boringssl/crypto/asn1/a_d2i_fp.c +173 -192
  456. data/third_party/boringssl/crypto/asn1/a_dup.c +43 -35
  457. data/third_party/boringssl/crypto/asn1/a_enum.c +107 -109
  458. data/third_party/boringssl/crypto/asn1/a_gentm.c +180 -181
  459. data/third_party/boringssl/crypto/asn1/a_i2d_fp.c +73 -80
  460. data/third_party/boringssl/crypto/asn1/a_int.c +357 -353
  461. data/third_party/boringssl/crypto/asn1/a_mbstr.c +272 -253
  462. data/third_party/boringssl/crypto/asn1/a_object.c +293 -309
  463. data/third_party/boringssl/crypto/asn1/a_octet.c +13 -6
  464. data/third_party/boringssl/crypto/asn1/a_print.c +54 -52
  465. data/third_party/boringssl/crypto/asn1/a_strnid.c +179 -157
  466. data/third_party/boringssl/crypto/asn1/a_time.c +125 -129
  467. data/third_party/boringssl/crypto/asn1/a_type.c +79 -86
  468. data/third_party/boringssl/crypto/asn1/a_utctm.c +246 -255
  469. data/third_party/boringssl/crypto/asn1/a_utf8.c +159 -135
  470. data/third_party/boringssl/crypto/asn1/asn1_lib.c +361 -368
  471. data/third_party/boringssl/crypto/asn1/asn1_locl.h +11 -11
  472. data/third_party/boringssl/crypto/asn1/asn1_par.c +309 -351
  473. data/third_party/boringssl/crypto/asn1/asn_pack.c +30 -29
  474. data/third_party/boringssl/crypto/asn1/bio_asn1.c +375 -394
  475. data/third_party/boringssl/crypto/asn1/bio_ndef.c +146 -149
  476. data/third_party/boringssl/crypto/asn1/f_enum.c +128 -134
  477. data/third_party/boringssl/crypto/asn1/f_int.c +131 -139
  478. data/third_party/boringssl/crypto/asn1/f_string.c +125 -133
  479. data/third_party/boringssl/crypto/asn1/t_bitst.c +30 -29
  480. data/third_party/boringssl/crypto/asn1/t_pkey.c +45 -47
  481. data/third_party/boringssl/crypto/asn1/tasn_dec.c +1099 -1216
  482. data/third_party/boringssl/crypto/asn1/tasn_enc.c +556 -592
  483. data/third_party/boringssl/crypto/asn1/tasn_fre.c +175 -193
  484. data/third_party/boringssl/crypto/asn1/tasn_new.c +271 -288
  485. data/third_party/boringssl/crypto/asn1/tasn_prn.c +462 -508
  486. data/third_party/boringssl/crypto/asn1/tasn_typ.c +28 -21
  487. data/third_party/boringssl/crypto/asn1/x_bignum.c +62 -52
  488. data/third_party/boringssl/crypto/asn1/x_long.c +101 -86
  489. data/third_party/boringssl/crypto/bio/buffer.c +3 -3
  490. data/third_party/boringssl/crypto/bn/asm/x86_64-gcc.c +8 -68
  491. data/third_party/boringssl/crypto/bn/bn.c +1 -1
  492. data/third_party/boringssl/crypto/bn/bn_asn1.c +9 -22
  493. data/third_party/boringssl/crypto/bn/convert.c +9 -4
  494. data/third_party/boringssl/crypto/bn/div.c +0 -20
  495. data/third_party/boringssl/crypto/bn/exponentiation.c +22 -13
  496. data/third_party/boringssl/crypto/bn/generic.c +6 -242
  497. data/third_party/boringssl/crypto/bn/internal.h +9 -70
  498. data/third_party/boringssl/crypto/bn/montgomery.c +1 -2
  499. data/third_party/boringssl/crypto/bn/mul.c +6 -26
  500. data/third_party/boringssl/crypto/bn/rsaz_exp.c +21 -28
  501. data/third_party/boringssl/crypto/bytestring/asn1_compat.c +51 -0
  502. data/third_party/boringssl/crypto/bytestring/ber.c +128 -87
  503. data/third_party/boringssl/crypto/bytestring/cbb.c +37 -3
  504. data/third_party/boringssl/crypto/bytestring/internal.h +39 -10
  505. data/third_party/boringssl/crypto/chacha/chacha_vec.c +18 -13
  506. data/third_party/boringssl/crypto/cipher/e_aes.c +2 -2
  507. data/third_party/boringssl/crypto/cipher/e_chacha20poly1305.c +4 -9
  508. data/third_party/boringssl/crypto/cipher/tls_cbc.c +39 -10
  509. data/third_party/boringssl/crypto/conf/conf.c +9 -0
  510. data/third_party/boringssl/crypto/cpu-intel.c +1 -1
  511. data/third_party/boringssl/crypto/crypto.c +2 -0
  512. data/third_party/boringssl/crypto/curve25519/curve25519.c +125 -120
  513. data/third_party/boringssl/crypto/curve25519/internal.h +45 -0
  514. data/third_party/boringssl/crypto/curve25519/x25519-x86_64.c +225 -0
  515. data/third_party/boringssl/crypto/dh/check.c +32 -10
  516. data/third_party/boringssl/crypto/dh/dh.c +1 -1
  517. data/third_party/boringssl/crypto/digest/md32_common.h +0 -60
  518. data/third_party/boringssl/crypto/dsa/dsa.c +47 -21
  519. data/third_party/boringssl/crypto/dsa/dsa_asn1.c +249 -64
  520. data/third_party/boringssl/crypto/ec/ec.c +45 -31
  521. data/third_party/boringssl/crypto/ec/ec_asn1.c +315 -382
  522. data/third_party/boringssl/crypto/ec/ec_key.c +1 -4
  523. data/third_party/boringssl/crypto/ec/ec_montgomery.c +0 -9
  524. data/third_party/boringssl/crypto/ec/internal.h +1 -19
  525. data/third_party/boringssl/crypto/ec/oct.c +12 -0
  526. data/third_party/boringssl/crypto/ec/p224-64.c +4 -65
  527. data/third_party/boringssl/crypto/ec/p256-64.c +9 -71
  528. data/third_party/boringssl/crypto/ec/p256-x86_64-table.h +1 -6
  529. data/third_party/boringssl/crypto/ec/p256-x86_64.c +3 -13
  530. data/third_party/boringssl/crypto/ec/simple.c +0 -76
  531. data/third_party/boringssl/crypto/ecdsa/ecdsa.c +1 -1
  532. data/third_party/boringssl/crypto/ecdsa/ecdsa_asn1.c +10 -24
  533. data/third_party/boringssl/crypto/evp/evp.c +4 -3
  534. data/third_party/boringssl/crypto/evp/evp_asn1.c +101 -0
  535. data/third_party/boringssl/crypto/evp/evp_ctx.c +22 -51
  536. data/third_party/boringssl/crypto/evp/internal.h +28 -27
  537. data/third_party/boringssl/crypto/evp/p_dsa_asn1.c +78 -249
  538. data/third_party/boringssl/crypto/evp/p_ec.c +19 -66
  539. data/third_party/boringssl/crypto/evp/p_ec_asn1.c +74 -231
  540. data/third_party/boringssl/crypto/evp/p_rsa.c +90 -13
  541. data/third_party/boringssl/crypto/evp/p_rsa_asn1.c +49 -48
  542. data/third_party/boringssl/crypto/internal.h +16 -1
  543. data/third_party/boringssl/crypto/mem.c +2 -2
  544. data/third_party/boringssl/crypto/modes/ctr.c +2 -1
  545. data/third_party/boringssl/crypto/modes/gcm.c +5 -3
  546. data/third_party/boringssl/crypto/obj/obj_dat.h +6 -3
  547. data/third_party/boringssl/crypto/pem/pem_all.c +83 -102
  548. data/third_party/boringssl/crypto/pem/pem_info.c +286 -309
  549. data/third_party/boringssl/crypto/pem/pem_lib.c +690 -710
  550. data/third_party/boringssl/crypto/pem/pem_oth.c +15 -16
  551. data/third_party/boringssl/crypto/pem/pem_pk8.c +132 -119
  552. data/third_party/boringssl/crypto/pem/pem_pkey.c +144 -220
  553. data/third_party/boringssl/crypto/pem/pem_x509.c +3 -3
  554. data/third_party/boringssl/crypto/pem/pem_xaux.c +5 -4
  555. data/third_party/boringssl/crypto/pkcs8/pkcs8.c +54 -60
  556. data/third_party/boringssl/crypto/poly1305/poly1305_arm.c +3 -1
  557. data/third_party/boringssl/crypto/poly1305/poly1305_vec.c +48 -50
  558. data/third_party/boringssl/crypto/rand/rand.c +2 -0
  559. data/third_party/boringssl/crypto/rsa/blinding.c +8 -48
  560. data/third_party/boringssl/crypto/rsa/internal.h +1 -9
  561. data/third_party/boringssl/crypto/rsa/padding.c +73 -77
  562. data/third_party/boringssl/crypto/rsa/rsa.c +1 -1
  563. data/third_party/boringssl/crypto/rsa/rsa_asn1.c +27 -46
  564. data/third_party/boringssl/crypto/rsa/rsa_impl.c +23 -34
  565. data/third_party/boringssl/crypto/test/scoped_types.h +3 -0
  566. data/third_party/boringssl/crypto/thread_win.c +15 -13
  567. data/third_party/boringssl/crypto/time_support.c +0 -6
  568. data/third_party/boringssl/crypto/x509/a_digest.c +26 -27
  569. data/third_party/boringssl/crypto/x509/a_sign.c +63 -64
  570. data/third_party/boringssl/crypto/x509/a_strex.c +482 -413
  571. data/third_party/boringssl/crypto/x509/a_verify.c +45 -51
  572. data/third_party/boringssl/crypto/x509/asn1_gen.c +715 -769
  573. data/third_party/boringssl/crypto/x509/by_dir.c +355 -393
  574. data/third_party/boringssl/crypto/x509/by_file.c +186 -206
  575. data/third_party/boringssl/crypto/x509/charmap.h +11 -11
  576. data/third_party/boringssl/crypto/x509/i2d_pr.c +21 -22
  577. data/third_party/boringssl/crypto/x509/t_crl.c +50 -51
  578. data/third_party/boringssl/crypto/x509/t_x509.c +414 -406
  579. data/third_party/boringssl/crypto/x509/t_x509a.c +44 -42
  580. data/third_party/boringssl/crypto/x509/vpm_int.h +13 -13
  581. data/third_party/boringssl/crypto/x509/x509_att.c +241 -219
  582. data/third_party/boringssl/crypto/x509/x509_cmp.c +343 -359
  583. data/third_party/boringssl/crypto/x509/x509_d2.c +36 -35
  584. data/third_party/boringssl/crypto/x509/x509_def.c +23 -13
  585. data/third_party/boringssl/crypto/x509/x509_ext.c +75 -75
  586. data/third_party/boringssl/crypto/x509/x509_lu.c +574 -612
  587. data/third_party/boringssl/crypto/x509/x509_obj.c +104 -115
  588. data/third_party/boringssl/crypto/x509/x509_r2x.c +40 -40
  589. data/third_party/boringssl/crypto/x509/x509_req.c +181 -174
  590. data/third_party/boringssl/crypto/x509/x509_set.c +71 -76
  591. data/third_party/boringssl/crypto/x509/x509_trs.c +193 -171
  592. data/third_party/boringssl/crypto/x509/x509_txt.c +135 -138
  593. data/third_party/boringssl/crypto/x509/x509_v3.c +174 -167
  594. data/third_party/boringssl/crypto/x509/x509_vfy.c +2079 -2130
  595. data/third_party/boringssl/crypto/x509/x509_vpm.c +486 -522
  596. data/third_party/boringssl/crypto/x509/x509cset.c +96 -99
  597. data/third_party/boringssl/crypto/x509/x509name.c +280 -275
  598. data/third_party/boringssl/crypto/x509/x509rset.c +15 -14
  599. data/third_party/boringssl/crypto/x509/x509spki.c +62 -60
  600. data/third_party/boringssl/crypto/x509/x509type.c +58 -60
  601. data/third_party/boringssl/crypto/x509/x_algor.c +70 -73
  602. data/third_party/boringssl/crypto/x509/x_all.c +282 -328
  603. data/third_party/boringssl/crypto/x509/x_attrib.c +36 -42
  604. data/third_party/boringssl/crypto/x509/x_crl.c +397 -418
  605. data/third_party/boringssl/crypto/x509/x_exten.c +5 -5
  606. data/third_party/boringssl/crypto/x509/x_info.c +30 -27
  607. data/third_party/boringssl/crypto/x509/x_name.c +387 -388
  608. data/third_party/boringssl/crypto/x509/x_pkey.c +32 -29
  609. data/third_party/boringssl/crypto/x509/x_pubkey.c +261 -280
  610. data/third_party/boringssl/crypto/x509/x_req.c +30 -33
  611. data/third_party/boringssl/crypto/x509/x_sig.c +2 -2
  612. data/third_party/boringssl/crypto/x509/x_spki.c +9 -7
  613. data/third_party/boringssl/crypto/x509/x_val.c +2 -2
  614. data/third_party/boringssl/crypto/x509/x_x509.c +120 -119
  615. data/third_party/boringssl/crypto/x509/x_x509a.c +99 -91
  616. data/third_party/boringssl/crypto/x509v3/ext_dat.h +57 -51
  617. data/third_party/boringssl/crypto/x509v3/pcy_cache.c +199 -214
  618. data/third_party/boringssl/crypto/x509v3/pcy_data.c +57 -64
  619. data/third_party/boringssl/crypto/x509v3/pcy_int.h +95 -90
  620. data/third_party/boringssl/crypto/x509v3/pcy_lib.c +86 -87
  621. data/third_party/boringssl/crypto/x509v3/pcy_map.c +61 -64
  622. data/third_party/boringssl/crypto/x509v3/pcy_node.c +108 -117
  623. data/third_party/boringssl/crypto/x509v3/pcy_tree.c +676 -724
  624. data/third_party/boringssl/crypto/x509v3/v3_akey.c +128 -136
  625. data/third_party/boringssl/crypto/x509v3/v3_akeya.c +7 -6
  626. data/third_party/boringssl/crypto/x509v3/v3_alt.c +499 -507
  627. data/third_party/boringssl/crypto/x509v3/v3_bcons.c +54 -47
  628. data/third_party/boringssl/crypto/x509v3/v3_bitst.c +67 -67
  629. data/third_party/boringssl/crypto/x509v3/v3_conf.c +330 -328
  630. data/third_party/boringssl/crypto/x509v3/v3_cpols.c +354 -338
  631. data/third_party/boringssl/crypto/x509v3/v3_crld.c +441 -496
  632. data/third_party/boringssl/crypto/x509v3/v3_enum.c +35 -33
  633. data/third_party/boringssl/crypto/x509v3/v3_extku.c +66 -63
  634. data/third_party/boringssl/crypto/x509v3/v3_genn.c +157 -159
  635. data/third_party/boringssl/crypto/x509v3/v3_ia5.c +45 -43
  636. data/third_party/boringssl/crypto/x509v3/v3_info.c +124 -112
  637. data/third_party/boringssl/crypto/x509v3/v3_int.c +30 -26
  638. data/third_party/boringssl/crypto/x509v3/v3_lib.c +231 -204
  639. data/third_party/boringssl/crypto/x509v3/v3_ncons.c +353 -381
  640. data/third_party/boringssl/crypto/x509v3/v3_pci.c +252 -270
  641. data/third_party/boringssl/crypto/x509v3/v3_pcia.c +9 -8
  642. data/third_party/boringssl/crypto/x509v3/v3_pcons.c +58 -61
  643. data/third_party/boringssl/crypto/x509v3/v3_pku.c +35 -34
  644. data/third_party/boringssl/crypto/x509v3/v3_pmaps.c +72 -74
  645. data/third_party/boringssl/crypto/x509v3/v3_prn.c +146 -121
  646. data/third_party/boringssl/crypto/x509v3/v3_purp.c +651 -582
  647. data/third_party/boringssl/crypto/x509v3/v3_skey.c +76 -72
  648. data/third_party/boringssl/crypto/x509v3/v3_sxnet.c +139 -131
  649. data/third_party/boringssl/crypto/x509v3/v3_utl.c +1072 -1068
  650. data/third_party/boringssl/include/openssl/asn1.h +40 -38
  651. data/third_party/boringssl/include/openssl/base.h +10 -1
  652. data/third_party/boringssl/include/openssl/bio.h +10 -11
  653. data/third_party/boringssl/include/openssl/bn.h +12 -9
  654. data/third_party/boringssl/include/openssl/buf.h +1 -1
  655. data/third_party/boringssl/include/openssl/bytestring.h +29 -0
  656. data/third_party/boringssl/include/openssl/conf.h +25 -0
  657. data/third_party/boringssl/include/openssl/crypto.h +6 -1
  658. data/third_party/boringssl/include/openssl/curve25519.h +6 -3
  659. data/third_party/boringssl/include/openssl/dh.h +7 -3
  660. data/third_party/boringssl/include/openssl/dsa.h +108 -51
  661. data/third_party/boringssl/include/openssl/ec.h +46 -21
  662. data/third_party/boringssl/include/openssl/ec_key.h +78 -42
  663. data/third_party/boringssl/include/openssl/ecdsa.h +4 -4
  664. data/third_party/boringssl/include/openssl/err.h +3 -2
  665. data/third_party/boringssl/include/openssl/evp.h +120 -37
  666. data/third_party/boringssl/include/openssl/mem.h +4 -13
  667. data/third_party/boringssl/include/openssl/obj_mac.h +4 -0
  668. data/third_party/boringssl/include/openssl/pem.h +0 -9
  669. data/third_party/boringssl/include/openssl/pkcs8.h +6 -2
  670. data/third_party/boringssl/include/openssl/rand.h +3 -0
  671. data/third_party/boringssl/include/openssl/rsa.h +42 -42
  672. data/third_party/boringssl/include/openssl/ssl.h +115 -41
  673. data/third_party/boringssl/include/openssl/stack.h +0 -3
  674. data/third_party/boringssl/include/openssl/stack_macros.h +0 -256
  675. data/third_party/boringssl/include/openssl/tls1.h +1 -1
  676. data/third_party/boringssl/include/openssl/x509.h +0 -2
  677. data/third_party/boringssl/include/openssl/x509_vfy.h +5 -0
  678. data/third_party/boringssl/ssl/d1_both.c +102 -101
  679. data/third_party/boringssl/ssl/d1_clnt.c +145 -150
  680. data/third_party/boringssl/ssl/d1_lib.c +63 -62
  681. data/third_party/boringssl/ssl/d1_pkt.c +73 -71
  682. data/third_party/boringssl/ssl/d1_srvr.c +116 -125
  683. data/third_party/boringssl/ssl/dtls_record.c +3 -3
  684. data/third_party/boringssl/ssl/internal.h +210 -208
  685. data/third_party/boringssl/ssl/pqueue/pqueue.c +2 -2
  686. data/third_party/boringssl/ssl/s3_both.c +116 -130
  687. data/third_party/boringssl/ssl/s3_clnt.c +589 -740
  688. data/third_party/boringssl/ssl/s3_enc.c +52 -151
  689. data/third_party/boringssl/ssl/s3_lib.c +70 -76
  690. data/third_party/boringssl/ssl/s3_pkt.c +105 -144
  691. data/third_party/boringssl/ssl/s3_srvr.c +542 -806
  692. data/third_party/boringssl/ssl/ssl_aead_ctx.c +1 -1
  693. data/third_party/boringssl/ssl/ssl_cert.c +2 -2
  694. data/third_party/boringssl/ssl/ssl_cipher.c +7 -3
  695. data/third_party/boringssl/ssl/ssl_ecdh.c +374 -0
  696. data/third_party/boringssl/ssl/ssl_lib.c +260 -221
  697. data/third_party/boringssl/ssl/ssl_session.c +17 -17
  698. data/third_party/boringssl/ssl/t1_enc.c +128 -273
  699. data/third_party/boringssl/ssl/t1_lib.c +134 -258
  700. data/third_party/boringssl/ssl/test/test_config.h +2 -0
  701. data/third_party/boringssl/ssl/tls_record.c +52 -15
  702. metadata +385 -359
  703. data/src/core/channel/client_uchannel.c +0 -243
  704. data/src/core/channel/client_uchannel.h +0 -60
  705. data/src/core/channel/connected_channel.h +0 -51
  706. data/src/core/client_config/lb_policies/pick_first.h +0 -43
  707. data/src/core/client_config/resolvers/dns_resolver.h +0 -42
  708. data/src/core/client_config/subchannel_factory.h +0 -66
  709. data/src/core/httpcli/parser.c +0 -211
  710. data/src/core/iomgr/fd_posix.c +0 -451
  711. data/src/core/iomgr/fd_posix.h +0 -192
  712. data/src/core/iomgr/pollset_multipoller_with_epoll.c +0 -324
  713. data/src/core/iomgr/pollset_multipoller_with_poll_posix.c +0 -234
  714. data/src/core/iomgr/pollset_posix.c +0 -633
  715. data/src/core/iomgr/pollset_posix.h +0 -153
  716. data/src/core/iomgr/pollset_set_posix.c +0 -202
  717. data/src/core/iomgr/pollset_set_posix.h +0 -45
  718. data/src/core/surface/init.c +0 -174
  719. data/src/core/surface/init_secure.c +0 -42
  720. data/src/core/surface/server_create.c +0 -48
  721. data/src/core/transport/chttp2/huffsyms.c +0 -297
  722. data/src/ruby/bin/grpc_ruby_interop_client +0 -33
  723. data/src/ruby/bin/grpc_ruby_interop_server +0 -33
  724. data/third_party/boringssl/crypto/dsa/internal.h +0 -78
@@ -1,6 +1,7 @@
1
1
  /* v3_prn.c */
2
- /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3
- * project 1999.
2
+ /*
3
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
4
+ * 1999.
4
5
  */
5
6
  /* ====================================================================
6
7
  * Copyright (c) 1999 The OpenSSL Project. All rights reserved.
@@ -10,7 +11,7 @@
10
11
  * are met:
11
12
  *
12
13
  * 1. Redistributions of source code must retain the above copyright
13
- * notice, this list of conditions and the following disclaimer.
14
+ * notice, this list of conditions and the following disclaimer.
14
15
  *
15
16
  * 2. Redistributions in binary form must reproduce the above copyright
16
17
  * notice, this list of conditions and the following disclaimer in
@@ -63,145 +64,169 @@
63
64
  #include <openssl/mem.h>
64
65
  #include <openssl/x509v3.h>
65
66
 
66
-
67
67
  /* Extension printing routines */
68
68
 
69
- static int unknown_ext_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent, int supported);
69
+ static int unknown_ext_print(BIO *out, X509_EXTENSION *ext,
70
+ unsigned long flag, int indent, int supported);
70
71
 
71
72
  /* Print out a name+value stack */
72
73
 
73
- void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent, int ml)
74
+ void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,
75
+ int ml)
74
76
  {
75
- size_t i;
76
- CONF_VALUE *nval;
77
- if(!val) return;
78
- if(!ml || !sk_CONF_VALUE_num(val)) {
79
- BIO_printf(out, "%*s", indent, "");
80
- if(!sk_CONF_VALUE_num(val)) BIO_puts(out, "<EMPTY>\n");
81
- }
82
- for(i = 0; i < sk_CONF_VALUE_num(val); i++) {
83
- if(ml) BIO_printf(out, "%*s", indent, "");
84
- else if(i > 0) BIO_printf(out, ", ");
85
- nval = sk_CONF_VALUE_value(val, i);
86
- if(!nval->name) BIO_puts(out, nval->value);
87
- else if(!nval->value) BIO_puts(out, nval->name);
88
- else BIO_printf(out, "%s:%s", nval->name, nval->value);
89
- if(ml) BIO_puts(out, "\n");
90
- }
77
+ size_t i;
78
+ CONF_VALUE *nval;
79
+ if (!val)
80
+ return;
81
+ if (!ml || !sk_CONF_VALUE_num(val)) {
82
+ BIO_printf(out, "%*s", indent, "");
83
+ if (!sk_CONF_VALUE_num(val))
84
+ BIO_puts(out, "<EMPTY>\n");
85
+ }
86
+ for (i = 0; i < sk_CONF_VALUE_num(val); i++) {
87
+ if (ml)
88
+ BIO_printf(out, "%*s", indent, "");
89
+ else if (i > 0)
90
+ BIO_printf(out, ", ");
91
+ nval = sk_CONF_VALUE_value(val, i);
92
+ if (!nval->name)
93
+ BIO_puts(out, nval->value);
94
+ else if (!nval->value)
95
+ BIO_puts(out, nval->name);
96
+ else
97
+ BIO_printf(out, "%s:%s", nval->name, nval->value);
98
+ if (ml)
99
+ BIO_puts(out, "\n");
100
+ }
91
101
  }
92
102
 
93
103
  /* Main routine: print out a general extension */
94
104
 
95
- int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent)
105
+ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
106
+ int indent)
96
107
  {
97
- void *ext_str = NULL;
98
- char *value = NULL;
99
- const unsigned char *p;
100
- const X509V3_EXT_METHOD *method;
101
- STACK_OF(CONF_VALUE) *nval = NULL;
102
- int ok = 1;
103
-
104
- if(!(method = X509V3_EXT_get(ext)))
105
- return unknown_ext_print(out, ext, flag, indent, 0);
106
- p = ext->value->data;
107
- if(method->it) ext_str = ASN1_item_d2i(NULL, &p, ext->value->length, ASN1_ITEM_ptr(method->it));
108
- else ext_str = method->d2i(NULL, &p, ext->value->length);
109
-
110
- if(!ext_str) return unknown_ext_print(out, ext, flag, indent, 1);
111
-
112
- if(method->i2s) {
113
- if(!(value = method->i2s(method, ext_str))) {
114
- ok = 0;
115
- goto err;
116
- }
117
- BIO_printf(out, "%*s%s", indent, "", value);
118
- } else if(method->i2v) {
119
- if(!(nval = method->i2v(method, ext_str, NULL))) {
120
- ok = 0;
121
- goto err;
122
- }
123
- X509V3_EXT_val_prn(out, nval, indent,
124
- method->ext_flags & X509V3_EXT_MULTILINE);
125
- } else if(method->i2r) {
126
- if(!method->i2r(method, ext_str, out, indent)) ok = 0;
127
- } else ok = 0;
128
-
129
- err:
130
- sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
131
- if(value) OPENSSL_free(value);
132
- if(method->it) ASN1_item_free(ext_str, ASN1_ITEM_ptr(method->it));
133
- else method->ext_free(ext_str);
134
- return ok;
108
+ void *ext_str = NULL;
109
+ char *value = NULL;
110
+ const unsigned char *p;
111
+ const X509V3_EXT_METHOD *method;
112
+ STACK_OF(CONF_VALUE) *nval = NULL;
113
+ int ok = 1;
114
+
115
+ if (!(method = X509V3_EXT_get(ext)))
116
+ return unknown_ext_print(out, ext, flag, indent, 0);
117
+ p = ext->value->data;
118
+ if (method->it)
119
+ ext_str =
120
+ ASN1_item_d2i(NULL, &p, ext->value->length,
121
+ ASN1_ITEM_ptr(method->it));
122
+ else
123
+ ext_str = method->d2i(NULL, &p, ext->value->length);
124
+
125
+ if (!ext_str)
126
+ return unknown_ext_print(out, ext, flag, indent, 1);
127
+
128
+ if (method->i2s) {
129
+ if (!(value = method->i2s(method, ext_str))) {
130
+ ok = 0;
131
+ goto err;
132
+ }
133
+ BIO_printf(out, "%*s%s", indent, "", value);
134
+ } else if (method->i2v) {
135
+ if (!(nval = method->i2v(method, ext_str, NULL))) {
136
+ ok = 0;
137
+ goto err;
138
+ }
139
+ X509V3_EXT_val_prn(out, nval, indent,
140
+ method->ext_flags & X509V3_EXT_MULTILINE);
141
+ } else if (method->i2r) {
142
+ if (!method->i2r(method, ext_str, out, indent))
143
+ ok = 0;
144
+ } else
145
+ ok = 0;
146
+
147
+ err:
148
+ sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
149
+ if (value)
150
+ OPENSSL_free(value);
151
+ if (method->it)
152
+ ASN1_item_free(ext_str, ASN1_ITEM_ptr(method->it));
153
+ else
154
+ method->ext_free(ext_str);
155
+ return ok;
135
156
  }
136
157
 
137
- int X509V3_extensions_print(BIO *bp, const char *title, STACK_OF(X509_EXTENSION) *exts, unsigned long flag, int indent)
158
+ int X509V3_extensions_print(BIO *bp, const char *title,
159
+ STACK_OF(X509_EXTENSION) *exts,
160
+ unsigned long flag, int indent)
138
161
  {
139
- size_t i;
140
- int j;
141
-
142
- if(sk_X509_EXTENSION_num(exts) <= 0) return 1;
143
-
144
- if(title)
145
- {
146
- BIO_printf(bp,"%*s%s:\n",indent, "", title);
147
- indent += 4;
148
- }
149
-
150
- for (i=0; i<sk_X509_EXTENSION_num(exts); i++)
151
- {
152
- ASN1_OBJECT *obj;
153
- X509_EXTENSION *ex;
154
- ex=sk_X509_EXTENSION_value(exts, i);
155
- if (indent && BIO_printf(bp,"%*s",indent, "") <= 0) return 0;
156
- obj=X509_EXTENSION_get_object(ex);
157
- i2a_ASN1_OBJECT(bp,obj);
158
- j=X509_EXTENSION_get_critical(ex);
159
- if (BIO_printf(bp,": %s\n",j?"critical":"") <= 0)
160
- return 0;
161
- if(!X509V3_EXT_print(bp, ex, flag, indent + 4))
162
- {
163
- BIO_printf(bp, "%*s", indent + 4, "");
164
- M_ASN1_OCTET_STRING_print(bp,ex->value);
165
- }
166
- if (BIO_write(bp,"\n",1) <= 0) return 0;
167
- }
168
- return 1;
162
+ size_t i;
163
+ int j;
164
+
165
+ if (sk_X509_EXTENSION_num(exts) <= 0)
166
+ return 1;
167
+
168
+ if (title) {
169
+ BIO_printf(bp, "%*s%s:\n", indent, "", title);
170
+ indent += 4;
171
+ }
172
+
173
+ for (i = 0; i < sk_X509_EXTENSION_num(exts); i++) {
174
+ ASN1_OBJECT *obj;
175
+ X509_EXTENSION *ex;
176
+ ex = sk_X509_EXTENSION_value(exts, i);
177
+ if (indent && BIO_printf(bp, "%*s", indent, "") <= 0)
178
+ return 0;
179
+ obj = X509_EXTENSION_get_object(ex);
180
+ i2a_ASN1_OBJECT(bp, obj);
181
+ j = X509_EXTENSION_get_critical(ex);
182
+ if (BIO_printf(bp, ": %s\n", j ? "critical" : "") <= 0)
183
+ return 0;
184
+ if (!X509V3_EXT_print(bp, ex, flag, indent + 4)) {
185
+ BIO_printf(bp, "%*s", indent + 4, "");
186
+ M_ASN1_OCTET_STRING_print(bp, ex->value);
187
+ }
188
+ if (BIO_write(bp, "\n", 1) <= 0)
189
+ return 0;
190
+ }
191
+ return 1;
169
192
  }
170
193
 
171
- static int unknown_ext_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent, int supported)
194
+ static int unknown_ext_print(BIO *out, X509_EXTENSION *ext,
195
+ unsigned long flag, int indent, int supported)
172
196
  {
173
- switch(flag & X509V3_EXT_UNKNOWN_MASK) {
174
-
175
- case X509V3_EXT_DEFAULT:
176
- return 0;
177
-
178
- case X509V3_EXT_ERROR_UNKNOWN:
179
- if(supported)
180
- BIO_printf(out, "%*s<Parse Error>", indent, "");
181
- else
182
- BIO_printf(out, "%*s<Not Supported>", indent, "");
183
- return 1;
184
-
185
- case X509V3_EXT_PARSE_UNKNOWN:
186
- return ASN1_parse_dump(out,
187
- ext->value->data, ext->value->length, indent, -1);
188
- case X509V3_EXT_DUMP_UNKNOWN:
189
- return BIO_hexdump(out, ext->value->data, ext->value->length, indent);
190
-
191
- default:
192
- return 1;
193
- }
197
+ switch (flag & X509V3_EXT_UNKNOWN_MASK) {
198
+
199
+ case X509V3_EXT_DEFAULT:
200
+ return 0;
201
+
202
+ case X509V3_EXT_ERROR_UNKNOWN:
203
+ if (supported)
204
+ BIO_printf(out, "%*s<Parse Error>", indent, "");
205
+ else
206
+ BIO_printf(out, "%*s<Not Supported>", indent, "");
207
+ return 1;
208
+
209
+ case X509V3_EXT_PARSE_UNKNOWN:
210
+ return ASN1_parse_dump(out,
211
+ ext->value->data, ext->value->length, indent,
212
+ -1);
213
+ case X509V3_EXT_DUMP_UNKNOWN:
214
+ return BIO_hexdump(out, ext->value->data, ext->value->length, indent);
215
+
216
+ default:
217
+ return 1;
218
+ }
194
219
  }
195
-
196
220
 
197
221
  #ifndef OPENSSL_NO_FP_API
198
222
  int X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
199
223
  {
200
- BIO *bio_tmp;
201
- int ret;
202
- if(!(bio_tmp = BIO_new_fp(fp, BIO_NOCLOSE))) return 0;
203
- ret = X509V3_EXT_print(bio_tmp, ext, flag, indent);
204
- BIO_free(bio_tmp);
205
- return ret;
224
+ BIO *bio_tmp;
225
+ int ret;
226
+ if (!(bio_tmp = BIO_new_fp(fp, BIO_NOCLOSE)))
227
+ return 0;
228
+ ret = X509V3_EXT_print(bio_tmp, ext, flag, indent);
229
+ BIO_free(bio_tmp);
230
+ return ret;
206
231
  }
207
232
  #endif
@@ -1,6 +1,7 @@
1
1
  /* v3_purp.c */
2
- /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3
- * project 2001.
2
+ /*
3
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
4
+ * 2001.
4
5
  */
5
6
  /* ====================================================================
6
7
  * Copyright (c) 1999-2004 The OpenSSL Project. All rights reserved.
@@ -10,7 +11,7 @@
10
11
  * are met:
11
12
  *
12
13
  * 1. Redistributions of source code must retain the above copyright
13
- * notice, this list of conditions and the following disclaimer.
14
+ * notice, this list of conditions and the following disclaimer.
14
15
  *
15
16
  * 2. Redistributions in binary form must reproduce the above copyright
16
17
  * notice, this list of conditions and the following disclaimer in
@@ -69,26 +70,32 @@
69
70
 
70
71
  #include "../internal.h"
71
72
 
72
-
73
73
  #define V1_ROOT (EXFLAG_V1|EXFLAG_SS)
74
74
  #define ku_reject(x, usage) \
75
- (((x)->ex_flags & EXFLAG_KUSAGE) && !((x)->ex_kusage & (usage)))
75
+ (((x)->ex_flags & EXFLAG_KUSAGE) && !((x)->ex_kusage & (usage)))
76
76
  #define xku_reject(x, usage) \
77
- (((x)->ex_flags & EXFLAG_XKUSAGE) && !((x)->ex_xkusage & (usage)))
77
+ (((x)->ex_flags & EXFLAG_XKUSAGE) && !((x)->ex_xkusage & (usage)))
78
78
  #define ns_reject(x, usage) \
79
- (((x)->ex_flags & EXFLAG_NSCERT) && !((x)->ex_nscert & (usage)))
79
+ (((x)->ex_flags & EXFLAG_NSCERT) && !((x)->ex_nscert & (usage)))
80
80
 
81
81
  static void x509v3_cache_extensions(X509 *x);
82
82
 
83
83
  static int check_ssl_ca(const X509 *x);
84
- static int check_purpose_ssl_client(const X509_PURPOSE *xp, const X509 *x, int ca);
85
- static int check_purpose_ssl_server(const X509_PURPOSE *xp, const X509 *x, int ca);
86
- static int check_purpose_ns_ssl_server(const X509_PURPOSE *xp, const X509 *x, int ca);
84
+ static int check_purpose_ssl_client(const X509_PURPOSE *xp, const X509 *x,
85
+ int ca);
86
+ static int check_purpose_ssl_server(const X509_PURPOSE *xp, const X509 *x,
87
+ int ca);
88
+ static int check_purpose_ns_ssl_server(const X509_PURPOSE *xp, const X509 *x,
89
+ int ca);
87
90
  static int purpose_smime(const X509 *x, int ca);
88
- static int check_purpose_smime_sign(const X509_PURPOSE *xp, const X509 *x, int ca);
89
- static int check_purpose_smime_encrypt(const X509_PURPOSE *xp, const X509 *x, int ca);
90
- static int check_purpose_crl_sign(const X509_PURPOSE *xp, const X509 *x, int ca);
91
- static int check_purpose_timestamp_sign(const X509_PURPOSE *xp, const X509 *x, int ca);
91
+ static int check_purpose_smime_sign(const X509_PURPOSE *xp, const X509 *x,
92
+ int ca);
93
+ static int check_purpose_smime_encrypt(const X509_PURPOSE *xp, const X509 *x,
94
+ int ca);
95
+ static int check_purpose_crl_sign(const X509_PURPOSE *xp, const X509 *x,
96
+ int ca);
97
+ static int check_purpose_timestamp_sign(const X509_PURPOSE *xp, const X509 *x,
98
+ int ca);
92
99
  static int no_check(const X509_PURPOSE *xp, const X509 *x, int ca);
93
100
  static int ocsp_helper(const X509_PURPOSE *xp, const X509 *x, int ca);
94
101
 
@@ -96,15 +103,29 @@ static int xp_cmp(const X509_PURPOSE **a, const X509_PURPOSE **b);
96
103
  static void xptable_free(X509_PURPOSE *p);
97
104
 
98
105
  static X509_PURPOSE xstandard[] = {
99
- {X509_PURPOSE_SSL_CLIENT, X509_TRUST_SSL_CLIENT, 0, check_purpose_ssl_client, (char *) "SSL client", (char *) "sslclient", NULL},
100
- {X509_PURPOSE_SSL_SERVER, X509_TRUST_SSL_SERVER, 0, check_purpose_ssl_server, (char *) "SSL server", (char *) "sslserver", NULL},
101
- {X509_PURPOSE_NS_SSL_SERVER, X509_TRUST_SSL_SERVER, 0, check_purpose_ns_ssl_server, (char *) "Netscape SSL server", (char *) "nssslserver", NULL},
102
- {X509_PURPOSE_SMIME_SIGN, X509_TRUST_EMAIL, 0, check_purpose_smime_sign, (char *) "S/MIME signing", (char *) "smimesign", NULL},
103
- {X509_PURPOSE_SMIME_ENCRYPT, X509_TRUST_EMAIL, 0, check_purpose_smime_encrypt, (char *) "S/MIME encryption", (char *) "smimeencrypt", NULL},
104
- {X509_PURPOSE_CRL_SIGN, X509_TRUST_COMPAT, 0, check_purpose_crl_sign, (char *) "CRL signing", (char *) "crlsign", NULL},
105
- {X509_PURPOSE_ANY, X509_TRUST_DEFAULT, 0, no_check, (char *) "Any Purpose", (char *) "any", NULL},
106
- {X509_PURPOSE_OCSP_HELPER, X509_TRUST_COMPAT, 0, ocsp_helper, (char *) "OCSP helper", (char *) "ocsphelper", NULL},
107
- {X509_PURPOSE_TIMESTAMP_SIGN, X509_TRUST_TSA, 0, check_purpose_timestamp_sign, (char *) "Time Stamp signing", (char *) "timestampsign", NULL},
106
+ {X509_PURPOSE_SSL_CLIENT, X509_TRUST_SSL_CLIENT, 0,
107
+ check_purpose_ssl_client, (char *)"SSL client", (char *)"sslclient",
108
+ NULL},
109
+ {X509_PURPOSE_SSL_SERVER, X509_TRUST_SSL_SERVER, 0,
110
+ check_purpose_ssl_server, (char *)"SSL server", (char *)"sslserver",
111
+ NULL},
112
+ {X509_PURPOSE_NS_SSL_SERVER, X509_TRUST_SSL_SERVER, 0,
113
+ check_purpose_ns_ssl_server, (char *)"Netscape SSL server",
114
+ (char *)"nssslserver", NULL},
115
+ {X509_PURPOSE_SMIME_SIGN, X509_TRUST_EMAIL, 0, check_purpose_smime_sign,
116
+ (char *)"S/MIME signing", (char *)"smimesign", NULL},
117
+ {X509_PURPOSE_SMIME_ENCRYPT, X509_TRUST_EMAIL, 0,
118
+ check_purpose_smime_encrypt, (char *)"S/MIME encryption",
119
+ (char *)"smimeencrypt", NULL},
120
+ {X509_PURPOSE_CRL_SIGN, X509_TRUST_COMPAT, 0, check_purpose_crl_sign,
121
+ (char *)"CRL signing", (char *)"crlsign", NULL},
122
+ {X509_PURPOSE_ANY, X509_TRUST_DEFAULT, 0, no_check, (char *)"Any Purpose",
123
+ (char *)"any", NULL},
124
+ {X509_PURPOSE_OCSP_HELPER, X509_TRUST_COMPAT, 0, ocsp_helper,
125
+ (char *)"OCSP helper", (char *)"ocsphelper", NULL},
126
+ {X509_PURPOSE_TIMESTAMP_SIGN, X509_TRUST_TSA, 0,
127
+ check_purpose_timestamp_sign, (char *)"Time Stamp signing",
128
+ (char *)"timestampsign", NULL},
108
129
  };
109
130
 
110
131
  #define X509_PURPOSE_COUNT (sizeof(xstandard)/sizeof(X509_PURPOSE))
@@ -113,693 +134,741 @@ static STACK_OF(X509_PURPOSE) *xptable = NULL;
113
134
 
114
135
  static int xp_cmp(const X509_PURPOSE **a, const X509_PURPOSE **b)
115
136
  {
116
- return (*a)->purpose - (*b)->purpose;
137
+ return (*a)->purpose - (*b)->purpose;
117
138
  }
118
139
 
119
- /* As much as I'd like to make X509_check_purpose use a "const" X509*
120
- * I really can't because it does recalculate hashes and do other non-const
121
- * things. */
140
+ /*
141
+ * As much as I'd like to make X509_check_purpose use a "const" X509* I
142
+ * really can't because it does recalculate hashes and do other non-const
143
+ * things.
144
+ */
122
145
  int X509_check_purpose(X509 *x, int id, int ca)
123
146
  {
124
- int idx;
125
- const X509_PURPOSE *pt;
126
- if(!(x->ex_flags & EXFLAG_SET)) {
127
- x509v3_cache_extensions(x);
128
- }
129
- if(id == -1) return 1;
130
- idx = X509_PURPOSE_get_by_id(id);
131
- if(idx == -1) return -1;
132
- pt = X509_PURPOSE_get0(idx);
133
- return pt->check_purpose(pt, x, ca);
147
+ int idx;
148
+ const X509_PURPOSE *pt;
149
+ if (!(x->ex_flags & EXFLAG_SET)) {
150
+ x509v3_cache_extensions(x);
151
+ }
152
+ if (id == -1)
153
+ return 1;
154
+ idx = X509_PURPOSE_get_by_id(id);
155
+ if (idx == -1)
156
+ return -1;
157
+ pt = X509_PURPOSE_get0(idx);
158
+ return pt->check_purpose(pt, x, ca);
134
159
  }
135
160
 
136
161
  int X509_PURPOSE_set(int *p, int purpose)
137
162
  {
138
- if(X509_PURPOSE_get_by_id(purpose) == -1) {
139
- OPENSSL_PUT_ERROR(X509V3, X509V3_R_INVALID_PURPOSE);
140
- return 0;
141
- }
142
- *p = purpose;
143
- return 1;
163
+ if (X509_PURPOSE_get_by_id(purpose) == -1) {
164
+ OPENSSL_PUT_ERROR(X509V3, X509V3_R_INVALID_PURPOSE);
165
+ return 0;
166
+ }
167
+ *p = purpose;
168
+ return 1;
144
169
  }
145
170
 
146
171
  int X509_PURPOSE_get_count(void)
147
172
  {
148
- if(!xptable) return X509_PURPOSE_COUNT;
149
- return sk_X509_PURPOSE_num(xptable) + X509_PURPOSE_COUNT;
173
+ if (!xptable)
174
+ return X509_PURPOSE_COUNT;
175
+ return sk_X509_PURPOSE_num(xptable) + X509_PURPOSE_COUNT;
150
176
  }
151
177
 
152
- X509_PURPOSE * X509_PURPOSE_get0(int idx)
178
+ X509_PURPOSE *X509_PURPOSE_get0(int idx)
153
179
  {
154
- if(idx < 0) return NULL;
155
- if(idx < (int)X509_PURPOSE_COUNT) return xstandard + idx;
156
- return sk_X509_PURPOSE_value(xptable, idx - X509_PURPOSE_COUNT);
180
+ if (idx < 0)
181
+ return NULL;
182
+ if (idx < (int)X509_PURPOSE_COUNT)
183
+ return xstandard + idx;
184
+ return sk_X509_PURPOSE_value(xptable, idx - X509_PURPOSE_COUNT);
157
185
  }
158
186
 
159
187
  int X509_PURPOSE_get_by_sname(char *sname)
160
188
  {
161
- int i;
162
- X509_PURPOSE *xptmp;
163
- for(i = 0; i < X509_PURPOSE_get_count(); i++) {
164
- xptmp = X509_PURPOSE_get0(i);
165
- if(!strcmp(xptmp->sname, sname)) return i;
166
- }
167
- return -1;
189
+ int i;
190
+ X509_PURPOSE *xptmp;
191
+ for (i = 0; i < X509_PURPOSE_get_count(); i++) {
192
+ xptmp = X509_PURPOSE_get0(i);
193
+ if (!strcmp(xptmp->sname, sname))
194
+ return i;
195
+ }
196
+ return -1;
168
197
  }
169
198
 
170
199
  int X509_PURPOSE_get_by_id(int purpose)
171
200
  {
172
- X509_PURPOSE tmp;
173
- size_t idx;
174
-
175
- if((purpose >= X509_PURPOSE_MIN) && (purpose <= X509_PURPOSE_MAX))
176
- return purpose - X509_PURPOSE_MIN;
177
- tmp.purpose = purpose;
178
- if(!xptable) return -1;
179
-
180
- if (!sk_X509_PURPOSE_find(xptable, &idx, &tmp))
181
- return -1;
182
- return idx + X509_PURPOSE_COUNT;
201
+ X509_PURPOSE tmp;
202
+ size_t idx;
203
+
204
+ if ((purpose >= X509_PURPOSE_MIN) && (purpose <= X509_PURPOSE_MAX))
205
+ return purpose - X509_PURPOSE_MIN;
206
+ tmp.purpose = purpose;
207
+ if (!xptable)
208
+ return -1;
209
+
210
+ if (!sk_X509_PURPOSE_find(xptable, &idx, &tmp))
211
+ return -1;
212
+ return idx + X509_PURPOSE_COUNT;
183
213
  }
184
214
 
185
215
  int X509_PURPOSE_add(int id, int trust, int flags,
186
- int (*ck)(const X509_PURPOSE *, const X509 *, int),
187
- char *name, char *sname, void *arg)
188
- {
189
- int idx;
190
- X509_PURPOSE *ptmp;
191
- char *name_dup, *sname_dup;
192
-
193
- /* This is set according to what we change: application can't set it */
194
- flags &= ~X509_PURPOSE_DYNAMIC;
195
- /* This will always be set for application modified trust entries */
196
- flags |= X509_PURPOSE_DYNAMIC_NAME;
197
- /* Get existing entry if any */
198
- idx = X509_PURPOSE_get_by_id(id);
199
- /* Need a new entry */
200
- if(idx == -1) {
201
- if(!(ptmp = OPENSSL_malloc(sizeof(X509_PURPOSE)))) {
202
- OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
203
- return 0;
204
- }
205
- ptmp->flags = X509_PURPOSE_DYNAMIC;
206
- } else ptmp = X509_PURPOSE_get0(idx);
207
-
208
- /* Duplicate the supplied names. */
209
- name_dup = BUF_strdup(name);
210
- sname_dup = BUF_strdup(sname);
211
- if (name_dup == NULL || sname_dup == NULL) {
212
- OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
213
- if (name_dup != NULL)
214
- OPENSSL_free(name_dup);
215
- if (sname_dup != NULL)
216
- OPENSSL_free(sname_dup);
217
- if (idx == -1)
218
- OPENSSL_free(ptmp);
219
- return 0;
220
- }
221
-
222
- /* OPENSSL_free existing name if dynamic */
223
- if(ptmp->flags & X509_PURPOSE_DYNAMIC_NAME) {
224
- OPENSSL_free(ptmp->name);
225
- OPENSSL_free(ptmp->sname);
226
- }
227
- /* dup supplied name */
228
- ptmp->name = name_dup;
229
- ptmp->sname = sname_dup;
230
- /* Keep the dynamic flag of existing entry */
231
- ptmp->flags &= X509_PURPOSE_DYNAMIC;
232
- /* Set all other flags */
233
- ptmp->flags |= flags;
234
-
235
- ptmp->purpose = id;
236
- ptmp->trust = trust;
237
- ptmp->check_purpose = ck;
238
- ptmp->usr_data = arg;
239
-
240
- /* If its a new entry manage the dynamic table */
241
- if(idx == -1) {
242
- if(!xptable && !(xptable = sk_X509_PURPOSE_new(xp_cmp))) {
243
- OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
244
- xptable_free(ptmp);
245
- return 0;
246
- }
247
- if (!sk_X509_PURPOSE_push(xptable, ptmp)) {
248
- OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
249
- xptable_free(ptmp);
250
- return 0;
251
- }
252
- }
253
- return 1;
216
+ int (*ck) (const X509_PURPOSE *, const X509 *, int),
217
+ char *name, char *sname, void *arg)
218
+ {
219
+ int idx;
220
+ X509_PURPOSE *ptmp;
221
+ char *name_dup, *sname_dup;
222
+
223
+ /*
224
+ * This is set according to what we change: application can't set it
225
+ */
226
+ flags &= ~X509_PURPOSE_DYNAMIC;
227
+ /* This will always be set for application modified trust entries */
228
+ flags |= X509_PURPOSE_DYNAMIC_NAME;
229
+ /* Get existing entry if any */
230
+ idx = X509_PURPOSE_get_by_id(id);
231
+ /* Need a new entry */
232
+ if (idx == -1) {
233
+ if (!(ptmp = OPENSSL_malloc(sizeof(X509_PURPOSE)))) {
234
+ OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
235
+ return 0;
236
+ }
237
+ ptmp->flags = X509_PURPOSE_DYNAMIC;
238
+ } else
239
+ ptmp = X509_PURPOSE_get0(idx);
240
+
241
+ /* Duplicate the supplied names. */
242
+ name_dup = BUF_strdup(name);
243
+ sname_dup = BUF_strdup(sname);
244
+ if (name_dup == NULL || sname_dup == NULL) {
245
+ OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
246
+ if (name_dup != NULL)
247
+ OPENSSL_free(name_dup);
248
+ if (sname_dup != NULL)
249
+ OPENSSL_free(sname_dup);
250
+ if (idx == -1)
251
+ OPENSSL_free(ptmp);
252
+ return 0;
253
+ }
254
+
255
+ /* OPENSSL_free existing name if dynamic */
256
+ if (ptmp->flags & X509_PURPOSE_DYNAMIC_NAME) {
257
+ OPENSSL_free(ptmp->name);
258
+ OPENSSL_free(ptmp->sname);
259
+ }
260
+ /* dup supplied name */
261
+ ptmp->name = name_dup;
262
+ ptmp->sname = sname_dup;
263
+ /* Keep the dynamic flag of existing entry */
264
+ ptmp->flags &= X509_PURPOSE_DYNAMIC;
265
+ /* Set all other flags */
266
+ ptmp->flags |= flags;
267
+
268
+ ptmp->purpose = id;
269
+ ptmp->trust = trust;
270
+ ptmp->check_purpose = ck;
271
+ ptmp->usr_data = arg;
272
+
273
+ /* If its a new entry manage the dynamic table */
274
+ if (idx == -1) {
275
+ if (!xptable && !(xptable = sk_X509_PURPOSE_new(xp_cmp))) {
276
+ OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
277
+ xptable_free(ptmp);
278
+ return 0;
279
+ }
280
+ if (!sk_X509_PURPOSE_push(xptable, ptmp)) {
281
+ OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
282
+ xptable_free(ptmp);
283
+ return 0;
284
+ }
285
+ }
286
+ return 1;
254
287
  }
255
288
 
256
289
  static void xptable_free(X509_PURPOSE *p)
257
- {
258
- if(!p) return;
259
- if (p->flags & X509_PURPOSE_DYNAMIC)
260
- {
261
- if (p->flags & X509_PURPOSE_DYNAMIC_NAME) {
262
- OPENSSL_free(p->name);
263
- OPENSSL_free(p->sname);
264
- }
265
- OPENSSL_free(p);
266
- }
267
- }
290
+ {
291
+ if (!p)
292
+ return;
293
+ if (p->flags & X509_PURPOSE_DYNAMIC) {
294
+ if (p->flags & X509_PURPOSE_DYNAMIC_NAME) {
295
+ OPENSSL_free(p->name);
296
+ OPENSSL_free(p->sname);
297
+ }
298
+ OPENSSL_free(p);
299
+ }
300
+ }
268
301
 
269
302
  void X509_PURPOSE_cleanup(void)
270
303
  {
271
- unsigned int i;
272
- sk_X509_PURPOSE_pop_free(xptable, xptable_free);
273
- for(i = 0; i < X509_PURPOSE_COUNT; i++) xptable_free(xstandard + i);
274
- xptable = NULL;
304
+ unsigned int i;
305
+ sk_X509_PURPOSE_pop_free(xptable, xptable_free);
306
+ for (i = 0; i < X509_PURPOSE_COUNT; i++)
307
+ xptable_free(xstandard + i);
308
+ xptable = NULL;
275
309
  }
276
310
 
277
311
  int X509_PURPOSE_get_id(X509_PURPOSE *xp)
278
312
  {
279
- return xp->purpose;
313
+ return xp->purpose;
280
314
  }
281
315
 
282
316
  char *X509_PURPOSE_get0_name(X509_PURPOSE *xp)
283
317
  {
284
- return xp->name;
318
+ return xp->name;
285
319
  }
286
320
 
287
321
  char *X509_PURPOSE_get0_sname(X509_PURPOSE *xp)
288
322
  {
289
- return xp->sname;
323
+ return xp->sname;
290
324
  }
291
325
 
292
326
  int X509_PURPOSE_get_trust(X509_PURPOSE *xp)
293
327
  {
294
- return xp->trust;
328
+ return xp->trust;
295
329
  }
296
330
 
297
331
  static int nid_cmp(const void *void_a, const void *void_b)
298
- {
299
- const int *a = void_a, *b = void_b;
332
+ {
333
+ const int *a = void_a, *b = void_b;
300
334
 
301
- return *a - *b;
302
- }
335
+ return *a - *b;
336
+ }
303
337
 
304
338
  int X509_supported_extension(X509_EXTENSION *ex)
305
- {
306
- /* This table is a list of the NIDs of supported extensions:
307
- * that is those which are used by the verify process. If
308
- * an extension is critical and doesn't appear in this list
309
- * then the verify process will normally reject the certificate.
310
- * The list must be kept in numerical order because it will be
311
- * searched using bsearch.
312
- */
313
-
314
- static const int supported_nids[] = {
315
- NID_netscape_cert_type, /* 71 */
316
- NID_key_usage, /* 83 */
317
- NID_subject_alt_name, /* 85 */
318
- NID_basic_constraints, /* 87 */
319
- NID_certificate_policies, /* 89 */
320
- NID_ext_key_usage, /* 126 */
321
- NID_policy_constraints, /* 401 */
322
- NID_proxyCertInfo, /* 663 */
323
- NID_name_constraints, /* 666 */
324
- NID_policy_mappings, /* 747 */
325
- NID_inhibit_any_policy /* 748 */
326
- };
327
-
328
- int ex_nid = OBJ_obj2nid(X509_EXTENSION_get_object(ex));
329
-
330
- if (ex_nid == NID_undef)
331
- return 0;
332
-
333
- if (bsearch(&ex_nid, supported_nids, sizeof(supported_nids)/sizeof(int), sizeof(int), nid_cmp) != NULL)
334
- return 1;
335
- return 0;
336
- }
339
+ {
340
+ /*
341
+ * This table is a list of the NIDs of supported extensions: that is
342
+ * those which are used by the verify process. If an extension is
343
+ * critical and doesn't appear in this list then the verify process will
344
+ * normally reject the certificate. The list must be kept in numerical
345
+ * order because it will be searched using bsearch.
346
+ */
347
+
348
+ static const int supported_nids[] = {
349
+ NID_netscape_cert_type, /* 71 */
350
+ NID_key_usage, /* 83 */
351
+ NID_subject_alt_name, /* 85 */
352
+ NID_basic_constraints, /* 87 */
353
+ NID_certificate_policies, /* 89 */
354
+ NID_ext_key_usage, /* 126 */
355
+ NID_policy_constraints, /* 401 */
356
+ NID_proxyCertInfo, /* 663 */
357
+ NID_name_constraints, /* 666 */
358
+ NID_policy_mappings, /* 747 */
359
+ NID_inhibit_any_policy /* 748 */
360
+ };
361
+
362
+ int ex_nid = OBJ_obj2nid(X509_EXTENSION_get_object(ex));
363
+
364
+ if (ex_nid == NID_undef)
365
+ return 0;
366
+
367
+ if (bsearch
368
+ (&ex_nid, supported_nids, sizeof(supported_nids) / sizeof(int),
369
+ sizeof(int), nid_cmp) != NULL)
370
+ return 1;
371
+ return 0;
372
+ }
337
373
 
338
374
  static void setup_dp(X509 *x, DIST_POINT *dp)
339
- {
340
- X509_NAME *iname = NULL;
341
- size_t i;
342
- if (dp->reasons)
343
- {
344
- if (dp->reasons->length > 0)
345
- dp->dp_reasons = dp->reasons->data[0];
346
- if (dp->reasons->length > 1)
347
- dp->dp_reasons |= (dp->reasons->data[1] << 8);
348
- dp->dp_reasons &= CRLDP_ALL_REASONS;
349
- }
350
- else
351
- dp->dp_reasons = CRLDP_ALL_REASONS;
352
- if (!dp->distpoint || (dp->distpoint->type != 1))
353
- return;
354
- for (i = 0; i < sk_GENERAL_NAME_num(dp->CRLissuer); i++)
355
- {
356
- GENERAL_NAME *gen = sk_GENERAL_NAME_value(dp->CRLissuer, i);
357
- if (gen->type == GEN_DIRNAME)
358
- {
359
- iname = gen->d.directoryName;
360
- break;
361
- }
362
- }
363
- if (!iname)
364
- iname = X509_get_issuer_name(x);
365
-
366
- DIST_POINT_set_dpname(dp->distpoint, iname);
367
-
368
- }
375
+ {
376
+ X509_NAME *iname = NULL;
377
+ size_t i;
378
+ if (dp->reasons) {
379
+ if (dp->reasons->length > 0)
380
+ dp->dp_reasons = dp->reasons->data[0];
381
+ if (dp->reasons->length > 1)
382
+ dp->dp_reasons |= (dp->reasons->data[1] << 8);
383
+ dp->dp_reasons &= CRLDP_ALL_REASONS;
384
+ } else
385
+ dp->dp_reasons = CRLDP_ALL_REASONS;
386
+ if (!dp->distpoint || (dp->distpoint->type != 1))
387
+ return;
388
+ for (i = 0; i < sk_GENERAL_NAME_num(dp->CRLissuer); i++) {
389
+ GENERAL_NAME *gen = sk_GENERAL_NAME_value(dp->CRLissuer, i);
390
+ if (gen->type == GEN_DIRNAME) {
391
+ iname = gen->d.directoryName;
392
+ break;
393
+ }
394
+ }
395
+ if (!iname)
396
+ iname = X509_get_issuer_name(x);
397
+
398
+ DIST_POINT_set_dpname(dp->distpoint, iname);
399
+
400
+ }
369
401
 
370
402
  static void setup_crldp(X509 *x)
371
- {
372
- size_t i;
373
- x->crldp = X509_get_ext_d2i(x, NID_crl_distribution_points, NULL, NULL);
374
- for (i = 0; i < sk_DIST_POINT_num(x->crldp); i++)
375
- setup_dp(x, sk_DIST_POINT_value(x->crldp, i));
376
- }
377
-
378
- /* g_x509_cache_extensions_lock is used to protect against concurrent calls to
379
- * |x509v3_cache_extensions|. Ideally this would be done with a |CRYPTO_once_t|
380
- * in the |X509| structure, but |CRYPTO_once_t| isn't public.
381
- *
403
+ {
404
+ size_t i;
405
+ x->crldp = X509_get_ext_d2i(x, NID_crl_distribution_points, NULL, NULL);
406
+ for (i = 0; i < sk_DIST_POINT_num(x->crldp); i++)
407
+ setup_dp(x, sk_DIST_POINT_value(x->crldp, i));
408
+ }
409
+
410
+ /*
411
+ * g_x509_cache_extensions_lock is used to protect against concurrent calls
412
+ * to |x509v3_cache_extensions|. Ideally this would be done with a
413
+ * |CRYPTO_once_t| in the |X509| structure, but |CRYPTO_once_t| isn't public.
382
414
  * Note: it's not entirely clear whether this lock is needed. Not all paths to
383
- * this function took a lock in OpenSSL. */
415
+ * this function took a lock in OpenSSL.
416
+ */
384
417
  static struct CRYPTO_STATIC_MUTEX g_x509_cache_extensions_lock =
385
418
  CRYPTO_STATIC_MUTEX_INIT;
386
419
 
387
420
  static void x509v3_cache_extensions(X509 *x)
388
421
  {
389
- BASIC_CONSTRAINTS *bs;
390
- PROXY_CERT_INFO_EXTENSION *pci;
391
- ASN1_BIT_STRING *usage;
392
- ASN1_BIT_STRING *ns;
393
- EXTENDED_KEY_USAGE *extusage;
394
- X509_EXTENSION *ex;
395
- size_t i;
396
- int j;
397
-
398
- CRYPTO_STATIC_MUTEX_lock_write(&g_x509_cache_extensions_lock);
399
-
400
- if(x->ex_flags & EXFLAG_SET)
401
- {
402
- CRYPTO_STATIC_MUTEX_unlock(&g_x509_cache_extensions_lock);
403
- return;
404
- }
405
-
406
- X509_digest(x, EVP_sha1(), x->sha1_hash, NULL);
407
- /* V1 should mean no extensions ... */
408
- if(!X509_get_version(x)) x->ex_flags |= EXFLAG_V1;
409
- /* Handle basic constraints */
410
- if((bs=X509_get_ext_d2i(x, NID_basic_constraints, NULL, NULL))) {
411
- if(bs->ca) x->ex_flags |= EXFLAG_CA;
412
- if(bs->pathlen) {
413
- if((bs->pathlen->type == V_ASN1_NEG_INTEGER)
414
- || !bs->ca) {
415
- x->ex_flags |= EXFLAG_INVALID;
416
- x->ex_pathlen = 0;
417
- } else x->ex_pathlen = ASN1_INTEGER_get(bs->pathlen);
418
- } else x->ex_pathlen = -1;
419
- BASIC_CONSTRAINTS_free(bs);
420
- x->ex_flags |= EXFLAG_BCONS;
421
- }
422
- /* Handle proxy certificates */
423
- if((pci=X509_get_ext_d2i(x, NID_proxyCertInfo, NULL, NULL))) {
424
- if (x->ex_flags & EXFLAG_CA
425
- || X509_get_ext_by_NID(x, NID_subject_alt_name, -1) >= 0
426
- || X509_get_ext_by_NID(x, NID_issuer_alt_name, -1) >= 0) {
427
- x->ex_flags |= EXFLAG_INVALID;
428
- }
429
- if (pci->pcPathLengthConstraint) {
430
- x->ex_pcpathlen =
431
- ASN1_INTEGER_get(pci->pcPathLengthConstraint);
432
- } else x->ex_pcpathlen = -1;
433
- PROXY_CERT_INFO_EXTENSION_free(pci);
434
- x->ex_flags |= EXFLAG_PROXY;
435
- }
436
- /* Handle key usage */
437
- if((usage=X509_get_ext_d2i(x, NID_key_usage, NULL, NULL))) {
438
- if(usage->length > 0) {
439
- x->ex_kusage = usage->data[0];
440
- if(usage->length > 1)
441
- x->ex_kusage |= usage->data[1] << 8;
442
- } else x->ex_kusage = 0;
443
- x->ex_flags |= EXFLAG_KUSAGE;
444
- ASN1_BIT_STRING_free(usage);
445
- }
446
- x->ex_xkusage = 0;
447
- if((extusage=X509_get_ext_d2i(x, NID_ext_key_usage, NULL, NULL))) {
448
- x->ex_flags |= EXFLAG_XKUSAGE;
449
- for(i = 0; i < sk_ASN1_OBJECT_num(extusage); i++) {
450
- switch(OBJ_obj2nid(sk_ASN1_OBJECT_value(extusage,i))) {
451
- case NID_server_auth:
452
- x->ex_xkusage |= XKU_SSL_SERVER;
453
- break;
454
-
455
- case NID_client_auth:
456
- x->ex_xkusage |= XKU_SSL_CLIENT;
457
- break;
458
-
459
- case NID_email_protect:
460
- x->ex_xkusage |= XKU_SMIME;
461
- break;
462
-
463
- case NID_code_sign:
464
- x->ex_xkusage |= XKU_CODE_SIGN;
465
- break;
466
-
467
- case NID_ms_sgc:
468
- case NID_ns_sgc:
469
- x->ex_xkusage |= XKU_SGC;
470
- break;
471
-
472
- case NID_OCSP_sign:
473
- x->ex_xkusage |= XKU_OCSP_SIGN;
474
- break;
475
-
476
- case NID_time_stamp:
477
- x->ex_xkusage |= XKU_TIMESTAMP;
478
- break;
479
-
480
- case NID_dvcs:
481
- x->ex_xkusage |= XKU_DVCS;
482
- break;
483
-
484
- case NID_anyExtendedKeyUsage:
485
- x->ex_xkusage |= XKU_ANYEKU;
486
- break;
487
- }
488
- }
489
- sk_ASN1_OBJECT_pop_free(extusage, ASN1_OBJECT_free);
490
- }
491
-
492
- if((ns=X509_get_ext_d2i(x, NID_netscape_cert_type, NULL, NULL))) {
493
- if(ns->length > 0) x->ex_nscert = ns->data[0];
494
- else x->ex_nscert = 0;
495
- x->ex_flags |= EXFLAG_NSCERT;
496
- ASN1_BIT_STRING_free(ns);
497
- }
498
- x->skid =X509_get_ext_d2i(x, NID_subject_key_identifier, NULL, NULL);
499
- x->akid =X509_get_ext_d2i(x, NID_authority_key_identifier, NULL, NULL);
500
- /* Does subject name match issuer ? */
501
- if(!X509_NAME_cmp(X509_get_subject_name(x), X509_get_issuer_name(x)))
502
- {
503
- x->ex_flags |= EXFLAG_SI;
504
- /* If SKID matches AKID also indicate self signed */
505
- if (X509_check_akid(x, x->akid) == X509_V_OK &&
506
- !ku_reject(x, KU_KEY_CERT_SIGN))
507
- x->ex_flags |= EXFLAG_SS;
508
- }
509
- x->altname = X509_get_ext_d2i(x, NID_subject_alt_name, NULL, NULL);
510
- x->nc = X509_get_ext_d2i(x, NID_name_constraints, &j, NULL);
511
- if (!x->nc && (j != -1))
512
- x->ex_flags |= EXFLAG_INVALID;
513
- setup_crldp(x);
514
-
515
- for (j = 0; j < X509_get_ext_count(x); j++)
516
- {
517
- ex = X509_get_ext(x, j);
518
- if (OBJ_obj2nid(X509_EXTENSION_get_object(ex))
519
- == NID_freshest_crl)
520
- x->ex_flags |= EXFLAG_FRESHEST;
521
- if (!X509_EXTENSION_get_critical(ex))
522
- continue;
523
- if (!X509_supported_extension(ex))
524
- {
525
- x->ex_flags |= EXFLAG_CRITICAL;
526
- break;
527
- }
528
- }
529
- x->ex_flags |= EXFLAG_SET;
530
-
531
- CRYPTO_STATIC_MUTEX_unlock(&g_x509_cache_extensions_lock);
532
- }
533
-
534
- /* CA checks common to all purposes
535
- * return codes:
536
- * 0 not a CA
537
- * 1 is a CA
538
- * 2 basicConstraints absent so "maybe" a CA
539
- * 3 basicConstraints absent but self signed V1.
540
- * 4 basicConstraints absent but keyUsage present and keyCertSign asserted.
422
+ BASIC_CONSTRAINTS *bs;
423
+ PROXY_CERT_INFO_EXTENSION *pci;
424
+ ASN1_BIT_STRING *usage;
425
+ ASN1_BIT_STRING *ns;
426
+ EXTENDED_KEY_USAGE *extusage;
427
+ X509_EXTENSION *ex;
428
+ size_t i;
429
+ int j;
430
+
431
+ CRYPTO_STATIC_MUTEX_lock_write(&g_x509_cache_extensions_lock);
432
+
433
+ if (x->ex_flags & EXFLAG_SET) {
434
+ CRYPTO_STATIC_MUTEX_unlock(&g_x509_cache_extensions_lock);
435
+ return;
436
+ }
437
+
438
+ X509_digest(x, EVP_sha1(), x->sha1_hash, NULL);
439
+ /* V1 should mean no extensions ... */
440
+ if (!X509_get_version(x))
441
+ x->ex_flags |= EXFLAG_V1;
442
+ /* Handle basic constraints */
443
+ if ((bs = X509_get_ext_d2i(x, NID_basic_constraints, NULL, NULL))) {
444
+ if (bs->ca)
445
+ x->ex_flags |= EXFLAG_CA;
446
+ if (bs->pathlen) {
447
+ if ((bs->pathlen->type == V_ASN1_NEG_INTEGER)
448
+ || !bs->ca) {
449
+ x->ex_flags |= EXFLAG_INVALID;
450
+ x->ex_pathlen = 0;
451
+ } else
452
+ x->ex_pathlen = ASN1_INTEGER_get(bs->pathlen);
453
+ } else
454
+ x->ex_pathlen = -1;
455
+ BASIC_CONSTRAINTS_free(bs);
456
+ x->ex_flags |= EXFLAG_BCONS;
457
+ }
458
+ /* Handle proxy certificates */
459
+ if ((pci = X509_get_ext_d2i(x, NID_proxyCertInfo, NULL, NULL))) {
460
+ if (x->ex_flags & EXFLAG_CA
461
+ || X509_get_ext_by_NID(x, NID_subject_alt_name, -1) >= 0
462
+ || X509_get_ext_by_NID(x, NID_issuer_alt_name, -1) >= 0) {
463
+ x->ex_flags |= EXFLAG_INVALID;
464
+ }
465
+ if (pci->pcPathLengthConstraint) {
466
+ x->ex_pcpathlen = ASN1_INTEGER_get(pci->pcPathLengthConstraint);
467
+ } else
468
+ x->ex_pcpathlen = -1;
469
+ PROXY_CERT_INFO_EXTENSION_free(pci);
470
+ x->ex_flags |= EXFLAG_PROXY;
471
+ }
472
+ /* Handle key usage */
473
+ if ((usage = X509_get_ext_d2i(x, NID_key_usage, NULL, NULL))) {
474
+ if (usage->length > 0) {
475
+ x->ex_kusage = usage->data[0];
476
+ if (usage->length > 1)
477
+ x->ex_kusage |= usage->data[1] << 8;
478
+ } else
479
+ x->ex_kusage = 0;
480
+ x->ex_flags |= EXFLAG_KUSAGE;
481
+ ASN1_BIT_STRING_free(usage);
482
+ }
483
+ x->ex_xkusage = 0;
484
+ if ((extusage = X509_get_ext_d2i(x, NID_ext_key_usage, NULL, NULL))) {
485
+ x->ex_flags |= EXFLAG_XKUSAGE;
486
+ for (i = 0; i < sk_ASN1_OBJECT_num(extusage); i++) {
487
+ switch (OBJ_obj2nid(sk_ASN1_OBJECT_value(extusage, i))) {
488
+ case NID_server_auth:
489
+ x->ex_xkusage |= XKU_SSL_SERVER;
490
+ break;
491
+
492
+ case NID_client_auth:
493
+ x->ex_xkusage |= XKU_SSL_CLIENT;
494
+ break;
495
+
496
+ case NID_email_protect:
497
+ x->ex_xkusage |= XKU_SMIME;
498
+ break;
499
+
500
+ case NID_code_sign:
501
+ x->ex_xkusage |= XKU_CODE_SIGN;
502
+ break;
503
+
504
+ case NID_ms_sgc:
505
+ case NID_ns_sgc:
506
+ x->ex_xkusage |= XKU_SGC;
507
+ break;
508
+
509
+ case NID_OCSP_sign:
510
+ x->ex_xkusage |= XKU_OCSP_SIGN;
511
+ break;
512
+
513
+ case NID_time_stamp:
514
+ x->ex_xkusage |= XKU_TIMESTAMP;
515
+ break;
516
+
517
+ case NID_dvcs:
518
+ x->ex_xkusage |= XKU_DVCS;
519
+ break;
520
+
521
+ case NID_anyExtendedKeyUsage:
522
+ x->ex_xkusage |= XKU_ANYEKU;
523
+ break;
524
+ }
525
+ }
526
+ sk_ASN1_OBJECT_pop_free(extusage, ASN1_OBJECT_free);
527
+ }
528
+
529
+ if ((ns = X509_get_ext_d2i(x, NID_netscape_cert_type, NULL, NULL))) {
530
+ if (ns->length > 0)
531
+ x->ex_nscert = ns->data[0];
532
+ else
533
+ x->ex_nscert = 0;
534
+ x->ex_flags |= EXFLAG_NSCERT;
535
+ ASN1_BIT_STRING_free(ns);
536
+ }
537
+ x->skid = X509_get_ext_d2i(x, NID_subject_key_identifier, NULL, NULL);
538
+ x->akid = X509_get_ext_d2i(x, NID_authority_key_identifier, NULL, NULL);
539
+ /* Does subject name match issuer ? */
540
+ if (!X509_NAME_cmp(X509_get_subject_name(x), X509_get_issuer_name(x))) {
541
+ x->ex_flags |= EXFLAG_SI;
542
+ /* If SKID matches AKID also indicate self signed */
543
+ if (X509_check_akid(x, x->akid) == X509_V_OK &&
544
+ !ku_reject(x, KU_KEY_CERT_SIGN))
545
+ x->ex_flags |= EXFLAG_SS;
546
+ }
547
+ x->altname = X509_get_ext_d2i(x, NID_subject_alt_name, NULL, NULL);
548
+ x->nc = X509_get_ext_d2i(x, NID_name_constraints, &j, NULL);
549
+ if (!x->nc && (j != -1))
550
+ x->ex_flags |= EXFLAG_INVALID;
551
+ setup_crldp(x);
552
+
553
+ for (j = 0; j < X509_get_ext_count(x); j++) {
554
+ ex = X509_get_ext(x, j);
555
+ if (OBJ_obj2nid(X509_EXTENSION_get_object(ex))
556
+ == NID_freshest_crl)
557
+ x->ex_flags |= EXFLAG_FRESHEST;
558
+ if (!X509_EXTENSION_get_critical(ex))
559
+ continue;
560
+ if (!X509_supported_extension(ex)) {
561
+ x->ex_flags |= EXFLAG_CRITICAL;
562
+ break;
563
+ }
564
+ }
565
+ x->ex_flags |= EXFLAG_SET;
566
+
567
+ CRYPTO_STATIC_MUTEX_unlock(&g_x509_cache_extensions_lock);
568
+ }
569
+
570
+ /*
571
+ * CA checks common to all purposes return codes: 0 not a CA 1 is a CA 2
572
+ * basicConstraints absent so "maybe" a CA 3 basicConstraints absent but self
573
+ * signed V1. 4 basicConstraints absent but keyUsage present and keyCertSign
574
+ * asserted.
541
575
  */
542
576
 
543
577
  static int check_ca(const X509 *x)
544
578
  {
545
- /* keyUsage if present should allow cert signing */
546
- if(ku_reject(x, KU_KEY_CERT_SIGN)) return 0;
547
- if(x->ex_flags & EXFLAG_BCONS) {
548
- if(x->ex_flags & EXFLAG_CA) return 1;
549
- /* If basicConstraints says not a CA then say so */
550
- else return 0;
551
- } else {
552
- /* we support V1 roots for... uh, I don't really know why. */
553
- if((x->ex_flags & V1_ROOT) == V1_ROOT) return 3;
554
- /* If key usage present it must have certSign so tolerate it */
555
- else if (x->ex_flags & EXFLAG_KUSAGE) return 4;
556
- /* Older certificates could have Netscape-specific CA types */
557
- else if (x->ex_flags & EXFLAG_NSCERT
558
- && x->ex_nscert & NS_ANY_CA) return 5;
559
- /* can this still be regarded a CA certificate? I doubt it */
560
- return 0;
561
- }
579
+ /* keyUsage if present should allow cert signing */
580
+ if (ku_reject(x, KU_KEY_CERT_SIGN))
581
+ return 0;
582
+ if (x->ex_flags & EXFLAG_BCONS) {
583
+ if (x->ex_flags & EXFLAG_CA)
584
+ return 1;
585
+ /* If basicConstraints says not a CA then say so */
586
+ else
587
+ return 0;
588
+ } else {
589
+ /* we support V1 roots for... uh, I don't really know why. */
590
+ if ((x->ex_flags & V1_ROOT) == V1_ROOT)
591
+ return 3;
592
+ /*
593
+ * If key usage present it must have certSign so tolerate it
594
+ */
595
+ else if (x->ex_flags & EXFLAG_KUSAGE)
596
+ return 4;
597
+ /* Older certificates could have Netscape-specific CA types */
598
+ else if (x->ex_flags & EXFLAG_NSCERT && x->ex_nscert & NS_ANY_CA)
599
+ return 5;
600
+ /* can this still be regarded a CA certificate? I doubt it */
601
+ return 0;
602
+ }
562
603
  }
563
604
 
564
605
  int X509_check_ca(X509 *x)
565
606
  {
566
- if(!(x->ex_flags & EXFLAG_SET)) {
567
- x509v3_cache_extensions(x);
568
- }
607
+ if (!(x->ex_flags & EXFLAG_SET)) {
608
+ x509v3_cache_extensions(x);
609
+ }
569
610
 
570
- return check_ca(x);
611
+ return check_ca(x);
571
612
  }
572
613
 
573
614
  /* Check SSL CA: common checks for SSL client and server */
574
615
  static int check_ssl_ca(const X509 *x)
575
616
  {
576
- int ca_ret;
577
- ca_ret = check_ca(x);
578
- if(!ca_ret) return 0;
579
- /* check nsCertType if present */
580
- if(ca_ret != 5 || x->ex_nscert & NS_SSL_CA) return ca_ret;
581
- else return 0;
617
+ int ca_ret;
618
+ ca_ret = check_ca(x);
619
+ if (!ca_ret)
620
+ return 0;
621
+ /* check nsCertType if present */
622
+ if (ca_ret != 5 || x->ex_nscert & NS_SSL_CA)
623
+ return ca_ret;
624
+ else
625
+ return 0;
582
626
  }
583
627
 
584
-
585
- static int check_purpose_ssl_client(const X509_PURPOSE *xp, const X509 *x, int ca)
628
+ static int check_purpose_ssl_client(const X509_PURPOSE *xp, const X509 *x,
629
+ int ca)
586
630
  {
587
- if(xku_reject(x,XKU_SSL_CLIENT)) return 0;
588
- if(ca) return check_ssl_ca(x);
589
- /* We need to do digital signatures or key agreement */
590
- if(ku_reject(x,KU_DIGITAL_SIGNATURE|KU_KEY_AGREEMENT)) return 0;
591
- /* nsCertType if present should allow SSL client use */
592
- if(ns_reject(x, NS_SSL_CLIENT)) return 0;
593
- return 1;
631
+ if (xku_reject(x, XKU_SSL_CLIENT))
632
+ return 0;
633
+ if (ca)
634
+ return check_ssl_ca(x);
635
+ /* We need to do digital signatures or key agreement */
636
+ if (ku_reject(x, KU_DIGITAL_SIGNATURE | KU_KEY_AGREEMENT))
637
+ return 0;
638
+ /* nsCertType if present should allow SSL client use */
639
+ if (ns_reject(x, NS_SSL_CLIENT))
640
+ return 0;
641
+ return 1;
594
642
  }
595
- /* Key usage needed for TLS/SSL server: digital signature, encipherment or
643
+
644
+ /*
645
+ * Key usage needed for TLS/SSL server: digital signature, encipherment or
596
646
  * key agreement. The ssl code can check this more thoroughly for individual
597
647
  * key types.
598
648
  */
599
649
  #define KU_TLS \
600
- KU_DIGITAL_SIGNATURE|KU_KEY_ENCIPHERMENT|KU_KEY_AGREEMENT
650
+ KU_DIGITAL_SIGNATURE|KU_KEY_ENCIPHERMENT|KU_KEY_AGREEMENT
601
651
 
602
- static int check_purpose_ssl_server(const X509_PURPOSE *xp, const X509 *x, int ca)
652
+ static int check_purpose_ssl_server(const X509_PURPOSE *xp, const X509 *x,
653
+ int ca)
603
654
  {
604
- if(xku_reject(x,XKU_SSL_SERVER|XKU_SGC)) return 0;
605
- if(ca) return check_ssl_ca(x);
655
+ if (xku_reject(x, XKU_SSL_SERVER | XKU_SGC))
656
+ return 0;
657
+ if (ca)
658
+ return check_ssl_ca(x);
606
659
 
607
- if(ns_reject(x, NS_SSL_SERVER)) return 0;
608
- if(ku_reject(x, KU_TLS)) return 0;
609
-
610
- return 1;
660
+ if (ns_reject(x, NS_SSL_SERVER))
661
+ return 0;
662
+ if (ku_reject(x, KU_TLS))
663
+ return 0;
664
+
665
+ return 1;
611
666
 
612
667
  }
613
668
 
614
- static int check_purpose_ns_ssl_server(const X509_PURPOSE *xp, const X509 *x, int ca)
669
+ static int check_purpose_ns_ssl_server(const X509_PURPOSE *xp, const X509 *x,
670
+ int ca)
615
671
  {
616
- int ret;
617
- ret = check_purpose_ssl_server(xp, x, ca);
618
- if(!ret || ca) return ret;
619
- /* We need to encipher or Netscape complains */
620
- if(ku_reject(x, KU_KEY_ENCIPHERMENT)) return 0;
621
- return ret;
672
+ int ret;
673
+ ret = check_purpose_ssl_server(xp, x, ca);
674
+ if (!ret || ca)
675
+ return ret;
676
+ /* We need to encipher or Netscape complains */
677
+ if (ku_reject(x, KU_KEY_ENCIPHERMENT))
678
+ return 0;
679
+ return ret;
622
680
  }
623
681
 
624
682
  /* common S/MIME checks */
625
683
  static int purpose_smime(const X509 *x, int ca)
626
684
  {
627
- if(xku_reject(x,XKU_SMIME)) return 0;
628
- if(ca) {
629
- int ca_ret;
630
- ca_ret = check_ca(x);
631
- if(!ca_ret) return 0;
632
- /* check nsCertType if present */
633
- if(ca_ret != 5 || x->ex_nscert & NS_SMIME_CA) return ca_ret;
634
- else return 0;
635
- }
636
- if(x->ex_flags & EXFLAG_NSCERT) {
637
- if(x->ex_nscert & NS_SMIME) return 1;
638
- /* Workaround for some buggy certificates */
639
- if(x->ex_nscert & NS_SSL_CLIENT) return 2;
640
- return 0;
641
- }
642
- return 1;
685
+ if (xku_reject(x, XKU_SMIME))
686
+ return 0;
687
+ if (ca) {
688
+ int ca_ret;
689
+ ca_ret = check_ca(x);
690
+ if (!ca_ret)
691
+ return 0;
692
+ /* check nsCertType if present */
693
+ if (ca_ret != 5 || x->ex_nscert & NS_SMIME_CA)
694
+ return ca_ret;
695
+ else
696
+ return 0;
697
+ }
698
+ if (x->ex_flags & EXFLAG_NSCERT) {
699
+ if (x->ex_nscert & NS_SMIME)
700
+ return 1;
701
+ /* Workaround for some buggy certificates */
702
+ if (x->ex_nscert & NS_SSL_CLIENT)
703
+ return 2;
704
+ return 0;
705
+ }
706
+ return 1;
643
707
  }
644
708
 
645
- static int check_purpose_smime_sign(const X509_PURPOSE *xp, const X509 *x, int ca)
709
+ static int check_purpose_smime_sign(const X509_PURPOSE *xp, const X509 *x,
710
+ int ca)
646
711
  {
647
- int ret;
648
- ret = purpose_smime(x, ca);
649
- if(!ret || ca) return ret;
650
- if(ku_reject(x, KU_DIGITAL_SIGNATURE|KU_NON_REPUDIATION)) return 0;
651
- return ret;
712
+ int ret;
713
+ ret = purpose_smime(x, ca);
714
+ if (!ret || ca)
715
+ return ret;
716
+ if (ku_reject(x, KU_DIGITAL_SIGNATURE | KU_NON_REPUDIATION))
717
+ return 0;
718
+ return ret;
652
719
  }
653
720
 
654
- static int check_purpose_smime_encrypt(const X509_PURPOSE *xp, const X509 *x, int ca)
721
+ static int check_purpose_smime_encrypt(const X509_PURPOSE *xp, const X509 *x,
722
+ int ca)
655
723
  {
656
- int ret;
657
- ret = purpose_smime(x, ca);
658
- if(!ret || ca) return ret;
659
- if(ku_reject(x, KU_KEY_ENCIPHERMENT)) return 0;
660
- return ret;
724
+ int ret;
725
+ ret = purpose_smime(x, ca);
726
+ if (!ret || ca)
727
+ return ret;
728
+ if (ku_reject(x, KU_KEY_ENCIPHERMENT))
729
+ return 0;
730
+ return ret;
661
731
  }
662
732
 
663
- static int check_purpose_crl_sign(const X509_PURPOSE *xp, const X509 *x, int ca)
733
+ static int check_purpose_crl_sign(const X509_PURPOSE *xp, const X509 *x,
734
+ int ca)
664
735
  {
665
- if(ca) {
666
- int ca_ret;
667
- if((ca_ret = check_ca(x)) != 2) return ca_ret;
668
- else return 0;
669
- }
670
- if(ku_reject(x, KU_CRL_SIGN)) return 0;
671
- return 1;
736
+ if (ca) {
737
+ int ca_ret;
738
+ if ((ca_ret = check_ca(x)) != 2)
739
+ return ca_ret;
740
+ else
741
+ return 0;
742
+ }
743
+ if (ku_reject(x, KU_CRL_SIGN))
744
+ return 0;
745
+ return 1;
672
746
  }
673
747
 
674
- /* OCSP helper: this is *not* a full OCSP check. It just checks that
675
- * each CA is valid. Additional checks must be made on the chain.
748
+ /*
749
+ * OCSP helper: this is *not* a full OCSP check. It just checks that each CA
750
+ * is valid. Additional checks must be made on the chain.
676
751
  */
677
752
 
678
753
  static int ocsp_helper(const X509_PURPOSE *xp, const X509 *x, int ca)
679
754
  {
680
- /* Must be a valid CA. Should we really support the "I don't know"
681
- value (2)? */
682
- if(ca) return check_ca(x);
683
- /* leaf certificate is checked in OCSP_verify() */
684
- return 1;
755
+ /*
756
+ * Must be a valid CA. Should we really support the "I don't know" value
757
+ * (2)?
758
+ */
759
+ if (ca)
760
+ return check_ca(x);
761
+ /* leaf certificate is checked in OCSP_verify() */
762
+ return 1;
685
763
  }
686
764
 
687
765
  static int check_purpose_timestamp_sign(const X509_PURPOSE *xp, const X509 *x,
688
- int ca)
766
+ int ca)
689
767
  {
690
- int i_ext;
691
-
692
- /* If ca is true we must return if this is a valid CA certificate. */
693
- if (ca) return check_ca(x);
694
-
695
- /*
696
- * Check the optional key usage field:
697
- * if Key Usage is present, it must be one of digitalSignature
698
- * and/or nonRepudiation (other values are not consistent and shall
699
- * be rejected).
700
- */
701
- if ((x->ex_flags & EXFLAG_KUSAGE)
702
- && ((x->ex_kusage & ~(KU_NON_REPUDIATION | KU_DIGITAL_SIGNATURE)) ||
703
- !(x->ex_kusage & (KU_NON_REPUDIATION | KU_DIGITAL_SIGNATURE))))
704
- return 0;
705
-
706
- /* Only time stamp key usage is permitted and it's required. */
707
- if (!(x->ex_flags & EXFLAG_XKUSAGE) || x->ex_xkusage != XKU_TIMESTAMP)
708
- return 0;
709
-
710
- /* Extended Key Usage MUST be critical */
711
- i_ext = X509_get_ext_by_NID((X509 *) x, NID_ext_key_usage, -1);
712
- if (i_ext >= 0)
713
- {
714
- X509_EXTENSION *ext = X509_get_ext((X509 *) x, i_ext);
715
- if (!X509_EXTENSION_get_critical(ext))
716
- return 0;
717
- }
718
-
719
- return 1;
768
+ int i_ext;
769
+
770
+ /* If ca is true we must return if this is a valid CA certificate. */
771
+ if (ca)
772
+ return check_ca(x);
773
+
774
+ /*
775
+ * Check the optional key usage field:
776
+ * if Key Usage is present, it must be one of digitalSignature
777
+ * and/or nonRepudiation (other values are not consistent and shall
778
+ * be rejected).
779
+ */
780
+ if ((x->ex_flags & EXFLAG_KUSAGE)
781
+ && ((x->ex_kusage & ~(KU_NON_REPUDIATION | KU_DIGITAL_SIGNATURE)) ||
782
+ !(x->ex_kusage & (KU_NON_REPUDIATION | KU_DIGITAL_SIGNATURE))))
783
+ return 0;
784
+
785
+ /* Only time stamp key usage is permitted and it's required. */
786
+ if (!(x->ex_flags & EXFLAG_XKUSAGE) || x->ex_xkusage != XKU_TIMESTAMP)
787
+ return 0;
788
+
789
+ /* Extended Key Usage MUST be critical */
790
+ i_ext = X509_get_ext_by_NID((X509 *)x, NID_ext_key_usage, -1);
791
+ if (i_ext >= 0) {
792
+ X509_EXTENSION *ext = X509_get_ext((X509 *)x, i_ext);
793
+ if (!X509_EXTENSION_get_critical(ext))
794
+ return 0;
795
+ }
796
+
797
+ return 1;
720
798
  }
721
799
 
722
800
  static int no_check(const X509_PURPOSE *xp, const X509 *x, int ca)
723
801
  {
724
- return 1;
802
+ return 1;
725
803
  }
726
804
 
727
- /* Various checks to see if one certificate issued the second.
728
- * This can be used to prune a set of possible issuer certificates
729
- * which have been looked up using some simple method such as by
730
- * subject name.
731
- * These are:
732
- * 1. Check issuer_name(subject) == subject_name(issuer)
733
- * 2. If akid(subject) exists check it matches issuer
734
- * 3. If key_usage(issuer) exists check it supports certificate signing
735
- * returns 0 for OK, positive for reason for mismatch, reasons match
736
- * codes for X509_verify_cert()
805
+ /*
806
+ * Various checks to see if one certificate issued the second. This can be
807
+ * used to prune a set of possible issuer certificates which have been looked
808
+ * up using some simple method such as by subject name. These are: 1. Check
809
+ * issuer_name(subject) == subject_name(issuer) 2. If akid(subject) exists
810
+ * check it matches issuer 3. If key_usage(issuer) exists check it supports
811
+ * certificate signing returns 0 for OK, positive for reason for mismatch,
812
+ * reasons match codes for X509_verify_cert()
737
813
  */
738
814
 
739
815
  int X509_check_issued(X509 *issuer, X509 *subject)
740
816
  {
741
- if(X509_NAME_cmp(X509_get_subject_name(issuer),
742
- X509_get_issuer_name(subject)))
743
- return X509_V_ERR_SUBJECT_ISSUER_MISMATCH;
744
- x509v3_cache_extensions(issuer);
745
- x509v3_cache_extensions(subject);
746
-
747
- if(subject->akid)
748
- {
749
- int ret = X509_check_akid(issuer, subject->akid);
750
- if (ret != X509_V_OK)
751
- return ret;
752
- }
753
-
754
- if(subject->ex_flags & EXFLAG_PROXY)
755
- {
756
- if(ku_reject(issuer, KU_DIGITAL_SIGNATURE))
757
- return X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE;
758
- }
759
- else if(ku_reject(issuer, KU_KEY_CERT_SIGN))
760
- return X509_V_ERR_KEYUSAGE_NO_CERTSIGN;
761
- return X509_V_OK;
817
+ if (X509_NAME_cmp(X509_get_subject_name(issuer),
818
+ X509_get_issuer_name(subject)))
819
+ return X509_V_ERR_SUBJECT_ISSUER_MISMATCH;
820
+ x509v3_cache_extensions(issuer);
821
+ x509v3_cache_extensions(subject);
822
+
823
+ if (subject->akid) {
824
+ int ret = X509_check_akid(issuer, subject->akid);
825
+ if (ret != X509_V_OK)
826
+ return ret;
827
+ }
828
+
829
+ if (subject->ex_flags & EXFLAG_PROXY) {
830
+ if (ku_reject(issuer, KU_DIGITAL_SIGNATURE))
831
+ return X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE;
832
+ } else if (ku_reject(issuer, KU_KEY_CERT_SIGN))
833
+ return X509_V_ERR_KEYUSAGE_NO_CERTSIGN;
834
+ return X509_V_OK;
762
835
  }
763
836
 
764
837
  int X509_check_akid(X509 *issuer, AUTHORITY_KEYID *akid)
765
- {
766
-
767
- if(!akid)
768
- return X509_V_OK;
769
-
770
- /* Check key ids (if present) */
771
- if(akid->keyid && issuer->skid &&
772
- ASN1_OCTET_STRING_cmp(akid->keyid, issuer->skid) )
773
- return X509_V_ERR_AKID_SKID_MISMATCH;
774
- /* Check serial number */
775
- if(akid->serial &&
776
- ASN1_INTEGER_cmp(X509_get_serialNumber(issuer), akid->serial))
777
- return X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH;
778
- /* Check issuer name */
779
- if(akid->issuer)
780
- {
781
- /* Ugh, for some peculiar reason AKID includes
782
- * SEQUENCE OF GeneralName. So look for a DirName.
783
- * There may be more than one but we only take any
784
- * notice of the first.
785
- */
786
- GENERAL_NAMES *gens;
787
- GENERAL_NAME *gen;
788
- X509_NAME *nm = NULL;
789
- size_t i;
790
- gens = akid->issuer;
791
- for(i = 0; i < sk_GENERAL_NAME_num(gens); i++)
792
- {
793
- gen = sk_GENERAL_NAME_value(gens, i);
794
- if(gen->type == GEN_DIRNAME)
795
- {
796
- nm = gen->d.dirn;
797
- break;
798
- }
799
- }
800
- if(nm && X509_NAME_cmp(nm, X509_get_issuer_name(issuer)))
801
- return X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH;
802
- }
803
- return X509_V_OK;
804
- }
838
+ {
805
839
 
840
+ if (!akid)
841
+ return X509_V_OK;
842
+
843
+ /* Check key ids (if present) */
844
+ if (akid->keyid && issuer->skid &&
845
+ ASN1_OCTET_STRING_cmp(akid->keyid, issuer->skid))
846
+ return X509_V_ERR_AKID_SKID_MISMATCH;
847
+ /* Check serial number */
848
+ if (akid->serial &&
849
+ ASN1_INTEGER_cmp(X509_get_serialNumber(issuer), akid->serial))
850
+ return X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH;
851
+ /* Check issuer name */
852
+ if (akid->issuer) {
853
+ /*
854
+ * Ugh, for some peculiar reason AKID includes SEQUENCE OF
855
+ * GeneralName. So look for a DirName. There may be more than one but
856
+ * we only take any notice of the first.
857
+ */
858
+ GENERAL_NAMES *gens;
859
+ GENERAL_NAME *gen;
860
+ X509_NAME *nm = NULL;
861
+ size_t i;
862
+ gens = akid->issuer;
863
+ for (i = 0; i < sk_GENERAL_NAME_num(gens); i++) {
864
+ gen = sk_GENERAL_NAME_value(gens, i);
865
+ if (gen->type == GEN_DIRNAME) {
866
+ nm = gen->d.dirn;
867
+ break;
868
+ }
869
+ }
870
+ if (nm && X509_NAME_cmp(nm, X509_get_issuer_name(issuer)))
871
+ return X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH;
872
+ }
873
+ return X509_V_OK;
874
+ }