iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.6.x'

Browse Source 
Conflicts:
	modules/schat.cpp
	src/SSLVerifyHost.cpp
	src/Utils.cpp
This commit is contained in:
Alexey Sokolov
2016-09-13 22:41:01 +01:00
parent 74e95ffdd9 b7dcac5e5f
commit 3846813512
4 changed files with 84 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/SSLVerifyHost.cpp
View File

@@ -17,6 +17,12 @@
#include <znc/SSLVerifyHost.h>
#ifdef HAVE_LIBSSL
#if defined(OPENSSL_VERSION_NUMBER) && !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100007
# define CONST_ASN1_STRING_DATA const /* 1.1.0-pre7: openssl/openssl@17ebf85abda18c3875b1ba6670fe7b393bc1f297 */
#else
# define ASN1_STRING_get0_data( x ) ASN1_STRING_data( x )
# define CONST_ASN1_STRING_DATA
#endif
#include <openssl/x509v3.h>
@@ -300,7 +306,7 @@ static HostnameValidationResult matches_common_name(const char* hostname,
int common_name_loc = -1;
X509_NAME_ENTRY* common_name_entry = nullptr;
ASN1_STRING* common_name_asn1 = nullptr;
char* common_name_str = nullptr;
CONST_ASN1_STRING_DATA char* common_name_str = nullptr;
// Find the position of the CN field in the Subject field of the certificate
common_name_loc = X509_NAME_get_index_by_NID(
@@ -321,7 +327,8 @@ static HostnameValidationResult matches_common_name(const char* hostname,
if (common_name_asn1 == nullptr) {
return Error;
}
common_name_str = (char*)ASN1_STRING_data(common_name_asn1);
common_name_str =
(CONST_ASN1_STRING_DATA char*)ASN1_STRING_get0_data(common_name_asn1);
// Make sure there isn't an embedded NUL character in the CN
if (ASN1_STRING_length(common_name_asn1) !=
@@ -367,7 +374,9 @@ static HostnameValidationResult matches_subject_alternative_name(
if (current_name->type == GEN_DNS) {
// Current name is a DNS name, let's check it
char* dns_name = (char*)ASN1_STRING_data(current_name->d.dNSName);
CONST_ASN1_STRING_DATA char* dns_name =
(CONST_ASN1_STRING_DATA char*)ASN1_STRING_get0_data(
current_name->d.dNSName);
// Make sure there isn't an embedded NUL character in the DNS name
if (ASN1_STRING_length(current_name->d.dNSName) !=