Check-in [a64e691ada]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

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:a64e691ada19c720087c60999e2babb78c6bf76208f1b2ceb8ae2a9d70563fc9
User & Date: rkeene 2019-04-25 16:51:45
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

Changes to Makefile.in.

    14     14   INSTALL = @INSTALL@
    15     15   INSTALL_PROGRAM = @INSTALL_PROGRAM@
    16     16   INSTALL_DATA = @INSTALL_DATA@
    17     17   VPATH = @srcdir@
    18     18   
    19     19   all: @EXTENSION_TARGET@
    20     20   
    21         -ifeq (@TCLEXT_BUILD@,shared)
           21  +@EXTENSION_TARGET@: @TCLEXT_BUILD@-@EXTENSION_TARGET@
           22  +	mv @TCLEXT_BUILD@-@EXTENSION_TARGET@ @EXTENSION_TARGET@
           23  +
    22     24   # The shared object target
    23         -@EXTENSION_TARGET@: tls.o tlsBIO.o tlsIO.o tlsX509.o Makefile
    24         -	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o tcltls.@SHOBJEXT@ tls.o tlsBIO.o tlsIO.o tlsX509.o $(LIBS)
    25         -else
           25  +shared-@EXTENSION_TARGET@: tls.o tlsBIO.o tlsIO.o tlsX509.o Makefile
           26  +	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o shared-@EXTENSION_TARGET@ tls.o tlsBIO.o tlsIO.o tlsX509.o $(LIBS)
           27  +
    26     28   # The static target
    27         -@EXTENSION_TARGET@: tls.o tlsBIO.o tlsIO.o tlsX509.o Makefile
    28         -	$(AR) rcu tcltls.a.new tls.o tlsBIO.o tlsIO.o tlsX509.o
    29         -	-$(RANLIB) tcltls.a.new
    30         -	mv tcltls.a.new tcltls.a
    31         -endif
           29  +static-@EXTENSION_TARGET@: tls.o tlsBIO.o tlsIO.o tlsX509.o Makefile
           30  +	$(AR) rcu static-@EXTENSION_TARGET@ tls.o tlsBIO.o tlsIO.o tlsX509.o
           31  +	-$(RANLIB) static-@EXTENSION_TARGET@
    32     32   
    33     33   # Dependencies for all our targets
    34     34   tls.o: @srcdir@/tls.c @srcdir@/tlsInt.h @srcdir@/tclOpts.h tls.tcl.h dh_params.h Makefile
    35     35   tlsBIO.o: @srcdir@/tlsBIO.c @srcdir@/tlsInt.h Makefile
    36     36   tlsIO.o: @srcdir@/tlsIO.c @srcdir@/tlsInt.h Makefile
    37     37   tlsX509.o: @srcdir@/tlsX509.c @srcdir@/tlsInt.h Makefile
    38     38   
................................................................................
    70     70   # Test target, run the automated test suite
    71     71   test: @EXTENSION_TARGET@
    72     72   	@TCLSH_PROG@ @srcdir@/tests/all.tcl $(TESTFLAGS) -load "lappend auto_path $(shell pwd)"
    73     73   
    74     74   # Clean the local build directory for rebuild against the same configuration
    75     75   clean:
    76     76   	rm -f tls.o tlsBIO.o tlsIO.o tlsX509.o
    77         -	rm -f tcltls.@SHOBJEXT@
    78         -	rm -f tcltls.@SHOBJEXT@.a tcltls.@SHOBJEXT@.def
    79         -	rm -f tcltls.a.new tcltls.a
           77  +	rm -f @EXTENSION_TARGET@ shared-@EXTENSION_TARGET@ static-@EXTENSION_TARGET@
           78  +	rm -f shared-@EXTENSION_TARGET@.def shared-@EXTENSION_TARGET@.lib
    80     79   	rm -f tls.tcl.h tls.tcl.h.new.1 tls.tcl.h.new.2
    81     80   
    82     81   # Clean the local build directory back to what it was after unpacking the
    83     82   # distribution tarball
    84     83   distclean: clean
    85     84   	rm -f config.log config.status
    86     85   	rm -f dh_params.h.new dh_params.h

Changes to build/update-wiki-docs.

     1      1   #! /usr/bin/env bash
     2      2   
     3      3   version="$1"
     4      4   
     5      5   cd "$(dirname "$(which "$0")")/.." || exit 1
     6      6   
     7      7   if [ -z "${version}" ]; then
     8         -	version="$(cat configure.in | grep AC_INIT | head -1 | sed 's@^AC_INIT([^,]*, *@@;s@,.*$@@;s@ *)$@@')"
            8  +	version="$(cat configure.ac | grep AC_INIT | head -1 | sed 's@^AC_INIT([^,]*, *@@;s@,.*$@@;s@ *)$@@')"
     9      9   fi
    10     10   
    11         -newBody="$(cat tls.htm  | sed '/<\/body>/,$ d;0,/<body[ >]/ d;/<!--/,/-->/ d' | sed 's/@@VERS@@/'"${version}"'/g' | grep -iv '^<!doctype')"
           11  +newBody="$(cat tls.htm | sed 's@\[@<nowiki>[</nowiki>@g' | sed '/<\/body>/,$ d;0,/<body[ >]/ d;/<!--/,/-->/ d' | sed 's/@@VERS@@/'"${version}"'/g' | grep -iv '^<!doctype')"
    12     12   oldBody="$(fossil wiki export 'Documentation')"
    13     13   
    14     14   if [ "${newBody}" != "${oldBody}" ]; then
    15     15   	echo "${newBody}" | fossil wiki commit 'Documentation'
    16     16   fi

Changes to pkgIndex.tcl.in.

     1      1   if {[package vsatisfies [package present Tcl] 8.5]} {
     2      2   	package ifneeded tls @PACKAGE_VERSION@ [list apply {{dir} {
     3      3   		if {{@TCLEXT_BUILD@} eq "static"} {
     4      4   			load {} Tls
     5      5   		} else {
     6         -			load [file join $dir tcltls.@SHOBJEXT@] Tls
            6  +			load [file join $dir @EXTENSION_TARGET@] Tls
     7      7   		}
     8      8   
     9      9   		set tlsTclInitScript [file join $dir tls.tcl]
    10     10   		if {[file exists $tlsTclInitScript]} {
    11     11   			source $tlsTclInitScript
    12     12   		}
    13     13   	}} $dir]
    14     14   } elseif {[package vsatisfies [package present Tcl] 8.4]} {
    15         -	package ifneeded tls @PACKAGE_VERSION@ [list load [file join $dir tcltls.@SHOBJEXT@] Tls]
           15  +	package ifneeded tls @PACKAGE_VERSION@ [list load [file join $dir @EXTENSION_TARGET@] Tls]
    16     16   }

Changes to tls.htm.

   143    143           <dt><strong>serial</strong> <em>n</em></dt>
   144    144           <dd>The serial number of the certificate.</dd>
   145    145           <dt><strong>cipher</strong> <em>cipher</em></dt>
   146    146           <dd>The current cipher in use between the client and
   147    147               server channels.</dd>
   148    148           <dt><strong>sbits</strong> <em>n</em></dt>
   149    149           <dd>The number of bits used for the session key.</dd>
          150  +        <dt><strong>certificate</strong> <em>n</em></dt>
          151  +        <dd>The PEM encoded certificate.</dd>
   150    152       </dl>
   151    153   </blockquote>
   152    154   
   153    155   <dl>
   154    156       <dt><a name="tls::import"><b>tls::import </b><i>channel
   155    157           ?options?</i></a></dt>
   156    158       <dd>SSL-enable a regular Tcl channel - it need not be a