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
@@ -73,763 +73,743 @@
73
73
 
74
74
  #include "../evp/internal.h"
75
75
 
76
+ #define MIN_LENGTH 4
76
77
 
77
- #define MIN_LENGTH 4
78
-
79
- static int load_iv(char **fromp,unsigned char *to, int num);
78
+ static int load_iv(char **fromp, unsigned char *to, int num);
80
79
  static int check_pem(const char *nm, const char *name);
81
80
  int pem_check_suffix(const char *pem_str, const char *suffix);
82
81
 
83
82
  void PEM_proc_type(char *buf, int type)
84
- {
85
- const char *str;
86
-
87
- if (type == PEM_TYPE_ENCRYPTED)
88
- str="ENCRYPTED";
89
- else if (type == PEM_TYPE_MIC_CLEAR)
90
- str="MIC-CLEAR";
91
- else if (type == PEM_TYPE_MIC_ONLY)
92
- str="MIC-ONLY";
93
- else
94
- str="BAD-TYPE";
95
-
96
- BUF_strlcat(buf,"Proc-Type: 4,",PEM_BUFSIZE);
97
- BUF_strlcat(buf,str,PEM_BUFSIZE);
98
- BUF_strlcat(buf,"\n",PEM_BUFSIZE);
99
- }
83
+ {
84
+ const char *str;
85
+
86
+ if (type == PEM_TYPE_ENCRYPTED)
87
+ str = "ENCRYPTED";
88
+ else if (type == PEM_TYPE_MIC_CLEAR)
89
+ str = "MIC-CLEAR";
90
+ else if (type == PEM_TYPE_MIC_ONLY)
91
+ str = "MIC-ONLY";
92
+ else
93
+ str = "BAD-TYPE";
94
+
95
+ BUF_strlcat(buf, "Proc-Type: 4,", PEM_BUFSIZE);
96
+ BUF_strlcat(buf, str, PEM_BUFSIZE);
97
+ BUF_strlcat(buf, "\n", PEM_BUFSIZE);
98
+ }
100
99
 
101
100
  void PEM_dek_info(char *buf, const char *type, int len, char *str)
102
- {
103
- static const unsigned char map[17]="0123456789ABCDEF";
104
- long i;
105
- int j;
106
-
107
- BUF_strlcat(buf,"DEK-Info: ",PEM_BUFSIZE);
108
- BUF_strlcat(buf,type,PEM_BUFSIZE);
109
- BUF_strlcat(buf,",",PEM_BUFSIZE);
110
- j=strlen(buf);
111
- if (j + (len * 2) + 1 > PEM_BUFSIZE)
112
- return;
113
- for (i=0; i<len; i++)
114
- {
115
- buf[j+i*2] =map[(str[i]>>4)&0x0f];
116
- buf[j+i*2+1]=map[(str[i] )&0x0f];
117
- }
118
- buf[j+i*2]='\n';
119
- buf[j+i*2+1]='\0';
120
- }
101
+ {
102
+ static const unsigned char map[17] = "0123456789ABCDEF";
103
+ long i;
104
+ int j;
105
+
106
+ BUF_strlcat(buf, "DEK-Info: ", PEM_BUFSIZE);
107
+ BUF_strlcat(buf, type, PEM_BUFSIZE);
108
+ BUF_strlcat(buf, ",", PEM_BUFSIZE);
109
+ j = strlen(buf);
110
+ if (j + (len * 2) + 1 > PEM_BUFSIZE)
111
+ return;
112
+ for (i = 0; i < len; i++) {
113
+ buf[j + i * 2] = map[(str[i] >> 4) & 0x0f];
114
+ buf[j + i * 2 + 1] = map[(str[i]) & 0x0f];
115
+ }
116
+ buf[j + i * 2] = '\n';
117
+ buf[j + i * 2 + 1] = '\0';
118
+ }
121
119
 
122
120
  #ifndef OPENSSL_NO_FP_API
123
121
  void *PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
124
- pem_password_cb *cb, void *u)
125
- {
126
- BIO *b;
127
- void *ret;
128
-
129
- if ((b=BIO_new(BIO_s_file())) == NULL)
130
- {
131
- OPENSSL_PUT_ERROR(PEM, ERR_R_BUF_LIB);
132
- return(0);
133
- }
134
- BIO_set_fp(b,fp,BIO_NOCLOSE);
135
- ret=PEM_ASN1_read_bio(d2i,name,b,x,cb,u);
136
- BIO_free(b);
137
- return(ret);
138
- }
122
+ pem_password_cb *cb, void *u)
123
+ {
124
+ BIO *b;
125
+ void *ret;
126
+
127
+ if ((b = BIO_new(BIO_s_file())) == NULL) {
128
+ OPENSSL_PUT_ERROR(PEM, ERR_R_BUF_LIB);
129
+ return (0);
130
+ }
131
+ BIO_set_fp(b, fp, BIO_NOCLOSE);
132
+ ret = PEM_ASN1_read_bio(d2i, name, b, x, cb, u);
133
+ BIO_free(b);
134
+ return (ret);
135
+ }
139
136
  #endif
140
137
 
141
138
  static int check_pem(const char *nm, const char *name)
142
139
  {
143
- /* Normal matching nm and name */
144
- if (!strcmp(nm,name)) return 1;
145
-
146
- /* Make PEM_STRING_EVP_PKEY match any private key */
147
-
148
- if(!strcmp(name,PEM_STRING_EVP_PKEY))
149
- {
150
- int slen;
151
- const EVP_PKEY_ASN1_METHOD *ameth;
152
- if(!strcmp(nm,PEM_STRING_PKCS8))
153
- return 1;
154
- if(!strcmp(nm,PEM_STRING_PKCS8INF))
155
- return 1;
156
- slen = pem_check_suffix(nm, "PRIVATE KEY");
157
- if (slen > 0)
158
- {
159
- /* NB: ENGINE implementations wont contain
160
- * a deprecated old private key decode function
161
- * so don't look for them.
162
- */
163
- ameth = EVP_PKEY_asn1_find_str(NULL, nm, slen);
164
- if (ameth && ameth->old_priv_decode)
165
- return 1;
166
- }
167
- return 0;
168
- }
169
-
170
- if(!strcmp(name,PEM_STRING_PARAMETERS))
171
- {
172
- int slen;
173
- const EVP_PKEY_ASN1_METHOD *ameth;
174
- slen = pem_check_suffix(nm, "PARAMETERS");
175
- if (slen > 0)
176
- {
177
- ENGINE *e;
178
- ameth = EVP_PKEY_asn1_find_str(&e, nm, slen);
179
- if (ameth)
180
- {
181
- int r;
182
- if (ameth->param_decode)
183
- r = 1;
184
- else
185
- r = 0;
186
- return r;
187
- }
188
- }
189
- return 0;
190
- }
191
- /* If reading DH parameters handle X9.42 DH format too */
192
- if(!strcmp(nm,PEM_STRING_DHXPARAMS) &&
193
- !strcmp(name,PEM_STRING_DHPARAMS)) return 1;
194
-
195
- /* Permit older strings */
196
-
197
- if(!strcmp(nm,PEM_STRING_X509_OLD) &&
198
- !strcmp(name,PEM_STRING_X509)) return 1;
199
-
200
- if(!strcmp(nm,PEM_STRING_X509_REQ_OLD) &&
201
- !strcmp(name,PEM_STRING_X509_REQ)) return 1;
202
-
203
- /* Allow normal certs to be read as trusted certs */
204
- if(!strcmp(nm,PEM_STRING_X509) &&
205
- !strcmp(name,PEM_STRING_X509_TRUSTED)) return 1;
206
-
207
- if(!strcmp(nm,PEM_STRING_X509_OLD) &&
208
- !strcmp(name,PEM_STRING_X509_TRUSTED)) return 1;
209
-
210
- /* Some CAs use PKCS#7 with CERTIFICATE headers */
211
- if(!strcmp(nm, PEM_STRING_X509) &&
212
- !strcmp(name, PEM_STRING_PKCS7)) return 1;
213
-
214
- if(!strcmp(nm, PEM_STRING_PKCS7_SIGNED) &&
215
- !strcmp(name, PEM_STRING_PKCS7)) return 1;
140
+ /* Normal matching nm and name */
141
+ if (!strcmp(nm, name))
142
+ return 1;
143
+
144
+ /* Make PEM_STRING_EVP_PKEY match any private key */
145
+
146
+ if (!strcmp(name, PEM_STRING_EVP_PKEY)) {
147
+ int slen;
148
+ const EVP_PKEY_ASN1_METHOD *ameth;
149
+ if (!strcmp(nm, PEM_STRING_PKCS8))
150
+ return 1;
151
+ if (!strcmp(nm, PEM_STRING_PKCS8INF))
152
+ return 1;
153
+ slen = pem_check_suffix(nm, "PRIVATE KEY");
154
+ if (slen > 0) {
155
+ /*
156
+ * NB: ENGINE implementations wont contain a deprecated old
157
+ * private key decode function so don't look for them.
158
+ */
159
+ ameth = EVP_PKEY_asn1_find_str(NULL, nm, slen);
160
+ if (ameth && ameth->old_priv_decode)
161
+ return 1;
162
+ }
163
+ return 0;
164
+ }
165
+
166
+ /* Permit older strings */
167
+
168
+ if (!strcmp(nm, PEM_STRING_X509_OLD) && !strcmp(name, PEM_STRING_X509))
169
+ return 1;
170
+
171
+ if (!strcmp(nm, PEM_STRING_X509_REQ_OLD) &&
172
+ !strcmp(name, PEM_STRING_X509_REQ))
173
+ return 1;
174
+
175
+ /* Allow normal certs to be read as trusted certs */
176
+ if (!strcmp(nm, PEM_STRING_X509) &&
177
+ !strcmp(name, PEM_STRING_X509_TRUSTED))
178
+ return 1;
179
+
180
+ if (!strcmp(nm, PEM_STRING_X509_OLD) &&
181
+ !strcmp(name, PEM_STRING_X509_TRUSTED))
182
+ return 1;
183
+
184
+ /* Some CAs use PKCS#7 with CERTIFICATE headers */
185
+ if (!strcmp(nm, PEM_STRING_X509) && !strcmp(name, PEM_STRING_PKCS7))
186
+ return 1;
187
+
188
+ if (!strcmp(nm, PEM_STRING_PKCS7_SIGNED) &&
189
+ !strcmp(name, PEM_STRING_PKCS7))
190
+ return 1;
216
191
 
217
192
  #ifndef OPENSSL_NO_CMS
218
- if(!strcmp(nm, PEM_STRING_X509) &&
219
- !strcmp(name, PEM_STRING_CMS)) return 1;
220
- /* Allow CMS to be read from PKCS#7 headers */
221
- if(!strcmp(nm, PEM_STRING_PKCS7) &&
222
- !strcmp(name, PEM_STRING_CMS)) return 1;
193
+ if (!strcmp(nm, PEM_STRING_X509) && !strcmp(name, PEM_STRING_CMS))
194
+ return 1;
195
+ /* Allow CMS to be read from PKCS#7 headers */
196
+ if (!strcmp(nm, PEM_STRING_PKCS7) && !strcmp(name, PEM_STRING_CMS))
197
+ return 1;
223
198
  #endif
224
199
 
225
- return 0;
200
+ return 0;
226
201
  }
227
202
 
228
- int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm, const char *name, BIO *bp,
229
- pem_password_cb *cb, void *u)
230
- {
231
- EVP_CIPHER_INFO cipher;
232
- char *nm=NULL,*header=NULL;
233
- unsigned char *data=NULL;
234
- long len;
235
- int ret = 0;
236
-
237
- for (;;)
238
- {
239
- if (!PEM_read_bio(bp,&nm,&header,&data,&len)) {
240
- if(ERR_GET_REASON(ERR_peek_error()) ==
241
- PEM_R_NO_START_LINE)
242
- ERR_add_error_data(2, "Expecting: ", name);
243
- return 0;
244
- }
245
- if(check_pem(nm, name)) break;
246
- OPENSSL_free(nm);
247
- OPENSSL_free(header);
248
- OPENSSL_free(data);
249
- }
250
- if (!PEM_get_EVP_CIPHER_INFO(header,&cipher)) goto err;
251
- if (!PEM_do_header(&cipher,data,&len,cb,u)) goto err;
252
-
253
- *pdata = data;
254
- *plen = len;
255
-
256
- if (pnm)
257
- *pnm = nm;
258
-
259
- ret = 1;
260
-
261
- err:
262
- if (!ret || !pnm) OPENSSL_free(nm);
263
- OPENSSL_free(header);
264
- if (!ret) OPENSSL_free(data);
265
- return ret;
266
- }
203
+ int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm,
204
+ const char *name, BIO *bp, pem_password_cb *cb,
205
+ void *u)
206
+ {
207
+ EVP_CIPHER_INFO cipher;
208
+ char *nm = NULL, *header = NULL;
209
+ unsigned char *data = NULL;
210
+ long len;
211
+ int ret = 0;
212
+
213
+ for (;;) {
214
+ if (!PEM_read_bio(bp, &nm, &header, &data, &len)) {
215
+ if (ERR_GET_REASON(ERR_peek_error()) == PEM_R_NO_START_LINE)
216
+ ERR_add_error_data(2, "Expecting: ", name);
217
+ return 0;
218
+ }
219
+ if (check_pem(nm, name))
220
+ break;
221
+ OPENSSL_free(nm);
222
+ OPENSSL_free(header);
223
+ OPENSSL_free(data);
224
+ }
225
+ if (!PEM_get_EVP_CIPHER_INFO(header, &cipher))
226
+ goto err;
227
+ if (!PEM_do_header(&cipher, data, &len, cb, u))
228
+ goto err;
229
+
230
+ *pdata = data;
231
+ *plen = len;
232
+
233
+ if (pnm)
234
+ *pnm = nm;
235
+
236
+ ret = 1;
237
+
238
+ err:
239
+ if (!ret || !pnm)
240
+ OPENSSL_free(nm);
241
+ OPENSSL_free(header);
242
+ if (!ret)
243
+ OPENSSL_free(data);
244
+ return ret;
245
+ }
267
246
 
268
247
  #ifndef OPENSSL_NO_FP_API
269
248
  int PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp,
270
- void *x, const EVP_CIPHER *enc, unsigned char *kstr,
271
- int klen, pem_password_cb *callback, void *u)
272
- {
273
- BIO *b;
274
- int ret;
275
-
276
- if ((b=BIO_new(BIO_s_file())) == NULL)
277
- {
278
- OPENSSL_PUT_ERROR(PEM, ERR_R_BUF_LIB);
279
- return(0);
280
- }
281
- BIO_set_fp(b,fp,BIO_NOCLOSE);
282
- ret=PEM_ASN1_write_bio(i2d,name,b,x,enc,kstr,klen,callback,u);
283
- BIO_free(b);
284
- return(ret);
285
- }
249
+ void *x, const EVP_CIPHER *enc, unsigned char *kstr,
250
+ int klen, pem_password_cb *callback, void *u)
251
+ {
252
+ BIO *b;
253
+ int ret;
254
+
255
+ if ((b = BIO_new(BIO_s_file())) == NULL) {
256
+ OPENSSL_PUT_ERROR(PEM, ERR_R_BUF_LIB);
257
+ return (0);
258
+ }
259
+ BIO_set_fp(b, fp, BIO_NOCLOSE);
260
+ ret = PEM_ASN1_write_bio(i2d, name, b, x, enc, kstr, klen, callback, u);
261
+ BIO_free(b);
262
+ return (ret);
263
+ }
286
264
  #endif
287
265
 
288
266
  int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp,
289
- void *x, const EVP_CIPHER *enc, unsigned char *kstr,
290
- int klen, pem_password_cb *callback, void *u)
291
- {
292
- EVP_CIPHER_CTX ctx;
293
- int dsize=0,i,j,ret=0;
294
- unsigned char *p,*data=NULL;
295
- const char *objstr=NULL;
296
- char buf[PEM_BUFSIZE];
297
- unsigned char key[EVP_MAX_KEY_LENGTH];
298
- unsigned char iv[EVP_MAX_IV_LENGTH];
299
-
300
- if (enc != NULL)
301
- {
302
- objstr=OBJ_nid2sn(EVP_CIPHER_nid(enc));
303
- if (objstr == NULL)
304
- {
305
- OPENSSL_PUT_ERROR(PEM, PEM_R_UNSUPPORTED_CIPHER);
306
- goto err;
307
- }
308
- }
309
-
310
- if ((dsize=i2d(x,NULL)) < 0)
311
- {
312
- OPENSSL_PUT_ERROR(PEM, ERR_R_ASN1_LIB);
313
- dsize=0;
314
- goto err;
315
- }
316
- /* dzise + 8 bytes are needed */
317
- /* actually it needs the cipher block size extra... */
318
- data=(unsigned char *)OPENSSL_malloc((unsigned int)dsize+20);
319
- if (data == NULL)
320
- {
321
- OPENSSL_PUT_ERROR(PEM, ERR_R_MALLOC_FAILURE);
322
- goto err;
323
- }
324
- p=data;
325
- i=i2d(x,&p);
326
-
327
- if (enc != NULL)
328
- {
329
- const unsigned iv_len = EVP_CIPHER_iv_length(enc);
330
-
331
- if (kstr == NULL)
332
- {
333
- klen = 0;
334
- if (!callback)
335
- callback = PEM_def_callback;
336
- klen=(*callback)(buf,PEM_BUFSIZE,1,u);
337
- if (klen <= 0)
338
- {
339
- OPENSSL_PUT_ERROR(PEM, PEM_R_READ_KEY);
340
- goto err;
341
- }
342
- kstr=(unsigned char *)buf;
343
- }
344
- assert(iv_len <= (int)sizeof(iv));
345
- if (!RAND_bytes(iv, iv_len)) /* Generate a salt */
346
- goto err;
347
- /* The 'iv' is used as the iv and as a salt. It is
348
- * NOT taken from the BytesToKey function */
349
- if (!EVP_BytesToKey(enc,EVP_md5(),iv,kstr,klen,1,key,NULL))
350
- goto err;
351
-
352
- if (kstr == (unsigned char *)buf) OPENSSL_cleanse(buf,PEM_BUFSIZE);
353
-
354
- assert(strlen(objstr)+23+2*iv_len+13 <= sizeof buf);
355
-
356
- buf[0]='\0';
357
- PEM_proc_type(buf,PEM_TYPE_ENCRYPTED);
358
- PEM_dek_info(buf,objstr,iv_len,(char *)iv);
359
- /* k=strlen(buf); */
360
-
361
- EVP_CIPHER_CTX_init(&ctx);
362
- ret = 1;
363
- if (!EVP_EncryptInit_ex(&ctx,enc,NULL,key,iv)
364
- || !EVP_EncryptUpdate(&ctx,data,&j,data,i)
365
- || !EVP_EncryptFinal_ex(&ctx,&(data[j]),&i))
366
- ret = 0;
367
- else
368
- i += j;
369
- EVP_CIPHER_CTX_cleanup(&ctx);
370
- if (ret == 0)
371
- goto err;
372
- }
373
- else
374
- {
375
- ret=1;
376
- buf[0]='\0';
377
- }
378
- i=PEM_write_bio(bp,name,buf,data,i);
379
- if (i <= 0) ret=0;
380
- err:
381
- OPENSSL_cleanse(key,sizeof(key));
382
- OPENSSL_cleanse(iv,sizeof(iv));
383
- OPENSSL_cleanse((char *)&ctx,sizeof(ctx));
384
- OPENSSL_cleanse(buf,PEM_BUFSIZE);
385
- if (data != NULL)
386
- {
387
- OPENSSL_cleanse(data,(unsigned int)dsize);
388
- OPENSSL_free(data);
389
- }
390
- return(ret);
391
- }
267
+ void *x, const EVP_CIPHER *enc, unsigned char *kstr,
268
+ int klen, pem_password_cb *callback, void *u)
269
+ {
270
+ EVP_CIPHER_CTX ctx;
271
+ int dsize = 0, i, j, ret = 0;
272
+ unsigned char *p, *data = NULL;
273
+ const char *objstr = NULL;
274
+ char buf[PEM_BUFSIZE];
275
+ unsigned char key[EVP_MAX_KEY_LENGTH];
276
+ unsigned char iv[EVP_MAX_IV_LENGTH];
277
+
278
+ if (enc != NULL) {
279
+ objstr = OBJ_nid2sn(EVP_CIPHER_nid(enc));
280
+ if (objstr == NULL) {
281
+ OPENSSL_PUT_ERROR(PEM, PEM_R_UNSUPPORTED_CIPHER);
282
+ goto err;
283
+ }
284
+ }
285
+
286
+ if ((dsize = i2d(x, NULL)) < 0) {
287
+ OPENSSL_PUT_ERROR(PEM, ERR_R_ASN1_LIB);
288
+ dsize = 0;
289
+ goto err;
290
+ }
291
+ /* dzise + 8 bytes are needed */
292
+ /* actually it needs the cipher block size extra... */
293
+ data = (unsigned char *)OPENSSL_malloc((unsigned int)dsize + 20);
294
+ if (data == NULL) {
295
+ OPENSSL_PUT_ERROR(PEM, ERR_R_MALLOC_FAILURE);
296
+ goto err;
297
+ }
298
+ p = data;
299
+ i = i2d(x, &p);
300
+
301
+ if (enc != NULL) {
302
+ const unsigned iv_len = EVP_CIPHER_iv_length(enc);
303
+
304
+ if (kstr == NULL) {
305
+ klen = 0;
306
+ if (!callback)
307
+ callback = PEM_def_callback;
308
+ klen = (*callback) (buf, PEM_BUFSIZE, 1, u);
309
+ if (klen <= 0) {
310
+ OPENSSL_PUT_ERROR(PEM, PEM_R_READ_KEY);
311
+ goto err;
312
+ }
313
+ kstr = (unsigned char *)buf;
314
+ }
315
+ assert(iv_len <= (int)sizeof(iv));
316
+ if (!RAND_bytes(iv, iv_len)) /* Generate a salt */
317
+ goto err;
318
+ /*
319
+ * The 'iv' is used as the iv and as a salt. It is NOT taken from
320
+ * the BytesToKey function
321
+ */
322
+ if (!EVP_BytesToKey(enc, EVP_md5(), iv, kstr, klen, 1, key, NULL))
323
+ goto err;
324
+
325
+ if (kstr == (unsigned char *)buf)
326
+ OPENSSL_cleanse(buf, PEM_BUFSIZE);
327
+
328
+ assert(strlen(objstr) + 23 + 2 * iv_len + 13 <= sizeof buf);
329
+
330
+ buf[0] = '\0';
331
+ PEM_proc_type(buf, PEM_TYPE_ENCRYPTED);
332
+ PEM_dek_info(buf, objstr, iv_len, (char *)iv);
333
+ /* k=strlen(buf); */
334
+
335
+ EVP_CIPHER_CTX_init(&ctx);
336
+ ret = 1;
337
+ if (!EVP_EncryptInit_ex(&ctx, enc, NULL, key, iv)
338
+ || !EVP_EncryptUpdate(&ctx, data, &j, data, i)
339
+ || !EVP_EncryptFinal_ex(&ctx, &(data[j]), &i))
340
+ ret = 0;
341
+ else
342
+ i += j;
343
+ EVP_CIPHER_CTX_cleanup(&ctx);
344
+ if (ret == 0)
345
+ goto err;
346
+ } else {
347
+ ret = 1;
348
+ buf[0] = '\0';
349
+ }
350
+ i = PEM_write_bio(bp, name, buf, data, i);
351
+ if (i <= 0)
352
+ ret = 0;
353
+ err:
354
+ OPENSSL_cleanse(key, sizeof(key));
355
+ OPENSSL_cleanse(iv, sizeof(iv));
356
+ OPENSSL_cleanse((char *)&ctx, sizeof(ctx));
357
+ OPENSSL_cleanse(buf, PEM_BUFSIZE);
358
+ if (data != NULL) {
359
+ OPENSSL_cleanse(data, (unsigned int)dsize);
360
+ OPENSSL_free(data);
361
+ }
362
+ return (ret);
363
+ }
392
364
 
393
365
  int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
394
- pem_password_cb *callback,void *u)
395
- {
396
- int i=0,j,o,klen;
397
- long len;
398
- EVP_CIPHER_CTX ctx;
399
- unsigned char key[EVP_MAX_KEY_LENGTH];
400
- char buf[PEM_BUFSIZE];
401
-
402
- len= *plen;
403
-
404
- if (cipher->cipher == NULL) return(1);
405
-
406
- klen = 0;
407
- if (!callback) callback = PEM_def_callback;
408
- klen=callback(buf,PEM_BUFSIZE,0,u);
409
- if (klen <= 0)
410
- {
411
- OPENSSL_PUT_ERROR(PEM, PEM_R_BAD_PASSWORD_READ);
412
- return(0);
413
- }
414
-
415
- if (!EVP_BytesToKey(cipher->cipher,EVP_md5(),&(cipher->iv[0]),
416
- (unsigned char *)buf,klen,1,key,NULL))
417
- return 0;
418
-
419
- j=(int)len;
420
- EVP_CIPHER_CTX_init(&ctx);
421
- o = EVP_DecryptInit_ex(&ctx,cipher->cipher,NULL, key,&(cipher->iv[0]));
422
- if (o)
423
- o = EVP_DecryptUpdate(&ctx,data,&i,data,j);
424
- if (o)
425
- o = EVP_DecryptFinal_ex(&ctx,&(data[i]),&j);
426
- EVP_CIPHER_CTX_cleanup(&ctx);
427
- OPENSSL_cleanse((char *)buf,sizeof(buf));
428
- OPENSSL_cleanse((char *)key,sizeof(key));
429
- if (!o)
430
- {
431
- OPENSSL_PUT_ERROR(PEM, PEM_R_BAD_DECRYPT);
432
- return(0);
433
- }
434
- j+=i;
435
- *plen=j;
436
- return(1);
437
- }
438
-
439
- static const EVP_CIPHER* cipher_by_name(const char *name) {
440
- /* This is similar to the (deprecated) function |EVP_get_cipherbyname|. */
441
- if (0 == strcmp(name, SN_rc4)) {
442
- return EVP_rc4();
443
- } else if (0 == strcmp(name, SN_des_cbc)) {
444
- return EVP_des_cbc();
445
- } else if (0 == strcmp(name, SN_des_ede3_cbc)) {
446
- return EVP_des_ede3_cbc();
447
- } else if (0 == strcmp(name, SN_aes_128_cbc)) {
448
- return EVP_aes_128_cbc();
449
- } else if (0 == strcmp(name, SN_aes_192_cbc)) {
450
- return EVP_aes_192_cbc();
451
- } else if (0 == strcmp(name, SN_aes_256_cbc)) {
452
- return EVP_aes_256_cbc();
453
- } else {
454
- return NULL;
455
- }
366
+ pem_password_cb *callback, void *u)
367
+ {
368
+ int i = 0, j, o, klen;
369
+ long len;
370
+ EVP_CIPHER_CTX ctx;
371
+ unsigned char key[EVP_MAX_KEY_LENGTH];
372
+ char buf[PEM_BUFSIZE];
373
+
374
+ len = *plen;
375
+
376
+ if (cipher->cipher == NULL)
377
+ return (1);
378
+
379
+ klen = 0;
380
+ if (!callback)
381
+ callback = PEM_def_callback;
382
+ klen = callback(buf, PEM_BUFSIZE, 0, u);
383
+ if (klen <= 0) {
384
+ OPENSSL_PUT_ERROR(PEM, PEM_R_BAD_PASSWORD_READ);
385
+ return (0);
386
+ }
387
+
388
+ if (!EVP_BytesToKey(cipher->cipher, EVP_md5(), &(cipher->iv[0]),
389
+ (unsigned char *)buf, klen, 1, key, NULL))
390
+ return 0;
391
+
392
+ j = (int)len;
393
+ EVP_CIPHER_CTX_init(&ctx);
394
+ o = EVP_DecryptInit_ex(&ctx, cipher->cipher, NULL, key, &(cipher->iv[0]));
395
+ if (o)
396
+ o = EVP_DecryptUpdate(&ctx, data, &i, data, j);
397
+ if (o)
398
+ o = EVP_DecryptFinal_ex(&ctx, &(data[i]), &j);
399
+ EVP_CIPHER_CTX_cleanup(&ctx);
400
+ OPENSSL_cleanse((char *)buf, sizeof(buf));
401
+ OPENSSL_cleanse((char *)key, sizeof(key));
402
+ if (!o) {
403
+ OPENSSL_PUT_ERROR(PEM, PEM_R_BAD_DECRYPT);
404
+ return (0);
405
+ }
406
+ j += i;
407
+ *plen = j;
408
+ return (1);
409
+ }
410
+
411
+ static const EVP_CIPHER *cipher_by_name(const char *name)
412
+ {
413
+ /* This is similar to the (deprecated) function |EVP_get_cipherbyname|. */
414
+ if (0 == strcmp(name, SN_rc4)) {
415
+ return EVP_rc4();
416
+ } else if (0 == strcmp(name, SN_des_cbc)) {
417
+ return EVP_des_cbc();
418
+ } else if (0 == strcmp(name, SN_des_ede3_cbc)) {
419
+ return EVP_des_ede3_cbc();
420
+ } else if (0 == strcmp(name, SN_aes_128_cbc)) {
421
+ return EVP_aes_128_cbc();
422
+ } else if (0 == strcmp(name, SN_aes_192_cbc)) {
423
+ return EVP_aes_192_cbc();
424
+ } else if (0 == strcmp(name, SN_aes_256_cbc)) {
425
+ return EVP_aes_256_cbc();
426
+ } else {
427
+ return NULL;
428
+ }
456
429
  }
457
430
 
458
431
  int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher)
459
- {
460
- const EVP_CIPHER *enc=NULL;
461
- char *p,c;
462
- char **header_pp = &header;
463
-
464
- cipher->cipher=NULL;
465
- if ((header == NULL) || (*header == '\0') || (*header == '\n'))
466
- return(1);
467
- if (strncmp(header,"Proc-Type: ",11) != 0)
468
- { OPENSSL_PUT_ERROR(PEM, PEM_R_NOT_PROC_TYPE); return(0); }
469
- header+=11;
470
- if (*header != '4') return(0); header++;
471
- if (*header != ',') return(0); header++;
472
- if (strncmp(header,"ENCRYPTED",9) != 0)
473
- { OPENSSL_PUT_ERROR(PEM, PEM_R_NOT_ENCRYPTED); return(0); }
474
- for (; (*header != '\n') && (*header != '\0'); header++)
475
- ;
476
- if (*header == '\0')
477
- { OPENSSL_PUT_ERROR(PEM, PEM_R_SHORT_HEADER); return(0); }
478
- header++;
479
- if (strncmp(header,"DEK-Info: ",10) != 0)
480
- { OPENSSL_PUT_ERROR(PEM, PEM_R_NOT_DEK_INFO); return(0); }
481
- header+=10;
482
-
483
- p=header;
484
- for (;;)
485
- {
486
- c= *header;
487
- if (!( ((c >= 'A') && (c <= 'Z')) || (c == '-') ||
488
- ((c >= '0') && (c <= '9'))))
489
- break;
490
- header++;
491
- }
492
- *header='\0';
493
- cipher->cipher=enc=cipher_by_name(p);
494
- *header=c;
495
- header++;
496
-
497
- if (enc == NULL)
498
- {
499
- OPENSSL_PUT_ERROR(PEM, PEM_R_UNSUPPORTED_ENCRYPTION);
500
- return(0);
501
- }
502
- if (!load_iv(header_pp,&(cipher->iv[0]),EVP_CIPHER_iv_length(enc)))
503
- return(0);
504
-
505
- return(1);
506
- }
432
+ {
433
+ const EVP_CIPHER *enc = NULL;
434
+ char *p, c;
435
+ char **header_pp = &header;
436
+
437
+ cipher->cipher = NULL;
438
+ if ((header == NULL) || (*header == '\0') || (*header == '\n'))
439
+ return (1);
440
+ if (strncmp(header, "Proc-Type: ", 11) != 0) {
441
+ OPENSSL_PUT_ERROR(PEM, PEM_R_NOT_PROC_TYPE);
442
+ return (0);
443
+ }
444
+ header += 11;
445
+ if (*header != '4')
446
+ return (0);
447
+ header++;
448
+ if (*header != ',')
449
+ return (0);
450
+ header++;
451
+ if (strncmp(header, "ENCRYPTED", 9) != 0) {
452
+ OPENSSL_PUT_ERROR(PEM, PEM_R_NOT_ENCRYPTED);
453
+ return (0);
454
+ }
455
+ for (; (*header != '\n') && (*header != '\0'); header++) ;
456
+ if (*header == '\0') {
457
+ OPENSSL_PUT_ERROR(PEM, PEM_R_SHORT_HEADER);
458
+ return (0);
459
+ }
460
+ header++;
461
+ if (strncmp(header, "DEK-Info: ", 10) != 0) {
462
+ OPENSSL_PUT_ERROR(PEM, PEM_R_NOT_DEK_INFO);
463
+ return (0);
464
+ }
465
+ header += 10;
466
+
467
+ p = header;
468
+ for (;;) {
469
+ c = *header;
470
+ if (!(((c >= 'A') && (c <= 'Z')) || (c == '-') ||
471
+ ((c >= '0') && (c <= '9'))))
472
+ break;
473
+ header++;
474
+ }
475
+ *header = '\0';
476
+ cipher->cipher = enc = cipher_by_name(p);
477
+ *header = c;
478
+ header++;
479
+
480
+ if (enc == NULL) {
481
+ OPENSSL_PUT_ERROR(PEM, PEM_R_UNSUPPORTED_ENCRYPTION);
482
+ return (0);
483
+ }
484
+ if (!load_iv(header_pp, &(cipher->iv[0]), EVP_CIPHER_iv_length(enc)))
485
+ return (0);
486
+
487
+ return (1);
488
+ }
507
489
 
508
490
  static int load_iv(char **fromp, unsigned char *to, int num)
509
- {
510
- int v,i;
511
- char *from;
512
-
513
- from= *fromp;
514
- for (i=0; i<num; i++) to[i]=0;
515
- num*=2;
516
- for (i=0; i<num; i++)
517
- {
518
- if ((*from >= '0') && (*from <= '9'))
519
- v= *from-'0';
520
- else if ((*from >= 'A') && (*from <= 'F'))
521
- v= *from-'A'+10;
522
- else if ((*from >= 'a') && (*from <= 'f'))
523
- v= *from-'a'+10;
524
- else
525
- {
526
- OPENSSL_PUT_ERROR(PEM, PEM_R_BAD_IV_CHARS);
527
- return(0);
528
- }
529
- from++;
530
- to[i/2]|=v<<(long)((!(i&1))*4);
531
- }
532
-
533
- *fromp=from;
534
- return(1);
535
- }
491
+ {
492
+ int v, i;
493
+ char *from;
494
+
495
+ from = *fromp;
496
+ for (i = 0; i < num; i++)
497
+ to[i] = 0;
498
+ num *= 2;
499
+ for (i = 0; i < num; i++) {
500
+ if ((*from >= '0') && (*from <= '9'))
501
+ v = *from - '0';
502
+ else if ((*from >= 'A') && (*from <= 'F'))
503
+ v = *from - 'A' + 10;
504
+ else if ((*from >= 'a') && (*from <= 'f'))
505
+ v = *from - 'a' + 10;
506
+ else {
507
+ OPENSSL_PUT_ERROR(PEM, PEM_R_BAD_IV_CHARS);
508
+ return (0);
509
+ }
510
+ from++;
511
+ to[i / 2] |= v << (long)((!(i & 1)) * 4);
512
+ }
513
+
514
+ *fromp = from;
515
+ return (1);
516
+ }
536
517
 
537
518
  #ifndef OPENSSL_NO_FP_API
538
519
  int PEM_write(FILE *fp, const char *name, const char *header,
539
- const unsigned char *data, long len)
540
- {
541
- BIO *b;
542
- int ret;
543
-
544
- if ((b=BIO_new(BIO_s_file())) == NULL)
545
- {
546
- OPENSSL_PUT_ERROR(PEM, ERR_R_BUF_LIB);
547
- return(0);
548
- }
549
- BIO_set_fp(b,fp,BIO_NOCLOSE);
550
- ret=PEM_write_bio(b, name, header, data,len);
551
- BIO_free(b);
552
- return(ret);
553
- }
520
+ const unsigned char *data, long len)
521
+ {
522
+ BIO *b;
523
+ int ret;
524
+
525
+ if ((b = BIO_new(BIO_s_file())) == NULL) {
526
+ OPENSSL_PUT_ERROR(PEM, ERR_R_BUF_LIB);
527
+ return (0);
528
+ }
529
+ BIO_set_fp(b, fp, BIO_NOCLOSE);
530
+ ret = PEM_write_bio(b, name, header, data, len);
531
+ BIO_free(b);
532
+ return (ret);
533
+ }
554
534
  #endif
555
535
 
556
536
  int PEM_write_bio(BIO *bp, const char *name, const char *header,
557
- const unsigned char *data, long len)
558
- {
559
- int nlen,n,i,j,outl;
560
- unsigned char *buf = NULL;
561
- EVP_ENCODE_CTX ctx;
562
- int reason=ERR_R_BUF_LIB;
563
-
564
- EVP_EncodeInit(&ctx);
565
- nlen=strlen(name);
566
-
567
- if ( (BIO_write(bp,"-----BEGIN ",11) != 11) ||
568
- (BIO_write(bp,name,nlen) != nlen) ||
569
- (BIO_write(bp,"-----\n",6) != 6))
570
- goto err;
571
-
572
- i=strlen(header);
573
- if (i > 0)
574
- {
575
- if ( (BIO_write(bp,header,i) != i) ||
576
- (BIO_write(bp,"\n",1) != 1))
577
- goto err;
578
- }
579
-
580
- buf = OPENSSL_malloc(PEM_BUFSIZE*8);
581
- if (buf == NULL)
582
- {
583
- reason=ERR_R_MALLOC_FAILURE;
584
- goto err;
585
- }
586
-
587
- i=j=0;
588
- while (len > 0)
589
- {
590
- n=(int)((len>(PEM_BUFSIZE*5))?(PEM_BUFSIZE*5):len);
591
- EVP_EncodeUpdate(&ctx,buf,&outl,&(data[j]),n);
592
- if ((outl) && (BIO_write(bp,(char *)buf,outl) != outl))
593
- goto err;
594
- i+=outl;
595
- len-=n;
596
- j+=n;
597
- }
598
- EVP_EncodeFinal(&ctx,buf,&outl);
599
- if ((outl > 0) && (BIO_write(bp,(char *)buf,outl) != outl)) goto err;
600
- OPENSSL_cleanse(buf, PEM_BUFSIZE*8);
601
- OPENSSL_free(buf);
602
- buf = NULL;
603
- if ( (BIO_write(bp,"-----END ",9) != 9) ||
604
- (BIO_write(bp,name,nlen) != nlen) ||
605
- (BIO_write(bp,"-----\n",6) != 6))
606
- goto err;
607
- return(i+outl);
608
- err:
609
- if (buf) {
610
- OPENSSL_cleanse(buf, PEM_BUFSIZE*8);
611
- OPENSSL_free(buf);
612
- }
613
- OPENSSL_PUT_ERROR(PEM, reason);
614
- return(0);
615
- }
537
+ const unsigned char *data, long len)
538
+ {
539
+ int nlen, n, i, j, outl;
540
+ unsigned char *buf = NULL;
541
+ EVP_ENCODE_CTX ctx;
542
+ int reason = ERR_R_BUF_LIB;
543
+
544
+ EVP_EncodeInit(&ctx);
545
+ nlen = strlen(name);
546
+
547
+ if ((BIO_write(bp, "-----BEGIN ", 11) != 11) ||
548
+ (BIO_write(bp, name, nlen) != nlen) ||
549
+ (BIO_write(bp, "-----\n", 6) != 6))
550
+ goto err;
551
+
552
+ i = strlen(header);
553
+ if (i > 0) {
554
+ if ((BIO_write(bp, header, i) != i) || (BIO_write(bp, "\n", 1) != 1))
555
+ goto err;
556
+ }
557
+
558
+ buf = OPENSSL_malloc(PEM_BUFSIZE * 8);
559
+ if (buf == NULL) {
560
+ reason = ERR_R_MALLOC_FAILURE;
561
+ goto err;
562
+ }
563
+
564
+ i = j = 0;
565
+ while (len > 0) {
566
+ n = (int)((len > (PEM_BUFSIZE * 5)) ? (PEM_BUFSIZE * 5) : len);
567
+ EVP_EncodeUpdate(&ctx, buf, &outl, &(data[j]), n);
568
+ if ((outl) && (BIO_write(bp, (char *)buf, outl) != outl))
569
+ goto err;
570
+ i += outl;
571
+ len -= n;
572
+ j += n;
573
+ }
574
+ EVP_EncodeFinal(&ctx, buf, &outl);
575
+ if ((outl > 0) && (BIO_write(bp, (char *)buf, outl) != outl))
576
+ goto err;
577
+ OPENSSL_cleanse(buf, PEM_BUFSIZE * 8);
578
+ OPENSSL_free(buf);
579
+ buf = NULL;
580
+ if ((BIO_write(bp, "-----END ", 9) != 9) ||
581
+ (BIO_write(bp, name, nlen) != nlen) ||
582
+ (BIO_write(bp, "-----\n", 6) != 6))
583
+ goto err;
584
+ return (i + outl);
585
+ err:
586
+ if (buf) {
587
+ OPENSSL_cleanse(buf, PEM_BUFSIZE * 8);
588
+ OPENSSL_free(buf);
589
+ }
590
+ OPENSSL_PUT_ERROR(PEM, reason);
591
+ return (0);
592
+ }
616
593
 
617
594
  #ifndef OPENSSL_NO_FP_API
618
595
  int PEM_read(FILE *fp, char **name, char **header, unsigned char **data,
619
- long *len)
620
- {
621
- BIO *b;
622
- int ret;
623
-
624
- if ((b=BIO_new(BIO_s_file())) == NULL)
625
- {
626
- OPENSSL_PUT_ERROR(PEM, ERR_R_BUF_LIB);
627
- return(0);
628
- }
629
- BIO_set_fp(b,fp,BIO_NOCLOSE);
630
- ret=PEM_read_bio(b, name, header, data,len);
631
- BIO_free(b);
632
- return(ret);
633
- }
596
+ long *len)
597
+ {
598
+ BIO *b;
599
+ int ret;
600
+
601
+ if ((b = BIO_new(BIO_s_file())) == NULL) {
602
+ OPENSSL_PUT_ERROR(PEM, ERR_R_BUF_LIB);
603
+ return (0);
604
+ }
605
+ BIO_set_fp(b, fp, BIO_NOCLOSE);
606
+ ret = PEM_read_bio(b, name, header, data, len);
607
+ BIO_free(b);
608
+ return (ret);
609
+ }
634
610
  #endif
635
611
 
636
612
  int PEM_read_bio(BIO *bp, char **name, char **header, unsigned char **data,
637
- long *len)
638
- {
639
- EVP_ENCODE_CTX ctx;
640
- int end=0,i,k,bl=0,hl=0,nohead=0;
641
- char buf[256];
642
- BUF_MEM *nameB;
643
- BUF_MEM *headerB;
644
- BUF_MEM *dataB,*tmpB;
645
-
646
- nameB=BUF_MEM_new();
647
- headerB=BUF_MEM_new();
648
- dataB=BUF_MEM_new();
649
- if ((nameB == NULL) || (headerB == NULL) || (dataB == NULL))
650
- {
651
- BUF_MEM_free(nameB);
652
- BUF_MEM_free(headerB);
653
- BUF_MEM_free(dataB);
654
- OPENSSL_PUT_ERROR(PEM, ERR_R_MALLOC_FAILURE);
655
- return(0);
656
- }
657
-
658
- buf[254]='\0';
659
- for (;;)
660
- {
661
- i=BIO_gets(bp,buf,254);
662
-
663
- if (i <= 0)
664
- {
665
- OPENSSL_PUT_ERROR(PEM, PEM_R_NO_START_LINE);
666
- goto err;
667
- }
668
-
669
- while ((i >= 0) && (buf[i] <= ' ')) i--;
670
- buf[++i]='\n'; buf[++i]='\0';
671
-
672
- if (strncmp(buf,"-----BEGIN ",11) == 0)
673
- {
674
- i=strlen(&(buf[11]));
675
-
676
- if (strncmp(&(buf[11+i-6]),"-----\n",6) != 0)
677
- continue;
678
- if (!BUF_MEM_grow(nameB,i+9))
679
- {
680
- OPENSSL_PUT_ERROR(PEM, ERR_R_MALLOC_FAILURE);
681
- goto err;
682
- }
683
- memcpy(nameB->data,&(buf[11]),i-6);
684
- nameB->data[i-6]='\0';
685
- break;
686
- }
687
- }
688
- hl=0;
689
- if (!BUF_MEM_grow(headerB,256))
690
- { OPENSSL_PUT_ERROR(PEM, ERR_R_MALLOC_FAILURE); goto err; }
691
- headerB->data[0]='\0';
692
- for (;;)
693
- {
694
- i=BIO_gets(bp,buf,254);
695
- if (i <= 0) break;
696
-
697
- while ((i >= 0) && (buf[i] <= ' ')) i--;
698
- buf[++i]='\n'; buf[++i]='\0';
699
-
700
- if (buf[0] == '\n') break;
701
- if (!BUF_MEM_grow(headerB,hl+i+9))
702
- { OPENSSL_PUT_ERROR(PEM, ERR_R_MALLOC_FAILURE); goto err; }
703
- if (strncmp(buf,"-----END ",9) == 0)
704
- {
705
- nohead=1;
706
- break;
707
- }
708
- memcpy(&(headerB->data[hl]),buf,i);
709
- headerB->data[hl+i]='\0';
710
- hl+=i;
711
- }
712
-
713
- bl=0;
714
- if (!BUF_MEM_grow(dataB,1024))
715
- { OPENSSL_PUT_ERROR(PEM, ERR_R_MALLOC_FAILURE); goto err; }
716
- dataB->data[0]='\0';
717
- if (!nohead)
718
- {
719
- for (;;)
720
- {
721
- i=BIO_gets(bp,buf,254);
722
- if (i <= 0) break;
723
-
724
- while ((i >= 0) && (buf[i] <= ' ')) i--;
725
- buf[++i]='\n'; buf[++i]='\0';
726
-
727
- if (i != 65) end=1;
728
- if (strncmp(buf,"-----END ",9) == 0)
729
- break;
730
- if (i > 65) break;
731
- if (!BUF_MEM_grow_clean(dataB,i+bl+9))
732
- {
733
- OPENSSL_PUT_ERROR(PEM, ERR_R_MALLOC_FAILURE);
734
- goto err;
735
- }
736
- memcpy(&(dataB->data[bl]),buf,i);
737
- dataB->data[bl+i]='\0';
738
- bl+=i;
739
- if (end)
740
- {
741
- buf[0]='\0';
742
- i=BIO_gets(bp,buf,254);
743
- if (i <= 0) break;
744
-
745
- while ((i >= 0) && (buf[i] <= ' ')) i--;
746
- buf[++i]='\n'; buf[++i]='\0';
747
-
748
- break;
749
- }
750
- }
751
- }
752
- else
753
- {
754
- tmpB=headerB;
755
- headerB=dataB;
756
- dataB=tmpB;
757
- bl=hl;
758
- }
759
- i=strlen(nameB->data);
760
- if ( (strncmp(buf,"-----END ",9) != 0) ||
761
- (strncmp(nameB->data,&(buf[9]),i) != 0) ||
762
- (strncmp(&(buf[9+i]),"-----\n",6) != 0))
763
- {
764
- OPENSSL_PUT_ERROR(PEM, PEM_R_BAD_END_LINE);
765
- goto err;
766
- }
767
-
768
- EVP_DecodeInit(&ctx);
769
- i=EVP_DecodeUpdate(&ctx,
770
- (unsigned char *)dataB->data,&bl,
771
- (unsigned char *)dataB->data,bl);
772
- if (i < 0)
773
- {
774
- OPENSSL_PUT_ERROR(PEM, PEM_R_BAD_BASE64_DECODE);
775
- goto err;
776
- }
777
- i=EVP_DecodeFinal(&ctx,(unsigned char *)&(dataB->data[bl]),&k);
778
- if (i < 0)
779
- {
780
- OPENSSL_PUT_ERROR(PEM, PEM_R_BAD_BASE64_DECODE);
781
- goto err;
782
- }
783
- bl+=k;
784
-
785
- if (bl == 0) goto err;
786
- *name=nameB->data;
787
- *header=headerB->data;
788
- *data=(unsigned char *)dataB->data;
789
- *len=bl;
790
- OPENSSL_free(nameB);
791
- OPENSSL_free(headerB);
792
- OPENSSL_free(dataB);
793
- return(1);
794
- err:
795
- BUF_MEM_free(nameB);
796
- BUF_MEM_free(headerB);
797
- BUF_MEM_free(dataB);
798
- return(0);
799
- }
800
-
801
- /* Check pem string and return prefix length.
802
- * If for example the pem_str == "RSA PRIVATE KEY" and suffix = "PRIVATE KEY"
803
- * the return value is 3 for the string "RSA".
613
+ long *len)
614
+ {
615
+ EVP_ENCODE_CTX ctx;
616
+ int end = 0, i, k, bl = 0, hl = 0, nohead = 0;
617
+ char buf[256];
618
+ BUF_MEM *nameB;
619
+ BUF_MEM *headerB;
620
+ BUF_MEM *dataB, *tmpB;
621
+
622
+ nameB = BUF_MEM_new();
623
+ headerB = BUF_MEM_new();
624
+ dataB = BUF_MEM_new();
625
+ if ((nameB == NULL) || (headerB == NULL) || (dataB == NULL)) {
626
+ BUF_MEM_free(nameB);
627
+ BUF_MEM_free(headerB);
628
+ BUF_MEM_free(dataB);
629
+ OPENSSL_PUT_ERROR(PEM, ERR_R_MALLOC_FAILURE);
630
+ return (0);
631
+ }
632
+
633
+ buf[254] = '\0';
634
+ for (;;) {
635
+ i = BIO_gets(bp, buf, 254);
636
+
637
+ if (i <= 0) {
638
+ OPENSSL_PUT_ERROR(PEM, PEM_R_NO_START_LINE);
639
+ goto err;
640
+ }
641
+
642
+ while ((i >= 0) && (buf[i] <= ' '))
643
+ i--;
644
+ buf[++i] = '\n';
645
+ buf[++i] = '\0';
646
+
647
+ if (strncmp(buf, "-----BEGIN ", 11) == 0) {
648
+ i = strlen(&(buf[11]));
649
+
650
+ if (strncmp(&(buf[11 + i - 6]), "-----\n", 6) != 0)
651
+ continue;
652
+ if (!BUF_MEM_grow(nameB, i + 9)) {
653
+ OPENSSL_PUT_ERROR(PEM, ERR_R_MALLOC_FAILURE);
654
+ goto err;
655
+ }
656
+ memcpy(nameB->data, &(buf[11]), i - 6);
657
+ nameB->data[i - 6] = '\0';
658
+ break;
659
+ }
660
+ }
661
+ hl = 0;
662
+ if (!BUF_MEM_grow(headerB, 256)) {
663
+ OPENSSL_PUT_ERROR(PEM, ERR_R_MALLOC_FAILURE);
664
+ goto err;
665
+ }
666
+ headerB->data[0] = '\0';
667
+ for (;;) {
668
+ i = BIO_gets(bp, buf, 254);
669
+ if (i <= 0)
670
+ break;
671
+
672
+ while ((i >= 0) && (buf[i] <= ' '))
673
+ i--;
674
+ buf[++i] = '\n';
675
+ buf[++i] = '\0';
676
+
677
+ if (buf[0] == '\n')
678
+ break;
679
+ if (!BUF_MEM_grow(headerB, hl + i + 9)) {
680
+ OPENSSL_PUT_ERROR(PEM, ERR_R_MALLOC_FAILURE);
681
+ goto err;
682
+ }
683
+ if (strncmp(buf, "-----END ", 9) == 0) {
684
+ nohead = 1;
685
+ break;
686
+ }
687
+ memcpy(&(headerB->data[hl]), buf, i);
688
+ headerB->data[hl + i] = '\0';
689
+ hl += i;
690
+ }
691
+
692
+ bl = 0;
693
+ if (!BUF_MEM_grow(dataB, 1024)) {
694
+ OPENSSL_PUT_ERROR(PEM, ERR_R_MALLOC_FAILURE);
695
+ goto err;
696
+ }
697
+ dataB->data[0] = '\0';
698
+ if (!nohead) {
699
+ for (;;) {
700
+ i = BIO_gets(bp, buf, 254);
701
+ if (i <= 0)
702
+ break;
703
+
704
+ while ((i >= 0) && (buf[i] <= ' '))
705
+ i--;
706
+ buf[++i] = '\n';
707
+ buf[++i] = '\0';
708
+
709
+ if (i != 65)
710
+ end = 1;
711
+ if (strncmp(buf, "-----END ", 9) == 0)
712
+ break;
713
+ if (i > 65)
714
+ break;
715
+ if (!BUF_MEM_grow_clean(dataB, i + bl + 9)) {
716
+ OPENSSL_PUT_ERROR(PEM, ERR_R_MALLOC_FAILURE);
717
+ goto err;
718
+ }
719
+ memcpy(&(dataB->data[bl]), buf, i);
720
+ dataB->data[bl + i] = '\0';
721
+ bl += i;
722
+ if (end) {
723
+ buf[0] = '\0';
724
+ i = BIO_gets(bp, buf, 254);
725
+ if (i <= 0)
726
+ break;
727
+
728
+ while ((i >= 0) && (buf[i] <= ' '))
729
+ i--;
730
+ buf[++i] = '\n';
731
+ buf[++i] = '\0';
732
+
733
+ break;
734
+ }
735
+ }
736
+ } else {
737
+ tmpB = headerB;
738
+ headerB = dataB;
739
+ dataB = tmpB;
740
+ bl = hl;
741
+ }
742
+ i = strlen(nameB->data);
743
+ if ((strncmp(buf, "-----END ", 9) != 0) ||
744
+ (strncmp(nameB->data, &(buf[9]), i) != 0) ||
745
+ (strncmp(&(buf[9 + i]), "-----\n", 6) != 0)) {
746
+ OPENSSL_PUT_ERROR(PEM, PEM_R_BAD_END_LINE);
747
+ goto err;
748
+ }
749
+
750
+ EVP_DecodeInit(&ctx);
751
+ i = EVP_DecodeUpdate(&ctx,
752
+ (unsigned char *)dataB->data, &bl,
753
+ (unsigned char *)dataB->data, bl);
754
+ if (i < 0) {
755
+ OPENSSL_PUT_ERROR(PEM, PEM_R_BAD_BASE64_DECODE);
756
+ goto err;
757
+ }
758
+ i = EVP_DecodeFinal(&ctx, (unsigned char *)&(dataB->data[bl]), &k);
759
+ if (i < 0) {
760
+ OPENSSL_PUT_ERROR(PEM, PEM_R_BAD_BASE64_DECODE);
761
+ goto err;
762
+ }
763
+ bl += k;
764
+
765
+ if (bl == 0)
766
+ goto err;
767
+ *name = nameB->data;
768
+ *header = headerB->data;
769
+ *data = (unsigned char *)dataB->data;
770
+ *len = bl;
771
+ OPENSSL_free(nameB);
772
+ OPENSSL_free(headerB);
773
+ OPENSSL_free(dataB);
774
+ return (1);
775
+ err:
776
+ BUF_MEM_free(nameB);
777
+ BUF_MEM_free(headerB);
778
+ BUF_MEM_free(dataB);
779
+ return (0);
780
+ }
781
+
782
+ /*
783
+ * Check pem string and return prefix length. If for example the pem_str ==
784
+ * "RSA PRIVATE KEY" and suffix = "PRIVATE KEY" the return value is 3 for the
785
+ * string "RSA".
804
786
  */
805
787
 
806
788
  int pem_check_suffix(const char *pem_str, const char *suffix)
807
- {
808
- int pem_len = strlen(pem_str);
809
- int suffix_len = strlen(suffix);
810
- const char *p;
811
- if (suffix_len + 1 >= pem_len)
812
- return 0;
813
- p = pem_str + pem_len - suffix_len;
814
- if (strcmp(p, suffix))
815
- return 0;
816
- p--;
817
- if (*p != ' ')
818
- return 0;
819
- return p - pem_str;
820
- }
789
+ {
790
+ int pem_len = strlen(pem_str);
791
+ int suffix_len = strlen(suffix);
792
+ const char *p;
793
+ if (suffix_len + 1 >= pem_len)
794
+ return 0;
795
+ p = pem_str + pem_len - suffix_len;
796
+ if (strcmp(p, suffix))
797
+ return 0;
798
+ p--;
799
+ if (*p != ' ')
800
+ return 0;
801
+ return p - pem_str;
802
+ }
821
803
 
822
804
  int PEM_def_callback(char *buf, int size, int rwflag, void *userdata)
823
- {
824
- if (!buf || !userdata)
825
- {
826
- return 0;
827
- }
828
- size_t len = strlen((char *) userdata);
829
- if (len >= (size_t) size)
830
- {
831
- return 0;
832
- }
833
- strcpy(buf, (char *) userdata);
834
- return len;
835
- }
805
+ {
806
+ if (!buf || !userdata) {
807
+ return 0;
808
+ }
809
+ size_t len = strlen((char *)userdata);
810
+ if (len >= (size_t)size) {
811
+ return 0;
812
+ }
813
+ strcpy(buf, (char *)userdata);
814
+ return len;
815
+ }