TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix ssl error messages

Browse Source
This commit is contained in:
David Rose 2009-10-20 22:25:57 +00:00
parent b86a9f0d8d
commit 8987a19ba2
1 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,24 +182,32 @@ load_certificates_from_pem_ram(const char *data, size_t data_size) {
X509_INFO *itmp = sk_X509_INFO_value(inf, i); X509_INFO *itmp = sk_X509_INFO_value(inf, i);
if (itmp->x509) { if (itmp->x509) {
X509_STORE_add_cert(_x509_store, itmp->x509); int result = X509_STORE_add_cert(_x509_store, itmp->x509);
count++; if (result == 0) {
notify_ssl_errors();
} else {
++count;
}
if (express_cat.is_spam()) { if (express_cat.is_spam()) {
express_cat.spam() express_cat.spam()
<< "Entry " << i << " is x509\n"; << "Entry " << i << " is x509\n";
} }
} else if (itmp->crl) { } else if (itmp->crl) {
X509_STORE_add_crl(_x509_store, itmp->crl); int result = X509_STORE_add_crl(_x509_store, itmp->crl);
count++; if (result == 0) {
notify_ssl_errors();
} else {
++count;
}
if (express_cat.is_spam()) { if (express_cat.is_spam()) {
express_cat.spam() express_cat.spam()
<< "Entry " << i << " is crl\n"; << "Entry " << i << " is crl\n";
} }
} else if (itmp->x_pkey) { } else if (itmp->x_pkey) {
// X509_STORE_add_crl(_x509_store, itmp->x_pkey);
// count++;
if (express_cat.is_spam()) { if (express_cat.is_spam()) {
express_cat.spam() express_cat.spam()
<< "Entry " << i << " is pkey\n"; << "Entry " << i << " is pkey\n";
@ -214,6 +222,11 @@ load_certificates_from_pem_ram(const char *data, size_t data_size) {
} }
sk_X509_INFO_pop_free(inf, X509_INFO_free); sk_X509_INFO_pop_free(inf, X509_INFO_free);
if (express_cat.is_spam()) {
express_cat.spam()
<< "successfully loaded " << count << " entries.\n";
}
return count; return count;
} }
@ -232,6 +245,12 @@ load_certificates_from_pem_ram(const char *data, size_t data_size) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
int OpenSSLWrapper:: int OpenSSLWrapper::
load_certificates_from_der_ram(const char *data, size_t data_size) { load_certificates_from_der_ram(const char *data, size_t data_size) {
if (express_cat.is_spam()) {
express_cat.spam()
<< "load_certificates_from_der_ram(" << (void *)data
<< ", " << data_size << ")\n";
}
int count = 0; int count = 0;
#if OPENSSL_VERSION_NUMBER >= 0x00908000L #if OPENSSL_VERSION_NUMBER >= 0x00908000L
@ -244,11 +263,25 @@ load_certificates_from_der_ram(const char *data, size_t data_size) {
bp = (unsigned char *)data; bp = (unsigned char *)data;
bp_end = bp + data_size; bp_end = bp + data_size;
X509 *x509 = d2i_X509(NULL, &bp, bp_end - bp); while (bp < bp_end) {
while (x509 != NULL) { X509 *x509 = d2i_X509(NULL, &bp, bp_end - bp);
X509_STORE_add_cert(_x509_store, x509); if (x509 == NULL) {
++count; notify_ssl_errors();
x509 = d2i_X509(NULL, &bp, bp_end - bp); break;
}
int result = X509_STORE_add_cert(_x509_store, x509);
if (result == 0) {
notify_ssl_errors();
} else {
++count;
}
}
if (express_cat.is_spam()) {
express_cat.spam()
<< "loaded " << count << " certificates\n";
} }
return count; return count;