[PATCH v4 0/3] MR10357: winhttp: Implement WINHTTP_OPTION_SERVER_CERT_CHAIN_CONTEXT

[Michael Green (＠m-green39)]

--
  v4: Revert "winhttp: Use cert directly instead of duplicating"
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10357

[PATCH v4 1/3] winhttp: Implement WINHTTP_OPTION_SERVER_CERT_CHAIN_CONTEXT

[Michael Green]

From: Michael Green <[e-mail]>

---
 dlls/winhttp/session.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c
index a3c8bb91010..de34e7c862c 100644
--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -832,6 +832,29 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void
         *buflen = sizeof(cert);
         return TRUE;
     }
+    case WINHTTP_OPTION_SERVER_CERT_CHAIN_CONTEXT:
+    {
+        const CERT_CONTEXT *cert;
+        const CERT_CHAIN_CONTEXT *cert_chain;
+
+        char oid_server_auth[] = szOID_PKIX_KP_SERVER_AUTH;
+        char *server_auth[] = { oid_server_auth };
+
+        CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } };
+
+        chainPara.RequestedUsage.Usage.cUsageIdentifier = 1;
+        chainPara.RequestedUsage.Usage.rgpszUsageIdentifier = server_auth;
+
+        if (!validate_buffer( buffer, buflen, sizeof(cert) )) return FALSE;
+        if (!(cert = CertDuplicateCertificateContext( request -> server_cert ))) return FALSE;
+
+        if (!CertGetCertificateChain(NULL, cert, NULL, NULL, &chainPara, 0, NULL, &cert_chain)) return FALSE;
+
+        *(CERT_CHAIN_CONTEXT **)buffer = (CERT_CHAIN_CONTEXT *)cert_chain;
+        *buflen = sizeof(cert_chain);
+
+        return TRUE;
+    }
     case WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT:
     {
         const CERT_CONTEXT *cert = request->server_cert;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10357

[PATCH v4 2/3] winhttp: Use cert directly instead of duplicating

[bsmntoid]

From: bsmntoid <[e-mail]>

---
 dlls/winhttp/session.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c
index de34e7c862c..6e94c252c73 100644
--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -834,7 +834,6 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void
     }
     case WINHTTP_OPTION_SERVER_CERT_CHAIN_CONTEXT:
     {
-        const CERT_CONTEXT *cert;
         const CERT_CHAIN_CONTEXT *cert_chain;
 
         char oid_server_auth[] = szOID_PKIX_KP_SERVER_AUTH;
@@ -845,10 +844,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void
         chainPara.RequestedUsage.Usage.cUsageIdentifier = 1;
         chainPara.RequestedUsage.Usage.rgpszUsageIdentifier = server_auth;
 
-        if (!validate_buffer( buffer, buflen, sizeof(cert) )) return FALSE;
-        if (!(cert = CertDuplicateCertificateContext( request -> server_cert ))) return FALSE;
-
-        if (!CertGetCertificateChain(NULL, cert, NULL, NULL, &chainPara, 0, NULL, &cert_chain)) return FALSE;
+        if (!CertGetCertificateChain(NULL, request->server_cert, NULL, NULL, &chainPara, 0, NULL, &cert_chain)) return FALSE;
 
         *(CERT_CHAIN_CONTEXT **)buffer = (CERT_CHAIN_CONTEXT *)cert_chain;
         *buflen = sizeof(cert_chain);
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10357

[PATCH v4 3/3] Revert "winhttp: Use cert directly instead of duplicating"

[Michael Green]

From: Michael Green <[e-mail]>

This reverts commit d94acc1faea1d954d06a1ac7a320b419a24da655
---
 dlls/winhttp/session.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c
index 6e94c252c73..de34e7c862c 100644
--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -834,6 +834,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void
     }
     case WINHTTP_OPTION_SERVER_CERT_CHAIN_CONTEXT:
     {
+        const CERT_CONTEXT *cert;
         const CERT_CHAIN_CONTEXT *cert_chain;
 
         char oid_server_auth[] = szOID_PKIX_KP_SERVER_AUTH;
@@ -844,7 +845,10 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void
         chainPara.RequestedUsage.Usage.cUsageIdentifier = 1;
         chainPara.RequestedUsage.Usage.rgpszUsageIdentifier = server_auth;
 
-        if (!CertGetCertificateChain(NULL, request->server_cert, NULL, NULL, &chainPara, 0, NULL, &cert_chain)) return FALSE;
+        if (!validate_buffer( buffer, buflen, sizeof(cert) )) return FALSE;
+        if (!(cert = CertDuplicateCertificateContext( request -> server_cert ))) return FALSE;
+
+        if (!CertGetCertificateChain(NULL, cert, NULL, NULL, &chainPara, 0, NULL, &cert_chain)) return FALSE;
 
         *(CERT_CHAIN_CONTEXT **)buffer = (CERT_CHAIN_CONTEXT *)cert_chain;
         *buflen = sizeof(cert_chain);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10357