grpc
/
grpc-go
mirror of https://github.com/grpc/grpc-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

benchmark: Revert to use old certs. (#3860)

This commit is contained in:
Easwar Swaminathan 2020-09-01 17:59:14 -07:00 committed by GitHub
parent 0b575750a9
commit 8c8305f8d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark/worker/benchmark_client.go
View File

@ -123,7 +123,7 @@ func createConns(config *testpb.ClientConfig) ([]*grpc.ClientConn, func(), error
// Check and set security options. // Check and set security options.
if config.SecurityParams != nil { if config.SecurityParams != nil {
if *caFile == "" { if *caFile == "" {
*caFile = testdata.Path("x509/server_ca.pem") *caFile = testdata.Path("ca.pem")
} }
creds, err := credentials.NewClientTLSFromFile(*caFile, config.SecurityParams.ServerHostOverride) creds, err := credentials.NewClientTLSFromFile(*caFile, config.SecurityParams.ServerHostOverride)
if err != nil { if err != nil {

4
benchmark/worker/benchmark_server.go
View File

@ -94,10 +94,10 @@ func startBenchmarkServer(config *testpb.ServerConfig, serverPort int) (*benchma
// Set security options. // Set security options.
if config.SecurityParams != nil { if config.SecurityParams != nil {
if *certFile == "" { if *certFile == "" {
*certFile = testdata.Path("x509/server1_cert.pem") *certFile = testdata.Path("server1.pem")
} }
if *keyFile == "" { if *keyFile == "" {
*keyFile = testdata.Path("x509/server1_key.pem") *keyFile = testdata.Path("server1.key")
} }
creds, err := credentials.NewServerTLSFromFile(*certFile, *keyFile) creds, err := credentials.NewServerTLSFromFile(*certFile, *keyFile)
if err != nil { if err != nil {