tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TlsUtility: Replace deprecated OpenSSL function with ASN1_STRING_get0_data()

This commit is contained in:
Michael Friedrich 2020-02-21 13:02:58 +01:00
parent 456b0779bb
commit fdb13d1b7d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/base/tlsutility.cpp
View File

@ -872,7 +872,13 @@ Array::Ptr GetSubjectAltNames(const std::shared_ptr<X509>& cert)
GENERAL_NAME* gen = sk_GENERAL_NAME_value(subjectAltNames, i); GENERAL_NAME* gen = sk_GENERAL_NAME_value(subjectAltNames, i);
if (gen->type == GEN_URI || gen->type == GEN_DNS || gen->type == GEN_EMAIL) { if (gen->type == GEN_URI || gen->type == GEN_DNS || gen->type == GEN_EMAIL) {
ASN1_IA5STRING *asn1_str = gen->d.uniformResourceIdentifier; ASN1_IA5STRING *asn1_str = gen->d.uniformResourceIdentifier;
#if OPENSSL_VERSION_NUMBER < 0x10100000L
String san = Convert::ToString(ASN1_STRING_data(asn1_str)); String san = Convert::ToString(ASN1_STRING_data(asn1_str));
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
String san = Convert::ToString(ASN1_STRING_get0_data(asn1_str));
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
sans->Add(san); sans->Add(san);
} }
} }