Overview
| Comment: | Added check for ssl.h file when checking for valid --opensslincludedir path. Added status message with find ssl.h result. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
65406cadf64e471683dc97040726753c |
| User & Date: | bohagan on 2024-03-02 00:02:23 |
| Other Links: | manifest | tags |
Context
|
2024-03-02
| ||
| 02:55 | Updated acinclude.m4 file to use pkg-config tool for OpenSSL installation defaults prior to using fall-back values. Linking to static OpenSSL libraries may need more work. check-in: b3ad65760e user: bohagan tags: trunk | |
| 00:02 | Added check for ssl.h file when checking for valid --opensslincludedir path. Added status message with find ssl.h result. check-in: 65406cadf6 user: bohagan tags: trunk | |
|
2024-02-28
| ||
| 04:42 | In password callback, added check for password > max size. Also added null terminator. check-in: 3866a025e0 user: bohagan tags: trunk | |
Changes
Modified acinclude.m4
from [0103c1481a]
to [18387d158b].
| ︙ | ︙ | |||
12 13 14 15 16 17 18 |
AC_CHECK_TOOL([PKG_CONFIG], [pkg-config])
dnl Disable support for TLS 1.0 protocol
AC_ARG_ENABLE([tls1], AS_HELP_STRING([--disable-tls1], [disable TLS1 protocol]), [
if test "${enableval}" = "no"; then
AC_DEFINE([NO_TLS1], [1], [Disable TLS1 protocol])
AC_MSG_CHECKING([for disable TLS1 protocol])
| | | | | | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 |
AC_CHECK_TOOL([PKG_CONFIG], [pkg-config])
dnl Disable support for TLS 1.0 protocol
AC_ARG_ENABLE([tls1], AS_HELP_STRING([--disable-tls1], [disable TLS1 protocol]), [
if test "${enableval}" = "no"; then
AC_DEFINE([NO_TLS1], [1], [Disable TLS1 protocol])
AC_MSG_CHECKING([for disable TLS1 protocol])
AC_MSG_RESULT([yes])
fi
])
dnl Disable support for TLS 1.1 protocol
AC_ARG_ENABLE([tls1_1], AS_HELP_STRING([--disable-tls1_1], [disable TLS1.1 protocol]), [
if test "${enableval}" = "no"; then
AC_DEFINE([NO_TLS1_1], [1], [Disable TLS1.1 protocol])
AC_MSG_CHECKING([for disable TLS1.1 protocol])
AC_MSG_RESULT([yes])
fi
])
dnl Disable support for TLS 1.2 protocol
AC_ARG_ENABLE([tls1_2], AS_HELP_STRING([--disable-tls1_2], [disable TLS1.2 protocol]), [
if test "${enableval}" = "no"; then
AC_DEFINE([NO_TLS1_2], [1], [Disable TLS1.2 protocol])
AC_MSG_CHECKING([for disable TLS1.2 protocol])
AC_MSG_RESULT([yes])
fi
])
dnl Disable support for TLS 1.3 protocol
AC_ARG_ENABLE([tls1_3], AS_HELP_STRING([--disable-tls1_3], [disable TLS1.3 protocol]), [
if test "${enableval}" = "no"; then
AC_DEFINE([NO_TLS1_3], [1], [Disable TLS1.3 protocol])
AC_MSG_CHECKING([for disable TLS1.3 protocol])
AC_MSG_RESULT([yes])
fi
])
dnl Determine if we have been asked to use a fast path if possible
AC_ARG_ENABLE([ssl-fastpath], AS_HELP_STRING([--enable-ssl-fastpath],
[enable using the underlying file descriptor for talking directly to the SSL library]), [
|
| ︙ | ︙ | |||
106 107 108 109 110 111 112 | AC_ARG_WITH([openssl-includedir], AS_HELP_STRING([--with-openssl-includedir=<dir>], [path to include directory of OpenSSL or LibreSSL installation] ), [ opensslincludedir="$withval" ], [ if test ! -z "$openssldir"; then | | > > > > | 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 |
AC_ARG_WITH([openssl-includedir],
AS_HELP_STRING([--with-openssl-includedir=<dir>],
[path to include directory of OpenSSL or LibreSSL installation]
), [
opensslincludedir="$withval"
], [
if test ! -z "$openssldir"; then
if test -f "${openssldir}/include/openssl/ssl.h"; then
opensslincludedir="${openssldir}/include/openssl"
else
opensslincludedir="${openssldir}/include"
fi
else
opensslincludedir=''
fi
]
)
AC_MSG_CHECKING([for OpenSSL include directory])
AC_MSG_RESULT($opensslincludedir)
dnl Set SSL include vars
if test ! -z "$opensslincludedir"; then
if test -f "$opensslincludedir/ssl.h"; then
TCLTLS_SSL_CFLAGS="-I$opensslincludedir"
TCLTLS_SSL_INCLUDES="-I$opensslincludedir"
AC_MSG_CHECKING([for ssl.h])
AC_MSG_RESULT([yes])
else
AC_MSG_CHECKING([for ssl.h])
AC_MSG_RESULT([no])
AC_MSG_ERROR([Unable to locate ssl.h])
fi
else
TCLTLS_SSL_CFLAGS="-I${includedir}/openssl"
TCLTLS_SSL_INCLUDES="-I${includedir}/openssl"
fi
|
| ︙ | ︙ |