From 5848349f1e0df84949a01b41d41904036cc070f7 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Fri, 4 Jun 2021 17:21:28 -0400 Subject: [PATCH 06/11] Fix merge issues and make the build work --- .../Cryptography/Pal.Unix/OpenSslX509ChainProcessor.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/OpenSslX509ChainProcessor.cs b/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/OpenSslX509ChainProcessor.cs index a7f777261e..d5ec28b1ae 100644 --- a/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/OpenSslX509ChainProcessor.cs +++ b/src/System.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/OpenSslX509ChainProcessor.cs @@ -370,8 +370,8 @@ internal void Finish(OidCollection applicationPolicy, OidCollection certificateP // chain is just fine (unless it returned a negative code for an exception) Debug.Assert(verify, "verify should have returned true"); - const Interop.Crypto.X509VerifyStatusCode NoCrl = - Interop.Crypto.X509VerifyStatusCode.X509_V_ERR_UNABLE_TO_GET_CRL; + Interop.Crypto.X509VerifyStatusCode NoCrl = + X509VerifyStatusCodeUniversal.X509_V_ERR_UNABLE_TO_GET_CRL; ErrorCollection? errors = workingChain.LastError > 0 ? (ErrorCollection?)workingChain[0] : null; @@ -726,7 +726,7 @@ private static ArraySegment Base64UrlEncode(ReadOnlySpan input) X509ChainStatus chainStatus = new X509ChainStatus { Status = statusFlag, - StatusInformation = Interop.Crypto.GetX509VerifyCertErrorString(errorCode), + StatusInformation = Interop.Crypto.GetX509VerifyCertErrorString(errorCode.Code), }; elementStatus.Add(chainStatus); -- 2.31.1