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.
- checksums.yaml +4 -4
- data/Makefile +2098 -828
- data/include/grpc/byte_buffer.h +1 -1
- data/include/grpc/byte_buffer_reader.h +1 -20
- data/include/grpc/census.h +4 -4
- data/include/grpc/compression.h +6 -5
- data/include/grpc/grpc.h +31 -20
- data/include/grpc/grpc_security.h +17 -31
- data/include/grpc/grpc_security_constants.h +114 -0
- data/include/grpc/grpc_zookeeper.h +1 -1
- data/include/grpc/impl/codegen/alloc.h +1 -1
- data/include/grpc/impl/codegen/atm.h +1 -1
- data/include/grpc/impl/codegen/atm_gcc_atomic.h +1 -1
- data/include/grpc/impl/codegen/atm_gcc_sync.h +1 -1
- data/include/grpc/impl/codegen/atm_win32.h +1 -1
- data/include/grpc/impl/codegen/byte_buffer.h +1 -1
- data/{src/core/client_config/lb_policies/round_robin.h → include/grpc/impl/codegen/byte_buffer_reader.h} +19 -8
- data/include/grpc/impl/codegen/grpc_types.h +20 -3
- data/include/grpc/impl/codegen/log.h +9 -2
- data/include/grpc/impl/codegen/port_platform.h +102 -17
- data/include/grpc/impl/codegen/propagation_bits.h +3 -3
- data/include/grpc/impl/codegen/slice.h +3 -3
- data/include/grpc/impl/codegen/slice_buffer.h +3 -3
- data/include/grpc/impl/codegen/status.h +1 -1
- data/include/grpc/impl/codegen/sync_generic.h +1 -1
- data/include/grpc/impl/codegen/sync_posix.h +1 -1
- data/include/grpc/impl/codegen/sync_win32.h +1 -1
- data/include/grpc/impl/codegen/time.h +3 -3
- data/include/grpc/status.h +1 -1
- data/include/grpc/support/alloc.h +1 -1
- data/include/grpc/support/atm.h +1 -1
- data/include/grpc/support/atm_gcc_atomic.h +4 -4
- data/include/grpc/support/atm_gcc_sync.h +1 -1
- data/include/grpc/support/atm_win32.h +1 -1
- data/include/grpc/support/avl.h +1 -1
- data/include/grpc/support/cmdline.h +1 -1
- data/include/grpc/support/cpu.h +1 -1
- data/include/grpc/support/histogram.h +1 -1
- data/include/grpc/support/host_port.h +1 -1
- data/include/grpc/support/log.h +1 -1
- data/include/grpc/support/log_win32.h +1 -1
- data/include/grpc/support/port_platform.h +1 -1
- data/include/grpc/support/slice.h +1 -1
- data/include/grpc/support/slice_buffer.h +1 -1
- data/include/grpc/support/string_util.h +3 -1
- data/include/grpc/support/subprocess.h +2 -2
- data/include/grpc/support/sync.h +1 -1
- data/include/grpc/support/sync_generic.h +1 -1
- data/include/grpc/support/sync_posix.h +1 -1
- data/include/grpc/support/sync_win32.h +1 -1
- data/include/grpc/support/thd.h +1 -1
- data/include/grpc/support/time.h +1 -1
- data/include/grpc/support/tls.h +1 -1
- data/include/grpc/support/tls_gcc.h +45 -1
- data/include/grpc/support/tls_msvc.h +3 -3
- data/include/grpc/support/tls_pthread.h +1 -1
- data/include/grpc/support/useful.h +1 -1
- data/src/boringssl/err_data.c +258 -252
- data/src/core/{census → ext/census}/aggregation.h +3 -3
- data/src/core/{statistics → ext/census}/census_interface.h +3 -3
- data/src/core/{statistics → ext/census}/census_rpc_stats.h +4 -4
- data/src/core/{census → ext/census}/context.c +2 -2
- data/src/core/{census → ext/census}/grpc_context.c +2 -2
- data/src/core/{census → ext/census}/grpc_filter.c +30 -16
- data/src/core/{census → ext/census}/grpc_filter.h +4 -4
- data/src/core/ext/census/grpc_plugin.c +82 -0
- data/src/core/{census → ext/census}/initialize.c +1 -1
- data/src/core/{census → ext/census}/mlog.c +2 -2
- data/src/core/{census → ext/census}/mlog.h +4 -4
- data/src/core/{census → ext/census}/operation.c +0 -0
- data/src/core/{census → ext/census}/placeholders.c +0 -0
- data/src/core/{census → ext/census}/rpc_metric_id.h +3 -3
- data/src/core/{census → ext/census}/tracing.c +0 -0
- data/src/core/{surface → ext/client_config}/channel_connectivity.c +8 -21
- data/src/core/{channel → ext/client_config}/client_channel.c +80 -35
- data/src/core/{channel → ext/client_config}/client_channel.h +5 -5
- data/src/core/{client_config/subchannel_factory.c → ext/client_config/client_channel_factory.c} +14 -6
- data/src/core/ext/client_config/client_channel_factory.h +85 -0
- data/src/core/{client_config → ext/client_config}/client_config.c +4 -2
- data/src/core/{client_config → ext/client_config}/client_config.h +4 -4
- data/src/core/ext/client_config/client_config_plugin.c +95 -0
- data/src/core/{client_config → ext/client_config}/connector.c +2 -2
- data/src/core/{client_config → ext/client_config}/connector.h +7 -10
- data/src/core/{client_config → ext/client_config}/default_initial_connect_string.c +1 -1
- data/src/core/{client_config → ext/client_config}/initial_connect_string.c +1 -1
- data/src/core/{client_config → ext/client_config}/initial_connect_string.h +4 -4
- data/src/core/{client_config → ext/client_config}/lb_policy.c +12 -3
- data/src/core/{client_config → ext/client_config}/lb_policy.h +19 -6
- data/src/core/{client_config → ext/client_config}/lb_policy_factory.c +4 -3
- data/src/core/{client_config → ext/client_config}/lb_policy_factory.h +14 -9
- data/src/core/{client_config → ext/client_config}/lb_policy_registry.c +4 -9
- data/src/core/{client_config → ext/client_config}/lb_policy_registry.h +7 -6
- data/src/core/ext/client_config/parse_address.c +137 -0
- data/src/core/ext/client_config/parse_address.h +56 -0
- data/src/core/{client_config → ext/client_config}/resolver.c +1 -1
- data/src/core/{client_config → ext/client_config}/resolver.h +6 -6
- data/src/core/{client_config → ext/client_config}/resolver_factory.c +1 -1
- data/src/core/{client_config → ext/client_config}/resolver_factory.h +7 -7
- data/src/core/{client_config → ext/client_config}/resolver_registry.c +25 -11
- data/src/core/{client_config → ext/client_config}/resolver_registry.h +9 -5
- data/src/core/{client_config → ext/client_config}/subchannel.c +90 -126
- data/src/core/{client_config → ext/client_config}/subchannel.h +15 -15
- data/src/core/{channel → ext/client_config}/subchannel_call_holder.c +9 -8
- data/src/core/{channel → ext/client_config}/subchannel_call_holder.h +7 -7
- data/src/core/{client_config → ext/client_config}/subchannel_index.c +3 -2
- data/src/core/{client_config → ext/client_config}/subchannel_index.h +5 -5
- data/src/core/{client_config → ext/client_config}/uri_parser.c +69 -1
- data/src/core/{client_config → ext/client_config}/uri_parser.h +15 -3
- data/src/core/{client_config/lb_policies → ext/lb_policy/grpclb}/load_balancer_api.c +18 -9
- data/src/core/{client_config/lb_policies → ext/lb_policy/grpclb}/load_balancer_api.h +5 -5
- data/src/core/{proto → ext/lb_policy/grpclb/proto}/grpc/lb/v0/load_balancer.pb.c +1 -1
- data/src/core/{proto → ext/lb_policy/grpclb/proto}/grpc/lb/v0/load_balancer.pb.h +0 -0
- data/src/core/{client_config/lb_policies → ext/lb_policy/pick_first}/pick_first.c +95 -32
- data/src/core/{client_config/lb_policies → ext/lb_policy/round_robin}/round_robin.c +98 -34
- data/src/core/{client_config/resolvers → ext/resolver/dns/native}/dns_resolver.c +83 -39
- data/src/core/{client_config/resolvers → ext/resolver/sockaddr}/sockaddr_resolver.c +66 -169
- data/src/core/{transport/chttp2 → ext/transport/chttp2/alpn}/alpn.c +1 -1
- data/src/core/{transport/chttp2 → ext/transport/chttp2/alpn}/alpn.h +3 -3
- data/src/core/{surface → ext/transport/chttp2/client/insecure}/channel_create.c +65 -59
- data/src/core/{surface → ext/transport/chttp2/client/secure}/secure_channel_create.c +77 -69
- data/src/core/{surface → ext/transport/chttp2/server/insecure}/server_chttp2.c +8 -11
- data/src/core/{security → ext/transport/chttp2/server/secure}/server_secure_chttp2.c +14 -17
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/bin_encoder.c +28 -74
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/bin_encoder.h +5 -5
- data/src/core/ext/transport/chttp2/transport/chttp2_plugin.c +46 -0
- data/src/core/{transport → ext/transport/chttp2/transport}/chttp2_transport.c +551 -310
- data/src/core/{transport → ext/transport/chttp2/transport}/chttp2_transport.h +5 -5
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame.h +3 -3
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_data.c +30 -14
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_data.h +10 -7
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_goaway.c +2 -2
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_goaway.h +5 -5
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_ping.c +2 -2
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_ping.h +5 -5
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_rst_stream.c +9 -5
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_rst_stream.h +8 -6
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_settings.c +6 -6
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_settings.h +5 -5
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_window_update.c +11 -5
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/frame_window_update.h +8 -6
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/hpack_encoder.c +21 -12
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/hpack_encoder.h +8 -6
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/hpack_parser.c +42 -25
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/hpack_parser.h +7 -7
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/hpack_table.c +21 -11
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/hpack_table.h +4 -4
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/http2_errors.h +3 -3
- data/src/core/ext/transport/chttp2/transport/huffsyms.c +105 -0
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/huffsyms.h +3 -3
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/incoming_metadata.c +2 -2
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/incoming_metadata.h +4 -4
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/internal.h +81 -37
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/parsing.c +54 -21
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/status_conversion.c +1 -1
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/status_conversion.h +4 -4
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/stream_lists.c +10 -2
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/stream_map.c +1 -1
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/stream_map.h +3 -3
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/timeout_encoding.c +4 -4
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/timeout_encoding.h +4 -4
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/varint.c +1 -1
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/varint.h +3 -3
- data/src/core/{transport/chttp2 → ext/transport/chttp2/transport}/writing.c +30 -20
- data/src/core/{channel → lib/channel}/channel_args.c +3 -15
- data/src/core/{channel → lib/channel}/channel_args.h +11 -15
- data/src/core/{channel → lib/channel}/channel_stack.c +5 -3
- data/src/core/{channel → lib/channel}/channel_stack.h +13 -8
- data/src/core/lib/channel/channel_stack_builder.c +277 -0
- data/src/core/lib/channel/channel_stack_builder.h +161 -0
- data/src/core/{channel → lib/channel}/compress_filter.c +51 -16
- data/src/core/{channel → lib/channel}/compress_filter.h +6 -4
- data/src/core/{channel → lib/channel}/connected_channel.c +34 -24
- data/src/core/lib/channel/connected_channel.h +42 -0
- data/src/core/{channel → lib/channel}/context.h +3 -3
- data/src/core/{channel → lib/channel}/http_client_filter.c +24 -13
- data/src/core/{channel → lib/channel}/http_client_filter.h +4 -4
- data/src/core/{channel → lib/channel}/http_server_filter.c +39 -19
- data/src/core/{channel → lib/channel}/http_server_filter.h +4 -4
- data/src/core/{compression → lib/compression}/algorithm_metadata.h +4 -4
- data/src/core/{compression → lib/compression}/compression_algorithm.c +46 -9
- data/src/core/{compression → lib/compression}/message_compress.c +1 -1
- data/src/core/{compression → lib/compression}/message_compress.h +3 -3
- data/src/core/{debug → lib/debug}/trace.c +2 -2
- data/src/core/{debug → lib/debug}/trace.h +3 -3
- data/src/core/{httpcli → lib/http}/format_request.c +8 -8
- data/src/core/{httpcli → lib/http}/format_request.h +4 -4
- data/src/core/{httpcli → lib/http}/httpcli.c +24 -19
- data/src/core/{httpcli → lib/http}/httpcli.h +14 -33
- data/src/core/{httpcli → lib/http}/httpcli_security_connector.c +5 -5
- data/src/core/lib/http/parser.c +341 -0
- data/src/core/lib/http/parser.h +119 -0
- data/src/core/{iomgr → lib/iomgr}/closure.c +8 -2
- data/src/core/{iomgr → lib/iomgr}/closure.h +7 -4
- data/src/core/{iomgr → lib/iomgr}/endpoint.c +1 -1
- data/src/core/{iomgr → lib/iomgr}/endpoint.h +5 -5
- data/src/core/{iomgr → lib/iomgr}/endpoint_pair.h +4 -4
- data/src/core/{iomgr → lib/iomgr}/endpoint_pair_posix.c +8 -7
- data/src/core/{iomgr → lib/iomgr}/endpoint_pair_windows.c +4 -4
- data/src/core/lib/iomgr/ev_poll_and_epoll_posix.c +1936 -0
- data/src/core/lib/iomgr/ev_poll_and_epoll_posix.h +41 -0
- data/src/core/lib/iomgr/ev_posix.c +164 -0
- data/src/core/lib/iomgr/ev_posix.h +158 -0
- data/src/core/{iomgr → lib/iomgr}/exec_ctx.c +78 -3
- data/src/core/{iomgr → lib/iomgr}/exec_ctx.h +25 -10
- data/src/core/{iomgr → lib/iomgr}/executor.c +3 -3
- data/src/core/{iomgr → lib/iomgr}/executor.h +5 -5
- data/src/core/{iomgr → lib/iomgr}/iocp_windows.c +6 -6
- data/src/core/{iomgr → lib/iomgr}/iocp_windows.h +5 -5
- data/src/core/{iomgr → lib/iomgr}/iomgr.c +13 -10
- data/src/core/{iomgr → lib/iomgr}/iomgr.h +3 -3
- data/src/core/{iomgr → lib/iomgr}/iomgr_internal.h +5 -9
- data/src/core/{iomgr → lib/iomgr}/iomgr_posix.c +6 -6
- data/src/core/{iomgr → lib/iomgr}/iomgr_posix.h +4 -4
- data/src/core/{iomgr → lib/iomgr}/iomgr_windows.c +7 -4
- data/src/core/{iomgr → lib/iomgr}/pollset.h +11 -11
- data/src/core/{iomgr → lib/iomgr}/pollset_set.h +5 -5
- data/src/core/{iomgr → lib/iomgr}/pollset_set_windows.c +2 -2
- data/src/core/lib/iomgr/pollset_set_windows.h +39 -0
- data/src/core/{iomgr → lib/iomgr}/pollset_windows.c +7 -7
- data/src/core/{iomgr → lib/iomgr}/pollset_windows.h +8 -5
- data/src/core/{iomgr → lib/iomgr}/resolve_address.h +10 -9
- data/src/core/{iomgr → lib/iomgr}/resolve_address_posix.c +22 -22
- data/src/core/{iomgr → lib/iomgr}/resolve_address_windows.c +20 -12
- data/src/core/{iomgr → lib/iomgr}/sockaddr.h +5 -5
- data/src/core/{iomgr → lib/iomgr}/sockaddr_posix.h +5 -5
- data/src/core/{iomgr → lib/iomgr}/sockaddr_utils.c +9 -16
- data/src/core/{iomgr → lib/iomgr}/sockaddr_utils.h +4 -4
- data/src/core/{iomgr → lib/iomgr}/sockaddr_win32.h +6 -4
- data/src/core/{iomgr → lib/iomgr}/socket_utils_common_posix.c +29 -7
- data/src/core/{iomgr → lib/iomgr}/socket_utils_linux.c +2 -2
- data/src/core/{iomgr → lib/iomgr}/socket_utils_posix.c +1 -1
- data/src/core/{iomgr → lib/iomgr}/socket_utils_posix.h +14 -4
- data/src/core/{iomgr → lib/iomgr}/socket_windows.c +7 -5
- data/src/core/{iomgr → lib/iomgr}/socket_windows.h +6 -6
- data/src/core/{iomgr → lib/iomgr}/tcp_client.h +6 -6
- data/src/core/{iomgr → lib/iomgr}/tcp_client_posix.c +33 -18
- data/src/core/{iomgr → lib/iomgr}/tcp_client_windows.c +30 -20
- data/src/core/{iomgr → lib/iomgr}/tcp_posix.c +9 -10
- data/src/core/{iomgr → lib/iomgr}/tcp_posix.h +6 -6
- data/src/core/{iomgr → lib/iomgr}/tcp_server.h +6 -6
- data/src/core/{iomgr → lib/iomgr}/tcp_server_posix.c +24 -37
- data/src/core/{iomgr → lib/iomgr}/tcp_server_windows.c +8 -36
- data/src/core/{iomgr → lib/iomgr}/tcp_windows.c +27 -17
- data/src/core/{iomgr → lib/iomgr}/tcp_windows.h +5 -5
- data/src/core/{iomgr → lib/iomgr}/time_averaged_stats.c +1 -1
- data/src/core/{iomgr → lib/iomgr}/time_averaged_stats.h +3 -3
- data/src/core/{iomgr → lib/iomgr}/timer.c +31 -4
- data/src/core/{iomgr → lib/iomgr}/timer.h +6 -7
- data/src/core/{iomgr → lib/iomgr}/timer_heap.c +2 -2
- data/src/core/{iomgr → lib/iomgr}/timer_heap.h +4 -4
- data/src/core/{iomgr → lib/iomgr}/udp_server.c +13 -37
- data/src/core/{iomgr → lib/iomgr}/udp_server.h +11 -10
- data/src/core/lib/iomgr/unix_sockets_posix.c +89 -0
- data/src/core/{client_config/resolvers/sockaddr_resolver.h → lib/iomgr/unix_sockets_posix.h} +15 -11
- data/src/core/lib/iomgr/unix_sockets_posix_noop.c +59 -0
- data/src/core/{iomgr → lib/iomgr}/wakeup_fd_eventfd.c +2 -2
- data/src/core/{iomgr → lib/iomgr}/wakeup_fd_nospecial.c +1 -1
- data/src/core/{iomgr → lib/iomgr}/wakeup_fd_pipe.c +8 -3
- data/src/core/{iomgr → lib/iomgr}/wakeup_fd_pipe.h +4 -4
- data/src/core/{iomgr → lib/iomgr}/wakeup_fd_posix.c +2 -2
- data/src/core/{iomgr → lib/iomgr}/wakeup_fd_posix.h +3 -3
- data/src/core/{iomgr → lib/iomgr}/workqueue.h +10 -10
- data/src/core/{iomgr → lib/iomgr}/workqueue_posix.c +5 -6
- data/src/core/{iomgr → lib/iomgr}/workqueue_posix.h +5 -5
- data/src/core/{iomgr → lib/iomgr}/workqueue_windows.c +1 -1
- data/src/core/{iomgr → lib/iomgr}/workqueue_windows.h +3 -3
- data/src/core/{json → lib/json}/json.c +1 -1
- data/src/core/{json → lib/json}/json.h +4 -4
- data/src/core/{json → lib/json}/json_common.h +3 -3
- data/src/core/{json → lib/json}/json_reader.c +16 -4
- data/src/core/{json → lib/json}/json_reader.h +4 -4
- data/src/core/{json → lib/json}/json_string.c +4 -4
- data/src/core/{json → lib/json}/json_writer.c +1 -1
- data/src/core/{json → lib/json}/json_writer.h +4 -4
- data/src/core/{profiling → lib/profiling}/basic_timers.c +3 -2
- data/src/core/{profiling → lib/profiling}/stap_timers.c +2 -2
- data/src/core/{profiling → lib/profiling}/timers.h +3 -3
- data/src/core/{security → lib/security}/auth_filters.h +4 -4
- data/src/core/{security → lib/security}/b64.c +2 -2
- data/src/core/{security → lib/security}/b64.h +4 -4
- data/src/core/{security → lib/security}/client_auth_filter.c +16 -16
- data/src/core/{security → lib/security}/credentials.c +42 -26
- data/src/core/{security → lib/security}/credentials.h +11 -10
- data/src/core/{security → lib/security}/credentials_metadata.c +1 -1
- data/src/core/{security → lib/security}/credentials_posix.c +3 -3
- data/src/core/{security → lib/security}/credentials_win32.c +3 -3
- data/src/core/{security → lib/security}/google_default_credentials.c +10 -9
- data/src/core/{security → lib/security}/handshake.c +4 -4
- data/src/core/{security → lib/security}/handshake.h +6 -6
- data/src/core/{security → lib/security}/json_token.c +4 -4
- data/src/core/{security → lib/security}/json_token.h +4 -4
- data/src/core/{security → lib/security}/jwt_verifier.c +14 -14
- data/src/core/{security → lib/security}/jwt_verifier.h +5 -5
- data/src/core/{security → lib/security}/secure_endpoint.c +9 -8
- data/src/core/{security → lib/security}/secure_endpoint.h +4 -4
- data/src/core/{security → lib/security}/security_connector.c +53 -21
- data/src/core/{security → lib/security}/security_connector.h +8 -8
- data/src/core/{security → lib/security}/security_context.c +5 -5
- data/src/core/{security → lib/security}/security_context.h +5 -5
- data/src/core/{security → lib/security}/server_auth_filter.c +9 -9
- data/src/core/{support → lib/support}/alloc.c +5 -3
- data/src/core/{support → lib/support}/avl.c +1 -1
- data/src/core/lib/support/backoff.c +76 -0
- data/src/core/lib/support/backoff.h +68 -0
- data/src/core/{support → lib/support}/block_annotate.h +3 -3
- data/src/core/{support → lib/support}/cmdline.c +1 -1
- data/src/core/{support → lib/support}/cpu_iphone.c +0 -0
- data/src/core/{support → lib/support}/cpu_linux.c +2 -2
- data/src/core/{support → lib/support}/cpu_posix.c +2 -2
- data/src/core/{support → lib/support}/cpu_windows.c +0 -0
- data/src/core/{support → lib/support}/env.h +3 -3
- data/src/core/{support → lib/support}/env_linux.c +3 -3
- data/src/core/{support → lib/support}/env_posix.c +2 -2
- data/src/core/{support → lib/support}/env_win32.c +27 -21
- data/src/core/{support → lib/support}/histogram.c +1 -1
- data/src/core/{support → lib/support}/host_port.c +1 -1
- data/src/core/{support → lib/support}/load_file.c +4 -4
- data/src/core/{support → lib/support}/load_file.h +4 -4
- data/src/core/{support → lib/support}/log.c +33 -0
- data/src/core/{support → lib/support}/log_android.c +2 -2
- data/src/core/{support → lib/support}/log_linux.c +6 -5
- data/src/core/{support → lib/support}/log_posix.c +3 -3
- data/src/core/{support → lib/support}/log_win32.c +8 -22
- data/src/core/{support → lib/support}/murmur_hash.c +1 -1
- data/src/core/{support → lib/support}/murmur_hash.h +3 -3
- data/src/core/{support → lib/support}/slice.c +0 -0
- data/src/core/{support → lib/support}/slice_buffer.c +0 -0
- data/src/core/{support → lib/support}/stack_lockfree.c +7 -7
- data/src/core/{support → lib/support}/stack_lockfree.h +3 -3
- data/src/core/{support → lib/support}/string.c +1 -1
- data/src/core/{support → lib/support}/string.h +4 -4
- data/src/core/{support → lib/support}/string_posix.c +1 -1
- data/src/core/{support/string_win32.c → lib/support/string_util_win32.c} +23 -38
- data/src/core/lib/support/string_win32.c +83 -0
- data/src/core/{support → lib/support}/string_win32.h +3 -3
- data/src/core/{support → lib/support}/subprocess_posix.c +3 -3
- data/src/core/{support → lib/support}/subprocess_windows.c +3 -3
- data/src/core/{support → lib/support}/sync.c +2 -2
- data/src/core/{support → lib/support}/sync_posix.c +3 -3
- data/src/core/{support → lib/support}/sync_win32.c +1 -1
- data/src/core/{support → lib/support}/thd.c +0 -0
- data/src/core/{support → lib/support}/thd_internal.h +3 -3
- data/src/core/{support → lib/support}/thd_posix.c +4 -3
- data/src/core/{support → lib/support}/thd_win32.c +1 -1
- data/src/core/{support → lib/support}/time.c +2 -2
- data/src/core/{support → lib/support}/time_posix.c +12 -6
- data/src/core/{support → lib/support}/time_precise.c +0 -0
- data/src/core/{support → lib/support}/time_precise.h +3 -3
- data/src/core/{support → lib/support}/time_win32.c +7 -7
- data/src/core/{support → lib/support}/tls_pthread.c +0 -0
- data/src/core/{support → lib/support}/tmpfile.h +4 -4
- data/src/core/lib/support/tmpfile_msys.c +73 -0
- data/src/core/{support → lib/support}/tmpfile_posix.c +5 -5
- data/src/core/{support → lib/support}/tmpfile_win32.c +5 -5
- data/src/core/{support → lib/support}/wrap_memcpy.c +0 -0
- data/src/core/{surface → lib/surface}/alarm.c +3 -3
- data/src/core/{surface → lib/surface}/api_trace.c +1 -1
- data/src/core/{surface → lib/surface}/api_trace.h +4 -4
- data/src/core/{surface → lib/surface}/byte_buffer.c +3 -3
- data/src/core/{surface → lib/surface}/byte_buffer_reader.c +3 -3
- data/src/core/{surface → lib/surface}/call.c +145 -73
- data/src/core/{surface → lib/surface}/call.h +14 -7
- data/src/core/{surface → lib/surface}/call_details.c +1 -1
- data/src/core/{surface → lib/surface}/call_log_batch.c +2 -2
- data/src/core/{surface → lib/surface}/call_test_only.h +3 -3
- data/src/core/{surface → lib/surface}/channel.c +33 -34
- data/src/core/{surface → lib/surface}/channel.h +9 -9
- data/src/core/lib/surface/channel_init.c +140 -0
- data/src/core/lib/surface/channel_init.h +87 -0
- data/src/core/{surface → lib/surface}/channel_ping.c +4 -4
- data/src/core/lib/surface/channel_stack_type.c +54 -0
- data/src/core/{httpcli/parser.h → lib/surface/channel_stack_type.h} +22 -28
- data/src/core/{surface → lib/surface}/completion_queue.c +15 -11
- data/src/core/{surface → lib/surface}/completion_queue.h +4 -4
- data/src/core/{surface → lib/surface}/event_string.c +2 -2
- data/src/core/{surface → lib/surface}/event_string.h +3 -3
- data/src/core/lib/surface/init.c +217 -0
- data/src/core/{surface → lib/surface}/init.h +4 -3
- data/src/core/lib/surface/init_secure.c +89 -0
- data/src/core/{surface → lib/surface}/lame_client.c +31 -19
- data/src/core/{iomgr/pollset_set_windows.h → lib/surface/lame_client.h} +7 -5
- data/src/core/{surface → lib/surface}/metadata_array.c +1 -1
- data/src/core/{surface → lib/surface}/server.c +208 -183
- data/src/core/{surface → lib/surface}/server.h +6 -11
- data/src/core/{surface → lib/surface}/surface_trace.h +5 -5
- data/src/core/{surface → lib/surface}/validate_metadata.c +1 -1
- data/src/core/{surface → lib/surface}/version.c +2 -2
- data/src/core/{transport → lib/transport}/byte_stream.c +1 -1
- data/src/core/{transport → lib/transport}/byte_stream.h +4 -4
- data/src/core/{transport → lib/transport}/connectivity_state.c +2 -2
- data/src/core/{transport → lib/transport}/connectivity_state.h +4 -4
- data/src/core/{transport → lib/transport}/metadata.c +71 -19
- data/src/core/{transport → lib/transport}/metadata.h +11 -4
- data/src/core/{transport → lib/transport}/metadata_batch.c +2 -2
- data/src/core/{transport → lib/transport}/metadata_batch.h +4 -4
- data/src/core/{transport → lib/transport}/static_metadata.c +100 -32
- data/src/core/{transport → lib/transport}/static_metadata.h +58 -58
- data/src/core/{transport → lib/transport}/transport.c +25 -5
- data/src/core/{transport → lib/transport}/transport.h +41 -16
- data/src/core/{transport → lib/transport}/transport_impl.h +8 -5
- data/src/core/{transport → lib/transport}/transport_op_string.c +2 -2
- data/src/core/{tsi → lib/tsi}/fake_transport_security.c +18 -14
- data/src/core/{tsi → lib/tsi}/fake_transport_security.h +4 -4
- data/src/core/{tsi → lib/tsi}/ssl_transport_security.c +173 -63
- data/src/core/{tsi → lib/tsi}/ssl_transport_security.h +24 -6
- data/src/core/{tsi → lib/tsi}/ssl_types.h +3 -3
- data/src/core/{tsi → lib/tsi}/transport_security.c +12 -28
- data/src/core/{tsi → lib/tsi}/transport_security.h +4 -4
- data/src/core/{tsi → lib/tsi}/transport_security_interface.h +12 -3
- data/src/core/plugin_registry/grpc_plugin_registry.c +66 -0
- data/src/ruby/ext/grpc/extconf.rb +14 -20
- data/src/ruby/ext/grpc/rb_byte_buffer.c +2 -3
- data/src/ruby/ext/grpc/rb_call.c +37 -4
- data/src/ruby/ext/grpc/rb_call_credentials.c +13 -3
- data/src/ruby/ext/grpc/rb_channel.c +2 -3
- data/src/ruby/ext/grpc/rb_channel_args.c +2 -3
- data/src/ruby/ext/grpc/rb_channel_credentials.c +31 -3
- data/src/ruby/ext/grpc/rb_completion_queue.c +2 -2
- data/src/ruby/ext/grpc/rb_event_thread.c +1 -1
- data/src/ruby/ext/grpc/rb_grpc.c +4 -2
- data/src/ruby/ext/grpc/rb_grpc_imports.generated.c +8 -0
- data/src/ruby/ext/grpc/rb_grpc_imports.generated.h +14 -2
- data/src/ruby/ext/grpc/rb_server.c +2 -3
- data/src/ruby/ext/grpc/rb_server_credentials.c +16 -13
- data/src/ruby/ext/grpc/rb_signal.c +70 -0
- data/src/ruby/ext/grpc/rb_signal.h +39 -0
- data/src/ruby/lib/grpc.rb +21 -13
- data/src/ruby/lib/grpc/core/time_consts.rb +2 -2
- data/src/ruby/lib/grpc/errors.rb +2 -2
- data/src/ruby/lib/grpc/generic/active_call.rb +10 -3
- data/src/ruby/lib/grpc/generic/bidi_call.rb +2 -2
- data/src/ruby/lib/grpc/generic/client_stub.rb +10 -7
- data/src/ruby/lib/grpc/generic/rpc_desc.rb +2 -2
- data/src/ruby/lib/grpc/generic/rpc_server.rb +21 -61
- data/src/ruby/lib/grpc/generic/service.rb +5 -15
- data/src/ruby/lib/grpc/grpc.rb +3 -3
- data/src/ruby/{bin/interop/interop_server.rb → lib/grpc/signals.rb} +39 -20
- data/src/ruby/lib/grpc/version.rb +2 -2
- data/src/ruby/pb/generate_proto_ruby.sh +9 -2
- data/src/ruby/pb/grpc/health/checker.rb +1 -1
- data/src/ruby/pb/grpc/testing/duplicate/echo_duplicate_services.rb +28 -0
- data/src/ruby/pb/grpc/testing/metrics.rb +28 -0
- data/src/ruby/pb/grpc/testing/metrics_services.rb +27 -0
- data/src/ruby/pb/test/client.rb +12 -23
- data/src/ruby/pb/test/server.rb +1 -1
- data/src/ruby/spec/client_server_spec.rb +1 -1
- data/src/ruby/spec/generic/client_stub_spec.rb +18 -17
- data/src/ruby/spec/generic/rpc_server_spec.rb +23 -7
- data/src/ruby/spec/generic/service_spec.rb +0 -69
- data/src/ruby/{bin/interop/interop_client.rb → spec/pb/duplicate/codegen_spec.rb} +41 -21
- data/src/ruby/spec/pb/health/checker_spec.rb +1 -1
- data/third_party/boringssl/crypto/asn1/a_bitstr.c +184 -176
- data/third_party/boringssl/crypto/asn1/a_bool.c +42 -44
- data/third_party/boringssl/crypto/asn1/a_bytes.c +236 -245
- data/third_party/boringssl/crypto/asn1/a_d2i_fp.c +173 -192
- data/third_party/boringssl/crypto/asn1/a_dup.c +43 -35
- data/third_party/boringssl/crypto/asn1/a_enum.c +107 -109
- data/third_party/boringssl/crypto/asn1/a_gentm.c +180 -181
- data/third_party/boringssl/crypto/asn1/a_i2d_fp.c +73 -80
- data/third_party/boringssl/crypto/asn1/a_int.c +357 -353
- data/third_party/boringssl/crypto/asn1/a_mbstr.c +272 -253
- data/third_party/boringssl/crypto/asn1/a_object.c +293 -309
- data/third_party/boringssl/crypto/asn1/a_octet.c +13 -6
- data/third_party/boringssl/crypto/asn1/a_print.c +54 -52
- data/third_party/boringssl/crypto/asn1/a_strnid.c +179 -157
- data/third_party/boringssl/crypto/asn1/a_time.c +125 -129
- data/third_party/boringssl/crypto/asn1/a_type.c +79 -86
- data/third_party/boringssl/crypto/asn1/a_utctm.c +246 -255
- data/third_party/boringssl/crypto/asn1/a_utf8.c +159 -135
- data/third_party/boringssl/crypto/asn1/asn1_lib.c +361 -368
- data/third_party/boringssl/crypto/asn1/asn1_locl.h +11 -11
- data/third_party/boringssl/crypto/asn1/asn1_par.c +309 -351
- data/third_party/boringssl/crypto/asn1/asn_pack.c +30 -29
- data/third_party/boringssl/crypto/asn1/bio_asn1.c +375 -394
- data/third_party/boringssl/crypto/asn1/bio_ndef.c +146 -149
- data/third_party/boringssl/crypto/asn1/f_enum.c +128 -134
- data/third_party/boringssl/crypto/asn1/f_int.c +131 -139
- data/third_party/boringssl/crypto/asn1/f_string.c +125 -133
- data/third_party/boringssl/crypto/asn1/t_bitst.c +30 -29
- data/third_party/boringssl/crypto/asn1/t_pkey.c +45 -47
- data/third_party/boringssl/crypto/asn1/tasn_dec.c +1099 -1216
- data/third_party/boringssl/crypto/asn1/tasn_enc.c +556 -592
- data/third_party/boringssl/crypto/asn1/tasn_fre.c +175 -193
- data/third_party/boringssl/crypto/asn1/tasn_new.c +271 -288
- data/third_party/boringssl/crypto/asn1/tasn_prn.c +462 -508
- data/third_party/boringssl/crypto/asn1/tasn_typ.c +28 -21
- data/third_party/boringssl/crypto/asn1/x_bignum.c +62 -52
- data/third_party/boringssl/crypto/asn1/x_long.c +101 -86
- data/third_party/boringssl/crypto/bio/buffer.c +3 -3
- data/third_party/boringssl/crypto/bn/asm/x86_64-gcc.c +8 -68
- data/third_party/boringssl/crypto/bn/bn.c +1 -1
- data/third_party/boringssl/crypto/bn/bn_asn1.c +9 -22
- data/third_party/boringssl/crypto/bn/convert.c +9 -4
- data/third_party/boringssl/crypto/bn/div.c +0 -20
- data/third_party/boringssl/crypto/bn/exponentiation.c +22 -13
- data/third_party/boringssl/crypto/bn/generic.c +6 -242
- data/third_party/boringssl/crypto/bn/internal.h +9 -70
- data/third_party/boringssl/crypto/bn/montgomery.c +1 -2
- data/third_party/boringssl/crypto/bn/mul.c +6 -26
- data/third_party/boringssl/crypto/bn/rsaz_exp.c +21 -28
- data/third_party/boringssl/crypto/bytestring/asn1_compat.c +51 -0
- data/third_party/boringssl/crypto/bytestring/ber.c +128 -87
- data/third_party/boringssl/crypto/bytestring/cbb.c +37 -3
- data/third_party/boringssl/crypto/bytestring/internal.h +39 -10
- data/third_party/boringssl/crypto/chacha/chacha_vec.c +18 -13
- data/third_party/boringssl/crypto/cipher/e_aes.c +2 -2
- data/third_party/boringssl/crypto/cipher/e_chacha20poly1305.c +4 -9
- data/third_party/boringssl/crypto/cipher/tls_cbc.c +39 -10
- data/third_party/boringssl/crypto/conf/conf.c +9 -0
- data/third_party/boringssl/crypto/cpu-intel.c +1 -1
- data/third_party/boringssl/crypto/crypto.c +2 -0
- data/third_party/boringssl/crypto/curve25519/curve25519.c +125 -120
- data/third_party/boringssl/crypto/curve25519/internal.h +45 -0
- data/third_party/boringssl/crypto/curve25519/x25519-x86_64.c +225 -0
- data/third_party/boringssl/crypto/dh/check.c +32 -10
- data/third_party/boringssl/crypto/dh/dh.c +1 -1
- data/third_party/boringssl/crypto/digest/md32_common.h +0 -60
- data/third_party/boringssl/crypto/dsa/dsa.c +47 -21
- data/third_party/boringssl/crypto/dsa/dsa_asn1.c +249 -64
- data/third_party/boringssl/crypto/ec/ec.c +45 -31
- data/third_party/boringssl/crypto/ec/ec_asn1.c +315 -382
- data/third_party/boringssl/crypto/ec/ec_key.c +1 -4
- data/third_party/boringssl/crypto/ec/ec_montgomery.c +0 -9
- data/third_party/boringssl/crypto/ec/internal.h +1 -19
- data/third_party/boringssl/crypto/ec/oct.c +12 -0
- data/third_party/boringssl/crypto/ec/p224-64.c +4 -65
- data/third_party/boringssl/crypto/ec/p256-64.c +9 -71
- data/third_party/boringssl/crypto/ec/p256-x86_64-table.h +1 -6
- data/third_party/boringssl/crypto/ec/p256-x86_64.c +3 -13
- data/third_party/boringssl/crypto/ec/simple.c +0 -76
- data/third_party/boringssl/crypto/ecdsa/ecdsa.c +1 -1
- data/third_party/boringssl/crypto/ecdsa/ecdsa_asn1.c +10 -24
- data/third_party/boringssl/crypto/evp/evp.c +4 -3
- data/third_party/boringssl/crypto/evp/evp_asn1.c +101 -0
- data/third_party/boringssl/crypto/evp/evp_ctx.c +22 -51
- data/third_party/boringssl/crypto/evp/internal.h +28 -27
- data/third_party/boringssl/crypto/evp/p_dsa_asn1.c +78 -249
- data/third_party/boringssl/crypto/evp/p_ec.c +19 -66
- data/third_party/boringssl/crypto/evp/p_ec_asn1.c +74 -231
- data/third_party/boringssl/crypto/evp/p_rsa.c +90 -13
- data/third_party/boringssl/crypto/evp/p_rsa_asn1.c +49 -48
- data/third_party/boringssl/crypto/internal.h +16 -1
- data/third_party/boringssl/crypto/mem.c +2 -2
- data/third_party/boringssl/crypto/modes/ctr.c +2 -1
- data/third_party/boringssl/crypto/modes/gcm.c +5 -3
- data/third_party/boringssl/crypto/obj/obj_dat.h +6 -3
- data/third_party/boringssl/crypto/pem/pem_all.c +83 -102
- data/third_party/boringssl/crypto/pem/pem_info.c +286 -309
- data/third_party/boringssl/crypto/pem/pem_lib.c +690 -710
- data/third_party/boringssl/crypto/pem/pem_oth.c +15 -16
- data/third_party/boringssl/crypto/pem/pem_pk8.c +132 -119
- data/third_party/boringssl/crypto/pem/pem_pkey.c +144 -220
- data/third_party/boringssl/crypto/pem/pem_x509.c +3 -3
- data/third_party/boringssl/crypto/pem/pem_xaux.c +5 -4
- data/third_party/boringssl/crypto/pkcs8/pkcs8.c +54 -60
- data/third_party/boringssl/crypto/poly1305/poly1305_arm.c +3 -1
- data/third_party/boringssl/crypto/poly1305/poly1305_vec.c +48 -50
- data/third_party/boringssl/crypto/rand/rand.c +2 -0
- data/third_party/boringssl/crypto/rsa/blinding.c +8 -48
- data/third_party/boringssl/crypto/rsa/internal.h +1 -9
- data/third_party/boringssl/crypto/rsa/padding.c +73 -77
- data/third_party/boringssl/crypto/rsa/rsa.c +1 -1
- data/third_party/boringssl/crypto/rsa/rsa_asn1.c +27 -46
- data/third_party/boringssl/crypto/rsa/rsa_impl.c +23 -34
- data/third_party/boringssl/crypto/test/scoped_types.h +3 -0
- data/third_party/boringssl/crypto/thread_win.c +15 -13
- data/third_party/boringssl/crypto/time_support.c +0 -6
- data/third_party/boringssl/crypto/x509/a_digest.c +26 -27
- data/third_party/boringssl/crypto/x509/a_sign.c +63 -64
- data/third_party/boringssl/crypto/x509/a_strex.c +482 -413
- data/third_party/boringssl/crypto/x509/a_verify.c +45 -51
- data/third_party/boringssl/crypto/x509/asn1_gen.c +715 -769
- data/third_party/boringssl/crypto/x509/by_dir.c +355 -393
- data/third_party/boringssl/crypto/x509/by_file.c +186 -206
- data/third_party/boringssl/crypto/x509/charmap.h +11 -11
- data/third_party/boringssl/crypto/x509/i2d_pr.c +21 -22
- data/third_party/boringssl/crypto/x509/t_crl.c +50 -51
- data/third_party/boringssl/crypto/x509/t_x509.c +414 -406
- data/third_party/boringssl/crypto/x509/t_x509a.c +44 -42
- data/third_party/boringssl/crypto/x509/vpm_int.h +13 -13
- data/third_party/boringssl/crypto/x509/x509_att.c +241 -219
- data/third_party/boringssl/crypto/x509/x509_cmp.c +343 -359
- data/third_party/boringssl/crypto/x509/x509_d2.c +36 -35
- data/third_party/boringssl/crypto/x509/x509_def.c +23 -13
- data/third_party/boringssl/crypto/x509/x509_ext.c +75 -75
- data/third_party/boringssl/crypto/x509/x509_lu.c +574 -612
- data/third_party/boringssl/crypto/x509/x509_obj.c +104 -115
- data/third_party/boringssl/crypto/x509/x509_r2x.c +40 -40
- data/third_party/boringssl/crypto/x509/x509_req.c +181 -174
- data/third_party/boringssl/crypto/x509/x509_set.c +71 -76
- data/third_party/boringssl/crypto/x509/x509_trs.c +193 -171
- data/third_party/boringssl/crypto/x509/x509_txt.c +135 -138
- data/third_party/boringssl/crypto/x509/x509_v3.c +174 -167
- data/third_party/boringssl/crypto/x509/x509_vfy.c +2079 -2130
- data/third_party/boringssl/crypto/x509/x509_vpm.c +486 -522
- data/third_party/boringssl/crypto/x509/x509cset.c +96 -99
- data/third_party/boringssl/crypto/x509/x509name.c +280 -275
- data/third_party/boringssl/crypto/x509/x509rset.c +15 -14
- data/third_party/boringssl/crypto/x509/x509spki.c +62 -60
- data/third_party/boringssl/crypto/x509/x509type.c +58 -60
- data/third_party/boringssl/crypto/x509/x_algor.c +70 -73
- data/third_party/boringssl/crypto/x509/x_all.c +282 -328
- data/third_party/boringssl/crypto/x509/x_attrib.c +36 -42
- data/third_party/boringssl/crypto/x509/x_crl.c +397 -418
- data/third_party/boringssl/crypto/x509/x_exten.c +5 -5
- data/third_party/boringssl/crypto/x509/x_info.c +30 -27
- data/third_party/boringssl/crypto/x509/x_name.c +387 -388
- data/third_party/boringssl/crypto/x509/x_pkey.c +32 -29
- data/third_party/boringssl/crypto/x509/x_pubkey.c +261 -280
- data/third_party/boringssl/crypto/x509/x_req.c +30 -33
- data/third_party/boringssl/crypto/x509/x_sig.c +2 -2
- data/third_party/boringssl/crypto/x509/x_spki.c +9 -7
- data/third_party/boringssl/crypto/x509/x_val.c +2 -2
- data/third_party/boringssl/crypto/x509/x_x509.c +120 -119
- data/third_party/boringssl/crypto/x509/x_x509a.c +99 -91
- data/third_party/boringssl/crypto/x509v3/ext_dat.h +57 -51
- data/third_party/boringssl/crypto/x509v3/pcy_cache.c +199 -214
- data/third_party/boringssl/crypto/x509v3/pcy_data.c +57 -64
- data/third_party/boringssl/crypto/x509v3/pcy_int.h +95 -90
- data/third_party/boringssl/crypto/x509v3/pcy_lib.c +86 -87
- data/third_party/boringssl/crypto/x509v3/pcy_map.c +61 -64
- data/third_party/boringssl/crypto/x509v3/pcy_node.c +108 -117
- data/third_party/boringssl/crypto/x509v3/pcy_tree.c +676 -724
- data/third_party/boringssl/crypto/x509v3/v3_akey.c +128 -136
- data/third_party/boringssl/crypto/x509v3/v3_akeya.c +7 -6
- data/third_party/boringssl/crypto/x509v3/v3_alt.c +499 -507
- data/third_party/boringssl/crypto/x509v3/v3_bcons.c +54 -47
- data/third_party/boringssl/crypto/x509v3/v3_bitst.c +67 -67
- data/third_party/boringssl/crypto/x509v3/v3_conf.c +330 -328
- data/third_party/boringssl/crypto/x509v3/v3_cpols.c +354 -338
- data/third_party/boringssl/crypto/x509v3/v3_crld.c +441 -496
- data/third_party/boringssl/crypto/x509v3/v3_enum.c +35 -33
- data/third_party/boringssl/crypto/x509v3/v3_extku.c +66 -63
- data/third_party/boringssl/crypto/x509v3/v3_genn.c +157 -159
- data/third_party/boringssl/crypto/x509v3/v3_ia5.c +45 -43
- data/third_party/boringssl/crypto/x509v3/v3_info.c +124 -112
- data/third_party/boringssl/crypto/x509v3/v3_int.c +30 -26
- data/third_party/boringssl/crypto/x509v3/v3_lib.c +231 -204
- data/third_party/boringssl/crypto/x509v3/v3_ncons.c +353 -381
- data/third_party/boringssl/crypto/x509v3/v3_pci.c +252 -270
- data/third_party/boringssl/crypto/x509v3/v3_pcia.c +9 -8
- data/third_party/boringssl/crypto/x509v3/v3_pcons.c +58 -61
- data/third_party/boringssl/crypto/x509v3/v3_pku.c +35 -34
- data/third_party/boringssl/crypto/x509v3/v3_pmaps.c +72 -74
- data/third_party/boringssl/crypto/x509v3/v3_prn.c +146 -121
- data/third_party/boringssl/crypto/x509v3/v3_purp.c +651 -582
- data/third_party/boringssl/crypto/x509v3/v3_skey.c +76 -72
- data/third_party/boringssl/crypto/x509v3/v3_sxnet.c +139 -131
- data/third_party/boringssl/crypto/x509v3/v3_utl.c +1072 -1068
- data/third_party/boringssl/include/openssl/asn1.h +40 -38
- data/third_party/boringssl/include/openssl/base.h +10 -1
- data/third_party/boringssl/include/openssl/bio.h +10 -11
- data/third_party/boringssl/include/openssl/bn.h +12 -9
- data/third_party/boringssl/include/openssl/buf.h +1 -1
- data/third_party/boringssl/include/openssl/bytestring.h +29 -0
- data/third_party/boringssl/include/openssl/conf.h +25 -0
- data/third_party/boringssl/include/openssl/crypto.h +6 -1
- data/third_party/boringssl/include/openssl/curve25519.h +6 -3
- data/third_party/boringssl/include/openssl/dh.h +7 -3
- data/third_party/boringssl/include/openssl/dsa.h +108 -51
- data/third_party/boringssl/include/openssl/ec.h +46 -21
- data/third_party/boringssl/include/openssl/ec_key.h +78 -42
- data/third_party/boringssl/include/openssl/ecdsa.h +4 -4
- data/third_party/boringssl/include/openssl/err.h +3 -2
- data/third_party/boringssl/include/openssl/evp.h +120 -37
- data/third_party/boringssl/include/openssl/mem.h +4 -13
- data/third_party/boringssl/include/openssl/obj_mac.h +4 -0
- data/third_party/boringssl/include/openssl/pem.h +0 -9
- data/third_party/boringssl/include/openssl/pkcs8.h +6 -2
- data/third_party/boringssl/include/openssl/rand.h +3 -0
- data/third_party/boringssl/include/openssl/rsa.h +42 -42
- data/third_party/boringssl/include/openssl/ssl.h +115 -41
- data/third_party/boringssl/include/openssl/stack.h +0 -3
- data/third_party/boringssl/include/openssl/stack_macros.h +0 -256
- data/third_party/boringssl/include/openssl/tls1.h +1 -1
- data/third_party/boringssl/include/openssl/x509.h +0 -2
- data/third_party/boringssl/include/openssl/x509_vfy.h +5 -0
- data/third_party/boringssl/ssl/d1_both.c +102 -101
- data/third_party/boringssl/ssl/d1_clnt.c +145 -150
- data/third_party/boringssl/ssl/d1_lib.c +63 -62
- data/third_party/boringssl/ssl/d1_pkt.c +73 -71
- data/third_party/boringssl/ssl/d1_srvr.c +116 -125
- data/third_party/boringssl/ssl/dtls_record.c +3 -3
- data/third_party/boringssl/ssl/internal.h +210 -208
- data/third_party/boringssl/ssl/pqueue/pqueue.c +2 -2
- data/third_party/boringssl/ssl/s3_both.c +116 -130
- data/third_party/boringssl/ssl/s3_clnt.c +589 -740
- data/third_party/boringssl/ssl/s3_enc.c +52 -151
- data/third_party/boringssl/ssl/s3_lib.c +70 -76
- data/third_party/boringssl/ssl/s3_pkt.c +105 -144
- data/third_party/boringssl/ssl/s3_srvr.c +542 -806
- data/third_party/boringssl/ssl/ssl_aead_ctx.c +1 -1
- data/third_party/boringssl/ssl/ssl_cert.c +2 -2
- data/third_party/boringssl/ssl/ssl_cipher.c +7 -3
- data/third_party/boringssl/ssl/ssl_ecdh.c +374 -0
- data/third_party/boringssl/ssl/ssl_lib.c +260 -221
- data/third_party/boringssl/ssl/ssl_session.c +17 -17
- data/third_party/boringssl/ssl/t1_enc.c +128 -273
- data/third_party/boringssl/ssl/t1_lib.c +134 -258
- data/third_party/boringssl/ssl/test/test_config.h +2 -0
- data/third_party/boringssl/ssl/tls_record.c +52 -15
- metadata +385 -359
- data/src/core/channel/client_uchannel.c +0 -243
- data/src/core/channel/client_uchannel.h +0 -60
- data/src/core/channel/connected_channel.h +0 -51
- data/src/core/client_config/lb_policies/pick_first.h +0 -43
- data/src/core/client_config/resolvers/dns_resolver.h +0 -42
- data/src/core/client_config/subchannel_factory.h +0 -66
- data/src/core/httpcli/parser.c +0 -211
- data/src/core/iomgr/fd_posix.c +0 -451
- data/src/core/iomgr/fd_posix.h +0 -192
- data/src/core/iomgr/pollset_multipoller_with_epoll.c +0 -324
- data/src/core/iomgr/pollset_multipoller_with_poll_posix.c +0 -234
- data/src/core/iomgr/pollset_posix.c +0 -633
- data/src/core/iomgr/pollset_posix.h +0 -153
- data/src/core/iomgr/pollset_set_posix.c +0 -202
- data/src/core/iomgr/pollset_set_posix.h +0 -45
- data/src/core/surface/init.c +0 -174
- data/src/core/surface/init_secure.c +0 -42
- data/src/core/surface/server_create.c +0 -48
- data/src/core/transport/chttp2/huffsyms.c +0 -297
- data/src/ruby/bin/grpc_ruby_interop_client +0 -33
- data/src/ruby/bin/grpc_ruby_interop_server +0 -33
- 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
|
-
|
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
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
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
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
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
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
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
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
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
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
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
|
-
|
200
|
+
return 0;
|
226
201
|
}
|
227
202
|
|
228
|
-
int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm,
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
|
251
|
-
|
252
|
-
|
253
|
-
|
254
|
-
|
255
|
-
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
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
|
-
|
271
|
-
|
272
|
-
|
273
|
-
|
274
|
-
|
275
|
-
|
276
|
-
|
277
|
-
|
278
|
-
|
279
|
-
|
280
|
-
|
281
|
-
|
282
|
-
|
283
|
-
|
284
|
-
|
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
|
-
|
290
|
-
|
291
|
-
|
292
|
-
|
293
|
-
|
294
|
-
|
295
|
-
|
296
|
-
|
297
|
-
|
298
|
-
|
299
|
-
|
300
|
-
|
301
|
-
|
302
|
-
|
303
|
-
|
304
|
-
|
305
|
-
|
306
|
-
|
307
|
-
|
308
|
-
|
309
|
-
|
310
|
-
|
311
|
-
|
312
|
-
|
313
|
-
|
314
|
-
|
315
|
-
|
316
|
-
|
317
|
-
|
318
|
-
|
319
|
-
|
320
|
-
|
321
|
-
|
322
|
-
|
323
|
-
|
324
|
-
|
325
|
-
|
326
|
-
|
327
|
-
|
328
|
-
|
329
|
-
|
330
|
-
|
331
|
-
|
332
|
-
|
333
|
-
|
334
|
-
|
335
|
-
|
336
|
-
|
337
|
-
|
338
|
-
|
339
|
-
|
340
|
-
|
341
|
-
|
342
|
-
|
343
|
-
|
344
|
-
|
345
|
-
|
346
|
-
|
347
|
-
|
348
|
-
|
349
|
-
|
350
|
-
|
351
|
-
|
352
|
-
|
353
|
-
|
354
|
-
|
355
|
-
|
356
|
-
|
357
|
-
|
358
|
-
|
359
|
-
|
360
|
-
|
361
|
-
|
362
|
-
|
363
|
-
|
364
|
-
|
365
|
-
|
366
|
-
|
367
|
-
|
368
|
-
|
369
|
-
|
370
|
-
|
371
|
-
|
372
|
-
|
373
|
-
|
374
|
-
|
375
|
-
|
376
|
-
|
377
|
-
|
378
|
-
|
379
|
-
|
380
|
-
|
381
|
-
|
382
|
-
|
383
|
-
|
384
|
-
|
385
|
-
|
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
|
-
|
395
|
-
|
396
|
-
|
397
|
-
|
398
|
-
|
399
|
-
|
400
|
-
|
401
|
-
|
402
|
-
|
403
|
-
|
404
|
-
|
405
|
-
|
406
|
-
|
407
|
-
|
408
|
-
|
409
|
-
|
410
|
-
|
411
|
-
|
412
|
-
|
413
|
-
|
414
|
-
|
415
|
-
|
416
|
-
|
417
|
-
|
418
|
-
|
419
|
-
|
420
|
-
|
421
|
-
|
422
|
-
|
423
|
-
|
424
|
-
|
425
|
-
|
426
|
-
|
427
|
-
|
428
|
-
|
429
|
-
|
430
|
-
|
431
|
-
|
432
|
-
|
433
|
-
|
434
|
-
|
435
|
-
|
436
|
-
|
437
|
-
|
438
|
-
|
439
|
-
static const EVP_CIPHER*
|
440
|
-
|
441
|
-
|
442
|
-
|
443
|
-
|
444
|
-
|
445
|
-
|
446
|
-
|
447
|
-
|
448
|
-
|
449
|
-
|
450
|
-
|
451
|
-
|
452
|
-
|
453
|
-
|
454
|
-
|
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
|
-
|
461
|
-
|
462
|
-
|
463
|
-
|
464
|
-
|
465
|
-
|
466
|
-
|
467
|
-
|
468
|
-
|
469
|
-
|
470
|
-
|
471
|
-
|
472
|
-
|
473
|
-
|
474
|
-
|
475
|
-
|
476
|
-
|
477
|
-
|
478
|
-
|
479
|
-
|
480
|
-
|
481
|
-
|
482
|
-
|
483
|
-
|
484
|
-
|
485
|
-
|
486
|
-
|
487
|
-
|
488
|
-
|
489
|
-
|
490
|
-
|
491
|
-
|
492
|
-
|
493
|
-
|
494
|
-
|
495
|
-
|
496
|
-
|
497
|
-
|
498
|
-
|
499
|
-
|
500
|
-
|
501
|
-
|
502
|
-
|
503
|
-
|
504
|
-
|
505
|
-
|
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
|
-
|
511
|
-
|
512
|
-
|
513
|
-
|
514
|
-
|
515
|
-
|
516
|
-
|
517
|
-
|
518
|
-
|
519
|
-
|
520
|
-
|
521
|
-
|
522
|
-
|
523
|
-
|
524
|
-
|
525
|
-
|
526
|
-
|
527
|
-
|
528
|
-
|
529
|
-
|
530
|
-
|
531
|
-
|
532
|
-
|
533
|
-
|
534
|
-
|
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
|
-
|
540
|
-
|
541
|
-
|
542
|
-
|
543
|
-
|
544
|
-
|
545
|
-
|
546
|
-
|
547
|
-
|
548
|
-
|
549
|
-
|
550
|
-
|
551
|
-
|
552
|
-
|
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
|
-
|
558
|
-
|
559
|
-
|
560
|
-
|
561
|
-
|
562
|
-
|
563
|
-
|
564
|
-
|
565
|
-
|
566
|
-
|
567
|
-
|
568
|
-
|
569
|
-
|
570
|
-
|
571
|
-
|
572
|
-
|
573
|
-
|
574
|
-
|
575
|
-
|
576
|
-
|
577
|
-
|
578
|
-
|
579
|
-
|
580
|
-
|
581
|
-
|
582
|
-
|
583
|
-
|
584
|
-
|
585
|
-
|
586
|
-
|
587
|
-
|
588
|
-
|
589
|
-
|
590
|
-
|
591
|
-
|
592
|
-
|
593
|
-
|
594
|
-
|
595
|
-
|
596
|
-
|
597
|
-
|
598
|
-
|
599
|
-
|
600
|
-
|
601
|
-
|
602
|
-
|
603
|
-
|
604
|
-
|
605
|
-
|
606
|
-
|
607
|
-
|
608
|
-
|
609
|
-
|
610
|
-
|
611
|
-
|
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
|
-
|
620
|
-
|
621
|
-
|
622
|
-
|
623
|
-
|
624
|
-
|
625
|
-
|
626
|
-
|
627
|
-
|
628
|
-
|
629
|
-
|
630
|
-
|
631
|
-
|
632
|
-
|
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
|
-
|
638
|
-
|
639
|
-
|
640
|
-
|
641
|
-
|
642
|
-
|
643
|
-
|
644
|
-
|
645
|
-
|
646
|
-
|
647
|
-
|
648
|
-
|
649
|
-
|
650
|
-
|
651
|
-
|
652
|
-
|
653
|
-
|
654
|
-
|
655
|
-
|
656
|
-
|
657
|
-
|
658
|
-
|
659
|
-
|
660
|
-
|
661
|
-
|
662
|
-
|
663
|
-
|
664
|
-
|
665
|
-
|
666
|
-
|
667
|
-
|
668
|
-
|
669
|
-
|
670
|
-
|
671
|
-
|
672
|
-
|
673
|
-
|
674
|
-
|
675
|
-
|
676
|
-
|
677
|
-
|
678
|
-
|
679
|
-
|
680
|
-
|
681
|
-
|
682
|
-
|
683
|
-
|
684
|
-
|
685
|
-
|
686
|
-
|
687
|
-
|
688
|
-
|
689
|
-
|
690
|
-
|
691
|
-
|
692
|
-
|
693
|
-
|
694
|
-
|
695
|
-
|
696
|
-
|
697
|
-
|
698
|
-
|
699
|
-
|
700
|
-
|
701
|
-
|
702
|
-
|
703
|
-
|
704
|
-
|
705
|
-
|
706
|
-
|
707
|
-
|
708
|
-
|
709
|
-
|
710
|
-
|
711
|
-
|
712
|
-
|
713
|
-
|
714
|
-
|
715
|
-
|
716
|
-
|
717
|
-
|
718
|
-
|
719
|
-
|
720
|
-
|
721
|
-
|
722
|
-
|
723
|
-
|
724
|
-
|
725
|
-
|
726
|
-
|
727
|
-
|
728
|
-
|
729
|
-
|
730
|
-
|
731
|
-
|
732
|
-
|
733
|
-
|
734
|
-
|
735
|
-
|
736
|
-
|
737
|
-
|
738
|
-
|
739
|
-
|
740
|
-
|
741
|
-
|
742
|
-
|
743
|
-
|
744
|
-
|
745
|
-
|
746
|
-
|
747
|
-
|
748
|
-
|
749
|
-
|
750
|
-
|
751
|
-
|
752
|
-
|
753
|
-
|
754
|
-
|
755
|
-
|
756
|
-
|
757
|
-
|
758
|
-
|
759
|
-
|
760
|
-
|
761
|
-
|
762
|
-
|
763
|
-
|
764
|
-
|
765
|
-
|
766
|
-
|
767
|
-
|
768
|
-
|
769
|
-
|
770
|
-
|
771
|
-
|
772
|
-
|
773
|
-
|
774
|
-
|
775
|
-
|
776
|
-
|
777
|
-
|
778
|
-
|
779
|
-
|
780
|
-
|
781
|
-
|
782
|
-
|
783
|
-
|
784
|
-
|
785
|
-
|
786
|
-
|
787
|
-
|
788
|
-
|
789
|
-
|
790
|
-
|
791
|
-
|
792
|
-
|
793
|
-
|
794
|
-
|
795
|
-
|
796
|
-
|
797
|
-
|
798
|
-
|
799
|
-
|
800
|
-
|
801
|
-
|
802
|
-
|
803
|
-
|
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
|
-
|
809
|
-
|
810
|
-
|
811
|
-
|
812
|
-
|
813
|
-
|
814
|
-
|
815
|
-
|
816
|
-
|
817
|
-
|
818
|
-
|
819
|
-
|
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
|
-
|
825
|
-
|
826
|
-
|
827
|
-
|
828
|
-
|
829
|
-
|
830
|
-
|
831
|
-
|
832
|
-
|
833
|
-
|
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
|
+
}
|