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