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,326 @@
|
|
1
|
+
/* Copyright (c) 2014, Google Inc.
|
2
|
+
*
|
3
|
+
* Permission to use, copy, modify, and/or distribute this software for any
|
4
|
+
* purpose with or without fee is hereby granted, provided that the above
|
5
|
+
* copyright notice and this permission notice appear in all copies.
|
6
|
+
*
|
7
|
+
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
8
|
+
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
9
|
+
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
10
|
+
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
11
|
+
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
|
12
|
+
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
13
|
+
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
|
14
|
+
|
15
|
+
#include <openssl/aead.h>
|
16
|
+
|
17
|
+
#include <string.h>
|
18
|
+
|
19
|
+
#include <openssl/chacha.h>
|
20
|
+
#include <openssl/cipher.h>
|
21
|
+
#include <openssl/cpu.h>
|
22
|
+
#include <openssl/err.h>
|
23
|
+
#include <openssl/mem.h>
|
24
|
+
#include <openssl/poly1305.h>
|
25
|
+
#include <openssl/type_check.h>
|
26
|
+
|
27
|
+
#include "../fipsmodule/cipher/internal.h"
|
28
|
+
#include "../internal.h"
|
29
|
+
|
30
|
+
|
31
|
+
#define POLY1305_TAG_LEN 16
|
32
|
+
|
33
|
+
struct aead_chacha20_poly1305_ctx {
|
34
|
+
uint8_t key[32];
|
35
|
+
};
|
36
|
+
|
37
|
+
// For convenience (the x86_64 calling convention allows only six parameters in
|
38
|
+
// registers), the final parameter for the assembly functions is both an input
|
39
|
+
// and output parameter.
|
40
|
+
union open_data {
|
41
|
+
struct {
|
42
|
+
alignas(16) uint8_t key[32];
|
43
|
+
uint32_t counter;
|
44
|
+
uint8_t nonce[12];
|
45
|
+
} in;
|
46
|
+
struct {
|
47
|
+
uint8_t tag[POLY1305_TAG_LEN];
|
48
|
+
} out;
|
49
|
+
};
|
50
|
+
|
51
|
+
union seal_data {
|
52
|
+
struct {
|
53
|
+
alignas(16) uint8_t key[32];
|
54
|
+
uint32_t counter;
|
55
|
+
uint8_t nonce[12];
|
56
|
+
const uint8_t *extra_ciphertext;
|
57
|
+
size_t extra_ciphertext_len;
|
58
|
+
} in;
|
59
|
+
struct {
|
60
|
+
uint8_t tag[POLY1305_TAG_LEN];
|
61
|
+
} out;
|
62
|
+
};
|
63
|
+
|
64
|
+
#if defined(OPENSSL_X86_64) && !defined(OPENSSL_NO_ASM) && \
|
65
|
+
!defined(OPENSSL_WINDOWS)
|
66
|
+
static int asm_capable(void) {
|
67
|
+
const int sse41_capable = (OPENSSL_ia32cap_P[1] & (1 << 19)) != 0;
|
68
|
+
return sse41_capable;
|
69
|
+
}
|
70
|
+
|
71
|
+
OPENSSL_COMPILE_ASSERT(sizeof(union open_data) == 48, wrong_open_data_size);
|
72
|
+
OPENSSL_COMPILE_ASSERT(sizeof(union seal_data) == 48 + 8 + 8,
|
73
|
+
wrong_seal_data_size);
|
74
|
+
|
75
|
+
// chacha20_poly1305_open is defined in chacha20_poly1305_x86_64.pl. It decrypts
|
76
|
+
// |plaintext_len| bytes from |ciphertext| and writes them to |out_plaintext|.
|
77
|
+
// Additional input parameters are passed in |aead_data->in|. On exit, it will
|
78
|
+
// write calculated tag value to |aead_data->out.tag|, which the caller must
|
79
|
+
// check.
|
80
|
+
extern void chacha20_poly1305_open(uint8_t *out_plaintext,
|
81
|
+
const uint8_t *ciphertext,
|
82
|
+
size_t plaintext_len, const uint8_t *ad,
|
83
|
+
size_t ad_len, union open_data *aead_data);
|
84
|
+
|
85
|
+
// chacha20_poly1305_open is defined in chacha20_poly1305_x86_64.pl. It encrypts
|
86
|
+
// |plaintext_len| bytes from |plaintext| and writes them to |out_ciphertext|.
|
87
|
+
// Additional input parameters are passed in |aead_data->in|. The calculated tag
|
88
|
+
// value is over the computed ciphertext concatenated with |extra_ciphertext|
|
89
|
+
// and written to |aead_data->out.tag|.
|
90
|
+
extern void chacha20_poly1305_seal(uint8_t *out_ciphertext,
|
91
|
+
const uint8_t *plaintext,
|
92
|
+
size_t plaintext_len, const uint8_t *ad,
|
93
|
+
size_t ad_len, union seal_data *aead_data);
|
94
|
+
#else
|
95
|
+
static int asm_capable(void) { return 0; }
|
96
|
+
|
97
|
+
|
98
|
+
static void chacha20_poly1305_open(uint8_t *out_plaintext,
|
99
|
+
const uint8_t *ciphertext,
|
100
|
+
size_t plaintext_len, const uint8_t *ad,
|
101
|
+
size_t ad_len, union open_data *aead_data) {}
|
102
|
+
|
103
|
+
static void chacha20_poly1305_seal(uint8_t *out_ciphertext,
|
104
|
+
const uint8_t *plaintext,
|
105
|
+
size_t plaintext_len, const uint8_t *ad,
|
106
|
+
size_t ad_len, union seal_data *aead_data) {}
|
107
|
+
#endif
|
108
|
+
|
109
|
+
static int aead_chacha20_poly1305_init(EVP_AEAD_CTX *ctx, const uint8_t *key,
|
110
|
+
size_t key_len, size_t tag_len) {
|
111
|
+
struct aead_chacha20_poly1305_ctx *c20_ctx;
|
112
|
+
|
113
|
+
if (tag_len == 0) {
|
114
|
+
tag_len = POLY1305_TAG_LEN;
|
115
|
+
}
|
116
|
+
|
117
|
+
if (tag_len > POLY1305_TAG_LEN) {
|
118
|
+
OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_TOO_LARGE);
|
119
|
+
return 0;
|
120
|
+
}
|
121
|
+
|
122
|
+
if (key_len != sizeof(c20_ctx->key)) {
|
123
|
+
return 0; // internal error - EVP_AEAD_CTX_init should catch this.
|
124
|
+
}
|
125
|
+
|
126
|
+
c20_ctx = OPENSSL_malloc(sizeof(struct aead_chacha20_poly1305_ctx));
|
127
|
+
if (c20_ctx == NULL) {
|
128
|
+
return 0;
|
129
|
+
}
|
130
|
+
|
131
|
+
OPENSSL_memcpy(c20_ctx->key, key, key_len);
|
132
|
+
ctx->aead_state = c20_ctx;
|
133
|
+
ctx->tag_len = tag_len;
|
134
|
+
|
135
|
+
return 1;
|
136
|
+
}
|
137
|
+
|
138
|
+
static void aead_chacha20_poly1305_cleanup(EVP_AEAD_CTX *ctx) {
|
139
|
+
OPENSSL_free(ctx->aead_state);
|
140
|
+
}
|
141
|
+
|
142
|
+
static void poly1305_update_length(poly1305_state *poly1305, size_t data_len) {
|
143
|
+
uint8_t length_bytes[8];
|
144
|
+
|
145
|
+
for (unsigned i = 0; i < sizeof(length_bytes); i++) {
|
146
|
+
length_bytes[i] = data_len;
|
147
|
+
data_len >>= 8;
|
148
|
+
}
|
149
|
+
|
150
|
+
CRYPTO_poly1305_update(poly1305, length_bytes, sizeof(length_bytes));
|
151
|
+
}
|
152
|
+
|
153
|
+
// calc_tag fills |tag| with the authentication tag for the given inputs.
|
154
|
+
static void calc_tag(uint8_t tag[POLY1305_TAG_LEN],
|
155
|
+
const struct aead_chacha20_poly1305_ctx *c20_ctx,
|
156
|
+
const uint8_t nonce[12], const uint8_t *ad, size_t ad_len,
|
157
|
+
const uint8_t *ciphertext, size_t ciphertext_len,
|
158
|
+
const uint8_t *ciphertext_extra,
|
159
|
+
size_t ciphertext_extra_len) {
|
160
|
+
alignas(16) uint8_t poly1305_key[32];
|
161
|
+
OPENSSL_memset(poly1305_key, 0, sizeof(poly1305_key));
|
162
|
+
CRYPTO_chacha_20(poly1305_key, poly1305_key, sizeof(poly1305_key),
|
163
|
+
c20_ctx->key, nonce, 0);
|
164
|
+
|
165
|
+
static const uint8_t padding[16] = { 0 }; // Padding is all zeros.
|
166
|
+
poly1305_state ctx;
|
167
|
+
CRYPTO_poly1305_init(&ctx, poly1305_key);
|
168
|
+
CRYPTO_poly1305_update(&ctx, ad, ad_len);
|
169
|
+
if (ad_len % 16 != 0) {
|
170
|
+
CRYPTO_poly1305_update(&ctx, padding, sizeof(padding) - (ad_len % 16));
|
171
|
+
}
|
172
|
+
CRYPTO_poly1305_update(&ctx, ciphertext, ciphertext_len);
|
173
|
+
CRYPTO_poly1305_update(&ctx, ciphertext_extra, ciphertext_extra_len);
|
174
|
+
const size_t ciphertext_total = ciphertext_len + ciphertext_extra_len;
|
175
|
+
if (ciphertext_total % 16 != 0) {
|
176
|
+
CRYPTO_poly1305_update(&ctx, padding,
|
177
|
+
sizeof(padding) - (ciphertext_total % 16));
|
178
|
+
}
|
179
|
+
poly1305_update_length(&ctx, ad_len);
|
180
|
+
poly1305_update_length(&ctx, ciphertext_total);
|
181
|
+
CRYPTO_poly1305_finish(&ctx, tag);
|
182
|
+
}
|
183
|
+
|
184
|
+
static int aead_chacha20_poly1305_seal_scatter(
|
185
|
+
const EVP_AEAD_CTX *ctx, uint8_t *out, uint8_t *out_tag,
|
186
|
+
size_t *out_tag_len, size_t max_out_tag_len, const uint8_t *nonce,
|
187
|
+
size_t nonce_len, const uint8_t *in, size_t in_len, const uint8_t *extra_in,
|
188
|
+
size_t extra_in_len, const uint8_t *ad, size_t ad_len) {
|
189
|
+
const struct aead_chacha20_poly1305_ctx *c20_ctx = ctx->aead_state;
|
190
|
+
|
191
|
+
if (extra_in_len + ctx->tag_len < ctx->tag_len) {
|
192
|
+
OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_TOO_LARGE);
|
193
|
+
return 0;
|
194
|
+
}
|
195
|
+
if (max_out_tag_len < ctx->tag_len + extra_in_len) {
|
196
|
+
OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_BUFFER_TOO_SMALL);
|
197
|
+
return 0;
|
198
|
+
}
|
199
|
+
if (nonce_len != 12) {
|
200
|
+
OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_UNSUPPORTED_NONCE_SIZE);
|
201
|
+
return 0;
|
202
|
+
}
|
203
|
+
|
204
|
+
// |CRYPTO_chacha_20| uses a 32-bit block counter. Therefore we disallow
|
205
|
+
// individual operations that work on more than 256GB at a time.
|
206
|
+
// |in_len_64| is needed because, on 32-bit platforms, size_t is only
|
207
|
+
// 32-bits and this produces a warning because it's always false.
|
208
|
+
// Casting to uint64_t inside the conditional is not sufficient to stop
|
209
|
+
// the warning.
|
210
|
+
const uint64_t in_len_64 = in_len;
|
211
|
+
if (in_len_64 >= (UINT64_C(1) << 32) * 64 - 64) {
|
212
|
+
OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_TOO_LARGE);
|
213
|
+
return 0;
|
214
|
+
}
|
215
|
+
|
216
|
+
if (max_out_tag_len < ctx->tag_len) {
|
217
|
+
OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_BUFFER_TOO_SMALL);
|
218
|
+
return 0;
|
219
|
+
}
|
220
|
+
|
221
|
+
// The the extra input is given, it is expected to be very short and so is
|
222
|
+
// encrypted byte-by-byte first.
|
223
|
+
if (extra_in_len) {
|
224
|
+
static const size_t kChaChaBlockSize = 64;
|
225
|
+
uint32_t block_counter = 1 + (in_len / kChaChaBlockSize);
|
226
|
+
size_t offset = in_len % kChaChaBlockSize;
|
227
|
+
uint8_t block[64 /* kChaChaBlockSize */];
|
228
|
+
|
229
|
+
for (size_t done = 0; done < extra_in_len; block_counter++) {
|
230
|
+
memset(block, 0, sizeof(block));
|
231
|
+
CRYPTO_chacha_20(block, block, sizeof(block), c20_ctx->key, nonce,
|
232
|
+
block_counter);
|
233
|
+
for (size_t i = offset; i < sizeof(block) && done < extra_in_len;
|
234
|
+
i++, done++) {
|
235
|
+
out_tag[done] = extra_in[done] ^ block[i];
|
236
|
+
}
|
237
|
+
offset = 0;
|
238
|
+
}
|
239
|
+
}
|
240
|
+
|
241
|
+
union seal_data data;
|
242
|
+
if (asm_capable()) {
|
243
|
+
OPENSSL_memcpy(data.in.key, c20_ctx->key, 32);
|
244
|
+
data.in.counter = 0;
|
245
|
+
OPENSSL_memcpy(data.in.nonce, nonce, 12);
|
246
|
+
data.in.extra_ciphertext = out_tag;
|
247
|
+
data.in.extra_ciphertext_len = extra_in_len;
|
248
|
+
chacha20_poly1305_seal(out, in, in_len, ad, ad_len, &data);
|
249
|
+
} else {
|
250
|
+
CRYPTO_chacha_20(out, in, in_len, c20_ctx->key, nonce, 1);
|
251
|
+
calc_tag(data.out.tag, c20_ctx, nonce, ad, ad_len, out, in_len, out_tag,
|
252
|
+
extra_in_len);
|
253
|
+
}
|
254
|
+
|
255
|
+
OPENSSL_memcpy(out_tag + extra_in_len, data.out.tag, ctx->tag_len);
|
256
|
+
*out_tag_len = extra_in_len + ctx->tag_len;
|
257
|
+
return 1;
|
258
|
+
}
|
259
|
+
|
260
|
+
static int aead_chacha20_poly1305_open_gather(
|
261
|
+
const EVP_AEAD_CTX *ctx, uint8_t *out, const uint8_t *nonce,
|
262
|
+
size_t nonce_len, const uint8_t *in, size_t in_len, const uint8_t *in_tag,
|
263
|
+
size_t in_tag_len, const uint8_t *ad, size_t ad_len) {
|
264
|
+
const struct aead_chacha20_poly1305_ctx *c20_ctx = ctx->aead_state;
|
265
|
+
|
266
|
+
if (nonce_len != 12) {
|
267
|
+
OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_UNSUPPORTED_NONCE_SIZE);
|
268
|
+
return 0;
|
269
|
+
}
|
270
|
+
|
271
|
+
if (in_tag_len != ctx->tag_len) {
|
272
|
+
OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_BAD_DECRYPT);
|
273
|
+
return 0;
|
274
|
+
}
|
275
|
+
|
276
|
+
// |CRYPTO_chacha_20| uses a 32-bit block counter. Therefore we disallow
|
277
|
+
// individual operations that work on more than 256GB at a time.
|
278
|
+
// |in_len_64| is needed because, on 32-bit platforms, size_t is only
|
279
|
+
// 32-bits and this produces a warning because it's always false.
|
280
|
+
// Casting to uint64_t inside the conditional is not sufficient to stop
|
281
|
+
// the warning.
|
282
|
+
const uint64_t in_len_64 = in_len;
|
283
|
+
if (in_len_64 >= (UINT64_C(1) << 32) * 64 - 64) {
|
284
|
+
OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_TOO_LARGE);
|
285
|
+
return 0;
|
286
|
+
}
|
287
|
+
|
288
|
+
union open_data data;
|
289
|
+
if (asm_capable()) {
|
290
|
+
OPENSSL_memcpy(data.in.key, c20_ctx->key, 32);
|
291
|
+
data.in.counter = 0;
|
292
|
+
OPENSSL_memcpy(data.in.nonce, nonce, 12);
|
293
|
+
chacha20_poly1305_open(out, in, in_len, ad, ad_len, &data);
|
294
|
+
} else {
|
295
|
+
calc_tag(data.out.tag, c20_ctx, nonce, ad, ad_len, in, in_len, NULL, 0);
|
296
|
+
CRYPTO_chacha_20(out, in, in_len, c20_ctx->key, nonce, 1);
|
297
|
+
}
|
298
|
+
|
299
|
+
if (CRYPTO_memcmp(data.out.tag, in_tag, ctx->tag_len) != 0) {
|
300
|
+
OPENSSL_PUT_ERROR(CIPHER, CIPHER_R_BAD_DECRYPT);
|
301
|
+
return 0;
|
302
|
+
}
|
303
|
+
|
304
|
+
return 1;
|
305
|
+
}
|
306
|
+
|
307
|
+
static const EVP_AEAD aead_chacha20_poly1305 = {
|
308
|
+
32, // key len
|
309
|
+
12, // nonce len
|
310
|
+
POLY1305_TAG_LEN, // overhead
|
311
|
+
POLY1305_TAG_LEN, // max tag length
|
312
|
+
1, // seal_scatter_supports_extra_in
|
313
|
+
|
314
|
+
aead_chacha20_poly1305_init,
|
315
|
+
NULL, // init_with_direction
|
316
|
+
aead_chacha20_poly1305_cleanup,
|
317
|
+
NULL /* open */,
|
318
|
+
aead_chacha20_poly1305_seal_scatter,
|
319
|
+
aead_chacha20_poly1305_open_gather,
|
320
|
+
NULL, // get_iv
|
321
|
+
NULL, // tag_len
|
322
|
+
};
|
323
|
+
|
324
|
+
const EVP_AEAD *EVP_aead_chacha20_poly1305(void) {
|
325
|
+
return &aead_chacha20_poly1305;
|
326
|
+
}
|
@@ -57,8 +57,6 @@
|
|
57
57
|
#include <openssl/cipher.h>
|
58
58
|
#include <openssl/nid.h>
|
59
59
|
|
60
|
-
#include "internal.h"
|
61
|
-
|
62
60
|
|
63
61
|
#define c2l(c, l) \
|
64
62
|
do { \
|
@@ -75,18 +73,25 @@
|
|
75
73
|
switch (n) { \
|
76
74
|
case 8: \
|
77
75
|
(l2) = ((uint32_t)(*(--(c)))) << 24L; \
|
76
|
+
OPENSSL_FALLTHROUGH; \
|
78
77
|
case 7: \
|
79
78
|
(l2) |= ((uint32_t)(*(--(c)))) << 16L; \
|
79
|
+
OPENSSL_FALLTHROUGH; \
|
80
80
|
case 6: \
|
81
81
|
(l2) |= ((uint32_t)(*(--(c)))) << 8L; \
|
82
|
+
OPENSSL_FALLTHROUGH; \
|
82
83
|
case 5: \
|
83
84
|
(l2) |= ((uint32_t)(*(--(c)))); \
|
85
|
+
OPENSSL_FALLTHROUGH; \
|
84
86
|
case 4: \
|
85
87
|
(l1) = ((uint32_t)(*(--(c)))) << 24L; \
|
88
|
+
OPENSSL_FALLTHROUGH; \
|
86
89
|
case 3: \
|
87
90
|
(l1) |= ((uint32_t)(*(--(c)))) << 16L; \
|
91
|
+
OPENSSL_FALLTHROUGH; \
|
88
92
|
case 2: \
|
89
93
|
(l1) |= ((uint32_t)(*(--(c)))) << 8L; \
|
94
|
+
OPENSSL_FALLTHROUGH; \
|
90
95
|
case 1: \
|
91
96
|
(l1) |= ((uint32_t)(*(--(c)))); \
|
92
97
|
} \
|
@@ -106,18 +111,25 @@
|
|
106
111
|
switch (n) { \
|
107
112
|
case 8: \
|
108
113
|
*(--(c)) = (uint8_t)(((l2) >> 24L) & 0xff); \
|
114
|
+
OPENSSL_FALLTHROUGH; \
|
109
115
|
case 7: \
|
110
116
|
*(--(c)) = (uint8_t)(((l2) >> 16L) & 0xff); \
|
117
|
+
OPENSSL_FALLTHROUGH; \
|
111
118
|
case 6: \
|
112
119
|
*(--(c)) = (uint8_t)(((l2) >> 8L) & 0xff); \
|
120
|
+
OPENSSL_FALLTHROUGH; \
|
113
121
|
case 5: \
|
114
122
|
*(--(c)) = (uint8_t)(((l2)) & 0xff); \
|
123
|
+
OPENSSL_FALLTHROUGH; \
|
115
124
|
case 4: \
|
116
125
|
*(--(c)) = (uint8_t)(((l1) >> 24L) & 0xff); \
|
126
|
+
OPENSSL_FALLTHROUGH; \
|
117
127
|
case 3: \
|
118
128
|
*(--(c)) = (uint8_t)(((l1) >> 16L) & 0xff); \
|
129
|
+
OPENSSL_FALLTHROUGH; \
|
119
130
|
case 2: \
|
120
131
|
*(--(c)) = (uint8_t)(((l1) >> 8L) & 0xff); \
|
132
|
+
OPENSSL_FALLTHROUGH; \
|
121
133
|
case 1: \
|
122
134
|
*(--(c)) = (uint8_t)(((l1)) & 0xff); \
|
123
135
|
} \
|
@@ -319,7 +331,7 @@ static void RC2_set_key(RC2_KEY *key, int len, const uint8_t *data, int bits) {
|
|
319
331
|
unsigned int c, d;
|
320
332
|
|
321
333
|
k = (uint8_t *)&key->data[0];
|
322
|
-
*k = 0;
|
334
|
+
*k = 0; // for if there is a zero length key
|
323
335
|
|
324
336
|
if (len > 128) {
|
325
337
|
len = 128;
|
@@ -335,7 +347,7 @@ static void RC2_set_key(RC2_KEY *key, int len, const uint8_t *data, int bits) {
|
|
335
347
|
k[i] = data[i];
|
336
348
|
}
|
337
349
|
|
338
|
-
|
350
|
+
// expand table
|
339
351
|
d = k[len - 1];
|
340
352
|
j = 0;
|
341
353
|
for (i = len; i < 128; i++, j++) {
|
@@ -343,7 +355,7 @@ static void RC2_set_key(RC2_KEY *key, int len, const uint8_t *data, int bits) {
|
|
343
355
|
k[i] = d;
|
344
356
|
}
|
345
357
|
|
346
|
-
|
358
|
+
// hmm.... key reduction to 'bits' bits
|
347
359
|
|
348
360
|
j = (bits + 7) >> 3;
|
349
361
|
i = 128 - j;
|
@@ -356,7 +368,7 @@ static void RC2_set_key(RC2_KEY *key, int len, const uint8_t *data, int bits) {
|
|
356
368
|
k[i] = d;
|
357
369
|
}
|
358
370
|
|
359
|
-
|
371
|
+
// copy from bytes into uint16_t's
|
360
372
|
ki = &(key->data[63]);
|
361
373
|
for (i = 127; i >= 0; i -= 2) {
|
362
374
|
*(ki--) = ((k[i] << 8) | k[i - 1]) & 0xffff;
|
@@ -364,8 +376,8 @@ static void RC2_set_key(RC2_KEY *key, int len, const uint8_t *data, int bits) {
|
|
364
376
|
}
|
365
377
|
|
366
378
|
typedef struct {
|
367
|
-
int key_bits;
|
368
|
-
RC2_KEY ks;
|
379
|
+
int key_bits; // effective key bits
|
380
|
+
RC2_KEY ks; // key schedule
|
369
381
|
} EVP_RC2_KEY;
|
370
382
|
|
371
383
|
static int rc2_init_key(EVP_CIPHER_CTX *ctx, const uint8_t *key,
|
@@ -401,8 +413,8 @@ static int rc2_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) {
|
|
401
413
|
key->key_bits = EVP_CIPHER_CTX_key_length(ctx) * 8;
|
402
414
|
return 1;
|
403
415
|
case EVP_CTRL_SET_RC2_KEY_BITS:
|
404
|
-
|
405
|
-
|
416
|
+
// Should be overridden by later call to |EVP_CTRL_INIT|, but
|
417
|
+
// people call it, so it may as well work.
|
406
418
|
key->key_bits = arg;
|
407
419
|
return 1;
|
408
420
|
|
File without changes
|