diff options
author | 2015-05-30 11:11:05 -0700 | |
---|---|---|
committer | 2015-05-30 11:11:05 -0700 | |
commit | f29a6c107df0aded7dac1a32bb2cbf10f98b08dd (patch) | |
tree | ef86fbb4c08e98e0c7690e01447d6b16a96d5988 /build.json | |
parent | 1ffb864053d7e124411559295a2567a8aad7411a (diff) | |
parent | a2779c122ec3b2c3b6a475afa2ed18145d1f1b61 (diff) |
Merge branch 'but-maybe-i-want-to-poll' into we-dont-need-no-backup
Conflicts:
Makefile
build.json
src/core/security/credentials.c
src/core/security/credentials.h
src/core/surface/call.c
test/core/end2end/tests/request_response_with_payload_and_call_creds.c
tools/doxygen/Doxyfile.c++
tools/doxygen/Doxyfile.core
Diffstat (limited to 'build.json')
-rw-r--r-- | build.json | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/build.json b/build.json index a59391bb75..87835288df 100644 --- a/build.json +++ b/build.json @@ -407,7 +407,7 @@ "src/core/httpcli/httpcli.h", "src/core/httpcli/httpcli_security_connector.h", "src/core/httpcli/parser.h", - "src/core/security/auth.h", + "src/core/security/auth_filters.h", "src/core/security/base64.h", "src/core/security/credentials.h", "src/core/security/json_token.h", @@ -425,9 +425,10 @@ "src/core/httpcli/httpcli.c", "src/core/httpcli/httpcli_security_connector.c", "src/core/httpcli/parser.c", - "src/core/security/auth.c", "src/core/security/base64.c", + "src/core/security/client_auth_filter.c", "src/core/security/credentials.c", + "src/core/security/credentials_metadata.c", "src/core/security/credentials_posix.c", "src/core/security/credentials_win32.c", "src/core/security/google_default_credentials.c", @@ -436,6 +437,7 @@ "src/core/security/secure_transport_setup.c", "src/core/security/security_connector.c", "src/core/security/security_context.c", + "src/core/security/server_auth_filter.c", "src/core/security/server_secure_chttp2.c", "src/core/surface/init_secure.c", "src/core/surface/secure_channel_create.c", @@ -1276,6 +1278,20 @@ ] }, { + "name": "grpc_auth_context_test", + "build": "test", + "language": "c", + "src": [ + "test/core/security/auth_context_test.c" + ], + "deps": [ + "grpc_test_util", + "grpc", + "gpr_test_util", + "gpr" + ] + }, + { "name": "grpc_base64_test", "build": "test", "language": "c", |