From fafca2b5f330994f72c226f4ba8facd085c9c05f Mon Sep 17 00:00:00 2001 From: Yihua Zhang Date: Mon, 22 Oct 2018 11:23:12 -0700 Subject: [PATCH] move fake URL string back to fake_security_connector.h --- .../security/security_connector/fake/fake_security_connector.cc | 1 - .../security/security_connector/fake/fake_security_connector.h | 2 ++ src/core/lib/security/security_connector/ssl_utils.h | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.cc b/src/core/lib/security/security_connector/fake/fake_security_connector.cc index 2d3c1297fe9..5c0c89b88f2 100644 --- a/src/core/lib/security/security_connector/fake/fake_security_connector.cc +++ b/src/core/lib/security/security_connector/fake/fake_security_connector.cc @@ -34,7 +34,6 @@ #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" -#include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/lib/security/transport/security_handshaker.h" #include "src/core/lib/security/transport/target_authority_table.h" #include "src/core/tsi/fake_transport_security.h" diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.h b/src/core/lib/security/security_connector/fake/fake_security_connector.h index e5a12504926..fdfe048c6e7 100644 --- a/src/core/lib/security/security_connector/fake/fake_security_connector.h +++ b/src/core/lib/security/security_connector/fake/fake_security_connector.h @@ -26,6 +26,8 @@ #include "src/core/lib/channel/handshaker.h" #include "src/core/lib/security/security_connector/security_connector.h" +#define GRPC_FAKE_SECURITY_URL_SCHEME "http+fake_security" + /* Creates a fake connector that emulates real channel security. */ grpc_channel_security_connector* grpc_fake_channel_security_connector_create( grpc_channel_credentials* channel_creds, diff --git a/src/core/lib/security/security_connector/ssl_utils.h b/src/core/lib/security/security_connector/ssl_utils.h index fc6be7453fb..6f6d473311b 100644 --- a/src/core/lib/security/security_connector/ssl_utils.h +++ b/src/core/lib/security/security_connector/ssl_utils.h @@ -33,7 +33,6 @@ /* --- URL schemes. --- */ #define GRPC_SSL_URL_SCHEME "https" -#define GRPC_FAKE_SECURITY_URL_SCHEME "http+fake_security" /* Return HTTP2-compliant cipher suites that gRPC accepts by default. */ const char* grpc_get_ssl_cipher_suites(void);