From 4dc4e96c8a4fb7e34ecae3a39ef0f3f3fb275e97 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 1 May 2014 09:53:37 -0300 Subject: -OpenSSL Fixes --- drivers/openssl/stream_peer_openssl.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'drivers/openssl/stream_peer_openssl.cpp') diff --git a/drivers/openssl/stream_peer_openssl.cpp b/drivers/openssl/stream_peer_openssl.cpp index 2414533df..0751c76e3 100644 --- a/drivers/openssl/stream_peer_openssl.cpp +++ b/drivers/openssl/stream_peer_openssl.cpp @@ -1,9 +1,6 @@ -#include "stream_peer_openssl.h" #ifdef OPENSSL_ENABLED -#include "globals.h" -#include "os/file_access.h" -#include "curl_hostcheck.h" +#include "stream_peer_openssl.h" //hostname matching code from curl @@ -109,6 +106,7 @@ int StreamPeerOpenSSL::_cert_verify_callback(X509_STORE_CTX *x509_ctx, void *arg bool base_cert_valid = X509_verify_cert(x509_ctx); if (!base_cert_valid) { print_line("Cause: "+String(X509_verify_cert_error_string(X509_STORE_CTX_get_error(x509_ctx)))); + ERR_print_errors_fp(stdout); } X509 *server_cert = X509_STORE_CTX_get_current_cert(x509_ctx); @@ -361,7 +359,11 @@ Error StreamPeerOpenSSL::connect(Ref p_base, bool p_validate_certs, // Same as before, try to connect. int result = SSL_connect( ssl ); + print_line("CONNECTION RESULT: "+itos(result)); + if (result<1) { + _print_error(result); + } X509 * peer = SSL_get_peer_certificate(ssl); @@ -547,8 +549,10 @@ void StreamPeerOpenSSL::initialize_ssl() { } BIO_free(mem); } - print_line("Loaded certs: "+itos(certs.size())); + print_line("Loaded certs from '"+certs_path+"': "+itos(certs.size())); } + String config_path =GLOBAL_DEF("ssl/config",""); + Globals::get_singleton()->set_custom_property_info("ssl/config",PropertyInfo(Variant::STRING,"ssl/config",PROPERTY_HINT_FILE,"*.cnf")); } -- cgit v1.2.3-70-g09d2