Overview
Comment: | Merged in changes from trunk |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | tls-1-7 |
Files: | files | file ages | folders |
SHA3-256: |
a64e691ada19c720087c60999e2babb7 |
User & Date: | rkeene on 2019-04-25 16:51:45 |
Other Links: | branch diff | manifest | tags |
Context
2019-04-25
| ||
16:51 | TclTLS 1.7.18 check-in: fb6a7404da user: rkeene tags: tls-1-7, tls-1-7-18 | |
16:51 | Merged in changes from trunk check-in: a64e691ada user: rkeene tags: tls-1-7 | |
2019-04-12
| ||
16:58 | Better handling of shared/static naming issues check-in: 2c8d3629bc user: rkeene tags: trunk | |
2019-04-09
| ||
17:57 | TclTLS 1.7.17 check-in: a598aa8a6b user: rkeene tags: tls-1-7, tls-1-7-17 | |
Changes
Modified Makefile.in from [4aa8763c1f] to [cdaa02b7ca].
︙ | ︙ | |||
14 15 16 17 18 19 20 | INSTALL = @[email protected] INSTALL_PROGRAM = @[email protected] INSTALL_DATA = @[email protected] VPATH = @[email protected] all: @[email protected] | | > > | | | | | | < < | 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 | INSTALL = @[email protected] INSTALL_PROGRAM = @[email protected] INSTALL_DATA = @[email protected] VPATH = @[email protected] all: @[email protected] @[email protected]: @[email protected][email protected][email protected] mv @[email protected]@[email protected] @[email protected] # The shared object target shared-@[email protected]: tls.o tlsBIO.o tlsIO.o tlsX509.o Makefile $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o shared-@EXTENSION_TARGE[email protected] tls.o tlsBIO.o tlsIO.o tlsX509.o $(LIBS) # The static target static-@[email protected]: tls.o tlsBIO.o tlsIO.o tlsX509.o Makefile $(AR) rcu static[email protected][email protected] tls.o tlsBIO.o tlsIO.o tlsX509.o -$(RANLIB) static[email protected][email protected] # Dependencies for all our targets tls.o: @[email protected]/tls.c @[email protected]/tlsInt.h @[email protected]/tclOpts.h tls.tcl.h dh_params.h Makefile tlsBIO.o: @[email protected]/tlsBIO.c @[email protected]/tlsInt.h Makefile tlsIO.o: @[email protected]/tlsIO.c @[email protected]/tlsInt.h Makefile tlsX509.o: @[email protected]/tlsX509.c @[email protected]/tlsInt.h Makefile |
︙ | ︙ | |||
70 71 72 73 74 75 76 | # Test target, run the automated test suite test: @[email protected] @[email protected] @[email protected]/tests/all.tcl $(TESTFLAGS) -load "lappend auto_path $(shell pwd)" # Clean the local build directory for rebuild against the same configuration clean: rm -f tls.o tlsBIO.o tlsIO.o tlsX509.o | | < | | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | # Test target, run the automated test suite test: @[email protected] @[email protected] @[email protected]/tests/all.tcl $(TESTFLAGS) -load "lappend auto_path $(shell pwd)" # Clean the local build directory for rebuild against the same configuration clean: rm -f tls.o tlsBIO.o tlsIO.o tlsX509.o rm -f @EX[email protected] [email protected][email protected] [email protected]_TARGE[email protected] rm -f [email protected][email protected] [email protected][email protected]lib rm -f tls.tcl.h tls.tcl.h.new.1 tls.tcl.h.new.2 # Clean the local build directory back to what it was after unpacking the # distribution tarball distclean: clean rm -f config.log config.status rm -f dh_params.h.new dh_params.h |
︙ | ︙ |
Modified build/update-wiki-docs from [18ccdf9d95] to [05d1cbbcf4].
1 2 3 4 5 6 7 | #! /usr/bin/env bash version="$1" cd "$(dirname "$(which "$0")")/.." || exit 1 if [ -z "${version}" ]; then | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | #! /usr/bin/env bash version="$1" cd "$(dirname "$(which "$0")")/.." || exit 1 if [ -z "${version}" ]; then version="$(cat configure.ac | grep AC_INIT | head -1 | sed '[email protected]^AC_INIT([^,]*, *@@;[email protected],.*[email protected]@;[email protected] *)[email protected]@')" fi newBody="$(cat tls.htm | sed '[email protected]\[@<nowiki>[</nowiki>@g' | sed '/<\/body>/,$ d;0,/<body[ >]/ d;/<!--/,/-->/ d' | sed 's/@@[email protected]@/'"${version}"'/g' | grep -iv '^<!doctype')" oldBody="$(fossil wiki export 'Documentation')" if [ "${newBody}" != "${oldBody}" ]; then echo "${newBody}" | fossil wiki commit 'Documentation' fi |
Modified pkgIndex.tcl.in from [d64d5caca7] to [6c4c62dd82].
1 2 3 4 5 | if {[package vsatisfies [package present Tcl] 8.5]} { package ifneeded tls @[email protected] [list apply {{dir} { if {{@[email protected]} eq "static"} { load {} Tls } else { | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | if {[package vsatisfies [package present Tcl] 8.5]} { package ifneeded tls @[email protected] [list apply {{dir} { if {{@[email protected]} eq "static"} { load {} Tls } else { load [file join $dir @EXTENSION_TARGE[email protected]] Tls } set tlsTclInitScript [file join $dir tls.tcl] if {[file exists $tlsTclInitScript]} { source $tlsTclInitScript } }} $dir] } elseif {[package vsatisfies [package present Tcl] 8.4]} { package ifneeded tls @[email protected] [list load [file join $dir @EXTENSION_TARGE[email protected]] Tls] } |
Modified tls.htm from [2335b9e315] to [60845f0ae5].
︙ | ︙ | |||
143 144 145 146 147 148 149 150 151 152 153 154 155 156 | <dt><strong>serial</strong> <em>n</em></dt> <dd>The serial number of the certificate.</dd> <dt><strong>cipher</strong> <em>cipher</em></dt> <dd>The current cipher in use between the client and server channels.</dd> <dt><strong>sbits</strong> <em>n</em></dt> <dd>The number of bits used for the session key.</dd> </dl> </blockquote> <dl> <dt><a name="tls::import"><b>tls::import </b><i>channel ?options?</i></a></dt> <dd>SSL-enable a regular Tcl channel - it need not be a | > > | 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 | <dt><strong>serial</strong> <em>n</em></dt> <dd>The serial number of the certificate.</dd> <dt><strong>cipher</strong> <em>cipher</em></dt> <dd>The current cipher in use between the client and server channels.</dd> <dt><strong>sbits</strong> <em>n</em></dt> <dd>The number of bits used for the session key.</dd> <dt><strong>certificate</strong> <em>n</em></dt> <dd>The PEM encoded certificate.</dd> </dl> </blockquote> <dl> <dt><a name="tls::import"><b>tls::import </b><i>channel ?options?</i></a></dt> <dd>SSL-enable a regular Tcl channel - it need not be a |
︙ | ︙ |