forked from Siegfried-Gottlich-Wotansson/wget-windows
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
45727d0
commit 4b94aab
Showing
3 changed files
with
186 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| --- src/openssl.c 2021-01-09 01:51:43.000000000 +0300 | ||
| +++ src/openssl.c.windows 2021-03-15 21:31:22.597135391 +0300 | ||
| @@ -174,6 +174,72 @@ | ||
|
|
||
| Returns true on success, false otherwise. */ | ||
|
|
||
| +/* Start: Windows SSL Cert Changes */ | ||
| +#ifdef WINDOWS | ||
| +/* Local version of CERT_CONTEXT, to prevent from bringing in a specific | ||
| + version of the Windows SDK */ | ||
| +typedef struct _CERT_CONTEXT | ||
| +{ | ||
| + unsigned int dwCertEncodingType; | ||
| + unsigned char *pbCertEncoded; | ||
| + unsigned int cbCertEncoded; | ||
| + void* pCertInfo; | ||
| + void* hCertStore; | ||
| +} CERT_CONTEXT, *PCERT_CONTEXT;typedef const CERT_CONTEXT *PCCERT_CONTEXT; | ||
| + | ||
| +/* Load crypt32.dll manually to prevent bringing it in unless used */ | ||
| +HMODULE Local_Crypt32() | ||
| +{ | ||
| + static HMODULE ret = NULL; | ||
| + if (!ret) | ||
| + { | ||
| + ret = LoadLibraryA("Crypt32.dll"); | ||
| + } | ||
| + return ret; | ||
| +} | ||
| + | ||
| +/* Bounce these APIs to our loaded version of crypt32.dll */ | ||
| +void* Local_CertOpenSystemStoreA(void* hprov, char* szSubsystemProtocol) | ||
| +{ | ||
| + if (Local_Crypt32()) | ||
| + { | ||
| + static FARPROC ret = NULL; | ||
| + if (!ret) | ||
| + { | ||
| + ret = GetProcAddress(Local_Crypt32(), "CertOpenSystemStoreA"); | ||
| + } | ||
| + if (ret) | ||
| + { | ||
| + typedef void* (WINAPI * PFN_Func)(void*, char*); | ||
| + return ((PFN_Func) ret)(hprov, szSubsystemProtocol); | ||
| + } | ||
| + } | ||
| + return NULL; | ||
| +} | ||
| + | ||
| +void* Local_CertEnumCertificatesInStore(void* hCertStore, void* pPrevCertContext) | ||
| +{ | ||
| + if (Local_Crypt32()) | ||
| + { | ||
| + static FARPROC ret = NULL; | ||
| + if (!ret) | ||
| + { | ||
| + ret = GetProcAddress(Local_Crypt32(), "CertEnumCertificatesInStore"); | ||
| + } | ||
| + if (ret) | ||
| + { | ||
| + typedef void* (WINAPI * PFN_Func)(void*, void*); | ||
| + return ((PFN_Func) ret)(hCertStore, pPrevCertContext); | ||
| + } | ||
| + } | ||
| + return NULL; | ||
| +} | ||
| + | ||
| +#define PKCS_7_ASN_ENCODING 0x00010000 | ||
| +#endif | ||
| +/* End: Windows SSL Cert Changes */ | ||
| + | ||
| + | ||
| bool | ||
| ssl_init (void) | ||
| { | ||
| @@ -335,6 +401,37 @@ | ||
| } | ||
|
|
||
| SSL_CTX_set_default_verify_paths (ssl_ctx); | ||
| + | ||
| + /* Start: Windows SSL Cert Changes */ | ||
| +#ifdef WINDOWS | ||
| + /* Only attempt to use the Windows store if one is not specified */ | ||
| + if (!opt.ca_cert) | ||
| + { | ||
| + /* Open the default Windows cert store */ | ||
| + void* hStore = Local_CertOpenSystemStoreA(NULL, "ROOT"); | ||
| + if (hStore) | ||
| + { | ||
| + /* And then open the OpenSSL store */ | ||
| + X509_STORE * store = SSL_CTX_get_cert_store(ssl_ctx); | ||
| + CERT_CONTEXT * pCertCtx = NULL; | ||
| + /* Loop through all the certs in the Windows cert store */ | ||
| + for ( pCertCtx = Local_CertEnumCertificatesInStore(hStore, NULL); | ||
| + pCertCtx != NULL; | ||
| + pCertCtx = Local_CertEnumCertificatesInStore(hStore, pCertCtx) ) | ||
| + { | ||
| + if (!((pCertCtx->dwCertEncodingType & PKCS_7_ASN_ENCODING) == PKCS_7_ASN_ENCODING)) | ||
| + { | ||
| + /* Add all certs we find to OpenSSL's store */ | ||
| + X509 *cert = d2i_X509(NULL, (const unsigned char**)&pCertCtx->pbCertEncoded, pCertCtx->cbCertEncoded); | ||
| + X509_STORE_add_cert(store, cert); | ||
| + X509_free(cert); | ||
| + } | ||
| + } | ||
| + } | ||
| + } | ||
| +#endif | ||
| + /* End: Windows SSL Cert Changes */ | ||
| + | ||
| SSL_CTX_load_verify_locations (ssl_ctx, opt.ca_cert, opt.ca_directory); | ||
|
|
||
| #ifdef X509_V_FLAG_PARTIAL_CHAIN |