TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

OK, we need ssl-certificates too

Browse Source
This commit is contained in:
David Rose 2009-09-17 17:38:07 +00:00
parent f1dc8538f6
commit bc23d7835b
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/express/config_express.cxx
View File

@ -79,6 +79,12 @@ ConfigVariableFilename ca_bundle_filename
"ca-bundle.crt is included in the OpenSSL distribution, and "
"is also included with Panda."));
ConfigVariableList ssl_certificates
("ssl-certificates",
PRC_DESC("This variable lists additional filenames, on top of the file "
"named by ca-bundle-filename, that contain trusted SSL "
"certificates or certificate authorities."));
////////////////////////////////////////////////////////////////////
// Function: init_libexpress
// Description: Initializes the library. This must be called at

1
panda/src/express/config_express.h
View File

@ -54,6 +54,7 @@ extern ConfigVariableBool keep_temporary_files;
extern EXPCL_PANDAEXPRESS ConfigVariableBool collect_tcp;
extern EXPCL_PANDAEXPRESS ConfigVariableDouble collect_tcp_interval;
extern ConfigVariableFilename ca_bundle_filename;
extern ConfigVariableList ssl_certificates;
// Expose the Config variable for Python access.
BEGIN_PUBLISH

7
panda/src/express/openSSLWrapper.cxx
View File

@ -42,6 +42,13 @@ OpenSSLWrapper() {
if (!ca_bundle_filename.empty()) {
load_certificates(ca_bundle_filename);
}
int num_certs = ssl_certificates.get_num_unique_values();
for (int ci = 0; ci < num_certs; ci++) {
string cert_file = ssl_certificates.get_unique_value(ci);
Filename filename = Filename::expand_from(cert_file);
load_certificates(filename);
}
}
////////////////////////////////////////////////////////////////////