grpc 1.24.0 → 1.25.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of grpc might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/Makefile +306 -243
- data/etc/roots.pem +0 -100
- data/include/grpc/grpc_security.h +44 -18
- data/include/grpc/impl/codegen/grpc_types.h +15 -0
- data/include/grpc/impl/codegen/port_platform.h +27 -11
- data/include/grpc/impl/codegen/sync_generic.h +1 -1
- data/src/boringssl/err_data.c +695 -650
- data/src/core/ext/filters/client_channel/client_channel.cc +257 -179
- data/src/core/ext/filters/client_channel/client_channel.h +24 -0
- data/src/core/ext/filters/client_channel/client_channel_channelz.cc +2 -3
- data/src/core/ext/filters/client_channel/client_channel_factory.h +1 -5
- data/src/core/ext/filters/client_channel/health/health_check_client.cc +18 -45
- data/src/core/ext/filters/client_channel/health/health_check_client.h +5 -13
- data/src/core/ext/filters/client_channel/http_connect_handshaker.cc +1 -1
- data/src/core/ext/filters/client_channel/lb_policy.cc +2 -3
- data/src/core/ext/filters/client_channel/lb_policy.h +65 -55
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc +14 -14
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +113 -36
- data/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +14 -19
- data/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +36 -13
- data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +3 -10
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc +814 -1589
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds.h +2 -5
- data/src/core/ext/filters/client_channel/lb_policy_factory.h +3 -6
- data/src/core/ext/filters/client_channel/resolver.cc +1 -2
- data/src/core/ext/filters/client_channel/resolver.h +8 -16
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +25 -8
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc +46 -12
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h +10 -17
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc +7 -8
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +4 -4
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +111 -44
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +22 -14
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h +1 -1
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc +2 -2
- data/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +29 -10
- data/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +27 -36
- data/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc +7 -10
- data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc +60 -16
- data/src/core/ext/filters/client_channel/resolver_factory.h +4 -8
- data/src/core/ext/filters/client_channel/resolver_registry.cc +1 -1
- data/src/core/ext/filters/client_channel/resolver_registry.h +1 -1
- data/src/core/ext/filters/client_channel/resolver_result_parsing.cc +7 -10
- data/src/core/ext/filters/client_channel/resolving_lb_policy.cc +7 -8
- data/src/core/ext/filters/client_channel/resolving_lb_policy.h +1 -1
- data/src/core/ext/filters/client_channel/retry_throttle.cc +5 -5
- data/src/core/ext/filters/client_channel/retry_throttle.h +1 -4
- data/src/core/ext/filters/client_channel/service_config.h +8 -8
- data/src/core/ext/filters/client_channel/subchannel.cc +53 -86
- data/src/core/ext/filters/client_channel/subchannel.h +7 -9
- data/src/core/ext/filters/client_channel/subchannel_interface.h +9 -13
- data/src/core/ext/filters/client_channel/subchannel_pool_interface.h +3 -6
- data/src/core/ext/filters/client_channel/{lb_policy/xds/xds_load_balancer_api.cc → xds/xds_api.cc} +169 -52
- data/src/core/ext/filters/client_channel/xds/xds_api.h +171 -0
- data/src/core/ext/filters/client_channel/xds/xds_bootstrap.cc +450 -0
- data/src/core/ext/filters/client_channel/xds/xds_bootstrap.h +99 -0
- data/src/core/ext/filters/client_channel/{lb_policy/xds → xds}/xds_channel.h +8 -6
- data/src/core/ext/filters/client_channel/xds/xds_channel_args.h +26 -0
- data/src/core/ext/filters/client_channel/{lb_policy/xds → xds}/xds_channel_secure.cc +28 -11
- data/src/core/ext/filters/client_channel/xds/xds_client.cc +1413 -0
- data/src/core/ext/filters/client_channel/xds/xds_client.h +221 -0
- data/src/core/ext/filters/client_channel/{lb_policy/xds → xds}/xds_client_stats.cc +1 -5
- data/src/core/ext/filters/client_channel/{lb_policy/xds → xds}/xds_client_stats.h +3 -4
- data/src/core/ext/filters/deadline/deadline_filter.cc +20 -20
- data/src/core/ext/filters/http/client/http_client_filter.cc +15 -15
- data/src/core/ext/filters/http/client_authority_filter.cc +14 -14
- data/src/core/ext/filters/http/message_compress/message_compress_filter.cc +12 -12
- data/src/core/ext/filters/max_age/max_age_filter.cc +59 -50
- data/src/core/ext/filters/message_size/message_size_filter.cc +18 -18
- data/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc +15 -14
- data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +233 -175
- data/src/core/ext/transport/chttp2/transport/flow_control.h +21 -24
- data/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +253 -163
- data/src/core/ext/transport/chttp2/transport/hpack_encoder.h +24 -12
- data/src/core/ext/transport/chttp2/transport/hpack_parser.cc +2 -3
- data/src/core/ext/transport/chttp2/transport/internal.h +13 -15
- data/src/core/ext/transport/chttp2/transport/writing.cc +3 -0
- data/src/core/ext/transport/inproc/inproc_transport.cc +20 -13
- data/src/core/lib/channel/channel_args.cc +16 -0
- data/src/core/lib/channel/channel_args.h +22 -0
- data/src/core/lib/channel/channelz.cc +5 -6
- data/src/core/lib/channel/channelz.h +1 -1
- data/src/core/lib/channel/connected_channel.cc +20 -20
- data/src/core/lib/channel/handshaker.h +3 -4
- data/src/core/lib/channel/handshaker_factory.h +1 -3
- data/src/core/lib/debug/trace.h +3 -2
- data/src/core/lib/gprpp/arena.cc +3 -3
- data/src/core/lib/gprpp/arena.h +2 -3
- data/src/core/lib/gprpp/inlined_vector.h +9 -0
- data/src/core/lib/gprpp/map.h +3 -501
- data/src/core/lib/gprpp/memory.h +45 -41
- data/src/core/lib/gprpp/mpscq.cc +108 -0
- data/src/core/lib/gprpp/mpscq.h +98 -0
- data/src/core/lib/gprpp/orphanable.h +6 -11
- data/src/core/lib/gprpp/ref_counted.h +25 -19
- data/src/core/lib/gprpp/set.h +33 -0
- data/src/core/lib/gprpp/thd.h +2 -4
- data/src/core/lib/http/httpcli.cc +1 -1
- data/src/core/lib/http/httpcli_security_connector.cc +15 -11
- data/src/core/lib/http/parser.cc +1 -1
- data/src/core/lib/iomgr/buffer_list.cc +4 -5
- data/src/core/lib/iomgr/buffer_list.h +5 -6
- data/src/core/lib/iomgr/call_combiner.cc +4 -5
- data/src/core/lib/iomgr/call_combiner.h +2 -2
- data/src/core/lib/iomgr/cfstream_handle.h +3 -5
- data/src/core/lib/iomgr/closure.h +8 -3
- data/src/core/lib/iomgr/combiner.cc +45 -82
- data/src/core/lib/iomgr/combiner.h +32 -8
- data/src/core/lib/iomgr/endpoint_cfstream.cc +5 -3
- data/src/core/lib/iomgr/ev_epoll1_linux.cc +19 -15
- data/src/core/lib/iomgr/ev_poll_posix.cc +3 -1
- data/src/core/lib/iomgr/exec_ctx.h +4 -3
- data/src/core/lib/iomgr/executor.cc +4 -2
- data/src/core/lib/iomgr/executor.h +3 -0
- data/src/core/lib/iomgr/executor/mpmcqueue.h +3 -6
- data/src/core/lib/iomgr/executor/threadpool.cc +1 -2
- data/src/core/lib/iomgr/executor/threadpool.h +7 -11
- data/src/core/lib/iomgr/resource_quota.cc +55 -51
- data/src/core/lib/iomgr/resource_quota.h +13 -9
- data/src/core/lib/iomgr/socket_utils_common_posix.cc +13 -0
- data/src/core/lib/iomgr/socket_utils_posix.h +4 -0
- data/src/core/lib/iomgr/tcp_client_posix.cc +4 -11
- data/src/core/lib/iomgr/tcp_custom.cc +9 -7
- data/src/core/lib/iomgr/tcp_posix.cc +20 -16
- data/src/core/lib/iomgr/tcp_server.h +1 -4
- data/src/core/lib/iomgr/tcp_server_custom.cc +5 -5
- data/src/core/lib/iomgr/tcp_server_posix.cc +1 -1
- data/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +2 -11
- data/src/core/lib/iomgr/timer_custom.cc +2 -2
- data/src/core/lib/iomgr/udp_server.cc +3 -2
- data/src/core/lib/iomgr/udp_server.h +6 -12
- data/src/core/lib/json/json.h +1 -1
- data/src/core/lib/json/json_string.cc +2 -2
- data/src/core/lib/profiling/basic_timers.cc +2 -2
- data/src/core/lib/security/credentials/alts/alts_credentials.cc +2 -2
- data/src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc +1 -1
- data/src/core/lib/security/credentials/credentials.h +4 -20
- data/src/core/lib/security/credentials/fake/fake_credentials.cc +4 -4
- data/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +1 -3
- data/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h +64 -0
- data/src/core/lib/security/security_connector/alts/alts_security_connector.cc +4 -4
- data/src/core/lib/security/security_connector/fake/fake_security_connector.cc +9 -7
- data/src/core/lib/security/security_connector/load_system_roots_linux.cc +2 -0
- data/src/core/lib/security/security_connector/local/local_security_connector.cc +4 -4
- data/src/core/lib/security/security_connector/security_connector.cc +1 -0
- data/src/core/lib/security/security_connector/security_connector.h +19 -17
- data/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc +8 -5
- data/src/core/lib/security/security_connector/ssl_utils.cc +2 -2
- data/src/core/lib/security/security_connector/ssl_utils.h +1 -1
- data/src/core/lib/security/security_connector/tls/spiffe_security_connector.cc +14 -6
- data/src/core/lib/security/security_connector/tls/spiffe_security_connector.h +4 -2
- data/src/core/lib/security/transport/client_auth_filter.cc +17 -17
- data/src/core/lib/security/transport/security_handshaker.cc +29 -13
- data/src/core/lib/security/transport/security_handshaker.h +4 -2
- data/src/core/lib/security/transport/server_auth_filter.cc +14 -14
- data/src/core/lib/slice/slice.cc +2 -10
- data/src/core/lib/slice/slice_hash_table.h +4 -6
- data/src/core/lib/slice/slice_intern.cc +42 -39
- data/src/core/lib/slice/slice_internal.h +3 -3
- data/src/core/lib/slice/slice_utils.h +21 -4
- data/src/core/lib/slice/slice_weak_hash_table.h +4 -6
- data/src/core/lib/surface/call.cc +3 -3
- data/src/core/lib/surface/channel.cc +7 -0
- data/src/core/lib/surface/completion_queue.cc +12 -11
- data/src/core/lib/surface/completion_queue.h +4 -2
- data/src/core/lib/surface/init.cc +1 -0
- data/src/core/lib/surface/lame_client.cc +33 -18
- data/src/core/lib/surface/server.cc +77 -76
- data/src/core/lib/surface/version.cc +1 -1
- data/src/core/lib/transport/byte_stream.h +3 -7
- data/src/core/lib/transport/connectivity_state.cc +112 -98
- data/src/core/lib/transport/connectivity_state.h +100 -50
- data/src/core/lib/transport/static_metadata.cc +276 -288
- data/src/core/lib/transport/static_metadata.h +73 -76
- data/src/core/lib/transport/status_conversion.cc +1 -1
- data/src/core/lib/transport/status_metadata.cc +1 -1
- data/src/core/lib/transport/transport.cc +2 -2
- data/src/core/lib/transport/transport.h +12 -4
- data/src/core/lib/transport/transport_op_string.cc +14 -11
- data/src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc +1 -1
- data/src/core/tsi/alts/handshaker/alts_shared_resource.cc +1 -1
- data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +5 -5
- data/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc +12 -2
- data/src/core/tsi/fake_transport_security.cc +7 -5
- data/src/core/tsi/grpc_shadow_boringssl.h +2918 -2627
- data/src/core/tsi/local_transport_security.cc +8 -6
- data/src/core/tsi/ssl/session_cache/ssl_session.h +1 -3
- data/src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc +1 -2
- data/src/core/tsi/ssl/session_cache/ssl_session_cache.cc +7 -5
- data/src/core/tsi/ssl/session_cache/ssl_session_cache.h +4 -6
- data/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc +1 -2
- data/src/core/tsi/ssl_transport_security.cc +12 -12
- data/src/core/tsi/ssl_transport_security.h +2 -2
- data/src/core/tsi/transport_security_grpc.cc +7 -0
- data/src/core/tsi/transport_security_grpc.h +6 -0
- data/src/ruby/ext/grpc/extconf.rb +1 -0
- data/src/ruby/ext/grpc/rb_call.c +1 -1
- data/src/ruby/ext/grpc/rb_channel.c +1 -1
- data/src/ruby/lib/grpc/generic/bidi_call.rb +1 -1
- data/src/ruby/lib/grpc/generic/rpc_server.rb +1 -1
- data/src/ruby/lib/grpc/version.rb +1 -1
- data/src/ruby/spec/google_rpc_status_utils_spec.rb +2 -2
- data/third_party/boringssl/crypto/asn1/a_bool.c +18 -5
- data/third_party/boringssl/crypto/asn1/a_d2i_fp.c +17 -221
- data/third_party/boringssl/crypto/asn1/a_dup.c +0 -24
- data/third_party/boringssl/crypto/asn1/a_enum.c +2 -2
- data/third_party/boringssl/crypto/asn1/a_i2d_fp.c +10 -72
- data/third_party/boringssl/crypto/asn1/a_int.c +12 -71
- data/third_party/boringssl/crypto/asn1/a_mbstr.c +110 -216
- data/third_party/boringssl/crypto/asn1/a_object.c +16 -5
- data/third_party/boringssl/crypto/asn1/a_strnid.c +1 -0
- data/third_party/boringssl/crypto/asn1/asn1_lib.c +5 -1
- data/third_party/boringssl/crypto/asn1/tasn_enc.c +3 -1
- data/third_party/boringssl/crypto/base64/base64.c +2 -2
- data/third_party/boringssl/crypto/bio/bio.c +73 -9
- data/third_party/boringssl/crypto/bio/connect.c +4 -0
- data/third_party/boringssl/crypto/bio/fd.c +4 -0
- data/third_party/boringssl/crypto/bio/file.c +5 -2
- data/third_party/boringssl/crypto/bio/socket.c +4 -0
- data/third_party/boringssl/crypto/bio/socket_helper.c +4 -0
- data/third_party/boringssl/crypto/bn_extra/convert.c +11 -7
- data/third_party/boringssl/crypto/bytestring/ber.c +8 -4
- data/third_party/boringssl/crypto/bytestring/cbb.c +19 -7
- data/third_party/boringssl/crypto/bytestring/cbs.c +28 -15
- data/third_party/boringssl/crypto/bytestring/internal.h +28 -7
- data/third_party/boringssl/crypto/bytestring/unicode.c +155 -0
- data/third_party/boringssl/crypto/chacha/chacha.c +36 -19
- data/third_party/boringssl/crypto/chacha/internal.h +45 -0
- data/third_party/boringssl/crypto/cipher_extra/cipher_extra.c +29 -0
- data/third_party/boringssl/crypto/cipher_extra/e_aesccm.c +269 -25
- data/third_party/boringssl/crypto/cipher_extra/e_aesctrhmac.c +16 -14
- data/third_party/boringssl/crypto/cipher_extra/e_aesgcmsiv.c +54 -38
- data/third_party/boringssl/crypto/cipher_extra/e_chacha20poly1305.c +133 -41
- data/third_party/boringssl/crypto/cipher_extra/e_tls.c +23 -15
- data/third_party/boringssl/crypto/cipher_extra/tls_cbc.c +24 -15
- data/third_party/boringssl/crypto/cmac/cmac.c +62 -25
- data/third_party/boringssl/crypto/conf/conf.c +7 -0
- data/third_party/boringssl/crypto/cpu-arm-linux.c +4 -148
- data/third_party/boringssl/crypto/cpu-arm-linux.h +201 -0
- data/third_party/boringssl/crypto/cpu-intel.c +45 -51
- data/third_party/boringssl/crypto/crypto.c +39 -22
- data/third_party/boringssl/crypto/curve25519/spake25519.c +1 -1
- data/third_party/boringssl/crypto/dsa/dsa.c +77 -53
- data/third_party/boringssl/crypto/ec_extra/ec_asn1.c +20 -8
- data/third_party/boringssl/crypto/ec_extra/ec_derive.c +96 -0
- data/third_party/boringssl/crypto/{ecdh/ecdh.c → ecdh_extra/ecdh_extra.c} +20 -58
- data/third_party/boringssl/crypto/ecdsa_extra/ecdsa_asn1.c +1 -9
- data/third_party/boringssl/crypto/engine/engine.c +2 -1
- data/third_party/boringssl/crypto/err/err.c +2 -0
- data/third_party/boringssl/crypto/err/internal.h +2 -2
- data/third_party/boringssl/crypto/evp/evp.c +89 -8
- data/third_party/boringssl/crypto/evp/evp_asn1.c +56 -5
- data/third_party/boringssl/crypto/evp/evp_ctx.c +52 -14
- data/third_party/boringssl/crypto/evp/internal.h +18 -1
- data/third_party/boringssl/crypto/evp/p_dsa_asn1.c +5 -0
- data/third_party/boringssl/crypto/evp/p_ec.c +51 -3
- data/third_party/boringssl/crypto/evp/p_ec_asn1.c +6 -7
- data/third_party/boringssl/crypto/evp/p_ed25519.c +36 -3
- data/third_party/boringssl/crypto/evp/p_ed25519_asn1.c +76 -45
- data/third_party/boringssl/crypto/evp/p_rsa.c +3 -1
- data/third_party/boringssl/crypto/evp/p_rsa_asn1.c +5 -0
- data/third_party/boringssl/crypto/evp/p_x25519.c +110 -0
- data/third_party/boringssl/crypto/evp/p_x25519_asn1.c +249 -0
- data/third_party/boringssl/crypto/evp/scrypt.c +6 -2
- data/third_party/boringssl/crypto/fipsmodule/aes/aes.c +34 -274
- data/third_party/boringssl/crypto/fipsmodule/aes/internal.h +161 -21
- data/third_party/boringssl/crypto/fipsmodule/aes/key_wrap.c +111 -13
- data/third_party/boringssl/crypto/fipsmodule/aes/mode_wrappers.c +17 -21
- data/third_party/boringssl/crypto/fipsmodule/bcm.c +119 -7
- data/third_party/boringssl/crypto/fipsmodule/bn/bn.c +19 -2
- data/third_party/boringssl/crypto/fipsmodule/bn/cmp.c +2 -2
- data/third_party/boringssl/crypto/fipsmodule/bn/ctx.c +93 -160
- data/third_party/boringssl/crypto/fipsmodule/bn/div.c +48 -57
- data/third_party/boringssl/crypto/fipsmodule/bn/div_extra.c +87 -0
- data/third_party/boringssl/crypto/fipsmodule/bn/exponentiation.c +143 -211
- data/third_party/boringssl/crypto/fipsmodule/bn/gcd.c +0 -305
- data/third_party/boringssl/crypto/fipsmodule/bn/gcd_extra.c +325 -0
- data/third_party/boringssl/crypto/fipsmodule/bn/internal.h +168 -50
- data/third_party/boringssl/crypto/fipsmodule/bn/montgomery.c +68 -92
- data/third_party/boringssl/crypto/fipsmodule/bn/montgomery_inv.c +7 -6
- data/third_party/boringssl/crypto/fipsmodule/bn/mul.c +11 -14
- data/third_party/boringssl/crypto/fipsmodule/bn/prime.c +358 -443
- data/third_party/boringssl/crypto/fipsmodule/bn/random.c +25 -35
- data/third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.c +20 -25
- data/third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.h +76 -5
- data/third_party/boringssl/crypto/fipsmodule/bn/shift.c +14 -14
- data/third_party/boringssl/crypto/fipsmodule/cipher/cipher.c +7 -2
- data/third_party/boringssl/crypto/fipsmodule/cipher/e_aes.c +383 -516
- data/third_party/boringssl/crypto/fipsmodule/cipher/e_des.c +4 -0
- data/third_party/boringssl/crypto/fipsmodule/cipher/internal.h +3 -4
- data/third_party/boringssl/crypto/fipsmodule/delocate.h +3 -2
- data/third_party/boringssl/crypto/fipsmodule/digest/digest.c +32 -17
- data/third_party/boringssl/crypto/fipsmodule/digest/md32_common.h +3 -3
- data/third_party/boringssl/crypto/fipsmodule/ec/ec.c +228 -122
- data/third_party/boringssl/crypto/fipsmodule/ec/ec_key.c +34 -8
- data/third_party/boringssl/crypto/fipsmodule/ec/ec_montgomery.c +311 -98
- data/third_party/boringssl/crypto/fipsmodule/ec/felem.c +82 -0
- data/third_party/boringssl/crypto/fipsmodule/ec/internal.h +263 -97
- data/third_party/boringssl/crypto/fipsmodule/ec/oct.c +22 -59
- data/third_party/boringssl/crypto/fipsmodule/ec/p224-64.c +317 -234
- data/third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64-table.h +9473 -9475
- data/third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.c +313 -109
- data/third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.h +36 -0
- data/third_party/boringssl/crypto/fipsmodule/ec/scalar.c +96 -0
- data/third_party/boringssl/crypto/fipsmodule/ec/simple.c +126 -792
- data/third_party/boringssl/crypto/fipsmodule/ec/simple_mul.c +84 -0
- data/third_party/boringssl/crypto/fipsmodule/ec/util.c +163 -12
- data/third_party/boringssl/crypto/fipsmodule/ec/wnaf.c +84 -211
- data/third_party/boringssl/crypto/fipsmodule/ecdh/ecdh.c +122 -0
- data/third_party/boringssl/crypto/fipsmodule/ecdsa/ecdsa.c +60 -205
- data/third_party/boringssl/crypto/fipsmodule/fips_shared_support.c +32 -0
- data/third_party/boringssl/crypto/fipsmodule/is_fips.c +2 -0
- data/third_party/boringssl/crypto/fipsmodule/md4/md4.c +3 -1
- data/third_party/boringssl/crypto/fipsmodule/md5/internal.h +37 -0
- data/third_party/boringssl/crypto/fipsmodule/md5/md5.c +11 -8
- data/third_party/boringssl/crypto/fipsmodule/modes/cbc.c +35 -79
- data/third_party/boringssl/crypto/fipsmodule/modes/cfb.c +7 -39
- data/third_party/boringssl/crypto/fipsmodule/modes/ctr.c +7 -27
- data/third_party/boringssl/crypto/fipsmodule/modes/gcm.c +123 -309
- data/third_party/boringssl/crypto/fipsmodule/modes/internal.h +189 -126
- data/third_party/boringssl/crypto/fipsmodule/modes/ofb.c +3 -2
- data/third_party/boringssl/crypto/fipsmodule/rand/ctrdrbg.c +2 -2
- data/third_party/boringssl/crypto/fipsmodule/rand/internal.h +35 -0
- data/third_party/boringssl/crypto/fipsmodule/rand/rand.c +24 -19
- data/third_party/boringssl/crypto/fipsmodule/rand/urandom.c +256 -77
- data/third_party/boringssl/crypto/fipsmodule/rsa/padding.c +10 -7
- data/third_party/boringssl/crypto/fipsmodule/rsa/rsa.c +5 -1
- data/third_party/boringssl/crypto/fipsmodule/rsa/rsa_impl.c +131 -14
- data/third_party/boringssl/crypto/fipsmodule/self_check/self_check.c +83 -10
- data/third_party/boringssl/crypto/fipsmodule/sha/internal.h +53 -0
- data/third_party/boringssl/crypto/fipsmodule/sha/sha1.c +9 -13
- data/third_party/boringssl/crypto/fipsmodule/sha/sha256.c +18 -12
- data/third_party/boringssl/crypto/fipsmodule/sha/sha512.c +95 -168
- data/third_party/boringssl/crypto/hrss/hrss.c +2201 -0
- data/third_party/boringssl/crypto/hrss/internal.h +62 -0
- data/third_party/boringssl/crypto/internal.h +95 -20
- data/third_party/boringssl/crypto/lhash/lhash.c +45 -33
- data/third_party/boringssl/crypto/mem.c +39 -2
- data/third_party/boringssl/crypto/obj/obj.c +4 -4
- data/third_party/boringssl/crypto/obj/obj_dat.h +6181 -875
- data/third_party/boringssl/crypto/pem/pem_all.c +2 -3
- data/third_party/boringssl/crypto/pem/pem_info.c +144 -162
- data/third_party/boringssl/crypto/pem/pem_lib.c +53 -52
- data/third_party/boringssl/crypto/pem/pem_pkey.c +13 -21
- data/third_party/boringssl/crypto/pkcs7/pkcs7.c +15 -22
- data/third_party/boringssl/crypto/pkcs7/pkcs7_x509.c +168 -16
- data/third_party/boringssl/crypto/pkcs8/internal.h +11 -0
- data/third_party/boringssl/crypto/pkcs8/p5_pbev2.c +24 -15
- data/third_party/boringssl/crypto/pkcs8/pkcs8.c +42 -25
- data/third_party/boringssl/crypto/pkcs8/pkcs8_x509.c +559 -43
- data/third_party/boringssl/crypto/pool/internal.h +1 -1
- data/third_party/boringssl/crypto/pool/pool.c +21 -0
- data/third_party/boringssl/crypto/rand_extra/deterministic.c +8 -0
- data/third_party/boringssl/crypto/rand_extra/fuchsia.c +1 -14
- data/third_party/boringssl/crypto/refcount_lock.c +2 -2
- data/third_party/boringssl/crypto/rsa_extra/rsa_print.c +22 -0
- data/third_party/boringssl/crypto/siphash/siphash.c +80 -0
- data/third_party/boringssl/crypto/stack/stack.c +83 -32
- data/third_party/boringssl/crypto/thread_none.c +2 -2
- data/third_party/boringssl/crypto/thread_pthread.c +2 -2
- data/third_party/boringssl/crypto/thread_win.c +38 -19
- data/third_party/boringssl/crypto/x509/a_strex.c +22 -2
- data/third_party/boringssl/crypto/x509/asn1_gen.c +2 -1
- data/third_party/boringssl/crypto/x509/by_dir.c +7 -0
- data/third_party/boringssl/crypto/x509/by_file.c +12 -10
- data/third_party/boringssl/crypto/x509/t_crl.c +5 -8
- data/third_party/boringssl/crypto/x509/t_req.c +1 -3
- data/third_party/boringssl/crypto/x509/t_x509.c +5 -8
- data/third_party/boringssl/crypto/x509/x509_cmp.c +1 -1
- data/third_party/boringssl/crypto/x509/x509_def.c +1 -1
- data/third_party/boringssl/crypto/x509/x509_lu.c +114 -5
- data/third_party/boringssl/crypto/x509/x509_req.c +20 -0
- data/third_party/boringssl/crypto/x509/x509_set.c +5 -0
- data/third_party/boringssl/crypto/x509/x509_trs.c +1 -0
- data/third_party/boringssl/crypto/x509/x509_txt.c +4 -5
- data/third_party/boringssl/crypto/x509/x509_vfy.c +145 -138
- data/third_party/boringssl/crypto/x509/x509_vpm.c +2 -0
- data/third_party/boringssl/crypto/x509/x509cset.c +40 -0
- data/third_party/boringssl/crypto/x509/x509name.c +2 -3
- data/third_party/boringssl/crypto/x509/x_all.c +109 -210
- data/third_party/boringssl/crypto/x509/x_x509.c +6 -0
- data/third_party/boringssl/crypto/x509v3/ext_dat.h +1 -3
- data/third_party/boringssl/crypto/x509v3/internal.h +56 -0
- data/third_party/boringssl/crypto/x509v3/pcy_cache.c +2 -0
- data/third_party/boringssl/crypto/x509v3/pcy_node.c +1 -0
- data/third_party/boringssl/crypto/x509v3/pcy_tree.c +4 -2
- data/third_party/boringssl/crypto/x509v3/v3_akey.c +5 -2
- data/third_party/boringssl/crypto/x509v3/v3_alt.c +19 -13
- data/third_party/boringssl/crypto/x509v3/v3_conf.c +2 -1
- data/third_party/boringssl/crypto/x509v3/v3_cpols.c +3 -2
- data/third_party/boringssl/crypto/x509v3/v3_genn.c +1 -6
- data/third_party/boringssl/crypto/x509v3/v3_lib.c +1 -0
- data/third_party/boringssl/crypto/x509v3/v3_ocsp.c +68 -0
- data/third_party/boringssl/crypto/x509v3/v3_pci.c +2 -1
- data/third_party/boringssl/crypto/x509v3/v3_purp.c +47 -69
- data/third_party/boringssl/crypto/x509v3/v3_skey.c +5 -2
- data/third_party/boringssl/crypto/x509v3/v3_utl.c +69 -25
- data/third_party/boringssl/include/openssl/aead.h +45 -19
- data/third_party/boringssl/include/openssl/aes.h +32 -7
- data/third_party/boringssl/include/openssl/asn1.h +7 -77
- data/third_party/boringssl/include/openssl/base.h +120 -6
- data/third_party/boringssl/include/openssl/base64.h +4 -1
- data/third_party/boringssl/include/openssl/bio.h +112 -81
- data/third_party/boringssl/include/openssl/blowfish.h +3 -3
- data/third_party/boringssl/include/openssl/bn.h +55 -29
- data/third_party/boringssl/include/openssl/buf.h +2 -2
- data/third_party/boringssl/include/openssl/bytestring.h +54 -32
- data/third_party/boringssl/include/openssl/cast.h +2 -2
- data/third_party/boringssl/include/openssl/cipher.h +46 -16
- data/third_party/boringssl/include/openssl/cmac.h +6 -2
- data/third_party/boringssl/include/openssl/conf.h +3 -6
- data/third_party/boringssl/include/openssl/cpu.h +25 -9
- data/third_party/boringssl/include/openssl/crypto.h +32 -10
- data/third_party/boringssl/include/openssl/curve25519.h +4 -4
- data/third_party/boringssl/include/openssl/dh.h +3 -2
- data/third_party/boringssl/include/openssl/digest.h +21 -7
- data/third_party/boringssl/include/openssl/dsa.h +8 -2
- data/third_party/boringssl/include/openssl/e_os2.h +18 -0
- data/third_party/boringssl/include/openssl/ec.h +25 -21
- data/third_party/boringssl/include/openssl/ec_key.h +36 -8
- data/third_party/boringssl/include/openssl/ecdh.h +17 -0
- data/third_party/boringssl/include/openssl/ecdsa.h +3 -3
- data/third_party/boringssl/include/openssl/engine.h +4 -4
- data/third_party/boringssl/include/openssl/err.h +3 -0
- data/third_party/boringssl/include/openssl/evp.h +199 -42
- data/third_party/boringssl/include/openssl/hmac.h +4 -4
- data/third_party/boringssl/include/openssl/hrss.h +100 -0
- data/third_party/boringssl/include/openssl/lhash.h +131 -23
- data/third_party/boringssl/include/openssl/md4.h +6 -4
- data/third_party/boringssl/include/openssl/md5.h +6 -4
- data/third_party/boringssl/include/openssl/mem.h +6 -2
- data/third_party/boringssl/include/openssl/nid.h +3 -0
- data/third_party/boringssl/include/openssl/obj.h +3 -0
- data/third_party/boringssl/include/openssl/pem.h +102 -64
- data/third_party/boringssl/include/openssl/pkcs7.h +136 -3
- data/third_party/boringssl/include/openssl/pkcs8.h +42 -3
- data/third_party/boringssl/include/openssl/pool.h +13 -2
- data/third_party/boringssl/include/openssl/ripemd.h +5 -4
- data/third_party/boringssl/include/openssl/rsa.h +46 -15
- data/third_party/boringssl/include/openssl/sha.h +40 -28
- data/third_party/boringssl/include/openssl/siphash.h +37 -0
- data/third_party/boringssl/include/openssl/span.h +17 -9
- data/third_party/boringssl/include/openssl/ssl.h +766 -393
- data/third_party/boringssl/include/openssl/ssl3.h +4 -3
- data/third_party/boringssl/include/openssl/stack.h +134 -77
- data/third_party/boringssl/include/openssl/thread.h +1 -1
- data/third_party/boringssl/include/openssl/tls1.h +25 -9
- data/third_party/boringssl/include/openssl/type_check.h +14 -15
- data/third_party/boringssl/include/openssl/x509.h +28 -3
- data/third_party/boringssl/include/openssl/x509_vfy.h +98 -32
- data/third_party/boringssl/include/openssl/x509v3.h +17 -13
- data/third_party/boringssl/ssl/d1_both.cc +9 -18
- data/third_party/boringssl/ssl/d1_lib.cc +4 -3
- data/third_party/boringssl/ssl/d1_pkt.cc +4 -4
- data/third_party/boringssl/ssl/d1_srtp.cc +15 -15
- data/third_party/boringssl/ssl/dtls_method.cc +0 -1
- data/third_party/boringssl/ssl/dtls_record.cc +28 -28
- data/third_party/boringssl/ssl/handoff.cc +295 -91
- data/third_party/boringssl/ssl/handshake.cc +133 -72
- data/third_party/boringssl/ssl/handshake_client.cc +218 -189
- data/third_party/boringssl/ssl/handshake_server.cc +399 -272
- data/third_party/boringssl/ssl/internal.h +1413 -928
- data/third_party/boringssl/ssl/s3_both.cc +175 -36
- data/third_party/boringssl/ssl/s3_lib.cc +9 -13
- data/third_party/boringssl/ssl/s3_pkt.cc +63 -29
- data/third_party/boringssl/ssl/ssl_aead_ctx.cc +55 -35
- data/third_party/boringssl/ssl/ssl_asn1.cc +57 -73
- data/third_party/boringssl/ssl/ssl_buffer.cc +13 -12
- data/third_party/boringssl/ssl/ssl_cert.cc +313 -210
- data/third_party/boringssl/ssl/ssl_cipher.cc +159 -221
- data/third_party/boringssl/ssl/ssl_file.cc +2 -0
- data/third_party/boringssl/ssl/ssl_key_share.cc +164 -19
- data/third_party/boringssl/ssl/ssl_lib.cc +847 -555
- data/third_party/boringssl/ssl/ssl_privkey.cc +441 -111
- data/third_party/boringssl/ssl/ssl_session.cc +230 -178
- data/third_party/boringssl/ssl/ssl_transcript.cc +21 -142
- data/third_party/boringssl/ssl/ssl_versions.cc +88 -93
- data/third_party/boringssl/ssl/ssl_x509.cc +279 -218
- data/third_party/boringssl/ssl/t1_enc.cc +5 -96
- data/third_party/boringssl/ssl/t1_lib.cc +931 -678
- data/third_party/boringssl/ssl/tls13_both.cc +251 -121
- data/third_party/boringssl/ssl/tls13_client.cc +129 -73
- data/third_party/boringssl/ssl/tls13_enc.cc +350 -282
- data/third_party/boringssl/ssl/tls13_server.cc +259 -192
- data/third_party/boringssl/ssl/tls_method.cc +26 -21
- data/third_party/boringssl/ssl/tls_record.cc +42 -47
- data/third_party/boringssl/third_party/fiat/curve25519.c +261 -1324
- data/third_party/boringssl/third_party/fiat/curve25519_32.h +911 -0
- data/third_party/boringssl/third_party/fiat/curve25519_64.h +559 -0
- data/third_party/boringssl/third_party/fiat/p256.c +238 -999
- data/third_party/boringssl/third_party/fiat/p256_32.h +3226 -0
- data/third_party/boringssl/third_party/fiat/p256_64.h +1217 -0
- data/third_party/upb/upb/port_def.inc +1 -1
- data/third_party/upb/upb/table.c +2 -1
- metadata +72 -44
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.h +0 -127
- data/src/core/lib/gpr/mpscq.cc +0 -117
- data/src/core/lib/gpr/mpscq.h +0 -88
- data/src/core/lib/gprpp/abstract.h +0 -47
- data/src/core/lib/gprpp/pair.h +0 -38
- data/third_party/boringssl/crypto/cipher_extra/e_ssl3.c +0 -460
- data/third_party/boringssl/crypto/fipsmodule/modes/ccm.c +0 -256
- data/third_party/boringssl/include/openssl/lhash_macros.h +0 -174
- data/third_party/boringssl/ssl/custom_extensions.cc +0 -265
@@ -1,256 +0,0 @@
|
|
1
|
-
/* ====================================================================
|
2
|
-
* Copyright (c) 2011 The OpenSSL Project. All rights reserved.
|
3
|
-
*
|
4
|
-
* Redistribution and use in source and binary forms, with or without
|
5
|
-
* modification, are permitted provided that the following conditions
|
6
|
-
* are met:
|
7
|
-
*
|
8
|
-
* 1. Redistributions of source code must retain the above copyright
|
9
|
-
* notice, this list of conditions and the following disclaimer.
|
10
|
-
*
|
11
|
-
* 2. Redistributions in binary form must reproduce the above copyright
|
12
|
-
* notice, this list of conditions and the following disclaimer in
|
13
|
-
* the documentation and/or other materials provided with the
|
14
|
-
* distribution.
|
15
|
-
*
|
16
|
-
* 3. All advertising materials mentioning features or use of this
|
17
|
-
* software must display the following acknowledgment:
|
18
|
-
* "This product includes software developed by the OpenSSL Project
|
19
|
-
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
|
20
|
-
*
|
21
|
-
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
22
|
-
* endorse or promote products derived from this software without
|
23
|
-
* prior written permission. For written permission, please contact
|
24
|
-
* openssl-core@openssl.org.
|
25
|
-
*
|
26
|
-
* 5. Products derived from this software may not be called "OpenSSL"
|
27
|
-
* nor may "OpenSSL" appear in their names without prior written
|
28
|
-
* permission of the OpenSSL Project.
|
29
|
-
*
|
30
|
-
* 6. Redistributions of any form whatsoever must retain the following
|
31
|
-
* acknowledgment:
|
32
|
-
* "This product includes software developed by the OpenSSL Project
|
33
|
-
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
34
|
-
*
|
35
|
-
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
36
|
-
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
37
|
-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
38
|
-
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
39
|
-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
40
|
-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
41
|
-
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
42
|
-
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
43
|
-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
44
|
-
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
45
|
-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
46
|
-
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
47
|
-
* ====================================================================
|
48
|
-
*/
|
49
|
-
|
50
|
-
#include <assert.h>
|
51
|
-
#include <string.h>
|
52
|
-
|
53
|
-
#include <openssl/cpu.h>
|
54
|
-
#include <openssl/mem.h>
|
55
|
-
|
56
|
-
#include "../../internal.h"
|
57
|
-
#include "internal.h"
|
58
|
-
|
59
|
-
|
60
|
-
struct ccm128_state {
|
61
|
-
union {
|
62
|
-
uint64_t u[2];
|
63
|
-
uint8_t c[16];
|
64
|
-
} nonce, cmac;
|
65
|
-
};
|
66
|
-
|
67
|
-
int CRYPTO_ccm128_init(CCM128_CONTEXT *ctx, const void *key, block128_f block,
|
68
|
-
ctr128_f ctr, unsigned M, unsigned L) {
|
69
|
-
if (M < 4 || M > 16 || (M & 1) != 0 || L < 2 || L > 8) {
|
70
|
-
return 0;
|
71
|
-
}
|
72
|
-
ctx->block = block;
|
73
|
-
ctx->ctr = ctr;
|
74
|
-
ctx->M = M;
|
75
|
-
ctx->L = L;
|
76
|
-
return 1;
|
77
|
-
}
|
78
|
-
|
79
|
-
size_t CRYPTO_ccm128_max_input(const CCM128_CONTEXT *ctx) {
|
80
|
-
return ctx->L >= sizeof(size_t) ? (size_t)-1
|
81
|
-
: (((size_t)1) << (ctx->L * 8)) - 1;
|
82
|
-
}
|
83
|
-
|
84
|
-
static int ccm128_init_state(const CCM128_CONTEXT *ctx,
|
85
|
-
struct ccm128_state *state, const void *key,
|
86
|
-
const uint8_t *nonce, size_t nonce_len,
|
87
|
-
const uint8_t *aad, size_t aad_len,
|
88
|
-
size_t plaintext_len) {
|
89
|
-
const block128_f block = ctx->block;
|
90
|
-
const unsigned M = ctx->M;
|
91
|
-
const unsigned L = ctx->L;
|
92
|
-
|
93
|
-
// |L| determines the expected |nonce_len| and the limit for |plaintext_len|.
|
94
|
-
if (plaintext_len > CRYPTO_ccm128_max_input(ctx) ||
|
95
|
-
nonce_len != 15 - L) {
|
96
|
-
return 0;
|
97
|
-
}
|
98
|
-
|
99
|
-
// Assemble the first block for computing the MAC.
|
100
|
-
OPENSSL_memset(state, 0, sizeof(*state));
|
101
|
-
state->nonce.c[0] = (uint8_t)((L - 1) | ((M - 2) / 2) << 3);
|
102
|
-
if (aad_len != 0) {
|
103
|
-
state->nonce.c[0] |= 0x40; // Set AAD Flag
|
104
|
-
}
|
105
|
-
OPENSSL_memcpy(&state->nonce.c[1], nonce, nonce_len);
|
106
|
-
for (unsigned i = 0; i < L; i++) {
|
107
|
-
state->nonce.c[15 - i] = (uint8_t)(plaintext_len >> (8 * i));
|
108
|
-
}
|
109
|
-
|
110
|
-
(*block)(state->nonce.c, state->cmac.c, key);
|
111
|
-
size_t blocks = 1;
|
112
|
-
|
113
|
-
if (aad_len != 0) {
|
114
|
-
unsigned i;
|
115
|
-
// Cast to u64 to avoid the compiler complaining about invalid shifts.
|
116
|
-
uint64_t aad_len_u64 = aad_len;
|
117
|
-
if (aad_len_u64 < 0x10000 - 0x100) {
|
118
|
-
state->cmac.c[0] ^= (uint8_t)(aad_len_u64 >> 8);
|
119
|
-
state->cmac.c[1] ^= (uint8_t)aad_len_u64;
|
120
|
-
i = 2;
|
121
|
-
} else if (aad_len_u64 <= 0xffffffff) {
|
122
|
-
state->cmac.c[0] ^= 0xff;
|
123
|
-
state->cmac.c[1] ^= 0xfe;
|
124
|
-
state->cmac.c[2] ^= (uint8_t)(aad_len_u64 >> 24);
|
125
|
-
state->cmac.c[3] ^= (uint8_t)(aad_len_u64 >> 16);
|
126
|
-
state->cmac.c[4] ^= (uint8_t)(aad_len_u64 >> 8);
|
127
|
-
state->cmac.c[5] ^= (uint8_t)aad_len_u64;
|
128
|
-
i = 6;
|
129
|
-
} else {
|
130
|
-
state->cmac.c[0] ^= 0xff;
|
131
|
-
state->cmac.c[1] ^= 0xff;
|
132
|
-
state->cmac.c[2] ^= (uint8_t)(aad_len_u64 >> 56);
|
133
|
-
state->cmac.c[3] ^= (uint8_t)(aad_len_u64 >> 48);
|
134
|
-
state->cmac.c[4] ^= (uint8_t)(aad_len_u64 >> 40);
|
135
|
-
state->cmac.c[5] ^= (uint8_t)(aad_len_u64 >> 32);
|
136
|
-
state->cmac.c[6] ^= (uint8_t)(aad_len_u64 >> 24);
|
137
|
-
state->cmac.c[7] ^= (uint8_t)(aad_len_u64 >> 16);
|
138
|
-
state->cmac.c[8] ^= (uint8_t)(aad_len_u64 >> 8);
|
139
|
-
state->cmac.c[9] ^= (uint8_t)aad_len_u64;
|
140
|
-
i = 10;
|
141
|
-
}
|
142
|
-
|
143
|
-
do {
|
144
|
-
for (; i < 16 && aad_len != 0; i++) {
|
145
|
-
state->cmac.c[i] ^= *aad;
|
146
|
-
aad++;
|
147
|
-
aad_len--;
|
148
|
-
}
|
149
|
-
(*block)(state->cmac.c, state->cmac.c, key);
|
150
|
-
blocks++;
|
151
|
-
i = 0;
|
152
|
-
} while (aad_len != 0);
|
153
|
-
}
|
154
|
-
|
155
|
-
// Per RFC 3610, section 2.6, the total number of block cipher operations done
|
156
|
-
// must not exceed 2^61. There are two block cipher operations remaining per
|
157
|
-
// message block, plus one block at the end to encrypt the MAC.
|
158
|
-
size_t remaining_blocks = 2 * ((plaintext_len + 15) / 16) + 1;
|
159
|
-
if (plaintext_len + 15 < plaintext_len ||
|
160
|
-
remaining_blocks + blocks < blocks ||
|
161
|
-
(uint64_t) remaining_blocks + blocks > UINT64_C(1) << 61) {
|
162
|
-
return 0;
|
163
|
-
}
|
164
|
-
|
165
|
-
// Assemble the first block for encrypting and decrypting. The bottom |L|
|
166
|
-
// bytes are replaced with a counter and all bit the encoding of |L| is
|
167
|
-
// cleared in the first byte.
|
168
|
-
state->nonce.c[0] &= 7;
|
169
|
-
return 1;
|
170
|
-
}
|
171
|
-
|
172
|
-
static int ccm128_encrypt(const CCM128_CONTEXT *ctx, struct ccm128_state *state,
|
173
|
-
const void *key, uint8_t *out, const uint8_t *in,
|
174
|
-
size_t len) {
|
175
|
-
// The counter for encryption begins at one.
|
176
|
-
for (unsigned i = 0; i < ctx->L; i++) {
|
177
|
-
state->nonce.c[15 - i] = 0;
|
178
|
-
}
|
179
|
-
state->nonce.c[15] = 1;
|
180
|
-
|
181
|
-
uint8_t partial_buf[16];
|
182
|
-
unsigned num = 0;
|
183
|
-
if (ctx->ctr != NULL) {
|
184
|
-
CRYPTO_ctr128_encrypt_ctr32(in, out, len, key, state->nonce.c, partial_buf,
|
185
|
-
&num, ctx->ctr);
|
186
|
-
} else {
|
187
|
-
CRYPTO_ctr128_encrypt(in, out, len, key, state->nonce.c, partial_buf, &num,
|
188
|
-
ctx->block);
|
189
|
-
}
|
190
|
-
return 1;
|
191
|
-
}
|
192
|
-
|
193
|
-
static int ccm128_compute_mac(const CCM128_CONTEXT *ctx,
|
194
|
-
struct ccm128_state *state, const void *key,
|
195
|
-
uint8_t *out_tag, size_t tag_len,
|
196
|
-
const uint8_t *in, size_t len) {
|
197
|
-
block128_f block = ctx->block;
|
198
|
-
if (tag_len != ctx->M) {
|
199
|
-
return 0;
|
200
|
-
}
|
201
|
-
|
202
|
-
// Incorporate |in| into the MAC.
|
203
|
-
union {
|
204
|
-
uint64_t u[2];
|
205
|
-
uint8_t c[16];
|
206
|
-
} tmp;
|
207
|
-
while (len >= 16) {
|
208
|
-
OPENSSL_memcpy(tmp.c, in, 16);
|
209
|
-
state->cmac.u[0] ^= tmp.u[0];
|
210
|
-
state->cmac.u[1] ^= tmp.u[1];
|
211
|
-
(*block)(state->cmac.c, state->cmac.c, key);
|
212
|
-
in += 16;
|
213
|
-
len -= 16;
|
214
|
-
}
|
215
|
-
if (len > 0) {
|
216
|
-
for (size_t i = 0; i < len; i++) {
|
217
|
-
state->cmac.c[i] ^= in[i];
|
218
|
-
}
|
219
|
-
(*block)(state->cmac.c, state->cmac.c, key);
|
220
|
-
}
|
221
|
-
|
222
|
-
// Encrypt the MAC with counter zero.
|
223
|
-
for (unsigned i = 0; i < ctx->L; i++) {
|
224
|
-
state->nonce.c[15 - i] = 0;
|
225
|
-
}
|
226
|
-
(*block)(state->nonce.c, tmp.c, key);
|
227
|
-
state->cmac.u[0] ^= tmp.u[0];
|
228
|
-
state->cmac.u[1] ^= tmp.u[1];
|
229
|
-
|
230
|
-
OPENSSL_memcpy(out_tag, state->cmac.c, tag_len);
|
231
|
-
return 1;
|
232
|
-
}
|
233
|
-
|
234
|
-
int CRYPTO_ccm128_encrypt(const CCM128_CONTEXT *ctx, const void *key,
|
235
|
-
uint8_t *out, uint8_t *out_tag, size_t tag_len,
|
236
|
-
const uint8_t *nonce, size_t nonce_len,
|
237
|
-
const uint8_t *in, size_t len, const uint8_t *aad,
|
238
|
-
size_t aad_len) {
|
239
|
-
struct ccm128_state state;
|
240
|
-
return ccm128_init_state(ctx, &state, key, nonce, nonce_len, aad, aad_len,
|
241
|
-
len) &&
|
242
|
-
ccm128_compute_mac(ctx, &state, key, out_tag, tag_len, in, len) &&
|
243
|
-
ccm128_encrypt(ctx, &state, key, out, in, len);
|
244
|
-
}
|
245
|
-
|
246
|
-
int CRYPTO_ccm128_decrypt(const CCM128_CONTEXT *ctx, const void *key,
|
247
|
-
uint8_t *out, uint8_t *out_tag, size_t tag_len,
|
248
|
-
const uint8_t *nonce, size_t nonce_len,
|
249
|
-
const uint8_t *in, size_t len, const uint8_t *aad,
|
250
|
-
size_t aad_len) {
|
251
|
-
struct ccm128_state state;
|
252
|
-
return ccm128_init_state(ctx, &state, key, nonce, nonce_len, aad, aad_len,
|
253
|
-
len) &&
|
254
|
-
ccm128_encrypt(ctx, &state, key, out, in, len) &&
|
255
|
-
ccm128_compute_mac(ctx, &state, key, out_tag, tag_len, out, len);
|
256
|
-
}
|
@@ -1,174 +0,0 @@
|
|
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
|
-
#if !defined(IN_LHASH_H)
|
16
|
-
#error "Don't include this file directly. Include lhash.h"
|
17
|
-
#endif
|
18
|
-
|
19
|
-
// ASN1_OBJECT
|
20
|
-
#define lh_ASN1_OBJECT_new(hash, comp) \
|
21
|
-
((LHASH_OF(ASN1_OBJECT) *)lh_new( \
|
22
|
-
CHECKED_CAST(lhash_hash_func, uint32_t(*)(const ASN1_OBJECT *), hash), \
|
23
|
-
CHECKED_CAST(lhash_cmp_func, \
|
24
|
-
int (*)(const ASN1_OBJECT *a, const ASN1_OBJECT *b), \
|
25
|
-
comp)))
|
26
|
-
|
27
|
-
#define lh_ASN1_OBJECT_free(lh) \
|
28
|
-
lh_free(CHECKED_CAST(_LHASH *, LHASH_OF(ASN1_OBJECT) *, lh));
|
29
|
-
|
30
|
-
#define lh_ASN1_OBJECT_num_items(lh) \
|
31
|
-
lh_num_items(CHECKED_CAST(_LHASH *, LHASH_OF(ASN1_OBJECT) *, lh))
|
32
|
-
|
33
|
-
#define lh_ASN1_OBJECT_retrieve(lh, data) \
|
34
|
-
((ASN1_OBJECT *)lh_retrieve( \
|
35
|
-
CHECKED_CAST(_LHASH *, LHASH_OF(ASN1_OBJECT) *, lh), \
|
36
|
-
CHECKED_CAST(void *, ASN1_OBJECT *, data)))
|
37
|
-
|
38
|
-
#define lh_ASN1_OBJECT_insert(lh, old_data, data) \
|
39
|
-
lh_insert(CHECKED_CAST(_LHASH *, LHASH_OF(ASN1_OBJECT) *, lh), \
|
40
|
-
CHECKED_CAST(void **, ASN1_OBJECT **, old_data), \
|
41
|
-
CHECKED_CAST(void *, ASN1_OBJECT *, data))
|
42
|
-
|
43
|
-
#define lh_ASN1_OBJECT_delete(lh, data) \
|
44
|
-
((ASN1_OBJECT *)lh_delete( \
|
45
|
-
CHECKED_CAST(_LHASH *, LHASH_OF(ASN1_OBJECT) *, lh), \
|
46
|
-
CHECKED_CAST(void *, ASN1_OBJECT *, data)))
|
47
|
-
|
48
|
-
#define lh_ASN1_OBJECT_doall(lh, func) \
|
49
|
-
lh_doall(CHECKED_CAST(_LHASH *, LHASH_OF(ASN1_OBJECT) *, lh), \
|
50
|
-
CHECKED_CAST(void (*)(void *), void (*)(ASN1_OBJECT *), func));
|
51
|
-
|
52
|
-
#define lh_ASN1_OBJECT_doall_arg(lh, func, arg) \
|
53
|
-
lh_doall_arg(CHECKED_CAST(_LHASH *, LHASH_OF(ASN1_OBJECT) *, lh), \
|
54
|
-
CHECKED_CAST(void (*)(void *, void *), \
|
55
|
-
void (*)(ASN1_OBJECT *, void *), func), \
|
56
|
-
arg);
|
57
|
-
|
58
|
-
|
59
|
-
// CONF_VALUE
|
60
|
-
#define lh_CONF_VALUE_new(hash, comp) \
|
61
|
-
((LHASH_OF(CONF_VALUE) *)lh_new( \
|
62
|
-
CHECKED_CAST(lhash_hash_func, uint32_t(*)(const CONF_VALUE *), hash), \
|
63
|
-
CHECKED_CAST(lhash_cmp_func, \
|
64
|
-
int (*)(const CONF_VALUE *a, const CONF_VALUE *b), comp)))
|
65
|
-
|
66
|
-
#define lh_CONF_VALUE_free(lh) \
|
67
|
-
lh_free(CHECKED_CAST(_LHASH *, LHASH_OF(CONF_VALUE) *, lh));
|
68
|
-
|
69
|
-
#define lh_CONF_VALUE_num_items(lh) \
|
70
|
-
lh_num_items(CHECKED_CAST(_LHASH *, LHASH_OF(CONF_VALUE) *, lh))
|
71
|
-
|
72
|
-
#define lh_CONF_VALUE_retrieve(lh, data) \
|
73
|
-
((CONF_VALUE *)lh_retrieve( \
|
74
|
-
CHECKED_CAST(_LHASH *, LHASH_OF(CONF_VALUE) *, lh), \
|
75
|
-
CHECKED_CAST(void *, CONF_VALUE *, data)))
|
76
|
-
|
77
|
-
#define lh_CONF_VALUE_insert(lh, old_data, data) \
|
78
|
-
lh_insert(CHECKED_CAST(_LHASH *, LHASH_OF(CONF_VALUE) *, lh), \
|
79
|
-
CHECKED_CAST(void **, CONF_VALUE **, old_data), \
|
80
|
-
CHECKED_CAST(void *, CONF_VALUE *, data))
|
81
|
-
|
82
|
-
#define lh_CONF_VALUE_delete(lh, data) \
|
83
|
-
((CONF_VALUE *)lh_delete(CHECKED_CAST(_LHASH *, LHASH_OF(CONF_VALUE) *, lh), \
|
84
|
-
CHECKED_CAST(void *, CONF_VALUE *, data)))
|
85
|
-
|
86
|
-
#define lh_CONF_VALUE_doall(lh, func) \
|
87
|
-
lh_doall(CHECKED_CAST(_LHASH *, LHASH_OF(CONF_VALUE) *, lh), \
|
88
|
-
CHECKED_CAST(void (*)(void *), void (*)(CONF_VALUE *), func));
|
89
|
-
|
90
|
-
#define lh_CONF_VALUE_doall_arg(lh, func, arg) \
|
91
|
-
lh_doall_arg(CHECKED_CAST(_LHASH *, LHASH_OF(CONF_VALUE) *, lh), \
|
92
|
-
CHECKED_CAST(void (*)(void *, void *), \
|
93
|
-
void (*)(CONF_VALUE *, void *), func), \
|
94
|
-
arg);
|
95
|
-
|
96
|
-
|
97
|
-
// CRYPTO_BUFFER
|
98
|
-
#define lh_CRYPTO_BUFFER_new(hash, comp) \
|
99
|
-
((LHASH_OF(CRYPTO_BUFFER) *)lh_new( \
|
100
|
-
CHECKED_CAST(lhash_hash_func, uint32_t(*)(const CRYPTO_BUFFER *), hash), \
|
101
|
-
CHECKED_CAST(lhash_cmp_func, \
|
102
|
-
int (*)(const CRYPTO_BUFFER *a, const CRYPTO_BUFFER *b), \
|
103
|
-
comp)))
|
104
|
-
|
105
|
-
#define lh_CRYPTO_BUFFER_free(lh) \
|
106
|
-
lh_free(CHECKED_CAST(_LHASH *, LHASH_OF(CRYPTO_BUFFER) *, lh));
|
107
|
-
|
108
|
-
#define lh_CRYPTO_BUFFER_num_items(lh) \
|
109
|
-
lh_num_items(CHECKED_CAST(_LHASH *, LHASH_OF(CRYPTO_BUFFER) *, lh))
|
110
|
-
|
111
|
-
#define lh_CRYPTO_BUFFER_retrieve(lh, data) \
|
112
|
-
((CRYPTO_BUFFER *)lh_retrieve( \
|
113
|
-
CHECKED_CAST(_LHASH *, LHASH_OF(CRYPTO_BUFFER) *, lh), \
|
114
|
-
CHECKED_CAST(void *, CRYPTO_BUFFER *, data)))
|
115
|
-
|
116
|
-
#define lh_CRYPTO_BUFFER_insert(lh, old_data, data) \
|
117
|
-
lh_insert(CHECKED_CAST(_LHASH *, LHASH_OF(CRYPTO_BUFFER) *, lh), \
|
118
|
-
CHECKED_CAST(void **, CRYPTO_BUFFER **, old_data), \
|
119
|
-
CHECKED_CAST(void *, CRYPTO_BUFFER *, data))
|
120
|
-
|
121
|
-
#define lh_CRYPTO_BUFFER_delete(lh, data) \
|
122
|
-
((CRYPTO_BUFFER *)lh_delete( \
|
123
|
-
CHECKED_CAST(_LHASH *, LHASH_OF(CRYPTO_BUFFER) *, lh), \
|
124
|
-
CHECKED_CAST(void *, CRYPTO_BUFFER *, data)))
|
125
|
-
|
126
|
-
#define lh_CRYPTO_BUFFER_doall(lh, func) \
|
127
|
-
lh_doall(CHECKED_CAST(_LHASH *, LHASH_OF(CRYPTO_BUFFER) *, lh), \
|
128
|
-
CHECKED_CAST(void (*)(void *), void (*)(CRYPTO_BUFFER *), func));
|
129
|
-
|
130
|
-
#define lh_CRYPTO_BUFFER_doall_arg(lh, func, arg) \
|
131
|
-
lh_doall_arg(CHECKED_CAST(_LHASH *, LHASH_OF(CRYPTO_BUFFER) *, lh), \
|
132
|
-
CHECKED_CAST(void (*)(void *, void *), \
|
133
|
-
void (*)(CRYPTO_BUFFER *, void *), func), \
|
134
|
-
arg);
|
135
|
-
|
136
|
-
|
137
|
-
// SSL_SESSION
|
138
|
-
#define lh_SSL_SESSION_new(hash, comp) \
|
139
|
-
((LHASH_OF(SSL_SESSION) *)lh_new( \
|
140
|
-
CHECKED_CAST(lhash_hash_func, uint32_t(*)(const SSL_SESSION *), hash), \
|
141
|
-
CHECKED_CAST(lhash_cmp_func, \
|
142
|
-
int (*)(const SSL_SESSION *a, const SSL_SESSION *b), \
|
143
|
-
comp)))
|
144
|
-
|
145
|
-
#define lh_SSL_SESSION_free(lh) \
|
146
|
-
lh_free(CHECKED_CAST(_LHASH *, LHASH_OF(SSL_SESSION) *, lh));
|
147
|
-
|
148
|
-
#define lh_SSL_SESSION_num_items(lh) \
|
149
|
-
lh_num_items(CHECKED_CAST(_LHASH *, LHASH_OF(SSL_SESSION) *, lh))
|
150
|
-
|
151
|
-
#define lh_SSL_SESSION_retrieve(lh, data) \
|
152
|
-
((SSL_SESSION *)lh_retrieve( \
|
153
|
-
CHECKED_CAST(_LHASH *, LHASH_OF(SSL_SESSION) *, lh), \
|
154
|
-
CHECKED_CAST(void *, SSL_SESSION *, data)))
|
155
|
-
|
156
|
-
#define lh_SSL_SESSION_insert(lh, old_data, data) \
|
157
|
-
lh_insert(CHECKED_CAST(_LHASH *, LHASH_OF(SSL_SESSION) *, lh), \
|
158
|
-
CHECKED_CAST(void **, SSL_SESSION **, old_data), \
|
159
|
-
CHECKED_CAST(void *, SSL_SESSION *, data))
|
160
|
-
|
161
|
-
#define lh_SSL_SESSION_delete(lh, data) \
|
162
|
-
((SSL_SESSION *)lh_delete( \
|
163
|
-
CHECKED_CAST(_LHASH *, LHASH_OF(SSL_SESSION) *, lh), \
|
164
|
-
CHECKED_CAST(void *, SSL_SESSION *, data)))
|
165
|
-
|
166
|
-
#define lh_SSL_SESSION_doall(lh, func) \
|
167
|
-
lh_doall(CHECKED_CAST(_LHASH *, LHASH_OF(SSL_SESSION) *, lh), \
|
168
|
-
CHECKED_CAST(void (*)(void *), void (*)(SSL_SESSION *), func));
|
169
|
-
|
170
|
-
#define lh_SSL_SESSION_doall_arg(lh, func, arg) \
|
171
|
-
lh_doall_arg(CHECKED_CAST(_LHASH *, LHASH_OF(SSL_SESSION) *, lh), \
|
172
|
-
CHECKED_CAST(void (*)(void *, void *), \
|
173
|
-
void (*)(SSL_SESSION *, void *), func), \
|
174
|
-
arg);
|
@@ -1,265 +0,0 @@
|
|
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/ssl.h>
|
16
|
-
|
17
|
-
#include <assert.h>
|
18
|
-
#include <string.h>
|
19
|
-
|
20
|
-
#include <openssl/bytestring.h>
|
21
|
-
#include <openssl/err.h>
|
22
|
-
#include <openssl/mem.h>
|
23
|
-
#include <openssl/stack.h>
|
24
|
-
|
25
|
-
#include "internal.h"
|
26
|
-
|
27
|
-
|
28
|
-
namespace bssl {
|
29
|
-
|
30
|
-
void SSL_CUSTOM_EXTENSION_free(SSL_CUSTOM_EXTENSION *custom_extension) {
|
31
|
-
OPENSSL_free(custom_extension);
|
32
|
-
}
|
33
|
-
|
34
|
-
static const SSL_CUSTOM_EXTENSION *custom_ext_find(
|
35
|
-
STACK_OF(SSL_CUSTOM_EXTENSION) *stack,
|
36
|
-
unsigned *out_index, uint16_t value) {
|
37
|
-
for (size_t i = 0; i < sk_SSL_CUSTOM_EXTENSION_num(stack); i++) {
|
38
|
-
const SSL_CUSTOM_EXTENSION *ext = sk_SSL_CUSTOM_EXTENSION_value(stack, i);
|
39
|
-
if (ext->value == value) {
|
40
|
-
if (out_index != NULL) {
|
41
|
-
*out_index = i;
|
42
|
-
}
|
43
|
-
return ext;
|
44
|
-
}
|
45
|
-
}
|
46
|
-
|
47
|
-
return NULL;
|
48
|
-
}
|
49
|
-
|
50
|
-
// default_add_callback is used as the |add_callback| when the user doesn't
|
51
|
-
// provide one. For servers, it does nothing while, for clients, it causes an
|
52
|
-
// empty extension to be included.
|
53
|
-
static int default_add_callback(SSL *ssl, unsigned extension_value,
|
54
|
-
const uint8_t **out, size_t *out_len,
|
55
|
-
int *out_alert_value, void *add_arg) {
|
56
|
-
if (ssl->server) {
|
57
|
-
return 0;
|
58
|
-
}
|
59
|
-
*out_len = 0;
|
60
|
-
return 1;
|
61
|
-
}
|
62
|
-
|
63
|
-
static int custom_ext_add_hello(SSL_HANDSHAKE *hs, CBB *extensions) {
|
64
|
-
SSL *const ssl = hs->ssl;
|
65
|
-
STACK_OF(SSL_CUSTOM_EXTENSION) *stack = ssl->ctx->client_custom_extensions;
|
66
|
-
if (ssl->server) {
|
67
|
-
stack = ssl->ctx->server_custom_extensions;
|
68
|
-
}
|
69
|
-
|
70
|
-
if (stack == NULL) {
|
71
|
-
return 1;
|
72
|
-
}
|
73
|
-
|
74
|
-
for (size_t i = 0; i < sk_SSL_CUSTOM_EXTENSION_num(stack); i++) {
|
75
|
-
const SSL_CUSTOM_EXTENSION *ext = sk_SSL_CUSTOM_EXTENSION_value(stack, i);
|
76
|
-
|
77
|
-
if (ssl->server &&
|
78
|
-
!(hs->custom_extensions.received & (1u << i))) {
|
79
|
-
// Servers cannot echo extensions that the client didn't send.
|
80
|
-
continue;
|
81
|
-
}
|
82
|
-
|
83
|
-
const uint8_t *contents;
|
84
|
-
size_t contents_len;
|
85
|
-
int alert = SSL_AD_DECODE_ERROR;
|
86
|
-
CBB contents_cbb;
|
87
|
-
|
88
|
-
switch (ext->add_callback(ssl, ext->value, &contents, &contents_len, &alert,
|
89
|
-
ext->add_arg)) {
|
90
|
-
case 1:
|
91
|
-
if (!CBB_add_u16(extensions, ext->value) ||
|
92
|
-
!CBB_add_u16_length_prefixed(extensions, &contents_cbb) ||
|
93
|
-
!CBB_add_bytes(&contents_cbb, contents, contents_len) ||
|
94
|
-
!CBB_flush(extensions)) {
|
95
|
-
OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
|
96
|
-
ERR_add_error_dataf("extension %u", (unsigned) ext->value);
|
97
|
-
if (ext->free_callback && 0 < contents_len) {
|
98
|
-
ext->free_callback(ssl, ext->value, contents, ext->add_arg);
|
99
|
-
}
|
100
|
-
return 0;
|
101
|
-
}
|
102
|
-
|
103
|
-
if (ext->free_callback && 0 < contents_len) {
|
104
|
-
ext->free_callback(ssl, ext->value, contents, ext->add_arg);
|
105
|
-
}
|
106
|
-
|
107
|
-
if (!ssl->server) {
|
108
|
-
assert((hs->custom_extensions.sent & (1u << i)) == 0);
|
109
|
-
hs->custom_extensions.sent |= (1u << i);
|
110
|
-
}
|
111
|
-
break;
|
112
|
-
|
113
|
-
case 0:
|
114
|
-
break;
|
115
|
-
|
116
|
-
default:
|
117
|
-
ssl_send_alert(ssl, SSL3_AL_FATAL, alert);
|
118
|
-
OPENSSL_PUT_ERROR(SSL, SSL_R_CUSTOM_EXTENSION_ERROR);
|
119
|
-
ERR_add_error_dataf("extension %u", (unsigned) ext->value);
|
120
|
-
return 0;
|
121
|
-
}
|
122
|
-
}
|
123
|
-
|
124
|
-
return 1;
|
125
|
-
}
|
126
|
-
|
127
|
-
int custom_ext_add_clienthello(SSL_HANDSHAKE *hs, CBB *extensions) {
|
128
|
-
return custom_ext_add_hello(hs, extensions);
|
129
|
-
}
|
130
|
-
|
131
|
-
int custom_ext_parse_serverhello(SSL_HANDSHAKE *hs, int *out_alert,
|
132
|
-
uint16_t value, const CBS *extension) {
|
133
|
-
SSL *const ssl = hs->ssl;
|
134
|
-
unsigned index;
|
135
|
-
const SSL_CUSTOM_EXTENSION *ext =
|
136
|
-
custom_ext_find(ssl->ctx->client_custom_extensions, &index, value);
|
137
|
-
|
138
|
-
if (// Unknown extensions are not allowed in a ServerHello.
|
139
|
-
ext == NULL ||
|
140
|
-
// Also, if we didn't send the extension, that's also unacceptable.
|
141
|
-
!(hs->custom_extensions.sent & (1u << index))) {
|
142
|
-
OPENSSL_PUT_ERROR(SSL, SSL_R_UNEXPECTED_EXTENSION);
|
143
|
-
ERR_add_error_dataf("extension %u", (unsigned)value);
|
144
|
-
*out_alert = SSL_AD_UNSUPPORTED_EXTENSION;
|
145
|
-
return 0;
|
146
|
-
}
|
147
|
-
|
148
|
-
if (ext->parse_callback != NULL &&
|
149
|
-
!ext->parse_callback(ssl, value, CBS_data(extension), CBS_len(extension),
|
150
|
-
out_alert, ext->parse_arg)) {
|
151
|
-
OPENSSL_PUT_ERROR(SSL, SSL_R_CUSTOM_EXTENSION_ERROR);
|
152
|
-
ERR_add_error_dataf("extension %u", (unsigned)ext->value);
|
153
|
-
return 0;
|
154
|
-
}
|
155
|
-
|
156
|
-
return 1;
|
157
|
-
}
|
158
|
-
|
159
|
-
int custom_ext_parse_clienthello(SSL_HANDSHAKE *hs, int *out_alert,
|
160
|
-
uint16_t value, const CBS *extension) {
|
161
|
-
SSL *const ssl = hs->ssl;
|
162
|
-
unsigned index;
|
163
|
-
const SSL_CUSTOM_EXTENSION *ext =
|
164
|
-
custom_ext_find(ssl->ctx->server_custom_extensions, &index, value);
|
165
|
-
|
166
|
-
if (ext == NULL) {
|
167
|
-
return 1;
|
168
|
-
}
|
169
|
-
|
170
|
-
assert((hs->custom_extensions.received & (1u << index)) == 0);
|
171
|
-
hs->custom_extensions.received |= (1u << index);
|
172
|
-
|
173
|
-
if (ext->parse_callback &&
|
174
|
-
!ext->parse_callback(ssl, value, CBS_data(extension), CBS_len(extension),
|
175
|
-
out_alert, ext->parse_arg)) {
|
176
|
-
OPENSSL_PUT_ERROR(SSL, SSL_R_CUSTOM_EXTENSION_ERROR);
|
177
|
-
ERR_add_error_dataf("extension %u", (unsigned)ext->value);
|
178
|
-
return 0;
|
179
|
-
}
|
180
|
-
|
181
|
-
return 1;
|
182
|
-
}
|
183
|
-
|
184
|
-
int custom_ext_add_serverhello(SSL_HANDSHAKE *hs, CBB *extensions) {
|
185
|
-
return custom_ext_add_hello(hs, extensions);
|
186
|
-
}
|
187
|
-
|
188
|
-
// MAX_NUM_CUSTOM_EXTENSIONS is the maximum number of custom extensions that
|
189
|
-
// can be set on an |SSL_CTX|. It's determined by the size of the bitset used
|
190
|
-
// to track when an extension has been sent.
|
191
|
-
#define MAX_NUM_CUSTOM_EXTENSIONS \
|
192
|
-
(sizeof(((SSL_HANDSHAKE *)NULL)->custom_extensions.sent) * 8)
|
193
|
-
|
194
|
-
static int custom_ext_append(STACK_OF(SSL_CUSTOM_EXTENSION) **stack,
|
195
|
-
unsigned extension_value,
|
196
|
-
SSL_custom_ext_add_cb add_cb,
|
197
|
-
SSL_custom_ext_free_cb free_cb, void *add_arg,
|
198
|
-
SSL_custom_ext_parse_cb parse_cb,
|
199
|
-
void *parse_arg) {
|
200
|
-
if (add_cb == NULL ||
|
201
|
-
0xffff < extension_value ||
|
202
|
-
SSL_extension_supported(extension_value) ||
|
203
|
-
// Specifying a free callback without an add callback is nonsensical
|
204
|
-
// and an error.
|
205
|
-
(*stack != NULL &&
|
206
|
-
(MAX_NUM_CUSTOM_EXTENSIONS <= sk_SSL_CUSTOM_EXTENSION_num(*stack) ||
|
207
|
-
custom_ext_find(*stack, NULL, extension_value) != NULL))) {
|
208
|
-
return 0;
|
209
|
-
}
|
210
|
-
|
211
|
-
SSL_CUSTOM_EXTENSION *ext =
|
212
|
-
(SSL_CUSTOM_EXTENSION *)OPENSSL_malloc(sizeof(SSL_CUSTOM_EXTENSION));
|
213
|
-
if (ext == NULL) {
|
214
|
-
return 0;
|
215
|
-
}
|
216
|
-
ext->add_callback = add_cb;
|
217
|
-
ext->add_arg = add_arg;
|
218
|
-
ext->free_callback = free_cb;
|
219
|
-
ext->parse_callback = parse_cb;
|
220
|
-
ext->parse_arg = parse_arg;
|
221
|
-
ext->value = extension_value;
|
222
|
-
|
223
|
-
if (*stack == NULL) {
|
224
|
-
*stack = sk_SSL_CUSTOM_EXTENSION_new_null();
|
225
|
-
if (*stack == NULL) {
|
226
|
-
SSL_CUSTOM_EXTENSION_free(ext);
|
227
|
-
return 0;
|
228
|
-
}
|
229
|
-
}
|
230
|
-
|
231
|
-
if (!sk_SSL_CUSTOM_EXTENSION_push(*stack, ext)) {
|
232
|
-
SSL_CUSTOM_EXTENSION_free(ext);
|
233
|
-
if (sk_SSL_CUSTOM_EXTENSION_num(*stack) == 0) {
|
234
|
-
sk_SSL_CUSTOM_EXTENSION_free(*stack);
|
235
|
-
*stack = NULL;
|
236
|
-
}
|
237
|
-
return 0;
|
238
|
-
}
|
239
|
-
|
240
|
-
return 1;
|
241
|
-
}
|
242
|
-
|
243
|
-
} // namespace bssl
|
244
|
-
|
245
|
-
using namespace bssl;
|
246
|
-
|
247
|
-
int SSL_CTX_add_client_custom_ext(SSL_CTX *ctx, unsigned extension_value,
|
248
|
-
SSL_custom_ext_add_cb add_cb,
|
249
|
-
SSL_custom_ext_free_cb free_cb, void *add_arg,
|
250
|
-
SSL_custom_ext_parse_cb parse_cb,
|
251
|
-
void *parse_arg) {
|
252
|
-
return custom_ext_append(&ctx->client_custom_extensions, extension_value,
|
253
|
-
add_cb ? add_cb : default_add_callback, free_cb,
|
254
|
-
add_arg, parse_cb, parse_arg);
|
255
|
-
}
|
256
|
-
|
257
|
-
int SSL_CTX_add_server_custom_ext(SSL_CTX *ctx, unsigned extension_value,
|
258
|
-
SSL_custom_ext_add_cb add_cb,
|
259
|
-
SSL_custom_ext_free_cb free_cb, void *add_arg,
|
260
|
-
SSL_custom_ext_parse_cb parse_cb,
|
261
|
-
void *parse_arg) {
|
262
|
-
return custom_ext_append(&ctx->server_custom_extensions, extension_value,
|
263
|
-
add_cb ? add_cb : default_add_callback, free_cb,
|
264
|
-
add_arg, parse_cb, parse_arg);
|
265
|
-
}
|