diff --git a/.gitignore b/.gitignore index 4b691209f..c9506601c 100644 --- a/.gitignore +++ b/.gitignore @@ -90,6 +90,7 @@ ylwrap *.mk # Visual Studio garbage +.vscode/ *.opensdf UpgradeLog*.XML _UpgradeReport_Files @@ -162,6 +163,7 @@ build/* build-2010/* build/* install/* +win-build/ build_* nel/tools/build_gamedata/configuration/buildsite.py diff --git a/nel/src/web/curl_certificates.cpp b/nel/src/web/curl_certificates.cpp index fdf69604f..52f04fe25 100644 --- a/nel/src/web/curl_certificates.cpp +++ b/nel/src/web/curl_certificates.cpp @@ -131,13 +131,6 @@ namespace NLWEB // only use OpenSSL callback if not using Windows SSPI and using OpenSSL backend if (useOpenSSLBackend && !(data && data->features & CURL_VERSION_SSPI)) { -#ifdef NL_OS_WINDOWS - // load native Windows CA Certs - addCertificatesFrom("CA"); - addCertificatesFrom("AuthRoot"); - addCertificatesFrom("ROOT"); -#endif - isUsingOpenSSLBackend = true; } else @@ -179,40 +172,6 @@ namespace NLWEB return name; } -#ifdef NL_OS_WINDOWS - void addCertificatesFrom(LPCSTR root) - { - HCERTSTORE hStore; - PCCERT_CONTEXT pContext = NULL; - X509 *x509; - hStore = CertOpenSystemStore(NULL, root); - if (hStore) - { - while (pContext = CertEnumCertificatesInStore(hStore, pContext)) - { - x509 = NULL; - x509 = d2i_X509(NULL, (const unsigned char **)&pContext->pbCertEncoded, pContext->cbCertEncoded); - - if (x509) - { - CertEntry entry; - entry.cert = x509; - entry.file = root; - entry.name = getCertName(x509); - - CertList.push_back(entry); - } - } - - CertFreeCertificateContext(pContext); - CertCloseStore(hStore, 0); - } - - // this is called before debug context is set and log ends up in log.log - //nlinfo("Loaded %d certificates from '%s' certificate store", (int)CertList.size(), root); - } -#endif - void addCertificatesFromFile(const std::string &cert) { if (!isInitialized) diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/anim.py old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/clod.py old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/cmb.py old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/ig.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/ig.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/pacs_prim.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/shape.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/shape.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/skel.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/skel.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/swt.py old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.py b/nel/tools/build_gamedata/generators/max_exporter_scripts/veget.py old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/max_exporter_scripts/zone.ms b/nel/tools/build_gamedata/generators/max_exporter_scripts/zone.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_footer.ms b/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_footer.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_header.ms b/nel/tools/build_gamedata/generators/simple_max_exporter_template/export_header.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_footer.ms b/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_footer.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_header.ms b/nel/tools/build_gamedata/generators/tagged_max_exporter_template/export_header.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/processes/anim/maxscript/anim_export.ms b/nel/tools/build_gamedata/processes/anim/maxscript/anim_export.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/processes/clodbank/maxscript/clod_export.ms b/nel/tools/build_gamedata/processes/clodbank/maxscript/clod_export.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/processes/ig/maxscript/ig_export.ms b/nel/tools/build_gamedata/processes/ig/maxscript/ig_export.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms b/nel/tools/build_gamedata/processes/ligo/maxscript/nel_ligo_export.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms b/nel/tools/build_gamedata/processes/pacs_prim/maxscript/pacs_prim_export.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/processes/rbank/maxscript/cmb_export.ms b/nel/tools/build_gamedata/processes/rbank/maxscript/cmb_export.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/processes/shape/maxscript/shape_export.ms b/nel/tools/build_gamedata/processes/shape/maxscript/shape_export.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/processes/skel/maxscript/skel_export.ms b/nel/tools/build_gamedata/processes/skel/maxscript/skel_export.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/processes/swt/maxscript/swt_export.ms b/nel/tools/build_gamedata/processes/swt/maxscript/swt_export.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/processes/veget/maxscript/veget_export.ms b/nel/tools/build_gamedata/processes/veget/maxscript/veget_export.ms old mode 100755 new mode 100644 diff --git a/nel/tools/build_gamedata/processes/zone/maxscript/zone_export.ms b/nel/tools/build_gamedata/processes/zone/maxscript/zone_export.ms old mode 100755 new mode 100644