Overview
Comment: | TclTLS 1.7.13 |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | tls-1-7 | tls-1-7-13 |
Files: | files | file ages | folders |
SHA1: |
4c0960be87c56f521d15450ba52e939f |
User & Date: | rkeene on 2017-09-01 00:27:40 |
Other Links: | branch diff | manifest | tags |
Context
2017-11-08
| ||
15:00 | TclTLS 1.7.14 check-in: 70cbcd6815 user: rkeene tags: tls-1-7, tls-1-7-14 | |
2017-09-01
| ||
00:27 | TclTLS 1.7.13 check-in: 4c0960be87 user: rkeene tags: tls-1-7, tls-1-7-13 | |
00:16 | Try harder to ensure the right SSL libraries are used check-in: 6704c33e48 user: rkeene tags: trunk | |
2017-05-01
| ||
14:45 | TclTLS 1.7.12 check-in: d0b9b91b33 user: rkeene tags: tls-1-7, tls-1-7-12 | |
Changes
Modified Makefile.in
from [d38aebcfd7]
to [4a2244787b].
︙ | ︙ | |||
41 42 43 44 45 46 47 | od -A n -v -t xC < '@srcdir@/tls.tcl' > tls.tcl.h.new.1 sed 's@ *@@g;s@..@0x&, @g' < tls.tcl.h.new.1 > tls.tcl.h.new.2 rm -f tls.tcl.h.new.1 mv tls.tcl.h.new.2 tls.tcl.h # Create default DH parameters dh_params.h: @srcdir@/gen_dh_params Makefile | | | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | od -A n -v -t xC < '@srcdir@/tls.tcl' > tls.tcl.h.new.1 sed 's@ *@@g;s@..@0x&, @g' < tls.tcl.h.new.1 > tls.tcl.h.new.2 rm -f tls.tcl.h.new.1 mv tls.tcl.h.new.2 tls.tcl.h # Create default DH parameters dh_params.h: @srcdir@/gen_dh_params Makefile sh @srcdir@/gen_dh_params @GEN_DH_PARAMS_ARGS@ > dh_params.h.new mv dh_params.h.new dh_params.h # Generic target for building files from the "srcdir" # tree -- the default target will not match paths .c.o: $(CC) $(CPPFLAGS) $(CFLAGS) -o "$@" -c "$<" |
︙ | ︙ |
Modified aclocal/tcltls_openssl.m4
from [b0fa31c047]
to [7fc36028a7].
︙ | ︙ | |||
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 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | AC_DEFINE($4, [1], [Define this to disable $3 in OpenSSL support]) fi ]) AC_DEFUN([TCLTLS_SSL_OPENSSL], [ openssldir='' AC_ARG_WITH([ssl-dir], AS_HELP_STRING( [--with-ssl-dir=<dir>], [deprecated, use --with-openssl-dir -- currently has the same meaning] ), [ openssldir="$withval" ] ) AC_ARG_WITH([openssl-dir], AS_HELP_STRING( [--with-openssl-dir=<dir>], [path to root directory of OpenSSL or LibreSSL installation] ), [ openssldir="$withval" ] ) if test -n "$openssldir"; then if test -e "$openssldir/libssl.$SHOBJEXT"; then TCLTLS_SSL_LIBS="-L$openssldir -lssl -lcrypto" openssldir="`AS_DIRNAME(["$openssldir"])`" else TCLTLS_SSL_LIBS="-L$openssldir/lib -lssl -lcrypto" fi TCLTLS_SSL_CFLAGS="-I$openssldir/include" TCLTLS_SSL_CPPFLAGS="-I$openssldir/include" fi pkgConfigExtraArgs='' if test "$TCLEXT_BUILD" = "static" -o "$TCLEXT_TLS_STATIC_SSL" = 'yes'; then pkgConfigExtraArgs='--static' fi dnl Use pkg-config to find the libraries AC_ARG_VAR([TCLTLS_SSL_LIBS], [libraries to pass to the linker for OpenSSL or LibreSSL]) AC_ARG_VAR([TCLTLS_SSL_CFLAGS], [C compiler flags for OpenSSL or LibreSSL]) AC_ARG_VAR([TCLTLS_SSL_CPPFLAGS], [C preprocessor flags for OpenSSL or LibreSSL]) if test -z "$TCLTLS_SSL_LIBS"; then TCLTLS_SSL_LIBS="`"${PKGCONFIG}" openssl --libs $pkgConfigExtraArgs`" || AC_MSG_ERROR([Unable to get OpenSSL Configuration]) fi if test -z "$TCLTLS_SSL_CFLAGS"; then TCLTLS_SSL_CFLAGS="`"${PKGCONFIG}" openssl --cflags-only-other $pkgConfigExtraArgs`" || AC_MSG_ERROR([Unable to get OpenSSL Configuration]) fi if test -z "$TCLTLS_SSL_CPPFLAGS"; then TCLTLS_SSL_CPPFLAGS="`"${PKGCONFIG}" openssl --cflags-only-I $pkgConfigExtraArgs`" || AC_MSG_ERROR([Unable to get OpenSSL Configuration]) fi if test "$TCLEXT_BUILD" = "static"; then dnl If we are doing a static build, save the linker flags for other programs to consume rm -f tcltls.a.linkadd AS_ECHO(["$TCLTLS_SSL_LIBS"]) > tcltls.a.linkadd fi | > > > > > > > > > > > > > > > > > > > > > | 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 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | AC_DEFINE($4, [1], [Define this to disable $3 in OpenSSL support]) fi ]) AC_DEFUN([TCLTLS_SSL_OPENSSL], [ openssldir='' opensslpkgconfigdir='' AC_ARG_WITH([ssl-dir], AS_HELP_STRING( [--with-ssl-dir=<dir>], [deprecated, use --with-openssl-dir -- currently has the same meaning] ), [ openssldir="$withval" ] ) AC_ARG_WITH([openssl-dir], AS_HELP_STRING( [--with-openssl-dir=<dir>], [path to root directory of OpenSSL or LibreSSL installation] ), [ openssldir="$withval" ] ) AC_ARG_WITH([openssl-pkgconfig], AS_HELP_STRING( [--with-openssl-pkgconfig=<dir>], [path to root directory of OpenSSL or LibreSSL pkgconfigdir] ), [ opensslpkgconfigdir="$withval" ] ) if test -n "$openssldir"; then if test -e "$openssldir/libssl.$SHOBJEXT"; then TCLTLS_SSL_LIBS="-L$openssldir -lssl -lcrypto" openssldir="`AS_DIRNAME(["$openssldir"])`" else TCLTLS_SSL_LIBS="-L$openssldir/lib -lssl -lcrypto" fi TCLTLS_SSL_CFLAGS="-I$openssldir/include" TCLTLS_SSL_CPPFLAGS="-I$openssldir/include" fi pkgConfigExtraArgs='' if test "$TCLEXT_BUILD" = "static" -o "$TCLEXT_TLS_STATIC_SSL" = 'yes'; then pkgConfigExtraArgs='--static' fi dnl Use pkg-config to find the libraries dnl Temporarily update PKG_CONFIG_PATH PKG_CONFIG_PATH_SAVE="${PKG_CONFIG_PATH}" if test -n "${opensslpkgconfigdir}"; then if ! test -f "${opensslpkgconfigdir}/openssl.pc"; then AC_MSG_ERROR([Unable to locate ${opensslpkgconfigdir}/openssl.pc]) fi PKG_CONFIG_PATH="${opensslpkgconfigdir}${PATH_SEPARATOR}${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH fi AC_ARG_VAR([TCLTLS_SSL_LIBS], [libraries to pass to the linker for OpenSSL or LibreSSL]) AC_ARG_VAR([TCLTLS_SSL_CFLAGS], [C compiler flags for OpenSSL or LibreSSL]) AC_ARG_VAR([TCLTLS_SSL_CPPFLAGS], [C preprocessor flags for OpenSSL or LibreSSL]) if test -z "$TCLTLS_SSL_LIBS"; then TCLTLS_SSL_LIBS="`"${PKGCONFIG}" openssl --libs $pkgConfigExtraArgs`" || AC_MSG_ERROR([Unable to get OpenSSL Configuration]) fi if test -z "$TCLTLS_SSL_CFLAGS"; then TCLTLS_SSL_CFLAGS="`"${PKGCONFIG}" openssl --cflags-only-other $pkgConfigExtraArgs`" || AC_MSG_ERROR([Unable to get OpenSSL Configuration]) fi if test -z "$TCLTLS_SSL_CPPFLAGS"; then TCLTLS_SSL_CPPFLAGS="`"${PKGCONFIG}" openssl --cflags-only-I $pkgConfigExtraArgs`" || AC_MSG_ERROR([Unable to get OpenSSL Configuration]) fi PKG_CONFIG_PATH="${PKG_CONFIG_PATH_SAVE}" if test "$TCLEXT_BUILD" = "static"; then dnl If we are doing a static build, save the linker flags for other programs to consume rm -f tcltls.a.linkadd AS_ECHO(["$TCLTLS_SSL_LIBS"]) > tcltls.a.linkadd fi |
︙ | ︙ | |||
106 107 108 109 110 111 112 | dnl Save compile-altering variables we are changing SAVE_LIBS="${LIBS}" SAVE_CFLAGS="${CFLAGS}" SAVE_CPPFLAGS="${CPPFLAGS}" dnl Update compile-altering variables to include the OpenSSL libraries | | | | | 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 | dnl Save compile-altering variables we are changing SAVE_LIBS="${LIBS}" SAVE_CFLAGS="${CFLAGS}" SAVE_CPPFLAGS="${CPPFLAGS}" dnl Update compile-altering variables to include the OpenSSL libraries LIBS="${TCLTLS_SSL_LIBS} ${SAVE_LIBS} ${TCLTLS_SSL_LIBS}" CFLAGS="${TCLTLS_SSL_CFLAGS} ${SAVE_CFLAGS} ${TCLTLS_SSL_CFLAGS}" CPPFLAGS="${TCLTLS_SSL_CPPFLAGS} ${SAVE_CPPFLAGS} ${TCLTLS_SSL_CPPFLAGS}" dnl Verify that basic functionality is there AC_LANG_PUSH(C) AC_MSG_CHECKING([if a basic OpenSSL program works]) AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include <openssl/ssl.h> #include <openssl/opensslv.h> |
︙ | ︙ |
Modified configure.ac
from [5462b4f4fd]
to [400907bd9d].
1 | dnl Define ourselves | | | 1 2 3 4 5 6 7 8 9 | dnl Define ourselves AC_INIT(tcltls, 1.7.13) dnl Checks for programs. AC_PROG_CC AC_PROG_MAKE_SET AC_PROG_INSTALL AC_GNU_SOURCE |
︙ | ︙ | |||
200 201 202 203 204 205 206 | ], [ AC_MSG_ERROR([Unsupported SSL library: $tcltls_ssl_lib]) ] ) dnl Determine how to use this SSL library AC_MSG_CHECKING([how to use $tcltls_ssl_lib]) | | | | | 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 | ], [ AC_MSG_ERROR([Unsupported SSL library: $tcltls_ssl_lib]) ] ) dnl Determine how to use this SSL library AC_MSG_CHECKING([how to use $tcltls_ssl_lib]) LIBS="${TCLTLS_SSL_LIBS} ${LIBS} ${TCLTLS_SSL_LIBS}" CFLAGS="${TCLTLS_SSL_CFLAGS} ${CFLAGS} ${TCLTLS_SSL_CFLAGS}" CPPFLAGS="${TCLTLS_SSL_CPPFLAGS} ${CPPFLAGS} ${TCLTLS_SSL_CPPFLAGS}" AC_MSG_RESULT([$TCLTLS_SSL_CPPFLAGS $TCLTLS_SSL_CFLAGS $TCLTLS_SSL_LIBS]) dnl Sync the RPATH if requested if test "$TCLEXT_BUILD" != 'static'; then if test "$TCLEXT_TLS_STATIC_SSL" = 'yes'; then DC_SYNC_RPATH([no]) else DC_SYNC_RPATH([yes]) fi fi dnl Produce output AC_OUTPUT(Makefile pkgIndex.tcl) |