Skip to content

Constify to fix build with OpenSSL 4 #590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
remicollet wants to merge 1 commit into
base: trunk
Choose a base branch
from
+6 −6
Open

Constify to fix build with OpenSSL 4 #590

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/ssl/ssl_openssl_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,19 +284,19 @@ class OpenSslVerifyIdentity {

private:
static Result match_common_name_ipaddr(X509* cert, const String& address) {
X509_NAME* name = X509_get_subject_name(cert);
const X509_NAME* name = X509_get_subject_name(cert);
if (name == NULL) {
return INVALID_CERT;
}

int i = -1;
while ((i = X509_NAME_get_index_by_NID(name, NID_commonName, i)) > 0) {
X509_NAME_ENTRY* name_entry = X509_NAME_get_entry(name, i);
const X509_NAME_ENTRY* name_entry = X509_NAME_get_entry(name, i);
if (name_entry == NULL) {
return INVALID_CERT;
}

ASN1_STRING* str = X509_NAME_ENTRY_get_data(name_entry);
const ASN1_STRING* str = X509_NAME_ENTRY_get_data(name_entry);
if (str == NULL) {
return INVALID_CERT;
}
Expand All @@ -315,19 +315,19 @@ class OpenSslVerifyIdentity {
}

static Result match_common_name_dns(X509* cert, const String& hostname) {
X509_NAME* name = X509_get_subject_name(cert);
const X509_NAME* name = X509_get_subject_name(cert);
if (name == NULL) {
return INVALID_CERT;
}

int i = -1;
while ((i = X509_NAME_get_index_by_NID(name, NID_commonName, i)) >= 0) {
X509_NAME_ENTRY* name_entry = X509_NAME_get_entry(name, i);
const X509_NAME_ENTRY* name_entry = X509_NAME_get_entry(name, i);
if (name_entry == NULL) {
return INVALID_CERT;
}

ASN1_STRING* str = X509_NAME_ENTRY_get_data(name_entry);
const ASN1_STRING* str = X509_NAME_ENTRY_get_data(name_entry);
if (str == NULL) {
return INVALID_CERT;
}
Expand Down