Commit 4b047ec6 authored by Marc Gravell's avatar Marc Gravell

make TrustIssuer an instance method

parent b816bf29
...@@ -190,7 +190,7 @@ public void RedisLabsSSL() ...@@ -190,7 +190,7 @@ public void RedisLabsSSL()
}, false) }, false)
}; };
options.CertificateValidation += ConfigurationOptions.TrustIssuer("redislabs_ca.pem"); options.TrustIssuer("redislabs_ca.pem");
......
...@@ -179,13 +179,15 @@ public static string TryNormalize(string value) ...@@ -179,13 +179,15 @@ public static string TryNormalize(string value)
/// <summary> /// <summary>
/// Create a certificate validation check that checks against the supplied issuer even if not known by the machine /// Create a certificate validation check that checks against the supplied issuer even if not known by the machine
/// </summary> /// </summary>
public static RemoteCertificateValidationCallback TrustIssuer(string issuerCertificatePath) public void TrustIssuer(string issuerCertificatePath) => CertificateValidationCallback = TrustIssuerCallback(issuerCertificatePath);
=> TrustIssuer(new X509Certificate2(issuerCertificatePath));
/// <summary> /// <summary>
/// Create a certificate validation check that checks against the supplied issuer even if not known by the machine /// Create a certificate validation check that checks against the supplied issuer even if not known by the machine
/// </summary> /// </summary>
public static RemoteCertificateValidationCallback TrustIssuer(X509Certificate2 issuer) public void TrustIssuer(X509Certificate2 issuer) => CertificateValidationCallback = TrustIssuerCallback(issuer);
internal static RemoteCertificateValidationCallback TrustIssuerCallback(string issuerCertificatePath)
=> TrustIssuerCallback(new X509Certificate2(issuerCertificatePath));
private static RemoteCertificateValidationCallback TrustIssuerCallback(X509Certificate2 issuer)
{ {
if (issuer == null) throw new ArgumentNullException(nameof(issuer)); if (issuer == null) throw new ArgumentNullException(nameof(issuer));
......
...@@ -949,7 +949,7 @@ private RemoteCertificateValidationCallback GetAmbientIssuerCertificateCallback( ...@@ -949,7 +949,7 @@ private RemoteCertificateValidationCallback GetAmbientIssuerCertificateCallback(
try try
{ {
var issuerPath = Environment.GetEnvironmentVariable("SERedis_IssuerCertPath"); var issuerPath = Environment.GetEnvironmentVariable("SERedis_IssuerCertPath");
if (!string.IsNullOrEmpty(issuerPath)) return ConfigurationOptions.TrustIssuer(issuerPath); if (!string.IsNullOrEmpty(issuerPath)) return ConfigurationOptions.TrustIssuerCallback(issuerPath);
} }
catch (Exception ex) catch (Exception ex)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment