diff options
author | 2015-05-30 11:08:34 -0700 | |
---|---|---|
committer | 2015-05-30 11:08:34 -0700 | |
commit | a2779c122ec3b2c3b6a475afa2ed18145d1f1b61 (patch) | |
tree | 4bb994c4e08e1c1ab30ad1841decbbf863e05548 /build.json | |
parent | 8f17c6c0283aeb78b615580529e98f1a28bf3c77 (diff) | |
parent | d7029e1ee3232fea606ab79b684e24294b7f8836 (diff) |
Merge github.com:grpc/grpc into but-maybe-i-want-to-poll
Conflicts:
Makefile
Diffstat (limited to 'build.json')
-rw-r--r-- | build.json | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/build.json b/build.json index 0a42d70967..df1a5f0fdb 100644 --- a/build.json +++ b/build.json @@ -7,7 +7,7 @@ "version": { "major": 0, "minor": 9, - "micro": 0, + "micro": 1, "build": 0 } }, @@ -405,7 +405,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", @@ -423,9 +423,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", @@ -434,6 +435,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", @@ -1274,6 +1276,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", |