Skip to content

Navigation Menu

Sign in

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit da98d00

Browse filesBrowse files
michaelpqmichaelpq
committed
Fix some comments in ./configure and meson setup files
The comments referring to SSL_CTX_set_cert_cb() in ./configure and ./configure.ac were inconsistent, as `autoreconf -i` would show. While on it, fix a typo on a comment related to the same check in meson.build. Issue introduced in 8e278b6, that removed support for OpenSSL 1.0.1. Per offlist report from Thomas Munro.
1 parent f863d82 commit da98d00
Copy full SHA for da98d00

File tree

3 files changed

+3
-4
lines changed
Filter options

3 files changed

+3
-4
lines changed

‎configure

Copy file name to clipboardExpand all lines: configure
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12961,7 +12961,7 @@ else
1296112961
fi
1296212962

1296312963
fi
12964-
# LibreSSL does not have SSL_CTX_set_cert_cb().
12964+
# Function introduced in OpenSSL 1.0.2, not in LibreSSL.
1296512965
for ac_func in SSL_CTX_set_cert_cb
1296612966
do :
1296712967
ac_fn_c_check_func "$LINENO" "SSL_CTX_set_cert_cb" "ac_cv_func_SSL_CTX_set_cert_cb"

‎configure.ac

Copy file name to clipboardExpand all lines: configure.ac
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,8 +1377,7 @@ if test "$with_ssl" = openssl ; then
13771377
AC_SEARCH_LIBS(CRYPTO_new_ex_data, [eay32 crypto], [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
13781378
AC_SEARCH_LIBS(SSL_new, [ssleay32 ssl], [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
13791379
fi
1380-
# Function introduced in OpenSSL 1.0.2. LibreSSL does not have
1381-
# SSL_CTX_set_cert_cb().
1380+
# Function introduced in OpenSSL 1.0.2, not in LibreSSL.
13821381
AC_CHECK_FUNCS([SSL_CTX_set_cert_cb])
13831382
# Functions introduced in OpenSSL 1.1.0. We used to check for
13841383
# OPENSSL_VERSION_NUMBER, but that didn't work with 1.1.0, because LibreSSL

‎meson.build

Copy file name to clipboardExpand all lines: meson.build
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1270,7 +1270,7 @@ if sslopt in ['auto', 'openssl']
12701270
['CRYPTO_new_ex_data', {'required': true}],
12711271
['SSL_new', {'required': true}],
12721272

1273-
# Functions introduced in OpenSSL 1.0.2, not in LibreSSL.
1273+
# Function introduced in OpenSSL 1.0.2, not in LibreSSL.
12741274
['SSL_CTX_set_cert_cb'],
12751275

12761276
# Functions introduced in OpenSSL 1.1.0. We used to check for

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.