diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-03-30 10:27:20 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-03-30 10:27:20 -0700 |
| commit | 29b527fa306fd46be0120e6c1322b813969e5e4e (patch) | |
| tree | 8b2aa03236a132474aa3c9d7546c9d5cf58fa377 /src/core | |
| parent | 387c3a4f566338c488e0b6406fcf7d4580bf5784 (diff) | |
Reinstate one check, fix fall out
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/lib/channel/http_client_filter.c | 2 | ||||
| -rw-r--r-- | src/core/lib/channel/http_server_filter.c | 2 | ||||
| -rw-r--r-- | src/core/lib/security/credentials/jwt/json_token.c | 2 | ||||
| -rw-r--r-- | src/core/lib/security/credentials/jwt/jwt_verifier.c | 2 | ||||
| -rw-r--r-- | src/core/lib/slice/b64.c (renamed from src/core/lib/security/util/b64.c) | 2 | ||||
| -rw-r--r-- | src/core/lib/slice/b64.h (renamed from src/core/lib/security/util/b64.h) | 0 |
6 files changed, 5 insertions, 5 deletions
diff --git a/src/core/lib/channel/http_client_filter.c b/src/core/lib/channel/http_client_filter.c index 967904df1e..17af2013d9 100644 --- a/src/core/lib/channel/http_client_filter.c +++ b/src/core/lib/channel/http_client_filter.c @@ -36,7 +36,7 @@ #include <grpc/support/string_util.h> #include <string.h> #include "src/core/lib/profiling/timers.h" -#include "src/core/lib/security/util/b64.h" +#include "src/core/lib/slice/b64.h" #include "src/core/lib/slice/percent_encoding.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" diff --git a/src/core/lib/channel/http_server_filter.c b/src/core/lib/channel/http_server_filter.c index 8d3c488ea0..6b1a02efa1 100644 --- a/src/core/lib/channel/http_server_filter.c +++ b/src/core/lib/channel/http_server_filter.c @@ -37,7 +37,7 @@ #include <grpc/support/log.h> #include <string.h> #include "src/core/lib/profiling/timers.h" -#include "src/core/lib/security/util/b64.h" +#include "src/core/lib/slice/b64.h" #include "src/core/lib/slice/percent_encoding.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" diff --git a/src/core/lib/security/credentials/jwt/json_token.c b/src/core/lib/security/credentials/jwt/json_token.c index 192a5f47ed..9749e2b09b 100644 --- a/src/core/lib/security/credentials/jwt/json_token.c +++ b/src/core/lib/security/credentials/jwt/json_token.c @@ -40,7 +40,7 @@ #include <grpc/support/string_util.h> #include <grpc/support/time.h> -#include "src/core/lib/security/util/b64.h" +#include "src/core/lib/slice/b64.h" #include "src/core/lib/security/util/json_util.h" #include "src/core/lib/support/string.h" diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.c b/src/core/lib/security/credentials/jwt/jwt_verifier.c index b10a5da2a2..0e2a264371 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.c +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.c @@ -45,7 +45,7 @@ #include "src/core/lib/http/httpcli.h" #include "src/core/lib/iomgr/polling_entity.h" -#include "src/core/lib/security/util/b64.h" +#include "src/core/lib/slice/b64.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/support/string.h" #include "src/core/tsi/ssl_types.h" diff --git a/src/core/lib/security/util/b64.c b/src/core/lib/slice/b64.c index 0d5a917660..2007cc4810 100644 --- a/src/core/lib/security/util/b64.c +++ b/src/core/lib/slice/b64.c @@ -31,7 +31,7 @@ * */ -#include "src/core/lib/security/util/b64.h" +#include "src/core/lib/slice/b64.h" #include <stdint.h> #include <string.h> diff --git a/src/core/lib/security/util/b64.h b/src/core/lib/slice/b64.h index ef52291c6a..ef52291c6a 100644 --- a/src/core/lib/security/util/b64.h +++ b/src/core/lib/slice/b64.h |