haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add policy to alter curl revoke settings on windows

This commit is contained in:
Marek Roszko 2023-07-13 18:58:54 -04:00
parent b0fa2561b6
commit cbb8835c87
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/kicad_curl/kicad_curl_easy.cpp
View File

@ -41,6 +41,8 @@
#include <kiplatform/environment.h> #include <kiplatform/environment.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <kiplatform/policy.h>
#include <policy_keys.h>
struct CURL_PROGRESS struct CURL_PROGRESS
{ {
@ -131,8 +133,20 @@ KICAD_CURL_EASY::KICAD_CURL_EASY() :
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
long sslOpts = CURLSSLOPT_NATIVE_CA;
POLICY_CURL_SSL_REVOKE policyState = KIPLATFORM::POLICY::GetPolicyEnum<POLICY_CURL_SSL_REVOKE>( POLICY_KEY_REQUESTS_CURL_REVOKE );
if( policyState == POLICY_CURL_SSL_REVOKE::BEST_EFFORT )
{
sslOpts |= CURLSSLOPT_REVOKE_BEST_EFFORT;
}
else if( policyState == POLICY_CURL_SSL_REVOKE::NONE )
{
sslOpts |= CURLSSLOPT_NO_REVOKE;
}
// We need this to use the Windows Certificate store // We need this to use the Windows Certificate store
curl_easy_setopt( m_CURL, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NATIVE_CA ); curl_easy_setopt( m_CURL, CURLOPT_SSL_OPTIONS, sslOpts );
#endif #endif
if( wxGetEnv( wxT( "KICAD_CURL_VERBOSE" ), nullptr ) ) if( wxGetEnv( wxT( "KICAD_CURL_VERBOSE" ), nullptr ) )

10
include/policy_keys.h
View File

@ -25,7 +25,17 @@
#ifndef POLICY_KEYS_H_ #ifndef POLICY_KEYS_H_
#define POLICY_KEYS_H_ #define POLICY_KEYS_H_
#include <cstdint>
#define POLICY_KEY_DATACOLLECTION wxT( "DataCollection" ) #define POLICY_KEY_DATACOLLECTION wxT( "DataCollection" )
#define POLICY_KEY_PCM wxT( "PluginAndContentManager" ) #define POLICY_KEY_PCM wxT( "PluginAndContentManager" )
#define POLICY_KEY_REQUESTS_CURL_REVOKE wxT( "curl\\SslRevoke" )
enum class POLICY_CURL_SSL_REVOKE : std::uint32_t
{
DEFAULT = 0,
BEST_EFFORT = 1,
NONE = 2
};
#endif // POLICY_KEYS_H_ #endif // POLICY_KEYS_H_