Revert "Move google_default channel_credentials out of `include/grpc/grpc_security.h` (#31786)" (#31822)

This reverts commit 3d59abc94e.
pull/31825/head
Cheng-Yu Chung 2 years ago committed by GitHub
parent 4d7df5580d
commit 0d3fcb41ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      BUILD
  2. 3
      CMakeLists.txt
  3. 2
      Makefile
  4. 3
      build_autogenerated.yaml
  5. 1
      gRPC-Core.podspec
  6. 2
      grpc.def
  7. 1
      grpc.gemspec
  8. 52
      include/grpc/channel_credentials/google_default.h
  9. 21
      include/grpc/grpc_security.h
  10. 1
      include/grpc/module.modulemap
  11. 1
      package.xml
  12. 1
      src/core/lib/security/credentials/channel_creds_registry_init.cc
  13. 1
      src/core/lib/security/credentials/google_default/google_default_credentials.cc
  14. 1
      src/cpp/client/secure_credentials.cc
  15. 1
      src/php/ext/grpc/channel_credentials.c
  16. 6
      src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi
  17. 4
      src/ruby/ext/grpc/rb_grpc_imports.generated.c
  18. 7
      src/ruby/ext/grpc/rb_grpc_imports.generated.h
  19. 1
      test/core/security/credentials_test.cc
  20. 1
      test/core/security/print_google_default_creds_token.cc
  21. 3
      test/core/surface/public_headers_must_be_c89.c
  22. 1
      tools/doxygen/Doxyfile.c++
  23. 1
      tools/doxygen/Doxyfile.c++.internal
  24. 1
      tools/doxygen/Doxyfile.core
  25. 1
      tools/doxygen/Doxyfile.core.internal

@ -194,7 +194,6 @@ GPR_PUBLIC_HDRS = [
GRPC_PUBLIC_HDRS = [ GRPC_PUBLIC_HDRS = [
"include/grpc/byte_buffer.h", "include/grpc/byte_buffer.h",
"include/grpc/byte_buffer_reader.h", "include/grpc/byte_buffer_reader.h",
"include/grpc/channel_credentials/google_default.h",
"include/grpc/compression.h", "include/grpc/compression.h",
"include/grpc/fork.h", "include/grpc/fork.h",
"include/grpc/grpc.h", "include/grpc/grpc.h",

3
CMakeLists.txt generated

@ -2435,7 +2435,6 @@ foreach(_hdr
include/grpc/byte_buffer.h include/grpc/byte_buffer.h
include/grpc/byte_buffer_reader.h include/grpc/byte_buffer_reader.h
include/grpc/census.h include/grpc/census.h
include/grpc/channel_credentials/google_default.h
include/grpc/compression.h include/grpc/compression.h
include/grpc/event_engine/endpoint_config.h include/grpc/event_engine/endpoint_config.h
include/grpc/event_engine/event_engine.h include/grpc/event_engine/event_engine.h
@ -3041,7 +3040,6 @@ foreach(_hdr
include/grpc/byte_buffer.h include/grpc/byte_buffer.h
include/grpc/byte_buffer_reader.h include/grpc/byte_buffer_reader.h
include/grpc/census.h include/grpc/census.h
include/grpc/channel_credentials/google_default.h
include/grpc/compression.h include/grpc/compression.h
include/grpc/event_engine/endpoint_config.h include/grpc/event_engine/endpoint_config.h
include/grpc/event_engine/event_engine.h include/grpc/event_engine/event_engine.h
@ -4519,7 +4517,6 @@ target_link_libraries(grpc_authorization_provider
foreach(_hdr foreach(_hdr
include/grpc/byte_buffer.h include/grpc/byte_buffer.h
include/grpc/byte_buffer_reader.h include/grpc/byte_buffer_reader.h
include/grpc/channel_credentials/google_default.h
include/grpc/compression.h include/grpc/compression.h
include/grpc/event_engine/endpoint_config.h include/grpc/event_engine/endpoint_config.h
include/grpc/event_engine/event_engine.h include/grpc/event_engine/event_engine.h

2
Makefile generated

@ -1669,7 +1669,6 @@ PUBLIC_HEADERS_C += \
include/grpc/byte_buffer.h \ include/grpc/byte_buffer.h \
include/grpc/byte_buffer_reader.h \ include/grpc/byte_buffer_reader.h \
include/grpc/census.h \ include/grpc/census.h \
include/grpc/channel_credentials/google_default.h \
include/grpc/compression.h \ include/grpc/compression.h \
include/grpc/event_engine/endpoint_config.h \ include/grpc/event_engine/endpoint_config.h \
include/grpc/event_engine/event_engine.h \ include/grpc/event_engine/event_engine.h \
@ -2135,7 +2134,6 @@ PUBLIC_HEADERS_C += \
include/grpc/byte_buffer.h \ include/grpc/byte_buffer.h \
include/grpc/byte_buffer_reader.h \ include/grpc/byte_buffer_reader.h \
include/grpc/census.h \ include/grpc/census.h \
include/grpc/channel_credentials/google_default.h \
include/grpc/compression.h \ include/grpc/compression.h \
include/grpc/event_engine/endpoint_config.h \ include/grpc/event_engine/endpoint_config.h \
include/grpc/event_engine/event_engine.h \ include/grpc/event_engine/event_engine.h \

@ -256,7 +256,6 @@ libs:
- include/grpc/byte_buffer.h - include/grpc/byte_buffer.h
- include/grpc/byte_buffer_reader.h - include/grpc/byte_buffer_reader.h
- include/grpc/census.h - include/grpc/census.h
- include/grpc/channel_credentials/google_default.h
- include/grpc/compression.h - include/grpc/compression.h
- include/grpc/event_engine/endpoint_config.h - include/grpc/event_engine/endpoint_config.h
- include/grpc/event_engine/event_engine.h - include/grpc/event_engine/event_engine.h
@ -1838,7 +1837,6 @@ libs:
- include/grpc/byte_buffer.h - include/grpc/byte_buffer.h
- include/grpc/byte_buffer_reader.h - include/grpc/byte_buffer_reader.h
- include/grpc/census.h - include/grpc/census.h
- include/grpc/channel_credentials/google_default.h
- include/grpc/compression.h - include/grpc/compression.h
- include/grpc/event_engine/endpoint_config.h - include/grpc/event_engine/endpoint_config.h
- include/grpc/event_engine/event_engine.h - include/grpc/event_engine/event_engine.h
@ -3373,7 +3371,6 @@ libs:
public_headers: public_headers:
- include/grpc/byte_buffer.h - include/grpc/byte_buffer.h
- include/grpc/byte_buffer_reader.h - include/grpc/byte_buffer_reader.h
- include/grpc/channel_credentials/google_default.h
- include/grpc/compression.h - include/grpc/compression.h
- include/grpc/event_engine/endpoint_config.h - include/grpc/event_engine/endpoint_config.h
- include/grpc/event_engine/event_engine.h - include/grpc/event_engine/event_engine.h

1
gRPC-Core.podspec generated

@ -107,7 +107,6 @@ Pod::Spec.new do |s|
ss.source_files = 'include/grpc/byte_buffer.h', ss.source_files = 'include/grpc/byte_buffer.h',
'include/grpc/byte_buffer_reader.h', 'include/grpc/byte_buffer_reader.h',
'include/grpc/census.h', 'include/grpc/census.h',
'include/grpc/channel_credentials/google_default.h',
'include/grpc/compression.h', 'include/grpc/compression.h',
'include/grpc/event_engine/endpoint_config.h', 'include/grpc/event_engine/endpoint_config.h',
'include/grpc/event_engine/event_engine.h', 'include/grpc/event_engine/event_engine.h',

2
grpc.def generated

@ -10,7 +10,6 @@ EXPORTS
grpc_byte_buffer_reader_peek grpc_byte_buffer_reader_peek
grpc_byte_buffer_reader_readall grpc_byte_buffer_reader_readall
grpc_raw_byte_buffer_from_reader grpc_raw_byte_buffer_from_reader
grpc_google_default_credentials_create
grpc_compression_algorithm_is_message grpc_compression_algorithm_is_message
grpc_compression_algorithm_is_stream grpc_compression_algorithm_is_stream
grpc_compression_algorithm_parse grpc_compression_algorithm_parse
@ -116,6 +115,7 @@ EXPORTS
grpc_ssl_session_cache_destroy grpc_ssl_session_cache_destroy
grpc_ssl_session_cache_create_channel_arg grpc_ssl_session_cache_create_channel_arg
grpc_call_credentials_release grpc_call_credentials_release
grpc_google_default_credentials_create
grpc_set_ssl_roots_override_callback grpc_set_ssl_roots_override_callback
grpc_ssl_credentials_create grpc_ssl_credentials_create
grpc_ssl_credentials_create_ex grpc_ssl_credentials_create_ex

1
grpc.gemspec generated

@ -50,7 +50,6 @@ Gem::Specification.new do |s|
s.files += %w( include/grpc/byte_buffer.h ) s.files += %w( include/grpc/byte_buffer.h )
s.files += %w( include/grpc/byte_buffer_reader.h ) s.files += %w( include/grpc/byte_buffer_reader.h )
s.files += %w( include/grpc/census.h ) s.files += %w( include/grpc/census.h )
s.files += %w( include/grpc/channel_credentials/google_default.h )
s.files += %w( include/grpc/compression.h ) s.files += %w( include/grpc/compression.h )
s.files += %w( include/grpc/event_engine/endpoint_config.h ) s.files += %w( include/grpc/event_engine/endpoint_config.h )
s.files += %w( include/grpc/event_engine/event_engine.h ) s.files += %w( include/grpc/event_engine/event_engine.h )

@ -1,52 +0,0 @@
// Copyright 2022 gRPC authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef GRPC_CHANNEL_CREDENTIALS_GOOGLE_DEFAULT_H
#define GRPC_CHANNEL_CREDENTIALS_GOOGLE_DEFAULT_H
#include <grpc/support/port_platform.h>
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
#ifdef __cplusplus
extern "C" {
#endif
/** Creates default credentials to connect to a google gRPC service.
WARNING: Do NOT use this credentials to connect to a non-google service as
this could result in an oauth2 token leak. The security level of the
resulting connection is GRPC_PRIVACY_AND_INTEGRITY.
If specified, the supplied call credentials object will be attached to the
returned channel credentials object. The call_credentials object must remain
valid throughout the lifetime of the returned grpc_channel_credentials
object. It is expected that the call credentials object was generated
according to the Application Default Credentials mechanism and asserts the
identity of the default service account of the machine. Supplying any other
sort of call credential will result in undefined behavior, up to and
including the sudden and unexpected failure of RPCs.
If nullptr is supplied, the returned channel credentials object will use a
call credentials object based on the Application Default Credentials
mechanism.
*/
GRPCAPI grpc_channel_credentials* grpc_google_default_credentials_create(
grpc_call_credentials* call_credentials);
#ifdef __cplusplus
}
#endif
#endif /* GRPC_CHANNEL_CREDENTIALS_GOOGLE_DEFAULT_H */

@ -131,6 +131,27 @@ typedef struct grpc_call_credentials grpc_call_credentials;
The creator of the credentials object is responsible for its release. */ The creator of the credentials object is responsible for its release. */
GRPCAPI void grpc_call_credentials_release(grpc_call_credentials* creds); GRPCAPI void grpc_call_credentials_release(grpc_call_credentials* creds);
/** Creates default credentials to connect to a google gRPC service.
WARNING: Do NOT use this credentials to connect to a non-google service as
this could result in an oauth2 token leak. The security level of the
resulting connection is GRPC_PRIVACY_AND_INTEGRITY.
If specified, the supplied call credentials object will be attached to the
returned channel credentials object. The call_credentials object must remain
valid throughout the lifetime of the returned grpc_channel_credentials
object. It is expected that the call credentials object was generated
according to the Application Default Credentials mechanism and asserts the
identity of the default service account of the machine. Supplying any other
sort of call credential will result in undefined behavior, up to and
including the sudden and unexpected failure of RPCs.
If nullptr is supplied, the returned channel credentials object will use a
call credentials object based on the Application Default Credentials
mechanism.
*/
GRPCAPI grpc_channel_credentials* grpc_google_default_credentials_create(
grpc_call_credentials* call_credentials);
/** Callback for getting the SSL roots override from the application. /** Callback for getting the SSL roots override from the application.
In case of success, *pem_roots_certs must be set to a NULL terminated string In case of success, *pem_roots_certs must be set to a NULL terminated string
containing the list of PEM encoded root certificates. The ownership is passed containing the list of PEM encoded root certificates. The ownership is passed

@ -5,7 +5,6 @@ framework module grpc {
header "byte_buffer.h" header "byte_buffer.h"
header "byte_buffer_reader.h" header "byte_buffer_reader.h"
header "census.h" header "census.h"
header "channel_credentials/google_default.h"
header "compression.h" header "compression.h"
header "fork.h" header "fork.h"
header "grpc.h" header "grpc.h"

1
package.xml generated

@ -32,7 +32,6 @@
<file baseinstalldir="/" name="include/grpc/byte_buffer.h" role="src" /> <file baseinstalldir="/" name="include/grpc/byte_buffer.h" role="src" />
<file baseinstalldir="/" name="include/grpc/byte_buffer_reader.h" role="src" /> <file baseinstalldir="/" name="include/grpc/byte_buffer_reader.h" role="src" />
<file baseinstalldir="/" name="include/grpc/census.h" role="src" /> <file baseinstalldir="/" name="include/grpc/census.h" role="src" />
<file baseinstalldir="/" name="include/grpc/channel_credentials/google_default.h" role="src" />
<file baseinstalldir="/" name="include/grpc/compression.h" role="src" /> <file baseinstalldir="/" name="include/grpc/compression.h" role="src" />
<file baseinstalldir="/" name="include/grpc/event_engine/endpoint_config.h" role="src" /> <file baseinstalldir="/" name="include/grpc/event_engine/endpoint_config.h" role="src" />
<file baseinstalldir="/" name="include/grpc/event_engine/event_engine.h" role="src" /> <file baseinstalldir="/" name="include/grpc/event_engine/event_engine.h" role="src" />

@ -22,7 +22,6 @@
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include <grpc/channel_credentials/google_default.h>
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/grpc_security.h> #include <grpc/grpc_security.h>

@ -32,7 +32,6 @@
#include "absl/strings/strip.h" #include "absl/strings/strip.h"
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include <grpc/channel_credentials/google_default.h>
#include <grpc/grpc_security.h> // IWYU pragma: keep #include <grpc/grpc_security.h> // IWYU pragma: keep
#include <grpc/grpc_security_constants.h> #include <grpc/grpc_security_constants.h>
#include <grpc/impl/codegen/grpc_types.h> #include <grpc/impl/codegen/grpc_types.h>

@ -29,7 +29,6 @@
#include "absl/strings/str_join.h" #include "absl/strings/str_join.h"
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include <grpc/channel_credentials/google_default.h>
#include <grpc/event_engine/event_engine.h> #include <grpc/event_engine/event_engine.h>
#include <grpc/grpc_security_constants.h> #include <grpc/grpc_security_constants.h>
#include <grpc/impl/codegen/gpr_types.h> #include <grpc/impl/codegen/gpr_types.h>

@ -27,7 +27,6 @@
#include <ext/spl/spl_exceptions.h> #include <ext/spl/spl_exceptions.h>
#include <zend_exceptions.h> #include <zend_exceptions.h>
#include <grpc/channel_credentials/google_default.h>
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include <grpc/support/string_util.h> #include <grpc/support/string_util.h>

@ -552,6 +552,7 @@ cdef extern from "grpc/grpc_security.h":
void grpc_set_ssl_roots_override_callback( void grpc_set_ssl_roots_override_callback(
grpc_ssl_roots_override_callback cb) nogil grpc_ssl_roots_override_callback cb) nogil
grpc_channel_credentials *grpc_google_default_credentials_create(grpc_call_credentials* call_credentials) nogil
grpc_channel_credentials *grpc_ssl_credentials_create( grpc_channel_credentials *grpc_ssl_credentials_create(
const char *pem_root_certs, grpc_ssl_pem_key_cert_pair *pem_key_cert_pair, const char *pem_root_certs, grpc_ssl_pem_key_cert_pair *pem_key_cert_pair,
verify_peer_options *verify_options, void *reserved) nogil verify_peer_options *verify_options, void *reserved) nogil
@ -666,7 +667,7 @@ cdef extern from "grpc/grpc_security.h":
ctypedef struct grpc_alts_credentials_options: ctypedef struct grpc_alts_credentials_options:
# We don't care about the internals (and in fact don't know them) # We don't care about the internals (and in fact don't know them)
pass pass
grpc_channel_credentials *grpc_alts_credentials_create( grpc_channel_credentials *grpc_alts_credentials_create(
const grpc_alts_credentials_options *options) const grpc_alts_credentials_options *options)
grpc_server_credentials *grpc_alts_server_credentials_create( grpc_server_credentials *grpc_alts_server_credentials_create(
@ -678,9 +679,6 @@ cdef extern from "grpc/grpc_security.h":
void grpc_alts_credentials_client_options_add_target_service_account(grpc_alts_credentials_options *options, const char *service_account) void grpc_alts_credentials_client_options_add_target_service_account(grpc_alts_credentials_options *options, const char *service_account)
cdef extern from "grpc/channel_credentials/google_default.h":
grpc_channel_credentials *grpc_google_default_credentials_create(grpc_call_credentials* call_credentials) nogil
cdef extern from "grpc/compression.h": cdef extern from "grpc/compression.h":

@ -33,7 +33,6 @@ grpc_byte_buffer_reader_next_type grpc_byte_buffer_reader_next_import;
grpc_byte_buffer_reader_peek_type grpc_byte_buffer_reader_peek_import; grpc_byte_buffer_reader_peek_type grpc_byte_buffer_reader_peek_import;
grpc_byte_buffer_reader_readall_type grpc_byte_buffer_reader_readall_import; grpc_byte_buffer_reader_readall_type grpc_byte_buffer_reader_readall_import;
grpc_raw_byte_buffer_from_reader_type grpc_raw_byte_buffer_from_reader_import; grpc_raw_byte_buffer_from_reader_type grpc_raw_byte_buffer_from_reader_import;
grpc_google_default_credentials_create_type grpc_google_default_credentials_create_import;
grpc_compression_algorithm_is_message_type grpc_compression_algorithm_is_message_import; grpc_compression_algorithm_is_message_type grpc_compression_algorithm_is_message_import;
grpc_compression_algorithm_is_stream_type grpc_compression_algorithm_is_stream_import; grpc_compression_algorithm_is_stream_type grpc_compression_algorithm_is_stream_import;
grpc_compression_algorithm_parse_type grpc_compression_algorithm_parse_import; grpc_compression_algorithm_parse_type grpc_compression_algorithm_parse_import;
@ -139,6 +138,7 @@ grpc_ssl_session_cache_create_lru_type grpc_ssl_session_cache_create_lru_import;
grpc_ssl_session_cache_destroy_type grpc_ssl_session_cache_destroy_import; grpc_ssl_session_cache_destroy_type grpc_ssl_session_cache_destroy_import;
grpc_ssl_session_cache_create_channel_arg_type grpc_ssl_session_cache_create_channel_arg_import; grpc_ssl_session_cache_create_channel_arg_type grpc_ssl_session_cache_create_channel_arg_import;
grpc_call_credentials_release_type grpc_call_credentials_release_import; grpc_call_credentials_release_type grpc_call_credentials_release_import;
grpc_google_default_credentials_create_type grpc_google_default_credentials_create_import;
grpc_set_ssl_roots_override_callback_type grpc_set_ssl_roots_override_callback_import; grpc_set_ssl_roots_override_callback_type grpc_set_ssl_roots_override_callback_import;
grpc_ssl_credentials_create_type grpc_ssl_credentials_create_import; grpc_ssl_credentials_create_type grpc_ssl_credentials_create_import;
grpc_ssl_credentials_create_ex_type grpc_ssl_credentials_create_ex_import; grpc_ssl_credentials_create_ex_type grpc_ssl_credentials_create_ex_import;
@ -318,7 +318,6 @@ void grpc_rb_load_imports(HMODULE library) {
grpc_byte_buffer_reader_peek_import = (grpc_byte_buffer_reader_peek_type) GetProcAddress(library, "grpc_byte_buffer_reader_peek"); grpc_byte_buffer_reader_peek_import = (grpc_byte_buffer_reader_peek_type) GetProcAddress(library, "grpc_byte_buffer_reader_peek");
grpc_byte_buffer_reader_readall_import = (grpc_byte_buffer_reader_readall_type) GetProcAddress(library, "grpc_byte_buffer_reader_readall"); grpc_byte_buffer_reader_readall_import = (grpc_byte_buffer_reader_readall_type) GetProcAddress(library, "grpc_byte_buffer_reader_readall");
grpc_raw_byte_buffer_from_reader_import = (grpc_raw_byte_buffer_from_reader_type) GetProcAddress(library, "grpc_raw_byte_buffer_from_reader"); grpc_raw_byte_buffer_from_reader_import = (grpc_raw_byte_buffer_from_reader_type) GetProcAddress(library, "grpc_raw_byte_buffer_from_reader");
grpc_google_default_credentials_create_import = (grpc_google_default_credentials_create_type) GetProcAddress(library, "grpc_google_default_credentials_create");
grpc_compression_algorithm_is_message_import = (grpc_compression_algorithm_is_message_type) GetProcAddress(library, "grpc_compression_algorithm_is_message"); grpc_compression_algorithm_is_message_import = (grpc_compression_algorithm_is_message_type) GetProcAddress(library, "grpc_compression_algorithm_is_message");
grpc_compression_algorithm_is_stream_import = (grpc_compression_algorithm_is_stream_type) GetProcAddress(library, "grpc_compression_algorithm_is_stream"); grpc_compression_algorithm_is_stream_import = (grpc_compression_algorithm_is_stream_type) GetProcAddress(library, "grpc_compression_algorithm_is_stream");
grpc_compression_algorithm_parse_import = (grpc_compression_algorithm_parse_type) GetProcAddress(library, "grpc_compression_algorithm_parse"); grpc_compression_algorithm_parse_import = (grpc_compression_algorithm_parse_type) GetProcAddress(library, "grpc_compression_algorithm_parse");
@ -424,6 +423,7 @@ void grpc_rb_load_imports(HMODULE library) {
grpc_ssl_session_cache_destroy_import = (grpc_ssl_session_cache_destroy_type) GetProcAddress(library, "grpc_ssl_session_cache_destroy"); grpc_ssl_session_cache_destroy_import = (grpc_ssl_session_cache_destroy_type) GetProcAddress(library, "grpc_ssl_session_cache_destroy");
grpc_ssl_session_cache_create_channel_arg_import = (grpc_ssl_session_cache_create_channel_arg_type) GetProcAddress(library, "grpc_ssl_session_cache_create_channel_arg"); grpc_ssl_session_cache_create_channel_arg_import = (grpc_ssl_session_cache_create_channel_arg_type) GetProcAddress(library, "grpc_ssl_session_cache_create_channel_arg");
grpc_call_credentials_release_import = (grpc_call_credentials_release_type) GetProcAddress(library, "grpc_call_credentials_release"); grpc_call_credentials_release_import = (grpc_call_credentials_release_type) GetProcAddress(library, "grpc_call_credentials_release");
grpc_google_default_credentials_create_import = (grpc_google_default_credentials_create_type) GetProcAddress(library, "grpc_google_default_credentials_create");
grpc_set_ssl_roots_override_callback_import = (grpc_set_ssl_roots_override_callback_type) GetProcAddress(library, "grpc_set_ssl_roots_override_callback"); grpc_set_ssl_roots_override_callback_import = (grpc_set_ssl_roots_override_callback_type) GetProcAddress(library, "grpc_set_ssl_roots_override_callback");
grpc_ssl_credentials_create_import = (grpc_ssl_credentials_create_type) GetProcAddress(library, "grpc_ssl_credentials_create"); grpc_ssl_credentials_create_import = (grpc_ssl_credentials_create_type) GetProcAddress(library, "grpc_ssl_credentials_create");
grpc_ssl_credentials_create_ex_import = (grpc_ssl_credentials_create_ex_type) GetProcAddress(library, "grpc_ssl_credentials_create_ex"); grpc_ssl_credentials_create_ex_import = (grpc_ssl_credentials_create_ex_type) GetProcAddress(library, "grpc_ssl_credentials_create_ex");

@ -26,7 +26,6 @@
#include <windows.h> #include <windows.h>
#include <grpc/byte_buffer.h> #include <grpc/byte_buffer.h>
#include <grpc/channel_credentials/google_default.h>
#include <grpc/compression.h> #include <grpc/compression.h>
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/grpc_posix.h> #include <grpc/grpc_posix.h>
@ -75,9 +74,6 @@ extern grpc_byte_buffer_reader_readall_type grpc_byte_buffer_reader_readall_impo
typedef grpc_byte_buffer*(*grpc_raw_byte_buffer_from_reader_type)(grpc_byte_buffer_reader* reader); typedef grpc_byte_buffer*(*grpc_raw_byte_buffer_from_reader_type)(grpc_byte_buffer_reader* reader);
extern grpc_raw_byte_buffer_from_reader_type grpc_raw_byte_buffer_from_reader_import; extern grpc_raw_byte_buffer_from_reader_type grpc_raw_byte_buffer_from_reader_import;
#define grpc_raw_byte_buffer_from_reader grpc_raw_byte_buffer_from_reader_import #define grpc_raw_byte_buffer_from_reader grpc_raw_byte_buffer_from_reader_import
typedef grpc_channel_credentials*(*grpc_google_default_credentials_create_type)(grpc_call_credentials* call_credentials);
extern grpc_google_default_credentials_create_type grpc_google_default_credentials_create_import;
#define grpc_google_default_credentials_create grpc_google_default_credentials_create_import
typedef int(*grpc_compression_algorithm_is_message_type)(grpc_compression_algorithm algorithm); typedef int(*grpc_compression_algorithm_is_message_type)(grpc_compression_algorithm algorithm);
extern grpc_compression_algorithm_is_message_type grpc_compression_algorithm_is_message_import; extern grpc_compression_algorithm_is_message_type grpc_compression_algorithm_is_message_import;
#define grpc_compression_algorithm_is_message grpc_compression_algorithm_is_message_import #define grpc_compression_algorithm_is_message grpc_compression_algorithm_is_message_import
@ -393,6 +389,9 @@ extern grpc_ssl_session_cache_create_channel_arg_type grpc_ssl_session_cache_cre
typedef void(*grpc_call_credentials_release_type)(grpc_call_credentials* creds); typedef void(*grpc_call_credentials_release_type)(grpc_call_credentials* creds);
extern grpc_call_credentials_release_type grpc_call_credentials_release_import; extern grpc_call_credentials_release_type grpc_call_credentials_release_import;
#define grpc_call_credentials_release grpc_call_credentials_release_import #define grpc_call_credentials_release grpc_call_credentials_release_import
typedef grpc_channel_credentials*(*grpc_google_default_credentials_create_type)(grpc_call_credentials* call_credentials);
extern grpc_google_default_credentials_create_type grpc_google_default_credentials_create_import;
#define grpc_google_default_credentials_create grpc_google_default_credentials_create_import
typedef void(*grpc_set_ssl_roots_override_callback_type)(grpc_ssl_roots_override_callback cb); typedef void(*grpc_set_ssl_roots_override_callback_type)(grpc_ssl_roots_override_callback cb);
extern grpc_set_ssl_roots_override_callback_type grpc_set_ssl_roots_override_callback_import; extern grpc_set_ssl_roots_override_callback_type grpc_set_ssl_roots_override_callback_import;
#define grpc_set_ssl_roots_override_callback grpc_set_ssl_roots_override_callback_import #define grpc_set_ssl_roots_override_callback grpc_set_ssl_roots_override_callback_import

@ -33,7 +33,6 @@
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
#include "absl/strings/str_replace.h" #include "absl/strings/str_replace.h"
#include <grpc/channel_credentials/google_default.h>
#include <grpc/grpc_security.h> #include <grpc/grpc_security.h>
#include <grpc/slice.h> #include <grpc/slice.h>
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>

@ -19,7 +19,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <grpc/channel_credentials/google_default.h>
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/grpc_security.h> #include <grpc/grpc_security.h>
#include <grpc/slice.h> #include <grpc/slice.h>

@ -19,7 +19,6 @@
#include <grpc/byte_buffer.h> #include <grpc/byte_buffer.h>
#include <grpc/byte_buffer_reader.h> #include <grpc/byte_buffer_reader.h>
#include <grpc/census.h> #include <grpc/census.h>
#include <grpc/channel_credentials/google_default.h>
#include <grpc/compression.h> #include <grpc/compression.h>
#include <grpc/fork.h> #include <grpc/fork.h>
#include <grpc/grpc.h> #include <grpc/grpc.h>
@ -80,7 +79,6 @@ int main(int argc, char **argv) {
printf("%lx", (unsigned long) grpc_byte_buffer_reader_peek); printf("%lx", (unsigned long) grpc_byte_buffer_reader_peek);
printf("%lx", (unsigned long) grpc_byte_buffer_reader_readall); printf("%lx", (unsigned long) grpc_byte_buffer_reader_readall);
printf("%lx", (unsigned long) grpc_raw_byte_buffer_from_reader); printf("%lx", (unsigned long) grpc_raw_byte_buffer_from_reader);
printf("%lx", (unsigned long) grpc_google_default_credentials_create);
printf("%lx", (unsigned long) grpc_compression_algorithm_is_message); printf("%lx", (unsigned long) grpc_compression_algorithm_is_message);
printf("%lx", (unsigned long) grpc_compression_algorithm_is_stream); printf("%lx", (unsigned long) grpc_compression_algorithm_is_stream);
printf("%lx", (unsigned long) grpc_compression_algorithm_parse); printf("%lx", (unsigned long) grpc_compression_algorithm_parse);
@ -184,6 +182,7 @@ int main(int argc, char **argv) {
printf("%lx", (unsigned long) grpc_ssl_session_cache_destroy); printf("%lx", (unsigned long) grpc_ssl_session_cache_destroy);
printf("%lx", (unsigned long) grpc_ssl_session_cache_create_channel_arg); printf("%lx", (unsigned long) grpc_ssl_session_cache_create_channel_arg);
printf("%lx", (unsigned long) grpc_call_credentials_release); printf("%lx", (unsigned long) grpc_call_credentials_release);
printf("%lx", (unsigned long) grpc_google_default_credentials_create);
printf("%lx", (unsigned long) grpc_set_ssl_roots_override_callback); printf("%lx", (unsigned long) grpc_set_ssl_roots_override_callback);
printf("%lx", (unsigned long) grpc_ssl_credentials_create); printf("%lx", (unsigned long) grpc_ssl_credentials_create);
printf("%lx", (unsigned long) grpc_ssl_credentials_create_ex); printf("%lx", (unsigned long) grpc_ssl_credentials_create_ex);

@ -880,7 +880,6 @@ include/grpc++/support/time.h \
include/grpc/byte_buffer.h \ include/grpc/byte_buffer.h \
include/grpc/byte_buffer_reader.h \ include/grpc/byte_buffer_reader.h \
include/grpc/census.h \ include/grpc/census.h \
include/grpc/channel_credentials/google_default.h \
include/grpc/compression.h \ include/grpc/compression.h \
include/grpc/event_engine/endpoint_config.h \ include/grpc/event_engine/endpoint_config.h \
include/grpc/event_engine/event_engine.h \ include/grpc/event_engine/event_engine.h \

@ -880,7 +880,6 @@ include/grpc++/support/time.h \
include/grpc/byte_buffer.h \ include/grpc/byte_buffer.h \
include/grpc/byte_buffer_reader.h \ include/grpc/byte_buffer_reader.h \
include/grpc/census.h \ include/grpc/census.h \
include/grpc/channel_credentials/google_default.h \
include/grpc/compression.h \ include/grpc/compression.h \
include/grpc/event_engine/endpoint_config.h \ include/grpc/event_engine/endpoint_config.h \
include/grpc/event_engine/event_engine.h \ include/grpc/event_engine/event_engine.h \

@ -810,7 +810,6 @@ doc/xds-test-descriptions.md \
include/grpc/byte_buffer.h \ include/grpc/byte_buffer.h \
include/grpc/byte_buffer_reader.h \ include/grpc/byte_buffer_reader.h \
include/grpc/census.h \ include/grpc/census.h \
include/grpc/channel_credentials/google_default.h \
include/grpc/compression.h \ include/grpc/compression.h \
include/grpc/event_engine/endpoint_config.h \ include/grpc/event_engine/endpoint_config.h \
include/grpc/event_engine/event_engine.h \ include/grpc/event_engine/event_engine.h \

@ -810,7 +810,6 @@ doc/xds-test-descriptions.md \
include/grpc/byte_buffer.h \ include/grpc/byte_buffer.h \
include/grpc/byte_buffer_reader.h \ include/grpc/byte_buffer_reader.h \
include/grpc/census.h \ include/grpc/census.h \
include/grpc/channel_credentials/google_default.h \
include/grpc/compression.h \ include/grpc/compression.h \
include/grpc/event_engine/endpoint_config.h \ include/grpc/event_engine/endpoint_config.h \
include/grpc/event_engine/event_engine.h \ include/grpc/event_engine/event_engine.h \

Loading…
Cancel
Save