diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2018-09-07 13:43:36 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2018-09-07 13:43:36 -0700 |
| commit | 209aee1c69aceeafd7d05208e76d3c1059edc720 (patch) | |
| tree | 88065f5e6d458f3449857fa6af91428bb6f159d7 /src/csharp | |
| parent | 7557c270a3f27a72be88dfcb2ae9efaeca527de4 (diff) | |
address review comments
Diffstat (limited to 'src/csharp')
| -rw-r--r-- | src/csharp/Grpc.Core/ServerCredentials.cs | 5 | ||||
| -rw-r--r-- | src/csharp/Grpc.IntegrationTesting/SslCredentialsTest.cs | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/csharp/Grpc.Core/ServerCredentials.cs b/src/csharp/Grpc.Core/ServerCredentials.cs index 056311e0c0..dc86f37a42 100644 --- a/src/csharp/Grpc.Core/ServerCredentials.cs +++ b/src/csharp/Grpc.Core/ServerCredentials.cs @@ -136,7 +136,7 @@ namespace Grpc.Core /// </summary> /// <param name="keyCertificatePairs">Key-certificates to use.</param> /// <param name="rootCertificates">PEM encoded client root certificates used to authenticate client.</param> - /// <param name="clientCertificateRequest">Options for requesting and verification of client certificate.</param> + /// <param name="clientCertificateRequest">Options for requesting and verifying client certificate.</param> public SslServerCredentials(IEnumerable<KeyCertificatePair> keyCertificatePairs, string rootCertificates, SslClientCertificateRequestType clientCertificateRequest) { this.keyCertificatePairs = new List<KeyCertificatePair>(keyCertificatePairs).AsReadOnly(); @@ -153,7 +153,8 @@ namespace Grpc.Core /// <summary> /// Creates server-side SSL credentials. - /// This constructor should be use if you do not wish to autheticate client at all. + /// This constructor should be used if you do not wish to authenticate the client. + /// (client certificate won't be requested and checked by the server at all). /// </summary> /// <param name="keyCertificatePairs">Key-certificates to use.</param> public SslServerCredentials(IEnumerable<KeyCertificatePair> keyCertificatePairs) : this(keyCertificatePairs, null, SslClientCertificateRequestType.DontRequestClientCertificate) diff --git a/src/csharp/Grpc.IntegrationTesting/SslCredentialsTest.cs b/src/csharp/Grpc.IntegrationTesting/SslCredentialsTest.cs index 713c4ea72a..1a6054f4cf 100644 --- a/src/csharp/Grpc.IntegrationTesting/SslCredentialsTest.cs +++ b/src/csharp/Grpc.IntegrationTesting/SslCredentialsTest.cs @@ -182,9 +182,9 @@ namespace Grpc.IntegrationTesting public void Constructor_NullRootCerts() { var keyCertPairs = new[] { keyCertPair }; - new SslServerCredentials(keyCertPairs, null, SslClientCertificateRequestType.DontRequestClientCertificate); - new SslServerCredentials(keyCertPairs, null, SslClientCertificateRequestType.RequestClientCertificateAndVerify); - new SslServerCredentials(keyCertPairs, null, SslClientCertificateRequestType.RequestAndRequireClientCertificateButDontVerify); + Assert.DoesNotThrow(() => new SslServerCredentials(keyCertPairs, null, SslClientCertificateRequestType.DontRequestClientCertificate)); + Assert.DoesNotThrow(() => new SslServerCredentials(keyCertPairs, null, SslClientCertificateRequestType.RequestClientCertificateAndVerify)); + Assert.DoesNotThrow(() => new SslServerCredentials(keyCertPairs, null, SslClientCertificateRequestType.RequestAndRequireClientCertificateButDontVerify)); Assert.Throws(typeof(ArgumentNullException), () => new SslServerCredentials(keyCertPairs, null, SslClientCertificateRequestType.RequestAndRequireClientCertificateAndVerify)); } |