From 8bbbd8c7cf9e9b129bff5c829fb12deada116ff0 Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 9 Oct 2009 19:06:19 +0000 Subject: [PATCH] compile with openssl 0.9.6 --- panda/src/downloader/httpChannel.cxx | 4 ++-- panda/src/downloader/httpClient.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/panda/src/downloader/httpChannel.cxx b/panda/src/downloader/httpChannel.cxx index a97a47fe47..d0e68d4838 100644 --- a/panda/src/downloader/httpChannel.cxx +++ b/panda/src/downloader/httpChannel.cxx @@ -3327,8 +3327,8 @@ validate_server_name(X509 *cert) { // According to RFC 2818, we should check the DNS name(s) in the // subjectAltName extension first, if that extension exists. - GENERAL_NAMES *subject_alt_names = - (GENERAL_NAMES *)X509_get_ext_d2i(cert, NID_subject_alt_name, NULL, NULL); + STACK_OF(GENERAL_NAME) *subject_alt_names = + (STACK_OF(GENERAL_NAME) *)X509_get_ext_d2i(cert, NID_subject_alt_name, NULL, NULL); if (subject_alt_names != NULL) { int num_alts = sk_GENERAL_NAME_num(subject_alt_names); for (int i = 0; i < num_alts; ++i) { diff --git a/panda/src/downloader/httpClient.cxx b/panda/src/downloader/httpClient.cxx index d450294496..391ccb227f 100644 --- a/panda/src/downloader/httpClient.cxx +++ b/panda/src/downloader/httpClient.cxx @@ -959,7 +959,7 @@ parse_http_version_string(const string &version) { bool HTTPClient:: load_certificates(const Filename &filename) { OpenSSLWrapper *sslw = OpenSSLWrapper::get_global_ptr(); - return sslw->load_certificates(filename); + return (sslw->load_certificates(filename) != 0); } ////////////////////////////////////////////////////////////////////