grpc 1.9.1 → 1.10.0.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 +2654 -953
- data/etc/roots.pem +282 -683
- data/include/grpc/compression.h +9 -26
- data/include/grpc/grpc.h +10 -24
- data/include/grpc/grpc_security.h +7 -1
- data/include/grpc/impl/codegen/compression_types.h +5 -62
- data/include/grpc/impl/codegen/grpc_types.h +10 -6
- data/include/grpc/module.modulemap +1 -10
- data/include/grpc/support/alloc.h +3 -2
- data/include/grpc/support/log.h +1 -2
- data/{src/core/lib/gpr/thd_internal.h → include/grpc/support/thd_id.h} +23 -9
- data/src/boringssl/err_data.c +550 -496
- data/src/core/ext/census/grpc_context.cc +2 -1
- data/src/core/ext/filters/client_channel/backup_poller.cc +5 -4
- data/src/core/ext/filters/client_channel/channel_connectivity.cc +7 -7
- data/src/core/ext/filters/client_channel/client_channel.cc +162 -172
- data/src/core/ext/filters/client_channel/client_channel_factory.cc +4 -2
- data/src/core/ext/filters/client_channel/client_channel_plugin.cc +10 -10
- data/src/core/ext/filters/client_channel/http_connect_handshaker.cc +18 -14
- data/src/core/ext/filters/client_channel/http_proxy.cc +3 -1
- data/src/core/ext/filters/client_channel/lb_policy.cc +21 -105
- data/src/core/ext/filters/client_channel/lb_policy.h +166 -170
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc +41 -36
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +1452 -1459
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h +1 -1
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc +3 -2
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc +7 -8
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +27 -27
- data/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +279 -304
- data/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +358 -330
- data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc +30 -41
- data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +7 -14
- data/src/core/ext/filters/client_channel/lb_policy_factory.cc +8 -21
- data/src/core/ext/filters/client_channel/lb_policy_factory.h +23 -27
- data/src/core/ext/filters/client_channel/lb_policy_registry.cc +58 -33
- data/src/core/ext/filters/client_channel/lb_policy_registry.h +25 -12
- data/src/core/ext/filters/client_channel/parse_address.cc +10 -8
- data/src/core/ext/filters/client_channel/proxy_mapper_registry.cc +2 -2
- data/src/core/ext/filters/client_channel/resolver.cc +6 -52
- data/src/core/ext/filters/client_channel/resolver.h +98 -55
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +266 -237
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +5 -5
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +31 -27
- data/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +244 -207
- data/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +161 -148
- data/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h +47 -31
- data/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc +126 -126
- data/src/core/ext/filters/client_channel/resolver_factory.h +33 -32
- data/src/core/ext/filters/client_channel/resolver_registry.cc +110 -90
- data/src/core/ext/filters/client_channel/resolver_registry.h +49 -36
- data/src/core/ext/filters/client_channel/retry_throttle.cc +29 -22
- data/src/core/ext/filters/client_channel/subchannel.cc +173 -173
- data/src/core/ext/filters/client_channel/subchannel.h +38 -45
- data/src/core/ext/filters/client_channel/subchannel_index.cc +44 -40
- data/src/core/ext/filters/client_channel/uri_parser.cc +3 -3
- data/src/core/ext/filters/deadline/deadline_filter.cc +27 -18
- data/src/core/ext/filters/http/client/http_client_filter.cc +26 -23
- data/src/core/ext/filters/http/http_filters_plugin.cc +3 -2
- data/src/core/ext/filters/http/message_compress/message_compress_filter.cc +78 -110
- data/src/core/ext/filters/http/server/http_server_filter.cc +29 -26
- data/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +9 -11
- data/src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc +2 -1
- data/src/core/ext/filters/max_age/max_age_filter.cc +14 -14
- data/src/core/ext/filters/message_size/message_size_filter.cc +20 -18
- data/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc +4 -4
- data/src/core/ext/filters/workarounds/workaround_utils.cc +4 -4
- data/src/core/ext/transport/chttp2/alpn/alpn.cc +2 -1
- data/src/core/ext/transport/chttp2/client/chttp2_connector.cc +10 -10
- data/src/core/ext/transport/chttp2/client/insecure/channel_create.cc +4 -4
- data/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +11 -12
- data/src/core/ext/transport/chttp2/server/chttp2_server.cc +16 -13
- data/src/core/ext/transport/chttp2/transport/bin_decoder.cc +36 -9
- data/src/core/ext/transport/chttp2/transport/bin_decoder.h +3 -0
- data/src/core/ext/transport/chttp2/transport/bin_encoder.cc +17 -14
- data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +139 -145
- data/src/core/ext/transport/chttp2/transport/flow_control.cc +16 -14
- data/src/core/ext/transport/chttp2/transport/flow_control.h +8 -7
- data/src/core/ext/transport/chttp2/transport/frame_data.cc +35 -33
- data/src/core/ext/transport/chttp2/transport/frame_goaway.cc +27 -25
- data/src/core/ext/transport/chttp2/transport/frame_ping.cc +12 -12
- data/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +16 -15
- data/src/core/ext/transport/chttp2/transport/frame_settings.cc +19 -19
- data/src/core/ext/transport/chttp2/transport/frame_window_update.cc +11 -11
- data/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +23 -22
- data/src/core/ext/transport/chttp2/transport/hpack_parser.cc +35 -35
- data/src/core/ext/transport/chttp2/transport/hpack_table.cc +10 -7
- data/src/core/ext/transport/chttp2/transport/http2_settings.cc +2 -2
- data/src/core/ext/transport/chttp2/transport/incoming_metadata.cc +2 -2
- data/src/core/ext/transport/chttp2/transport/internal.h +1 -1
- data/src/core/ext/transport/chttp2/transport/parsing.cc +35 -39
- data/src/core/ext/transport/chttp2/transport/stream_map.cc +8 -7
- data/src/core/ext/transport/chttp2/transport/varint.cc +5 -5
- data/src/core/ext/transport/chttp2/transport/writing.cc +18 -18
- data/src/core/ext/transport/inproc/inproc_transport.cc +43 -23
- data/src/core/lib/{gpr → avl}/avl.cc +61 -57
- data/{include/grpc/support → src/core/lib/avl}/avl.h +25 -35
- data/src/core/lib/backoff/backoff.cc +6 -5
- data/src/core/lib/channel/channel_args.cc +23 -109
- data/src/core/lib/channel/channel_args.h +5 -31
- data/src/core/lib/channel/channel_stack.cc +11 -8
- data/src/core/lib/channel/channel_stack_builder.cc +10 -7
- data/src/core/lib/channel/connected_channel.cc +18 -17
- data/src/core/lib/channel/handshaker.cc +8 -8
- data/src/core/lib/channel/handshaker_registry.cc +3 -2
- data/src/core/lib/compression/algorithm_metadata.h +13 -6
- data/src/core/lib/compression/compression.cc +72 -183
- data/src/core/lib/compression/compression_internal.cc +274 -0
- data/src/core/lib/compression/compression_internal.h +86 -0
- data/src/core/lib/compression/message_compress.cc +15 -15
- data/src/core/lib/compression/message_compress.h +4 -3
- data/src/core/lib/compression/stream_compression_gzip.cc +8 -8
- data/src/core/lib/compression/stream_compression_identity.cc +1 -1
- data/src/core/lib/debug/stats.cc +10 -8
- data/src/core/lib/debug/stats_data.cc +2 -1
- data/src/core/lib/debug/trace.cc +3 -3
- data/src/core/lib/gpr/alloc.cc +7 -11
- data/src/core/lib/gpr/arena.cc +34 -12
- data/src/core/lib/gpr/atm.cc +2 -1
- data/src/core/lib/gpr/cpu_linux.cc +3 -3
- data/src/core/lib/gpr/cpu_posix.cc +2 -1
- data/src/core/lib/gpr/env.h +1 -1
- data/src/core/lib/gpr/env_linux.cc +1 -1
- data/src/core/lib/gpr/env_windows.cc +4 -4
- data/src/core/lib/gpr/fork.cc +16 -2
- data/src/core/lib/gpr/host_port.cc +5 -4
- data/{include/grpc/support → src/core/lib/gpr}/host_port.h +5 -13
- data/src/core/lib/gpr/log.cc +5 -4
- data/src/core/lib/gpr/log_linux.cc +1 -1
- data/src/core/lib/gpr/mpscq.cc +1 -0
- data/src/core/lib/gpr/murmur_hash.cc +4 -4
- data/src/core/lib/gpr/string.cc +19 -16
- data/src/core/lib/gpr/string_posix.cc +3 -3
- data/src/core/lib/gpr/sync_posix.cc +5 -9
- data/src/core/lib/gpr/thd.cc +3 -3
- data/{include/grpc/support → src/core/lib/gpr}/thd.h +20 -28
- data/src/core/lib/gpr/thd_posix.cc +6 -4
- data/src/core/lib/gpr/thd_windows.cc +3 -1
- data/src/core/lib/gpr/time.cc +6 -4
- data/src/core/lib/gpr/time_posix.cc +2 -2
- data/{include/grpc/support → src/core/lib/gpr}/tls.h +6 -6
- data/{include/grpc/support → src/core/lib/gpr}/tls_gcc.h +3 -3
- data/{include/grpc/support → src/core/lib/gpr}/tls_msvc.h +3 -3
- data/src/core/lib/gpr/tls_pthread.cc +1 -1
- data/{include/grpc/support → src/core/lib/gpr}/tls_pthread.h +3 -3
- data/{include/grpc/support → src/core/lib/gpr}/useful.h +3 -3
- data/src/core/lib/{gpr++ → gprpp}/abstract.h +3 -3
- data/src/core/lib/{gpr++ → gprpp}/atomic.h +5 -5
- data/src/core/lib/{gpr++ → gprpp}/atomic_with_atm.h +3 -3
- data/src/core/lib/{gpr++ → gprpp}/atomic_with_std.h +3 -3
- data/src/core/lib/{gpr++ → gprpp}/debug_location.h +3 -3
- data/src/core/lib/{gpr++ → gprpp}/inlined_vector.h +44 -22
- data/src/core/lib/{gpr++ → gprpp}/manual_constructor.h +2 -2
- data/src/core/lib/{gpr++ → gprpp}/memory.h +14 -5
- data/src/core/lib/{gpr++ → gprpp}/orphanable.h +39 -14
- data/src/core/lib/{gpr++ → gprpp}/ref_counted.h +42 -10
- data/src/core/lib/{gpr++ → gprpp}/ref_counted_ptr.h +18 -8
- data/src/core/lib/http/format_request.cc +3 -3
- data/src/core/lib/http/httpcli.cc +6 -7
- data/src/core/lib/http/httpcli_security_connector.cc +10 -10
- data/src/core/lib/http/parser.cc +16 -12
- data/src/core/lib/iomgr/call_combiner.cc +12 -13
- data/src/core/lib/iomgr/closure.h +4 -6
- data/src/core/lib/iomgr/combiner.cc +10 -21
- data/src/core/lib/iomgr/error.cc +50 -55
- data/src/core/lib/iomgr/ev_epoll1_linux.cc +41 -52
- data/src/core/lib/iomgr/ev_epollex_linux.cc +80 -28
- data/src/core/lib/iomgr/ev_epollsig_linux.cc +23 -30
- data/src/core/lib/iomgr/ev_poll_posix.cc +52 -46
- data/src/core/lib/iomgr/ev_posix.cc +47 -6
- data/src/core/lib/iomgr/exec_ctx.cc +10 -10
- data/src/core/lib/iomgr/exec_ctx.h +1 -1
- data/src/core/lib/iomgr/executor.cc +16 -13
- data/src/core/lib/iomgr/fork_posix.cc +1 -3
- data/src/core/lib/iomgr/gethostname_host_name_max.cc +1 -1
- data/src/core/lib/iomgr/iocp_windows.cc +1 -2
- data/src/core/lib/iomgr/iomgr.cc +2 -2
- data/src/core/lib/iomgr/iomgr_uv.cc +2 -0
- data/src/core/lib/iomgr/iomgr_uv.h +1 -1
- data/src/core/lib/iomgr/is_epollexclusive_available.cc +5 -4
- data/src/core/lib/iomgr/load_file.cc +3 -3
- data/src/core/lib/iomgr/pollset_windows.cc +1 -1
- data/src/core/lib/iomgr/resolve_address_posix.cc +10 -9
- data/src/core/lib/iomgr/resolve_address_uv.cc +2 -2
- data/src/core/lib/iomgr/resolve_address_windows.cc +3 -2
- data/src/core/lib/iomgr/resource_quota.cc +36 -34
- data/src/core/lib/iomgr/sockaddr_utils.cc +39 -23
- data/src/core/lib/iomgr/socket_factory_posix.cc +5 -5
- data/src/core/lib/iomgr/socket_mutator.cc +7 -7
- data/src/core/lib/iomgr/socket_utils_common_posix.cc +7 -4
- data/src/core/lib/iomgr/socket_utils_linux.cc +3 -2
- data/src/core/lib/iomgr/tcp_client_posix.cc +7 -6
- data/src/core/lib/iomgr/tcp_client_windows.cc +0 -1
- data/src/core/lib/iomgr/tcp_posix.cc +47 -55
- data/src/core/lib/iomgr/tcp_server_posix.cc +12 -10
- data/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +7 -5
- data/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc +4 -3
- data/src/core/lib/iomgr/tcp_windows.cc +1 -1
- data/src/core/lib/iomgr/timer_generic.cc +16 -14
- data/src/core/lib/iomgr/timer_heap.cc +8 -7
- data/src/core/lib/iomgr/timer_manager.cc +4 -3
- data/src/core/lib/iomgr/udp_server.cc +24 -16
- data/src/core/lib/iomgr/unix_sockets_posix.cc +15 -10
- data/src/core/lib/iomgr/wakeup_fd_cv.cc +6 -5
- data/src/core/lib/iomgr/wakeup_fd_eventfd.cc +1 -2
- data/src/core/lib/json/json.cc +1 -1
- data/src/core/lib/json/json_reader.cc +8 -6
- data/src/core/lib/json/json_string.cc +19 -18
- data/src/core/lib/json/json_writer.cc +10 -8
- data/src/core/lib/profiling/basic_timers.cc +1 -1
- data/src/core/lib/profiling/timers.h +3 -20
- data/src/core/lib/security/context/security_context.cc +16 -14
- data/src/core/lib/security/credentials/composite/composite_credentials.cc +17 -14
- data/src/core/lib/security/credentials/credentials.cc +9 -8
- data/src/core/lib/security/credentials/credentials.h +1 -1
- data/src/core/lib/security/credentials/credentials_metadata.cc +2 -2
- data/src/core/lib/security/credentials/fake/fake_credentials.cc +12 -13
- data/src/core/lib/security/credentials/google_default/google_default_credentials.cc +7 -4
- data/src/core/lib/security/credentials/iam/iam_credentials.cc +5 -3
- data/src/core/lib/security/credentials/jwt/json_token.cc +4 -3
- data/src/core/lib/security/credentials/jwt/jwt_credentials.cc +7 -7
- data/src/core/lib/security/credentials/jwt/jwt_verifier.cc +21 -18
- data/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +23 -18
- data/src/core/lib/security/credentials/plugin/plugin_credentials.cc +11 -7
- data/src/core/lib/security/credentials/ssl/ssl_credentials.cc +22 -21
- data/src/core/lib/security/{transport → security_connector}/security_connector.cc +46 -43
- data/src/core/lib/security/{transport → security_connector}/security_connector.h +3 -3
- data/src/core/lib/security/transport/client_auth_filter.cc +32 -34
- data/src/core/lib/security/transport/lb_targets_info.cc +7 -5
- data/src/core/lib/security/transport/secure_endpoint.cc +21 -21
- data/src/core/lib/security/transport/security_handshaker.cc +19 -18
- data/src/core/lib/security/transport/security_handshaker.h +1 -1
- data/src/core/lib/security/transport/server_auth_filter.cc +21 -21
- data/src/core/lib/slice/b64.cc +19 -16
- data/src/core/lib/slice/percent_encoding.cc +5 -5
- data/src/core/lib/slice/slice.cc +35 -33
- data/src/core/lib/slice/slice_buffer.cc +16 -14
- data/src/core/lib/slice/slice_hash_table.cc +3 -2
- data/src/core/lib/slice/slice_intern.cc +21 -25
- data/src/core/lib/slice/slice_string_helpers.cc +45 -9
- data/src/core/lib/slice/slice_string_helpers.h +6 -0
- data/src/core/lib/surface/byte_buffer.cc +2 -2
- data/src/core/lib/surface/byte_buffer_reader.cc +6 -3
- data/src/core/lib/surface/call.cc +171 -260
- data/src/core/lib/surface/call_test_only.h +1 -13
- data/src/core/lib/surface/channel.cc +20 -43
- data/src/core/lib/surface/channel_init.cc +7 -7
- data/src/core/lib/surface/channel_ping.cc +2 -2
- data/src/core/lib/surface/completion_queue.cc +69 -75
- data/src/core/lib/surface/init.cc +4 -5
- data/src/core/lib/surface/init_secure.cc +1 -1
- data/src/core/lib/surface/lame_client.cc +1 -1
- data/src/core/lib/surface/server.cc +64 -59
- data/src/core/lib/surface/version.cc +2 -2
- data/src/core/lib/transport/bdp_estimator.cc +6 -5
- data/src/core/lib/transport/byte_stream.cc +23 -14
- data/src/core/lib/transport/byte_stream.h +1 -1
- data/src/core/lib/transport/connectivity_state.cc +9 -13
- data/src/core/lib/transport/error_utils.cc +10 -7
- data/src/core/lib/transport/metadata.cc +27 -26
- data/src/core/lib/transport/metadata.h +1 -1
- data/src/core/lib/transport/pid_controller.cc +2 -1
- data/src/core/lib/transport/service_config.cc +5 -5
- data/src/core/lib/transport/static_metadata.cc +225 -222
- data/src/core/lib/transport/static_metadata.h +77 -76
- data/src/core/lib/transport/timeout_encoding.cc +3 -2
- data/src/core/lib/transport/transport.cc +6 -5
- data/src/core/lib/transport/transport_op_string.cc +0 -1
- data/src/core/plugin_registry/grpc_plugin_registry.cc +4 -4
- data/src/core/tsi/alts_transport_security.cc +61 -0
- data/src/core/tsi/{gts_transport_security.h → alts_transport_security.h} +16 -8
- data/src/core/tsi/fake_transport_security.cc +59 -43
- data/src/core/tsi/ssl_transport_security.cc +122 -107
- data/src/core/tsi/transport_security.cc +3 -3
- data/src/core/tsi/transport_security_adapter.cc +16 -10
- data/src/ruby/bin/apis/pubsub_demo.rb +1 -1
- data/src/ruby/ext/grpc/rb_channel.c +3 -4
- data/src/ruby/ext/grpc/rb_compression_options.c +13 -3
- data/src/ruby/ext/grpc/rb_grpc_imports.generated.c +4 -76
- data/src/ruby/ext/grpc/rb_grpc_imports.generated.h +8 -120
- data/src/ruby/ext/grpc/rb_server.c +52 -28
- data/src/ruby/lib/grpc/generic/rpc_server.rb +7 -4
- data/src/ruby/lib/grpc/version.rb +1 -1
- data/src/ruby/pb/test/client.rb +1 -1
- data/src/ruby/pb/test/server.rb +1 -1
- data/src/ruby/spec/client_server_spec.rb +4 -2
- data/src/ruby/spec/generic/active_call_spec.rb +2 -1
- data/src/ruby/spec/generic/client_stub_spec.rb +32 -8
- data/src/ruby/spec/server_spec.rb +26 -7
- data/third_party/boringssl/crypto/asn1/a_bitstr.c +7 -2
- data/third_party/boringssl/crypto/asn1/a_d2i_fp.c +15 -0
- data/third_party/boringssl/crypto/asn1/a_gentm.c +1 -1
- data/third_party/boringssl/crypto/asn1/a_print.c +0 -28
- data/third_party/boringssl/crypto/asn1/a_strnid.c +3 -0
- data/third_party/boringssl/crypto/asn1/a_time.c +17 -9
- data/third_party/boringssl/crypto/asn1/a_utctm.c +1 -1
- data/third_party/boringssl/crypto/asn1/asn1_lib.c +5 -49
- data/third_party/boringssl/crypto/asn1/asn1_locl.h +1 -1
- data/third_party/boringssl/crypto/asn1/tasn_dec.c +9 -9
- data/third_party/boringssl/crypto/asn1/tasn_enc.c +0 -6
- data/third_party/boringssl/crypto/asn1/time_support.c +5 -5
- data/third_party/boringssl/crypto/base64/base64.c +65 -43
- data/third_party/boringssl/crypto/bio/bio.c +134 -110
- data/third_party/boringssl/crypto/bio/bio_mem.c +9 -9
- data/third_party/boringssl/crypto/bio/connect.c +17 -17
- data/third_party/boringssl/crypto/bio/fd.c +2 -1
- data/third_party/boringssl/crypto/bio/file.c +14 -14
- data/third_party/boringssl/crypto/bio/hexdump.c +15 -16
- data/third_party/boringssl/crypto/bio/internal.h +14 -14
- data/third_party/boringssl/crypto/bio/pair.c +45 -45
- data/third_party/boringssl/crypto/bio/printf.c +6 -10
- data/third_party/boringssl/crypto/{bn → bn_extra}/bn_asn1.c +9 -9
- data/third_party/boringssl/crypto/{bn → bn_extra}/convert.c +18 -223
- data/third_party/boringssl/crypto/buf/buf.c +20 -44
- data/third_party/boringssl/crypto/bytestring/ber.c +35 -35
- data/third_party/boringssl/crypto/bytestring/cbb.c +24 -24
- data/third_party/boringssl/crypto/bytestring/cbs.c +33 -37
- data/third_party/boringssl/crypto/bytestring/internal.h +38 -38
- data/third_party/boringssl/crypto/chacha/chacha.c +7 -7
- data/third_party/boringssl/crypto/{asn1/t_bitst.c → cipher_extra/cipher_extra.c} +49 -38
- data/third_party/boringssl/crypto/{cipher → cipher_extra}/derive_key.c +0 -2
- data/third_party/boringssl/crypto/cipher_extra/e_aesctrhmac.c +281 -0
- data/third_party/boringssl/crypto/cipher_extra/e_aesgcmsiv.c +867 -0
- data/third_party/boringssl/crypto/cipher_extra/e_chacha20poly1305.c +326 -0
- data/third_party/boringssl/crypto/{cipher → cipher_extra}/e_null.c +0 -1
- data/third_party/boringssl/crypto/{cipher → cipher_extra}/e_rc2.c +22 -10
- data/third_party/boringssl/crypto/{cipher → cipher_extra}/e_rc4.c +0 -0
- data/third_party/boringssl/crypto/{cipher → cipher_extra}/e_ssl3.c +120 -64
- data/third_party/boringssl/crypto/{cipher → cipher_extra}/e_tls.c +220 -141
- data/third_party/boringssl/crypto/{asn1/x_bignum.c → cipher_extra/internal.h} +61 -86
- data/third_party/boringssl/crypto/cipher_extra/tls_cbc.c +482 -0
- data/third_party/boringssl/crypto/cmac/cmac.c +20 -20
- data/third_party/boringssl/crypto/conf/conf.c +32 -20
- data/third_party/boringssl/crypto/conf/internal.h +3 -3
- data/third_party/boringssl/crypto/cpu-aarch64-linux.c +5 -5
- data/third_party/boringssl/crypto/cpu-arm-linux.c +44 -41
- data/third_party/boringssl/crypto/cpu-intel.c +68 -43
- data/third_party/boringssl/crypto/cpu-ppc64le.c +5 -7
- data/third_party/boringssl/crypto/crypto.c +54 -32
- data/third_party/boringssl/crypto/curve25519/curve25519.c +269 -269
- data/third_party/boringssl/crypto/curve25519/internal.h +28 -8
- data/third_party/boringssl/crypto/curve25519/spake25519.c +180 -106
- data/third_party/boringssl/crypto/curve25519/x25519-x86_64.c +9 -9
- data/third_party/boringssl/crypto/dh/check.c +33 -34
- data/third_party/boringssl/crypto/dh/dh.c +72 -36
- data/third_party/boringssl/crypto/dh/dh_asn1.c +1 -1
- data/third_party/boringssl/crypto/dh/params.c +1 -161
- data/third_party/boringssl/crypto/digest_extra/digest_extra.c +240 -0
- data/third_party/boringssl/crypto/dsa/dsa.c +127 -87
- data/third_party/boringssl/crypto/dsa/dsa_asn1.c +1 -1
- data/third_party/boringssl/crypto/{ec → ec_extra}/ec_asn1.c +83 -70
- data/third_party/boringssl/crypto/ecdh/ecdh.c +1 -1
- data/third_party/boringssl/crypto/{ecdsa → ecdsa_extra}/ecdsa_asn1.c +86 -31
- data/third_party/boringssl/crypto/engine/engine.c +6 -6
- data/third_party/boringssl/crypto/err/err.c +197 -106
- data/third_party/boringssl/crypto/err/internal.h +58 -0
- data/third_party/boringssl/crypto/evp/digestsign.c +86 -14
- data/third_party/boringssl/crypto/evp/evp.c +6 -11
- data/third_party/boringssl/crypto/evp/evp_asn1.c +17 -17
- data/third_party/boringssl/crypto/evp/evp_ctx.c +15 -11
- data/third_party/boringssl/crypto/evp/internal.h +66 -51
- data/third_party/boringssl/crypto/evp/p_dsa_asn1.c +11 -11
- data/third_party/boringssl/crypto/evp/p_ec.c +10 -8
- data/third_party/boringssl/crypto/evp/p_ec_asn1.c +11 -12
- data/third_party/boringssl/crypto/evp/p_ed25519.c +71 -0
- data/third_party/boringssl/crypto/evp/p_ed25519_asn1.c +190 -0
- data/third_party/boringssl/crypto/evp/p_rsa.c +50 -95
- data/third_party/boringssl/crypto/evp/p_rsa_asn1.c +28 -18
- data/third_party/boringssl/crypto/evp/pbkdf.c +49 -56
- data/third_party/boringssl/crypto/evp/print.c +5 -36
- data/third_party/boringssl/crypto/evp/scrypt.c +209 -0
- data/third_party/boringssl/crypto/ex_data.c +15 -45
- data/third_party/boringssl/crypto/fipsmodule/aes/internal.h +100 -0
- data/third_party/boringssl/crypto/fipsmodule/bcm.c +679 -0
- data/third_party/boringssl/crypto/{bn → fipsmodule/bn}/internal.h +40 -27
- data/third_party/boringssl/crypto/{bn → fipsmodule/bn}/rsaz_exp.h +0 -0
- data/third_party/boringssl/crypto/{cipher → fipsmodule/cipher}/internal.h +34 -67
- data/third_party/boringssl/crypto/fipsmodule/delocate.h +88 -0
- data/third_party/boringssl/crypto/{des → fipsmodule/des}/internal.h +18 -4
- data/third_party/boringssl/crypto/{digest → fipsmodule/digest}/internal.h +18 -18
- data/third_party/boringssl/crypto/{digest → fipsmodule/digest}/md32_common.h +58 -64
- data/third_party/boringssl/crypto/{ec → fipsmodule/ec}/internal.h +58 -52
- data/third_party/boringssl/crypto/{ec → fipsmodule/ec}/p256-x86_64-table.h +11 -11
- data/third_party/boringssl/crypto/{ec → fipsmodule/ec}/p256-x86_64.h +32 -32
- data/third_party/boringssl/crypto/{rand/internal.h → fipsmodule/is_fips.c} +10 -15
- data/third_party/boringssl/crypto/{modes → fipsmodule/modes}/internal.h +112 -119
- data/third_party/boringssl/crypto/fipsmodule/rand/internal.h +92 -0
- data/third_party/boringssl/crypto/{rsa → fipsmodule/rsa}/internal.h +36 -49
- data/third_party/boringssl/crypto/hkdf/hkdf.c +6 -6
- data/third_party/boringssl/crypto/internal.h +301 -233
- data/third_party/boringssl/crypto/lhash/lhash.c +26 -45
- data/third_party/boringssl/crypto/mem.c +76 -33
- data/third_party/boringssl/crypto/obj/obj.c +44 -28
- data/third_party/boringssl/crypto/obj/obj_dat.h +102 -34
- data/third_party/boringssl/crypto/obj/obj_xref.c +6 -6
- data/third_party/boringssl/crypto/pem/pem_info.c +3 -5
- data/third_party/boringssl/crypto/pem/pem_lib.c +1 -6
- data/third_party/boringssl/crypto/pem/pem_pk8.c +1 -0
- data/third_party/boringssl/crypto/pem/pem_pkey.c +1 -1
- data/third_party/boringssl/crypto/pem/pem_xaux.c +0 -2
- data/third_party/boringssl/crypto/pkcs7/internal.h +49 -0
- data/third_party/boringssl/crypto/pkcs7/pkcs7.c +166 -0
- data/third_party/boringssl/crypto/{x509/pkcs7.c → pkcs7/pkcs7_x509.c} +27 -147
- data/third_party/boringssl/crypto/pkcs8/internal.h +34 -16
- data/third_party/boringssl/crypto/pkcs8/p5_pbev2.c +120 -39
- data/third_party/boringssl/crypto/pkcs8/pkcs8.c +144 -857
- data/third_party/boringssl/crypto/pkcs8/pkcs8_x509.c +789 -0
- data/third_party/boringssl/crypto/poly1305/internal.h +4 -3
- data/third_party/boringssl/crypto/poly1305/poly1305.c +14 -14
- data/third_party/boringssl/crypto/poly1305/poly1305_arm.c +11 -11
- data/third_party/boringssl/crypto/poly1305/poly1305_vec.c +41 -41
- data/third_party/boringssl/crypto/pool/internal.h +2 -2
- data/third_party/boringssl/crypto/pool/pool.c +15 -15
- data/third_party/boringssl/crypto/{rand → rand_extra}/deterministic.c +7 -7
- data/third_party/boringssl/crypto/rand_extra/forkunsafe.c +46 -0
- data/third_party/boringssl/crypto/{rand → rand_extra}/fuchsia.c +7 -7
- data/third_party/boringssl/crypto/rand_extra/rand_extra.c +70 -0
- data/third_party/boringssl/crypto/{rand → rand_extra}/windows.c +5 -5
- data/third_party/boringssl/crypto/refcount_c11.c +2 -2
- data/third_party/boringssl/crypto/refcount_lock.c +1 -1
- data/third_party/boringssl/crypto/{rsa → rsa_extra}/rsa_asn1.c +12 -120
- data/third_party/boringssl/crypto/stack/stack.c +13 -13
- data/third_party/boringssl/crypto/thread_none.c +1 -1
- data/third_party/boringssl/crypto/thread_pthread.c +1 -1
- data/third_party/boringssl/crypto/thread_win.c +40 -40
- data/third_party/boringssl/crypto/x509/a_sign.c +5 -12
- data/third_party/boringssl/crypto/x509/a_verify.c +6 -18
- data/third_party/boringssl/crypto/x509/algorithm.c +22 -6
- data/third_party/boringssl/crypto/x509/asn1_gen.c +30 -7
- data/third_party/boringssl/crypto/x509/by_dir.c +2 -2
- data/third_party/boringssl/crypto/x509/by_file.c +2 -2
- data/third_party/boringssl/crypto/x509/rsa_pss.c +5 -5
- data/third_party/boringssl/crypto/x509/t_x509.c +2 -1
- data/third_party/boringssl/crypto/x509/x509_def.c +5 -0
- data/third_party/boringssl/crypto/x509/x509_lu.c +35 -4
- data/third_party/boringssl/crypto/x509/x509_set.c +10 -0
- data/third_party/boringssl/crypto/x509/x509_vfy.c +20 -17
- data/third_party/boringssl/crypto/x509/x_name.c +13 -16
- data/third_party/boringssl/crypto/x509/x_x509.c +3 -3
- data/third_party/boringssl/crypto/x509/x_x509a.c +0 -7
- data/third_party/boringssl/crypto/x509v3/ext_dat.h +8 -0
- data/third_party/boringssl/crypto/x509v3/pcy_int.h +2 -2
- data/third_party/boringssl/crypto/x509v3/pcy_lib.c +0 -9
- data/third_party/boringssl/crypto/x509v3/pcy_node.c +1 -1
- data/third_party/boringssl/crypto/x509v3/pcy_tree.c +25 -15
- data/third_party/boringssl/crypto/x509v3/v3_alt.c +21 -11
- data/third_party/boringssl/crypto/x509v3/v3_cpols.c +9 -3
- data/third_party/boringssl/crypto/x509v3/v3_info.c +22 -14
- data/third_party/boringssl/crypto/x509v3/v3_ncons.c +27 -11
- data/third_party/boringssl/crypto/x509v3/v3_pci.c +0 -33
- data/third_party/boringssl/crypto/x509v3/v3_utl.c +4 -4
- data/third_party/boringssl/include/openssl/aead.h +280 -191
- data/third_party/boringssl/include/openssl/aes.h +50 -50
- data/third_party/boringssl/include/openssl/arm_arch.h +12 -12
- data/third_party/boringssl/include/openssl/asn1.h +14 -77
- data/third_party/boringssl/include/openssl/asn1t.h +11 -15
- data/third_party/boringssl/include/openssl/base.h +78 -51
- data/third_party/boringssl/include/openssl/base64.h +68 -68
- data/third_party/boringssl/include/openssl/bio.h +472 -406
- data/third_party/boringssl/include/openssl/blowfish.h +1 -1
- data/third_party/boringssl/include/openssl/bn.h +454 -435
- data/third_party/boringssl/include/openssl/buf.h +27 -27
- data/third_party/boringssl/include/openssl/bytestring.h +282 -267
- data/third_party/boringssl/include/openssl/cast.h +2 -2
- data/third_party/boringssl/include/openssl/chacha.h +5 -5
- data/third_party/boringssl/include/openssl/cipher.h +209 -200
- data/third_party/boringssl/include/openssl/cmac.h +27 -27
- data/third_party/boringssl/include/openssl/conf.h +49 -46
- data/third_party/boringssl/include/openssl/cpu.h +60 -45
- data/third_party/boringssl/include/openssl/crypto.h +59 -35
- data/third_party/boringssl/include/openssl/curve25519.h +97 -92
- data/third_party/boringssl/include/openssl/des.h +25 -25
- data/third_party/boringssl/include/openssl/dh.h +98 -97
- data/third_party/boringssl/include/openssl/digest.h +143 -114
- data/third_party/boringssl/include/openssl/dsa.h +217 -202
- data/third_party/boringssl/include/openssl/ec.h +132 -131
- data/third_party/boringssl/include/openssl/ec_key.h +132 -128
- data/third_party/boringssl/include/openssl/ecdh.h +9 -9
- data/third_party/boringssl/include/openssl/ecdsa.h +66 -66
- data/third_party/boringssl/include/openssl/engine.h +38 -38
- data/third_party/boringssl/include/openssl/err.h +189 -219
- data/third_party/boringssl/include/openssl/evp.h +473 -397
- data/third_party/boringssl/include/openssl/ex_data.h +46 -56
- data/third_party/boringssl/include/openssl/hkdf.h +17 -17
- data/third_party/boringssl/include/openssl/hmac.h +55 -43
- data/third_party/boringssl/include/openssl/is_boringssl.h +16 -0
- data/third_party/boringssl/include/openssl/lhash.h +67 -67
- data/third_party/boringssl/include/openssl/lhash_macros.h +4 -4
- data/third_party/boringssl/include/openssl/md4.h +14 -14
- data/third_party/boringssl/include/openssl/md5.h +14 -14
- data/third_party/boringssl/include/openssl/mem.h +39 -33
- data/third_party/boringssl/include/openssl/nid.h +43 -0
- data/third_party/boringssl/include/openssl/obj.h +93 -87
- data/third_party/boringssl/include/openssl/opensslconf.h +8 -1
- data/third_party/boringssl/include/openssl/pem.h +2 -122
- data/third_party/boringssl/include/openssl/pkcs7.h +68 -2
- data/third_party/boringssl/include/openssl/pkcs8.h +81 -66
- data/third_party/boringssl/include/openssl/poly1305.h +11 -11
- data/third_party/boringssl/include/openssl/pool.h +29 -25
- data/third_party/boringssl/include/openssl/rand.h +48 -45
- data/third_party/boringssl/include/openssl/rc4.h +9 -9
- data/third_party/boringssl/include/openssl/ripemd.h +13 -13
- data/third_party/boringssl/include/openssl/rsa.h +371 -340
- data/third_party/boringssl/include/openssl/sha.h +71 -71
- data/third_party/boringssl/include/openssl/span.h +191 -0
- data/third_party/boringssl/include/openssl/ssl.h +2639 -2519
- data/third_party/boringssl/include/openssl/ssl3.h +39 -122
- data/third_party/boringssl/include/openssl/stack.h +355 -164
- data/third_party/boringssl/include/openssl/thread.h +43 -43
- data/third_party/boringssl/include/openssl/tls1.h +60 -63
- data/third_party/boringssl/include/openssl/type_check.h +10 -14
- data/third_party/boringssl/include/openssl/x509.h +41 -116
- data/third_party/boringssl/include/openssl/x509_vfy.h +17 -25
- data/third_party/boringssl/include/openssl/x509v3.h +27 -21
- data/third_party/boringssl/ssl/{bio_ssl.c → bio_ssl.cc} +9 -5
- data/third_party/boringssl/ssl/{custom_extensions.c → custom_extensions.cc} +19 -12
- data/third_party/boringssl/ssl/{d1_both.c → d1_both.cc} +224 -193
- data/third_party/boringssl/ssl/{d1_lib.c → d1_lib.cc} +86 -79
- data/third_party/boringssl/ssl/{d1_pkt.c → d1_pkt.cc} +55 -87
- data/third_party/boringssl/ssl/{d1_srtp.c → d1_srtp.cc} +12 -16
- data/third_party/boringssl/ssl/{dtls_method.c → dtls_method.cc} +33 -50
- data/third_party/boringssl/ssl/{dtls_record.c → dtls_record.cc} +76 -64
- data/third_party/boringssl/ssl/handshake.cc +547 -0
- data/third_party/boringssl/ssl/handshake_client.cc +1828 -0
- data/third_party/boringssl/ssl/handshake_server.cc +1672 -0
- data/third_party/boringssl/ssl/internal.h +2027 -1280
- data/third_party/boringssl/ssl/s3_both.cc +603 -0
- data/third_party/boringssl/ssl/{s3_lib.c → s3_lib.cc} +22 -10
- data/third_party/boringssl/ssl/{s3_pkt.c → s3_pkt.cc} +171 -75
- data/third_party/boringssl/ssl/ssl_aead_ctx.cc +415 -0
- data/third_party/boringssl/ssl/{ssl_asn1.c → ssl_asn1.cc} +257 -261
- data/third_party/boringssl/ssl/{ssl_buffer.c → ssl_buffer.cc} +81 -97
- data/third_party/boringssl/ssl/{ssl_cert.c → ssl_cert.cc} +304 -414
- data/third_party/boringssl/ssl/{ssl_cipher.c → ssl_cipher.cc} +427 -505
- data/third_party/boringssl/ssl/{ssl_file.c → ssl_file.cc} +24 -16
- data/third_party/boringssl/ssl/ssl_key_share.cc +245 -0
- data/third_party/boringssl/ssl/{ssl_lib.c → ssl_lib.cc} +665 -828
- data/third_party/boringssl/ssl/ssl_privkey.cc +518 -0
- data/third_party/boringssl/ssl/{ssl_session.c → ssl_session.cc} +596 -471
- data/third_party/boringssl/ssl/{ssl_stat.c → ssl_stat.cc} +5 -224
- data/third_party/boringssl/ssl/{ssl_transcript.c → ssl_transcript.cc} +117 -140
- data/third_party/boringssl/ssl/ssl_versions.cc +439 -0
- data/third_party/boringssl/ssl/{ssl_x509.c → ssl_x509.cc} +751 -267
- data/third_party/boringssl/ssl/{t1_enc.c → t1_enc.cc} +120 -161
- data/third_party/boringssl/ssl/{t1_lib.c → t1_lib.cc} +859 -966
- data/third_party/boringssl/ssl/{tls13_both.c → tls13_both.cc} +202 -284
- data/third_party/boringssl/ssl/tls13_client.cc +842 -0
- data/third_party/boringssl/ssl/{tls13_enc.c → tls13_enc.cc} +108 -90
- data/third_party/boringssl/ssl/tls13_server.cc +967 -0
- data/third_party/boringssl/ssl/{tls_method.c → tls_method.cc} +94 -73
- data/third_party/boringssl/ssl/tls_record.cc +675 -0
- metadata +117 -168
- data/include/grpc/support/cmdline.h +0 -88
- data/include/grpc/support/subprocess.h +0 -44
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h +0 -29
- data/src/core/ext/filters/client_channel/resolver_factory.cc +0 -40
- data/src/core/lib/gpr/cmdline.cc +0 -330
- data/src/core/lib/gpr/subprocess_posix.cc +0 -99
- data/src/core/lib/gpr/subprocess_windows.cc +0 -126
- data/src/core/lib/surface/alarm.cc +0 -137
- data/src/core/lib/surface/alarm_internal.h +0 -40
- data/src/core/tsi/gts_transport_security.cc +0 -40
- data/third_party/boringssl/crypto/aes/aes.c +0 -1142
- data/third_party/boringssl/crypto/aes/internal.h +0 -87
- data/third_party/boringssl/crypto/aes/key_wrap.c +0 -138
- data/third_party/boringssl/crypto/aes/mode_wrappers.c +0 -112
- data/third_party/boringssl/crypto/asn1/x_long.c +0 -200
- data/third_party/boringssl/crypto/bn/add.c +0 -377
- data/third_party/boringssl/crypto/bn/asm/x86_64-gcc.c +0 -532
- data/third_party/boringssl/crypto/bn/bn.c +0 -365
- data/third_party/boringssl/crypto/bn/cmp.c +0 -239
- data/third_party/boringssl/crypto/bn/ctx.c +0 -313
- data/third_party/boringssl/crypto/bn/div.c +0 -728
- data/third_party/boringssl/crypto/bn/exponentiation.c +0 -1240
- data/third_party/boringssl/crypto/bn/gcd.c +0 -635
- data/third_party/boringssl/crypto/bn/generic.c +0 -707
- data/third_party/boringssl/crypto/bn/kronecker.c +0 -176
- data/third_party/boringssl/crypto/bn/montgomery.c +0 -409
- data/third_party/boringssl/crypto/bn/montgomery_inv.c +0 -207
- data/third_party/boringssl/crypto/bn/mul.c +0 -871
- data/third_party/boringssl/crypto/bn/prime.c +0 -861
- data/third_party/boringssl/crypto/bn/random.c +0 -343
- data/third_party/boringssl/crypto/bn/rsaz_exp.c +0 -254
- data/third_party/boringssl/crypto/bn/shift.c +0 -307
- data/third_party/boringssl/crypto/bn/sqrt.c +0 -506
- data/third_party/boringssl/crypto/cipher/aead.c +0 -156
- data/third_party/boringssl/crypto/cipher/cipher.c +0 -657
- data/third_party/boringssl/crypto/cipher/e_aes.c +0 -1771
- data/third_party/boringssl/crypto/cipher/e_chacha20poly1305.c +0 -276
- data/third_party/boringssl/crypto/cipher/e_des.c +0 -205
- data/third_party/boringssl/crypto/cipher/tls_cbc.c +0 -482
- data/third_party/boringssl/crypto/des/des.c +0 -771
- data/third_party/boringssl/crypto/digest/digest.c +0 -251
- data/third_party/boringssl/crypto/digest/digests.c +0 -358
- data/third_party/boringssl/crypto/ec/ec.c +0 -847
- data/third_party/boringssl/crypto/ec/ec_key.c +0 -479
- data/third_party/boringssl/crypto/ec/ec_montgomery.c +0 -303
- data/third_party/boringssl/crypto/ec/oct.c +0 -416
- data/third_party/boringssl/crypto/ec/p224-64.c +0 -1143
- data/third_party/boringssl/crypto/ec/p256-64.c +0 -1701
- data/third_party/boringssl/crypto/ec/p256-x86_64.c +0 -561
- data/third_party/boringssl/crypto/ec/simple.c +0 -1118
- data/third_party/boringssl/crypto/ec/util-64.c +0 -109
- data/third_party/boringssl/crypto/ec/wnaf.c +0 -458
- data/third_party/boringssl/crypto/ecdsa/ecdsa.c +0 -479
- data/third_party/boringssl/crypto/hmac/hmac.c +0 -215
- data/third_party/boringssl/crypto/md4/md4.c +0 -236
- data/third_party/boringssl/crypto/md5/md5.c +0 -285
- data/third_party/boringssl/crypto/modes/cbc.c +0 -212
- data/third_party/boringssl/crypto/modes/cfb.c +0 -230
- data/third_party/boringssl/crypto/modes/ctr.c +0 -219
- data/third_party/boringssl/crypto/modes/gcm.c +0 -1071
- data/third_party/boringssl/crypto/modes/ofb.c +0 -95
- data/third_party/boringssl/crypto/modes/polyval.c +0 -94
- data/third_party/boringssl/crypto/pkcs8/p8_pkey.c +0 -85
- data/third_party/boringssl/crypto/rand/rand.c +0 -244
- data/third_party/boringssl/crypto/rand/urandom.c +0 -335
- data/third_party/boringssl/crypto/rsa/blinding.c +0 -265
- data/third_party/boringssl/crypto/rsa/padding.c +0 -708
- data/third_party/boringssl/crypto/rsa/rsa.c +0 -830
- data/third_party/boringssl/crypto/rsa/rsa_impl.c +0 -1100
- data/third_party/boringssl/crypto/sha/sha1-altivec.c +0 -346
- data/third_party/boringssl/crypto/sha/sha1.c +0 -355
- data/third_party/boringssl/crypto/sha/sha256.c +0 -329
- data/third_party/boringssl/crypto/sha/sha512.c +0 -609
- data/third_party/boringssl/crypto/x509/x509type.c +0 -126
- data/third_party/boringssl/include/openssl/stack_macros.h +0 -3987
- data/third_party/boringssl/ssl/handshake_client.c +0 -1883
- data/third_party/boringssl/ssl/handshake_server.c +0 -1950
- data/third_party/boringssl/ssl/s3_both.c +0 -895
- data/third_party/boringssl/ssl/ssl_aead_ctx.c +0 -335
- data/third_party/boringssl/ssl/ssl_ecdh.c +0 -465
- data/third_party/boringssl/ssl/ssl_privkey.c +0 -683
- data/third_party/boringssl/ssl/ssl_privkey_cc.cc +0 -76
- data/third_party/boringssl/ssl/tls13_client.c +0 -712
- data/third_party/boringssl/ssl/tls13_server.c +0 -680
- data/third_party/boringssl/ssl/tls_record.c +0 -556
@@ -0,0 +1,789 @@
|
|
1
|
+
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
2
|
+
* project 1999.
|
3
|
+
*/
|
4
|
+
/* ====================================================================
|
5
|
+
* Copyright (c) 1999 The OpenSSL Project. All rights reserved.
|
6
|
+
*
|
7
|
+
* Redistribution and use in source and binary forms, with or without
|
8
|
+
* modification, are permitted provided that the following conditions
|
9
|
+
* are met:
|
10
|
+
*
|
11
|
+
* 1. Redistributions of source code must retain the above copyright
|
12
|
+
* notice, this list of conditions and the following disclaimer.
|
13
|
+
*
|
14
|
+
* 2. Redistributions in binary form must reproduce the above copyright
|
15
|
+
* notice, this list of conditions and the following disclaimer in
|
16
|
+
* the documentation and/or other materials provided with the
|
17
|
+
* distribution.
|
18
|
+
*
|
19
|
+
* 3. All advertising materials mentioning features or use of this
|
20
|
+
* software must display the following acknowledgment:
|
21
|
+
* "This product includes software developed by the OpenSSL Project
|
22
|
+
* for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
|
23
|
+
*
|
24
|
+
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
25
|
+
* endorse or promote products derived from this software without
|
26
|
+
* prior written permission. For written permission, please contact
|
27
|
+
* licensing@OpenSSL.org.
|
28
|
+
*
|
29
|
+
* 5. Products derived from this software may not be called "OpenSSL"
|
30
|
+
* nor may "OpenSSL" appear in their names without prior written
|
31
|
+
* permission of the OpenSSL Project.
|
32
|
+
*
|
33
|
+
* 6. Redistributions of any form whatsoever must retain the following
|
34
|
+
* acknowledgment:
|
35
|
+
* "This product includes software developed by the OpenSSL Project
|
36
|
+
* for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
|
37
|
+
*
|
38
|
+
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
39
|
+
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
40
|
+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
41
|
+
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
42
|
+
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
43
|
+
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
44
|
+
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
45
|
+
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
46
|
+
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
47
|
+
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
48
|
+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
49
|
+
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
50
|
+
* ====================================================================
|
51
|
+
*
|
52
|
+
* This product includes cryptographic software written by Eric Young
|
53
|
+
* (eay@cryptsoft.com). This product includes software written by Tim
|
54
|
+
* Hudson (tjh@cryptsoft.com). */
|
55
|
+
|
56
|
+
#include <openssl/pkcs8.h>
|
57
|
+
|
58
|
+
#include <limits.h>
|
59
|
+
|
60
|
+
#include <openssl/asn1t.h>
|
61
|
+
#include <openssl/asn1.h>
|
62
|
+
#include <openssl/bio.h>
|
63
|
+
#include <openssl/buf.h>
|
64
|
+
#include <openssl/bytestring.h>
|
65
|
+
#include <openssl/err.h>
|
66
|
+
#include <openssl/evp.h>
|
67
|
+
#include <openssl/digest.h>
|
68
|
+
#include <openssl/hmac.h>
|
69
|
+
#include <openssl/mem.h>
|
70
|
+
#include <openssl/x509.h>
|
71
|
+
|
72
|
+
#include "internal.h"
|
73
|
+
#include "../bytestring/internal.h"
|
74
|
+
#include "../internal.h"
|
75
|
+
|
76
|
+
|
77
|
+
// Minor tweak to operation: zero private key data
|
78
|
+
static int pkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
|
79
|
+
void *exarg) {
|
80
|
+
// Since the structure must still be valid use ASN1_OP_FREE_PRE
|
81
|
+
if (operation == ASN1_OP_FREE_PRE) {
|
82
|
+
PKCS8_PRIV_KEY_INFO *key = (PKCS8_PRIV_KEY_INFO *)*pval;
|
83
|
+
if (key->pkey && key->pkey->type == V_ASN1_OCTET_STRING &&
|
84
|
+
key->pkey->value.octet_string) {
|
85
|
+
OPENSSL_cleanse(key->pkey->value.octet_string->data,
|
86
|
+
key->pkey->value.octet_string->length);
|
87
|
+
}
|
88
|
+
}
|
89
|
+
return 1;
|
90
|
+
}
|
91
|
+
|
92
|
+
ASN1_SEQUENCE_cb(PKCS8_PRIV_KEY_INFO, pkey_cb) = {
|
93
|
+
ASN1_SIMPLE(PKCS8_PRIV_KEY_INFO, version, ASN1_INTEGER),
|
94
|
+
ASN1_SIMPLE(PKCS8_PRIV_KEY_INFO, pkeyalg, X509_ALGOR),
|
95
|
+
ASN1_SIMPLE(PKCS8_PRIV_KEY_INFO, pkey, ASN1_ANY),
|
96
|
+
ASN1_IMP_SET_OF_OPT(PKCS8_PRIV_KEY_INFO, attributes, X509_ATTRIBUTE, 0)
|
97
|
+
} ASN1_SEQUENCE_END_cb(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO)
|
98
|
+
|
99
|
+
IMPLEMENT_ASN1_FUNCTIONS(PKCS8_PRIV_KEY_INFO)
|
100
|
+
|
101
|
+
EVP_PKEY *EVP_PKCS82PKEY(PKCS8_PRIV_KEY_INFO *p8) {
|
102
|
+
uint8_t *der = NULL;
|
103
|
+
int der_len = i2d_PKCS8_PRIV_KEY_INFO(p8, &der);
|
104
|
+
if (der_len < 0) {
|
105
|
+
return NULL;
|
106
|
+
}
|
107
|
+
|
108
|
+
CBS cbs;
|
109
|
+
CBS_init(&cbs, der, (size_t)der_len);
|
110
|
+
EVP_PKEY *ret = EVP_parse_private_key(&cbs);
|
111
|
+
if (ret == NULL || CBS_len(&cbs) != 0) {
|
112
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_DECODE_ERROR);
|
113
|
+
EVP_PKEY_free(ret);
|
114
|
+
OPENSSL_free(der);
|
115
|
+
return NULL;
|
116
|
+
}
|
117
|
+
|
118
|
+
OPENSSL_free(der);
|
119
|
+
return ret;
|
120
|
+
}
|
121
|
+
|
122
|
+
PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey) {
|
123
|
+
CBB cbb;
|
124
|
+
uint8_t *der = NULL;
|
125
|
+
size_t der_len;
|
126
|
+
if (!CBB_init(&cbb, 0) ||
|
127
|
+
!EVP_marshal_private_key(&cbb, pkey) ||
|
128
|
+
!CBB_finish(&cbb, &der, &der_len) ||
|
129
|
+
der_len > LONG_MAX) {
|
130
|
+
CBB_cleanup(&cbb);
|
131
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_ENCODE_ERROR);
|
132
|
+
goto err;
|
133
|
+
}
|
134
|
+
|
135
|
+
const uint8_t *p = der;
|
136
|
+
PKCS8_PRIV_KEY_INFO *p8 = d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, (long)der_len);
|
137
|
+
if (p8 == NULL || p != der + der_len) {
|
138
|
+
PKCS8_PRIV_KEY_INFO_free(p8);
|
139
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_DECODE_ERROR);
|
140
|
+
goto err;
|
141
|
+
}
|
142
|
+
|
143
|
+
OPENSSL_free(der);
|
144
|
+
return p8;
|
145
|
+
|
146
|
+
err:
|
147
|
+
OPENSSL_free(der);
|
148
|
+
return NULL;
|
149
|
+
}
|
150
|
+
|
151
|
+
PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(X509_SIG *pkcs8, const char *pass,
|
152
|
+
int pass_len_in) {
|
153
|
+
size_t pass_len;
|
154
|
+
if (pass_len_in == -1 && pass != NULL) {
|
155
|
+
pass_len = strlen(pass);
|
156
|
+
} else {
|
157
|
+
pass_len = (size_t)pass_len_in;
|
158
|
+
}
|
159
|
+
|
160
|
+
PKCS8_PRIV_KEY_INFO *ret = NULL;
|
161
|
+
EVP_PKEY *pkey = NULL;
|
162
|
+
uint8_t *in = NULL;
|
163
|
+
|
164
|
+
// Convert the legacy ASN.1 object to a byte string.
|
165
|
+
int in_len = i2d_X509_SIG(pkcs8, &in);
|
166
|
+
if (in_len < 0) {
|
167
|
+
goto err;
|
168
|
+
}
|
169
|
+
|
170
|
+
CBS cbs;
|
171
|
+
CBS_init(&cbs, in, in_len);
|
172
|
+
pkey = PKCS8_parse_encrypted_private_key(&cbs, pass, pass_len);
|
173
|
+
if (pkey == NULL || CBS_len(&cbs) != 0) {
|
174
|
+
goto err;
|
175
|
+
}
|
176
|
+
|
177
|
+
ret = EVP_PKEY2PKCS8(pkey);
|
178
|
+
|
179
|
+
err:
|
180
|
+
OPENSSL_free(in);
|
181
|
+
EVP_PKEY_free(pkey);
|
182
|
+
return ret;
|
183
|
+
}
|
184
|
+
|
185
|
+
X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, const char *pass,
|
186
|
+
int pass_len_in, const uint8_t *salt, size_t salt_len,
|
187
|
+
int iterations, PKCS8_PRIV_KEY_INFO *p8inf) {
|
188
|
+
size_t pass_len;
|
189
|
+
if (pass_len_in == -1 && pass != NULL) {
|
190
|
+
pass_len = strlen(pass);
|
191
|
+
} else {
|
192
|
+
pass_len = (size_t)pass_len_in;
|
193
|
+
}
|
194
|
+
|
195
|
+
// Parse out the private key.
|
196
|
+
EVP_PKEY *pkey = EVP_PKCS82PKEY(p8inf);
|
197
|
+
if (pkey == NULL) {
|
198
|
+
return NULL;
|
199
|
+
}
|
200
|
+
|
201
|
+
X509_SIG *ret = NULL;
|
202
|
+
uint8_t *der = NULL;
|
203
|
+
size_t der_len;
|
204
|
+
CBB cbb;
|
205
|
+
if (!CBB_init(&cbb, 128) ||
|
206
|
+
!PKCS8_marshal_encrypted_private_key(&cbb, pbe_nid, cipher, pass,
|
207
|
+
pass_len, salt, salt_len, iterations,
|
208
|
+
pkey) ||
|
209
|
+
!CBB_finish(&cbb, &der, &der_len)) {
|
210
|
+
CBB_cleanup(&cbb);
|
211
|
+
goto err;
|
212
|
+
}
|
213
|
+
|
214
|
+
// Convert back to legacy ASN.1 objects.
|
215
|
+
const uint8_t *ptr = der;
|
216
|
+
ret = d2i_X509_SIG(NULL, &ptr, der_len);
|
217
|
+
if (ret == NULL || ptr != der + der_len) {
|
218
|
+
OPENSSL_PUT_ERROR(PKCS8, ERR_R_INTERNAL_ERROR);
|
219
|
+
X509_SIG_free(ret);
|
220
|
+
ret = NULL;
|
221
|
+
}
|
222
|
+
|
223
|
+
err:
|
224
|
+
OPENSSL_free(der);
|
225
|
+
EVP_PKEY_free(pkey);
|
226
|
+
return ret;
|
227
|
+
}
|
228
|
+
|
229
|
+
struct pkcs12_context {
|
230
|
+
EVP_PKEY **out_key;
|
231
|
+
STACK_OF(X509) *out_certs;
|
232
|
+
const char *password;
|
233
|
+
size_t password_len;
|
234
|
+
};
|
235
|
+
|
236
|
+
// PKCS12_handle_sequence parses a BER-encoded SEQUENCE of elements in a PKCS#12
|
237
|
+
// structure.
|
238
|
+
static int PKCS12_handle_sequence(
|
239
|
+
CBS *sequence, struct pkcs12_context *ctx,
|
240
|
+
int (*handle_element)(CBS *cbs, struct pkcs12_context *ctx)) {
|
241
|
+
uint8_t *der_bytes = NULL;
|
242
|
+
size_t der_len;
|
243
|
+
CBS in;
|
244
|
+
int ret = 0;
|
245
|
+
|
246
|
+
// Although a BER->DER conversion is done at the beginning of |PKCS12_parse|,
|
247
|
+
// the ASN.1 data gets wrapped in OCTETSTRINGs and/or encrypted and the
|
248
|
+
// conversion cannot see through those wrappings. So each time we step
|
249
|
+
// through one we need to convert to DER again.
|
250
|
+
if (!CBS_asn1_ber_to_der(sequence, &der_bytes, &der_len)) {
|
251
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
252
|
+
return 0;
|
253
|
+
}
|
254
|
+
|
255
|
+
if (der_bytes != NULL) {
|
256
|
+
CBS_init(&in, der_bytes, der_len);
|
257
|
+
} else {
|
258
|
+
CBS_init(&in, CBS_data(sequence), CBS_len(sequence));
|
259
|
+
}
|
260
|
+
|
261
|
+
CBS child;
|
262
|
+
if (!CBS_get_asn1(&in, &child, CBS_ASN1_SEQUENCE) ||
|
263
|
+
CBS_len(&in) != 0) {
|
264
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
265
|
+
goto err;
|
266
|
+
}
|
267
|
+
|
268
|
+
while (CBS_len(&child) > 0) {
|
269
|
+
CBS element;
|
270
|
+
if (!CBS_get_asn1(&child, &element, CBS_ASN1_SEQUENCE)) {
|
271
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
272
|
+
goto err;
|
273
|
+
}
|
274
|
+
|
275
|
+
if (!handle_element(&element, ctx)) {
|
276
|
+
goto err;
|
277
|
+
}
|
278
|
+
}
|
279
|
+
|
280
|
+
ret = 1;
|
281
|
+
|
282
|
+
err:
|
283
|
+
OPENSSL_free(der_bytes);
|
284
|
+
return ret;
|
285
|
+
}
|
286
|
+
|
287
|
+
// 1.2.840.113549.1.12.10.1.2
|
288
|
+
static const uint8_t kPKCS8ShroudedKeyBag[] = {
|
289
|
+
0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x0c, 0x0a, 0x01, 0x02};
|
290
|
+
|
291
|
+
// 1.2.840.113549.1.12.10.1.3
|
292
|
+
static const uint8_t kCertBag[] = {0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d,
|
293
|
+
0x01, 0x0c, 0x0a, 0x01, 0x03};
|
294
|
+
|
295
|
+
// 1.2.840.113549.1.9.22.1
|
296
|
+
static const uint8_t kX509Certificate[] = {0x2a, 0x86, 0x48, 0x86, 0xf7,
|
297
|
+
0x0d, 0x01, 0x09, 0x16, 0x01};
|
298
|
+
|
299
|
+
// PKCS12_handle_safe_bag parses a single SafeBag element in a PKCS#12
|
300
|
+
// structure.
|
301
|
+
static int PKCS12_handle_safe_bag(CBS *safe_bag, struct pkcs12_context *ctx) {
|
302
|
+
CBS bag_id, wrapped_value;
|
303
|
+
if (!CBS_get_asn1(safe_bag, &bag_id, CBS_ASN1_OBJECT) ||
|
304
|
+
!CBS_get_asn1(safe_bag, &wrapped_value,
|
305
|
+
CBS_ASN1_CONTEXT_SPECIFIC | CBS_ASN1_CONSTRUCTED | 0)
|
306
|
+
/* Ignore the bagAttributes field. */) {
|
307
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
308
|
+
return 0;
|
309
|
+
}
|
310
|
+
|
311
|
+
if (CBS_mem_equal(&bag_id, kPKCS8ShroudedKeyBag,
|
312
|
+
sizeof(kPKCS8ShroudedKeyBag))) {
|
313
|
+
// See RFC 7292, section 4.2.2.
|
314
|
+
if (*ctx->out_key) {
|
315
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_MULTIPLE_PRIVATE_KEYS_IN_PKCS12);
|
316
|
+
return 0;
|
317
|
+
}
|
318
|
+
|
319
|
+
EVP_PKEY *pkey = PKCS8_parse_encrypted_private_key(
|
320
|
+
&wrapped_value, ctx->password, ctx->password_len);
|
321
|
+
if (pkey == NULL) {
|
322
|
+
return 0;
|
323
|
+
}
|
324
|
+
|
325
|
+
if (CBS_len(&wrapped_value) != 0) {
|
326
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
327
|
+
EVP_PKEY_free(pkey);
|
328
|
+
return 0;
|
329
|
+
}
|
330
|
+
|
331
|
+
*ctx->out_key = pkey;
|
332
|
+
return 1;
|
333
|
+
}
|
334
|
+
|
335
|
+
if (CBS_mem_equal(&bag_id, kCertBag, sizeof(kCertBag))) {
|
336
|
+
// See RFC 7292, section 4.2.3.
|
337
|
+
CBS cert_bag, cert_type, wrapped_cert, cert;
|
338
|
+
if (!CBS_get_asn1(&wrapped_value, &cert_bag, CBS_ASN1_SEQUENCE) ||
|
339
|
+
!CBS_get_asn1(&cert_bag, &cert_type, CBS_ASN1_OBJECT) ||
|
340
|
+
!CBS_get_asn1(&cert_bag, &wrapped_cert,
|
341
|
+
CBS_ASN1_CONTEXT_SPECIFIC | CBS_ASN1_CONSTRUCTED | 0) ||
|
342
|
+
!CBS_get_asn1(&wrapped_cert, &cert, CBS_ASN1_OCTETSTRING)) {
|
343
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
344
|
+
return 0;
|
345
|
+
}
|
346
|
+
|
347
|
+
// Skip unknown certificate types.
|
348
|
+
if (!CBS_mem_equal(&cert_type, kX509Certificate,
|
349
|
+
sizeof(kX509Certificate))) {
|
350
|
+
return 1;
|
351
|
+
}
|
352
|
+
|
353
|
+
if (CBS_len(&cert) > LONG_MAX) {
|
354
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
355
|
+
return 0;
|
356
|
+
}
|
357
|
+
|
358
|
+
const uint8_t *inp = CBS_data(&cert);
|
359
|
+
X509 *x509 = d2i_X509(NULL, &inp, (long)CBS_len(&cert));
|
360
|
+
if (!x509) {
|
361
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
362
|
+
return 0;
|
363
|
+
}
|
364
|
+
|
365
|
+
if (inp != CBS_data(&cert) + CBS_len(&cert)) {
|
366
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
367
|
+
X509_free(x509);
|
368
|
+
return 0;
|
369
|
+
}
|
370
|
+
|
371
|
+
if (0 == sk_X509_push(ctx->out_certs, x509)) {
|
372
|
+
X509_free(x509);
|
373
|
+
return 0;
|
374
|
+
}
|
375
|
+
|
376
|
+
return 1;
|
377
|
+
}
|
378
|
+
|
379
|
+
// Unknown element type - ignore it.
|
380
|
+
return 1;
|
381
|
+
}
|
382
|
+
|
383
|
+
// 1.2.840.113549.1.7.1
|
384
|
+
static const uint8_t kPKCS7Data[] = {0x2a, 0x86, 0x48, 0x86, 0xf7,
|
385
|
+
0x0d, 0x01, 0x07, 0x01};
|
386
|
+
|
387
|
+
// 1.2.840.113549.1.7.6
|
388
|
+
static const uint8_t kPKCS7EncryptedData[] = {0x2a, 0x86, 0x48, 0x86, 0xf7,
|
389
|
+
0x0d, 0x01, 0x07, 0x06};
|
390
|
+
|
391
|
+
// PKCS12_handle_content_info parses a single PKCS#7 ContentInfo element in a
|
392
|
+
// PKCS#12 structure.
|
393
|
+
static int PKCS12_handle_content_info(CBS *content_info,
|
394
|
+
struct pkcs12_context *ctx) {
|
395
|
+
CBS content_type, wrapped_contents, contents;
|
396
|
+
int ret = 0;
|
397
|
+
uint8_t *storage = NULL;
|
398
|
+
|
399
|
+
if (!CBS_get_asn1(content_info, &content_type, CBS_ASN1_OBJECT) ||
|
400
|
+
!CBS_get_asn1(content_info, &wrapped_contents,
|
401
|
+
CBS_ASN1_CONTEXT_SPECIFIC | CBS_ASN1_CONSTRUCTED | 0) ||
|
402
|
+
CBS_len(content_info) != 0) {
|
403
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
404
|
+
goto err;
|
405
|
+
}
|
406
|
+
|
407
|
+
if (CBS_mem_equal(&content_type, kPKCS7EncryptedData,
|
408
|
+
sizeof(kPKCS7EncryptedData))) {
|
409
|
+
// See https://tools.ietf.org/html/rfc2315#section-13.
|
410
|
+
//
|
411
|
+
// PKCS#7 encrypted data inside a PKCS#12 structure is generally an
|
412
|
+
// encrypted certificate bag and it's generally encrypted with 40-bit
|
413
|
+
// RC2-CBC.
|
414
|
+
CBS version_bytes, eci, contents_type, ai, encrypted_contents;
|
415
|
+
uint8_t *out;
|
416
|
+
size_t out_len;
|
417
|
+
|
418
|
+
if (!CBS_get_asn1(&wrapped_contents, &contents, CBS_ASN1_SEQUENCE) ||
|
419
|
+
!CBS_get_asn1(&contents, &version_bytes, CBS_ASN1_INTEGER) ||
|
420
|
+
// EncryptedContentInfo, see
|
421
|
+
// https://tools.ietf.org/html/rfc2315#section-10.1
|
422
|
+
!CBS_get_asn1(&contents, &eci, CBS_ASN1_SEQUENCE) ||
|
423
|
+
!CBS_get_asn1(&eci, &contents_type, CBS_ASN1_OBJECT) ||
|
424
|
+
// AlgorithmIdentifier, see
|
425
|
+
// https://tools.ietf.org/html/rfc5280#section-4.1.1.2
|
426
|
+
!CBS_get_asn1(&eci, &ai, CBS_ASN1_SEQUENCE) ||
|
427
|
+
!CBS_get_asn1_implicit_string(
|
428
|
+
&eci, &encrypted_contents, &storage,
|
429
|
+
CBS_ASN1_CONTEXT_SPECIFIC | 0, CBS_ASN1_OCTETSTRING)) {
|
430
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
431
|
+
goto err;
|
432
|
+
}
|
433
|
+
|
434
|
+
if (!CBS_mem_equal(&contents_type, kPKCS7Data, sizeof(kPKCS7Data))) {
|
435
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
436
|
+
goto err;
|
437
|
+
}
|
438
|
+
|
439
|
+
if (!pkcs8_pbe_decrypt(&out, &out_len, &ai, ctx->password,
|
440
|
+
ctx->password_len, CBS_data(&encrypted_contents),
|
441
|
+
CBS_len(&encrypted_contents))) {
|
442
|
+
goto err;
|
443
|
+
}
|
444
|
+
|
445
|
+
CBS safe_contents;
|
446
|
+
CBS_init(&safe_contents, out, out_len);
|
447
|
+
ret = PKCS12_handle_sequence(&safe_contents, ctx, PKCS12_handle_safe_bag);
|
448
|
+
OPENSSL_free(out);
|
449
|
+
} else if (CBS_mem_equal(&content_type, kPKCS7Data, sizeof(kPKCS7Data))) {
|
450
|
+
CBS octet_string_contents;
|
451
|
+
|
452
|
+
if (!CBS_get_asn1(&wrapped_contents, &octet_string_contents,
|
453
|
+
CBS_ASN1_OCTETSTRING)) {
|
454
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
455
|
+
goto err;
|
456
|
+
}
|
457
|
+
|
458
|
+
ret = PKCS12_handle_sequence(&octet_string_contents, ctx,
|
459
|
+
PKCS12_handle_safe_bag);
|
460
|
+
} else {
|
461
|
+
// Unknown element type - ignore it.
|
462
|
+
ret = 1;
|
463
|
+
}
|
464
|
+
|
465
|
+
err:
|
466
|
+
OPENSSL_free(storage);
|
467
|
+
return ret;
|
468
|
+
}
|
469
|
+
|
470
|
+
int PKCS12_get_key_and_certs(EVP_PKEY **out_key, STACK_OF(X509) *out_certs,
|
471
|
+
CBS *ber_in, const char *password) {
|
472
|
+
uint8_t *der_bytes = NULL;
|
473
|
+
size_t der_len;
|
474
|
+
CBS in, pfx, mac_data, authsafe, content_type, wrapped_authsafes, authsafes;
|
475
|
+
uint64_t version;
|
476
|
+
int ret = 0;
|
477
|
+
struct pkcs12_context ctx;
|
478
|
+
const size_t original_out_certs_len = sk_X509_num(out_certs);
|
479
|
+
|
480
|
+
// The input may be in BER format.
|
481
|
+
if (!CBS_asn1_ber_to_der(ber_in, &der_bytes, &der_len)) {
|
482
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
483
|
+
return 0;
|
484
|
+
}
|
485
|
+
if (der_bytes != NULL) {
|
486
|
+
CBS_init(&in, der_bytes, der_len);
|
487
|
+
} else {
|
488
|
+
CBS_init(&in, CBS_data(ber_in), CBS_len(ber_in));
|
489
|
+
}
|
490
|
+
|
491
|
+
*out_key = NULL;
|
492
|
+
OPENSSL_memset(&ctx, 0, sizeof(ctx));
|
493
|
+
|
494
|
+
// See ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-12/pkcs-12v1.pdf, section
|
495
|
+
// four.
|
496
|
+
if (!CBS_get_asn1(&in, &pfx, CBS_ASN1_SEQUENCE) ||
|
497
|
+
CBS_len(&in) != 0 ||
|
498
|
+
!CBS_get_asn1_uint64(&pfx, &version)) {
|
499
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
500
|
+
goto err;
|
501
|
+
}
|
502
|
+
|
503
|
+
if (version < 3) {
|
504
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_VERSION);
|
505
|
+
goto err;
|
506
|
+
}
|
507
|
+
|
508
|
+
if (!CBS_get_asn1(&pfx, &authsafe, CBS_ASN1_SEQUENCE)) {
|
509
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
510
|
+
goto err;
|
511
|
+
}
|
512
|
+
|
513
|
+
if (CBS_len(&pfx) == 0) {
|
514
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_MISSING_MAC);
|
515
|
+
goto err;
|
516
|
+
}
|
517
|
+
|
518
|
+
if (!CBS_get_asn1(&pfx, &mac_data, CBS_ASN1_SEQUENCE)) {
|
519
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
520
|
+
goto err;
|
521
|
+
}
|
522
|
+
|
523
|
+
// authsafe is a PKCS#7 ContentInfo. See
|
524
|
+
// https://tools.ietf.org/html/rfc2315#section-7.
|
525
|
+
if (!CBS_get_asn1(&authsafe, &content_type, CBS_ASN1_OBJECT) ||
|
526
|
+
!CBS_get_asn1(&authsafe, &wrapped_authsafes,
|
527
|
+
CBS_ASN1_CONTEXT_SPECIFIC | CBS_ASN1_CONSTRUCTED | 0)) {
|
528
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
529
|
+
goto err;
|
530
|
+
}
|
531
|
+
|
532
|
+
// The content type can either be data or signedData. The latter indicates
|
533
|
+
// that it's signed by a public key, which isn't supported.
|
534
|
+
if (!CBS_mem_equal(&content_type, kPKCS7Data, sizeof(kPKCS7Data))) {
|
535
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_PKCS12_PUBLIC_KEY_INTEGRITY_NOT_SUPPORTED);
|
536
|
+
goto err;
|
537
|
+
}
|
538
|
+
|
539
|
+
if (!CBS_get_asn1(&wrapped_authsafes, &authsafes, CBS_ASN1_OCTETSTRING)) {
|
540
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
541
|
+
goto err;
|
542
|
+
}
|
543
|
+
|
544
|
+
ctx.out_key = out_key;
|
545
|
+
ctx.out_certs = out_certs;
|
546
|
+
ctx.password = password;
|
547
|
+
ctx.password_len = password != NULL ? strlen(password) : 0;
|
548
|
+
|
549
|
+
// Verify the MAC.
|
550
|
+
{
|
551
|
+
CBS mac, salt, expected_mac;
|
552
|
+
if (!CBS_get_asn1(&mac_data, &mac, CBS_ASN1_SEQUENCE)) {
|
553
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
554
|
+
goto err;
|
555
|
+
}
|
556
|
+
|
557
|
+
const EVP_MD *md = EVP_parse_digest_algorithm(&mac);
|
558
|
+
if (md == NULL) {
|
559
|
+
goto err;
|
560
|
+
}
|
561
|
+
|
562
|
+
if (!CBS_get_asn1(&mac, &expected_mac, CBS_ASN1_OCTETSTRING) ||
|
563
|
+
!CBS_get_asn1(&mac_data, &salt, CBS_ASN1_OCTETSTRING)) {
|
564
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
565
|
+
goto err;
|
566
|
+
}
|
567
|
+
|
568
|
+
// The iteration count is optional and the default is one.
|
569
|
+
uint64_t iterations = 1;
|
570
|
+
if (CBS_len(&mac_data) > 0) {
|
571
|
+
if (!CBS_get_asn1_uint64(&mac_data, &iterations) ||
|
572
|
+
iterations > UINT_MAX) {
|
573
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
|
574
|
+
goto err;
|
575
|
+
}
|
576
|
+
}
|
577
|
+
|
578
|
+
uint8_t hmac_key[EVP_MAX_MD_SIZE];
|
579
|
+
if (!pkcs12_key_gen(ctx.password, ctx.password_len, CBS_data(&salt),
|
580
|
+
CBS_len(&salt), PKCS12_MAC_ID, iterations,
|
581
|
+
EVP_MD_size(md), hmac_key, md)) {
|
582
|
+
goto err;
|
583
|
+
}
|
584
|
+
|
585
|
+
uint8_t hmac[EVP_MAX_MD_SIZE];
|
586
|
+
unsigned hmac_len;
|
587
|
+
if (NULL == HMAC(md, hmac_key, EVP_MD_size(md), CBS_data(&authsafes),
|
588
|
+
CBS_len(&authsafes), hmac, &hmac_len)) {
|
589
|
+
goto err;
|
590
|
+
}
|
591
|
+
|
592
|
+
if (!CBS_mem_equal(&expected_mac, hmac, hmac_len)) {
|
593
|
+
OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_INCORRECT_PASSWORD);
|
594
|
+
goto err;
|
595
|
+
}
|
596
|
+
}
|
597
|
+
|
598
|
+
// authsafes contains a series of PKCS#7 ContentInfos.
|
599
|
+
if (!PKCS12_handle_sequence(&authsafes, &ctx, PKCS12_handle_content_info)) {
|
600
|
+
goto err;
|
601
|
+
}
|
602
|
+
|
603
|
+
ret = 1;
|
604
|
+
|
605
|
+
err:
|
606
|
+
OPENSSL_free(der_bytes);
|
607
|
+
if (!ret) {
|
608
|
+
EVP_PKEY_free(*out_key);
|
609
|
+
*out_key = NULL;
|
610
|
+
while (sk_X509_num(out_certs) > original_out_certs_len) {
|
611
|
+
X509 *x509 = sk_X509_pop(out_certs);
|
612
|
+
X509_free(x509);
|
613
|
+
}
|
614
|
+
}
|
615
|
+
|
616
|
+
return ret;
|
617
|
+
}
|
618
|
+
|
619
|
+
void PKCS12_PBE_add(void) {}
|
620
|
+
|
621
|
+
struct pkcs12_st {
|
622
|
+
uint8_t *ber_bytes;
|
623
|
+
size_t ber_len;
|
624
|
+
};
|
625
|
+
|
626
|
+
PKCS12 *d2i_PKCS12(PKCS12 **out_p12, const uint8_t **ber_bytes,
|
627
|
+
size_t ber_len) {
|
628
|
+
PKCS12 *p12;
|
629
|
+
|
630
|
+
p12 = OPENSSL_malloc(sizeof(PKCS12));
|
631
|
+
if (!p12) {
|
632
|
+
return NULL;
|
633
|
+
}
|
634
|
+
|
635
|
+
p12->ber_bytes = OPENSSL_malloc(ber_len);
|
636
|
+
if (!p12->ber_bytes) {
|
637
|
+
OPENSSL_free(p12);
|
638
|
+
return NULL;
|
639
|
+
}
|
640
|
+
|
641
|
+
OPENSSL_memcpy(p12->ber_bytes, *ber_bytes, ber_len);
|
642
|
+
p12->ber_len = ber_len;
|
643
|
+
*ber_bytes += ber_len;
|
644
|
+
|
645
|
+
if (out_p12) {
|
646
|
+
PKCS12_free(*out_p12);
|
647
|
+
|
648
|
+
*out_p12 = p12;
|
649
|
+
}
|
650
|
+
|
651
|
+
return p12;
|
652
|
+
}
|
653
|
+
|
654
|
+
PKCS12* d2i_PKCS12_bio(BIO *bio, PKCS12 **out_p12) {
|
655
|
+
size_t used = 0;
|
656
|
+
BUF_MEM *buf;
|
657
|
+
const uint8_t *dummy;
|
658
|
+
static const size_t kMaxSize = 256 * 1024;
|
659
|
+
PKCS12 *ret = NULL;
|
660
|
+
|
661
|
+
buf = BUF_MEM_new();
|
662
|
+
if (buf == NULL) {
|
663
|
+
return NULL;
|
664
|
+
}
|
665
|
+
if (BUF_MEM_grow(buf, 8192) == 0) {
|
666
|
+
goto out;
|
667
|
+
}
|
668
|
+
|
669
|
+
for (;;) {
|
670
|
+
int n = BIO_read(bio, &buf->data[used], buf->length - used);
|
671
|
+
if (n < 0) {
|
672
|
+
if (used == 0) {
|
673
|
+
goto out;
|
674
|
+
}
|
675
|
+
// Workaround a bug in node.js. It uses a memory BIO for this in the wrong
|
676
|
+
// mode.
|
677
|
+
n = 0;
|
678
|
+
}
|
679
|
+
|
680
|
+
if (n == 0) {
|
681
|
+
break;
|
682
|
+
}
|
683
|
+
used += n;
|
684
|
+
|
685
|
+
if (used < buf->length) {
|
686
|
+
continue;
|
687
|
+
}
|
688
|
+
|
689
|
+
if (buf->length > kMaxSize ||
|
690
|
+
BUF_MEM_grow(buf, buf->length * 2) == 0) {
|
691
|
+
goto out;
|
692
|
+
}
|
693
|
+
}
|
694
|
+
|
695
|
+
dummy = (uint8_t*) buf->data;
|
696
|
+
ret = d2i_PKCS12(out_p12, &dummy, used);
|
697
|
+
|
698
|
+
out:
|
699
|
+
BUF_MEM_free(buf);
|
700
|
+
return ret;
|
701
|
+
}
|
702
|
+
|
703
|
+
PKCS12* d2i_PKCS12_fp(FILE *fp, PKCS12 **out_p12) {
|
704
|
+
BIO *bio;
|
705
|
+
PKCS12 *ret;
|
706
|
+
|
707
|
+
bio = BIO_new_fp(fp, 0 /* don't take ownership */);
|
708
|
+
if (!bio) {
|
709
|
+
return NULL;
|
710
|
+
}
|
711
|
+
|
712
|
+
ret = d2i_PKCS12_bio(bio, out_p12);
|
713
|
+
BIO_free(bio);
|
714
|
+
return ret;
|
715
|
+
}
|
716
|
+
|
717
|
+
int PKCS12_parse(const PKCS12 *p12, const char *password, EVP_PKEY **out_pkey,
|
718
|
+
X509 **out_cert, STACK_OF(X509) **out_ca_certs) {
|
719
|
+
CBS ber_bytes;
|
720
|
+
STACK_OF(X509) *ca_certs = NULL;
|
721
|
+
char ca_certs_alloced = 0;
|
722
|
+
|
723
|
+
if (out_ca_certs != NULL && *out_ca_certs != NULL) {
|
724
|
+
ca_certs = *out_ca_certs;
|
725
|
+
}
|
726
|
+
|
727
|
+
if (!ca_certs) {
|
728
|
+
ca_certs = sk_X509_new_null();
|
729
|
+
if (ca_certs == NULL) {
|
730
|
+
OPENSSL_PUT_ERROR(PKCS8, ERR_R_MALLOC_FAILURE);
|
731
|
+
return 0;
|
732
|
+
}
|
733
|
+
ca_certs_alloced = 1;
|
734
|
+
}
|
735
|
+
|
736
|
+
CBS_init(&ber_bytes, p12->ber_bytes, p12->ber_len);
|
737
|
+
if (!PKCS12_get_key_and_certs(out_pkey, ca_certs, &ber_bytes, password)) {
|
738
|
+
if (ca_certs_alloced) {
|
739
|
+
sk_X509_free(ca_certs);
|
740
|
+
}
|
741
|
+
return 0;
|
742
|
+
}
|
743
|
+
|
744
|
+
*out_cert = NULL;
|
745
|
+
if (sk_X509_num(ca_certs) > 0) {
|
746
|
+
*out_cert = sk_X509_shift(ca_certs);
|
747
|
+
}
|
748
|
+
|
749
|
+
if (out_ca_certs) {
|
750
|
+
*out_ca_certs = ca_certs;
|
751
|
+
} else {
|
752
|
+
sk_X509_pop_free(ca_certs, X509_free);
|
753
|
+
}
|
754
|
+
|
755
|
+
return 1;
|
756
|
+
}
|
757
|
+
|
758
|
+
int PKCS12_verify_mac(const PKCS12 *p12, const char *password,
|
759
|
+
int password_len) {
|
760
|
+
if (password == NULL) {
|
761
|
+
if (password_len != 0) {
|
762
|
+
return 0;
|
763
|
+
}
|
764
|
+
} else if (password_len != -1 &&
|
765
|
+
(password[password_len] != 0 ||
|
766
|
+
OPENSSL_memchr(password, 0, password_len) != NULL)) {
|
767
|
+
return 0;
|
768
|
+
}
|
769
|
+
|
770
|
+
EVP_PKEY *pkey = NULL;
|
771
|
+
X509 *cert = NULL;
|
772
|
+
if (!PKCS12_parse(p12, password, &pkey, &cert, NULL)) {
|
773
|
+
ERR_clear_error();
|
774
|
+
return 0;
|
775
|
+
}
|
776
|
+
|
777
|
+
EVP_PKEY_free(pkey);
|
778
|
+
X509_free(cert);
|
779
|
+
|
780
|
+
return 1;
|
781
|
+
}
|
782
|
+
|
783
|
+
void PKCS12_free(PKCS12 *p12) {
|
784
|
+
if (p12 == NULL) {
|
785
|
+
return;
|
786
|
+
}
|
787
|
+
OPENSSL_free(p12->ber_bytes);
|
788
|
+
OPENSSL_free(p12);
|
789
|
+
}
|