Changes In Branch tls-1-7 Through [bf7f82b5e8] Excluding Merge-Ins
This is equivalent to a diff from 6aedc8c1b5 to bf7f82b5e8
2016-12-08
| ||
04:26 | Merged in work for TclTLS 1.7 to trunk check-in: 0409513536 user: rkeene tags: trunk | |
2016-12-02
| ||
16:09 | Minor cleanup of global variables and void function check-in: ee18d6c91e user: rkeene tags: tls-1-7 | |
2016-12-01
| ||
21:51 | Updated to support a deterministic mode check-in: bf7f82b5e8 user: rkeene tags: tls-1-7 | |
21:36 | Updated to generate DH parameters more dynamically check-in: 3d5e70d1d5 user: rkeene tags: tls-1-7 | |
2016-11-22
| ||
22:07 | Create new branch named "tcltls-2" check-in: ae164b967d user: rkeene tags: tls-1-7 | |
21:43 | Merged in several outstanding patches check-in: 6aedc8c1b5 user: rkeene tags: trunk | |
21:36 | Applied patch Closed-Leaf check-in: 4ec3fe7449 user: rkeene tags: rkeene-eoffix | |
17:58 | Applied patch Closed-Leaf check-in: db95f55e95 user: rkeene tags: rkeene-unthreaded | |
17:58 | Applied patch Closed-Leaf check-in: a141858eec user: rkeene tags: rkeene-fixcrosscompile | |
17:58 | Applied patch Closed-Leaf check-in: 0c7fd93cac user: rkeene tags: rkeene-peercertificate | |
2015-07-07
| ||
17:16 | Updated with dhparam.2.patch for tls ticket #59. check-in: 2aadaa4c28 user: andreas_kupries tags: trunk | |
Added .fossil-settings/ignore-glob version [103e76cae5].
Added HEADER version [786e922403].
Modified Makefile.in
from [de778baab4]
to [d6e6218bd6].
| 1 2 3 4 5 6 7 8 9 10 11 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 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | - - - - - - - - - - - - - - - - - + + - - - - - + - - - - + - - - - - + - - + - - - - - - + + + - - - - + - - - - - - + - - - - - - - + - - - - + - - - - + - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - + - - + - - + - - - + - - - - - - - - - - - - - - - - - - - - - + - - - - - - - + - - + - - + - - + - - - + - - - - + - - - - - - - - + + - - - - - + - - - - - - - - - + - - - - - - - - - - - + - - - + - - + - - - - - - - - - - + - - - - - - - - - - - - + - - - - - - - - - + + + - - - - - - - - - - - - - - - + + + - - - - + - - - - - - - - - + + - - - - + - - + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + - - - + - - + - - - - - - - - - - - - + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - + - - + - - - - - + + - - + - - - - + - - - - - - + - - - |
|
Modified README.txt
from [a2f4c7f22f]
to [98035f2af2].
1 2 3 4 | 1 2 3 4 5 6 7 8 9 10 11 | - - | Original TLS Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> TLS 1.4.1 Copyright (C) 2000 Ajuba Solutions TLS 1.6 Copyright (C) 2008 ActiveState Software Inc. |
︙ |
Deleted aclocal.m4 version [9e0a6d21b1].
Added autogen.sh version [c6e14774e1].
Added build/makearch.info version [cbbf41f89e].
Added build/post.sh version [b845836733].
Added build/pre.sh version [a8f310fb41].
Deleted configure version [c1aa70d493].
Modified configure.in
from [8e59f65b56]
to [92ab7478f3].
| 1 2 3 4 5 6 7 8 9 10 11 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 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 | - - - - - + - - - - - - - - + + - - - + + - - - - - + + + - - - + + - - + - - + - - - - - - - - + + - - - - - - - + - - + - - + - - - - - - - - - - - - - - - + - - - - - - + - - - - + + + + - + + - - - - + + - + - - - - - - + + - - - - - - - - - + - + + - - - + + + + - - + - - - - - - - + + + - - - - - - + - - + - - - - + - - + - - - - - - - + - - + - - - - - - - + + + - + - - - - + - - - + + - + - - - - - - - - + - - - - - + + - + - - - + - - - + + + + - - - - + - - + + - - - - - - - - - - + + + - - - - - - - - - + + - - + - - - + - + |
|
Deleted fixstrtod.c version [097c39a2a6].
Added gen_dh_params version [121b16da7e].
Added pkgIndex.tcl.in version [69b06405aa].
Modified tclOpts.h
from [4e3c2a8397]
to [aff9aa3b9c].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 | - - | /* * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> * |
︙ |
Deleted tclconfig/README.txt version [180f4215d5].
Deleted tclconfig/install-sh version [b087e5c4b9].
Deleted tclconfig/tcl.m4 version [1cb6792ef2].
Modified tests/all.tcl
from [0cb48d72f1]
to [a5976d4aa4].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | + + | # all.tcl -- # # This file contains a top-level script to run all of the Tcl # tests. Execute it by invoking "source all.test" when running tcltest # in this directory. # # Copyright (c) 1998-2000 by Ajuba Solutions. # All rights reserved. # # RCS: @(#) $Id: all.tcl,v 1.5 2000/08/15 18:45:01 hobbs Exp $ set auto_path [linsert $auto_path 0 [file normalize [file join [file dirname [info script]] ..]]] if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest namespace import ::tcltest::* } set ::tcltest::testSingleFile false |
︙ |
Modified tests/ciphers.test
from [775a49336b]
to [9bef3a5541].
︙ | |||
13 14 15 16 17 18 19 | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | - - | if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest namespace import ::tcltest::* } # The build dir is added as the first element of $PATH |
︙ |
Modified tests/keytest1.tcl
from [d7e22b5f32]
to [897f9f74ad].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | + + + | #!/bin/sh # The next line is executed by /bin/sh, but not tcl \ exec tclsh "$0" ${1+"$@"} set auto_path [linsert $auto_path 0 [file normalize [file join [file dirname [info script]] ..]]] package require tls proc creadable {s} { puts "LINE=[gets $s]" after 2000 exit } proc myserv {s args} { fileevent $s readable [list creadable $s] } close [file tempfile keyfile] close [file tempfile certfile] tls::misc req 1024 $keyfile $certfile [list C CCC ST STTT L LLLL O OOOO OU OUUUU CN CNNNN Email some@email.com days 730 serial 12] tls::socket -keyfile $keyfile -certfile $certfile -server myserv 12300 puts "Now run keytest2.tcl" vwait forever |
Modified tests/keytest2.tcl
from [24f9bfe9d5]
to [9ae291a22a].
|
Modified tests/oldTests/tls.tcl
from [d3ab0f3fc4]
to [3ec4a78d72].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 | - - | # # Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> # |
︙ |
Modified tests/oldTests/tlsAuto.tcl
from [af559bc2dc]
to [c6f69ae9dc].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 | - - | # # Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> # |
︙ |
Modified tests/oldTests/tlsBlocking.tcl
from [10a9ce36e6]
to [272e10e79e].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 | - - | # # Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> # |
︙ |
Modified tests/oldTests/tlsCiphers.tcl
from [015cebb2a4]
to [fc1b7f572b].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 | - - | # # Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> # |
︙ |
Modified tests/oldTests/tlsHttp.tcl
from [a70dbb3194]
to [a53b6ea2fa].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 | - - | # # Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> # |
︙ |
Modified tests/oldTests/tlsSrv.tcl
from [94376e17c0]
to [03126ed641].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 | - - | # # Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> # |
︙ |
Modified tests/oldTests/tlsSrv2.tcl
from [55ffa72ce8]
to [26eb405e56].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 | - - | # # Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> # |
︙ |
Modified tests/oldTests/tlsUpload.tcl
from [82c9e6c118]
to [7d5a3a1baa].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 | - - | # # Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> # |
︙ |
Modified tests/tlsIO.test
from [29322e679c]
to [eaefd1ceb9].
︙ | |||
66 67 68 69 70 71 72 | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | - - + | if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest namespace import -force ::tcltest::* } # The build dir is added as the first element of $PATH |
︙ | |||
300 301 302 303 304 305 306 307 | 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 | + - | test tlsIO-1.12 {arg parsing for socket command} {socket} { list [catch {tls::socket foo badport} msg] $msg } {1 {expected integer but got "badport"}} test tlsIO-2.1 {tcp connection} {socket stdio} { removeFile script set f [open script w] puts $f [list set auto_path $auto_path] puts $f { |
︙ | |||
342 343 344 345 346 347 348 349 | 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 | + - | } else { set port [expr {$tlsServerPort + [pid]%1024}] } test tlsIO-2.2 {tcp connection with client port specified} {socket stdio} { removeFile script set f [open script w] puts $f [list set auto_path $auto_path] puts $f { |
︙ | |||
382 383 384 385 386 387 388 389 | 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 | + - | close $f set x } [list ready "hello $port"] test tlsIO-2.3 {tcp connection with client interface specified} {socket stdio} { removeFile script set f [open script w] puts $f [list set auto_path $auto_path] puts $f { |
︙ | |||
420 421 422 423 424 425 426 427 | 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 | + - | close $f set x } {ready {hello 127.0.0.1}} test tlsIO-2.4 {tcp connection with server interface specified} {socket stdio} { removeFile script set f [open script w] puts $f [list set auto_path $auto_path] puts $f { |
︙ | |||
457 458 459 460 461 462 463 464 | 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 | + - | close $f set x } {ready hello} test tlsIO-2.5 {tcp connection with redundant server port} {socket stdio} { removeFile script set f [open script w] puts $f [list set auto_path $auto_path] puts $f { |
︙ | |||
504 505 506 507 508 509 510 511 | 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 | + - | } set status } ok test tlsIO-2.7 {echo server, one line} {socket stdio} { removeFile script set f [open script w] puts $f [list set auto_path $auto_path] puts $f { |
︙ | |||
548 549 550 551 552 553 554 555 | 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 | + - | set y [gets $f] close $f list $x $y } {{hello abcdefghijklmnop} done} test tlsIO-2.8 {echo server, loop 50 times, single connection} {socket stdio} { set f [open script w] puts $f [list set auto_path $auto_path] puts $f { |
︙ | |||
600 601 602 603 604 605 606 607 | 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 | + - | set x } {done 50} test tlsIO-2.9 {socket conflict} {socket stdio} { set s [tls::socket -server accept 8828] removeFile script set f [open script w] puts $f [list set auto_path $auto_path] puts -nonewline $f { |
︙ | |||
687 688 689 690 691 692 693 694 | 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 | + - | test tlsIO-2.12 {tcp connection; no certificates specified} \ {socket stdio unixOnly} { # There is a debug assertion on Windows/SSL that causes a crash when the # certificate isn't specified. removeFile script set f [open script w] puts $f [list set auto_path $auto_path] puts $f { |
︙ | |||
720 721 722 723 724 725 726 727 | 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 | + - | close $f set x } {ready done {}} test tlsIO-3.1 {socket conflict} {socket stdio} { removeFile script set f [open script w] puts $f [list set auto_path $auto_path] puts $f { |
︙ | |||
745 746 747 748 749 750 751 752 | 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 | + - | close $f set x } {1 {couldn't open socket: address already in use}} test tlsIO-3.2 {server with several clients} {socket stdio} { removeFile script set f [open script w] puts $f [list set auto_path $auto_path] puts $f { |
︙ | |||
814 815 816 817 818 819 820 821 | 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 | + - | set x } {ready done} test tlsIO-4.1 {server with several clients} {socket stdio} { # have seen intermittent hangs on Windows removeFile script set f [open script w] puts $f [list set auto_path $auto_path] puts $f { |
︙ | |||
922 923 924 925 926 927 928 929 | 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 | + - | } {couldn't open socket: not owner} test tlsIO-6.1 {accept callback error} {socket stdio} { # There is a debug assertion on Windows/SSL that causes a crash when the # certificate isn't specified. removeFile script set f [open script w] puts $f [list set auto_path $auto_path] puts $f { |
︙ | |||
950 951 952 953 954 955 956 957 | 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 | + - | rename bgerror {} set x } {{divide by zero}} test tlsIO-7.1 {testing socket specific options} {socket stdio} { removeFile script set f [open script w] puts $f [list set auto_path $auto_path] puts $f { |
︙ | |||
984 985 986 987 988 989 990 991 | 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 | + - | lappend l [string compare [lindex $p 2] 8820] lappend l [llength $p] } {0 0 3} test tlsIO-7.2 {testing socket specific options} {socket stdio} { removeFile script set f [open script w] puts $f [list set auto_path $auto_path] puts $f { |
︙ | |||
1756 1757 1758 1759 1760 1761 1762 1763 | 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 | + - | # Script2 creates the server socket, launches script1, # waits a second, and exits. The server socket will now # be closed unless script1 inherited it. set f [open script2 w] puts $f [list set tclsh $::tcltest::tcltest] puts $f [list set auto_path $auto_path] puts $f { |
︙ | |||
1813 1814 1815 1816 1817 1818 1819 1820 | 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 | + - | # Script2 opens the client socket and writes to it. It then # launches script1 and exits. If the child process inherited the # client socket, the socket will still be open. set f [open script2 w] puts $f [list set tclsh $::tcltest::tcltest] puts $f [list set auto_path $auto_path] puts $f { |
︙ | |||
1874 1875 1876 1877 1878 1879 1880 1881 | 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 | + - | after 10000 exit vwait forever } close $f set f [open script2 w] puts $f [list set tclsh $::tcltest::tcltest] puts $f [list set auto_path $auto_path] puts $f { |
︙ | |||
1926 1927 1928 1929 1930 1931 1932 | 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 | - | test tlsIO-13.1 {Testing use of shared socket between two threads} \ {socket testthread} { # HOBBS: never tested removeFile script threadReap makeFile { |
︙ |
Modified tls.c
from [15a7d7809d]
to [05e974345e].
1 2 3 4 5 6 7 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | - - | /* * Copyright (C) 1997-1999 Matt Newman <matt@novadigm.com> * some modifications: * Copyright (C) 2000 Ajuba Solutions * Copyright (C) 2002 ActiveState Corporation * Copyright (C) 2004 Starfish Systems * |
︙ | |||
77 78 79 80 81 82 83 | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | #define ENABLED(flag, mask) (((flag) & (mask)) == (mask)) /* * Static data structures */ #ifndef OPENSSL_NO_DH |
︙ | |||
1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 | 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 | + + + + | *------------------------------------------------------------------- */ int Tls_Init(Tcl_Interp *interp) /* Interpreter in which the package is * to be made available. */ { const unsigned char tlsTclInitScript[] = { #include "tls.tcl.h" }; int major, minor, patchlevel, release; /* * The original 8.2.0 stacked channel implementation (and the patch * that preceded it) had problems with scalability and robustness. * These were address in 8.3.2 / 8.4a2, so we now require that as a * minimum for TLS 1.4+. We only support 8.2+ now (8.3.2+ preferred). |
︙ | |||
1717 1718 1719 1720 1721 1722 1723 | 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 | + + + + - + | Tcl_CreateObjCommand(interp, "tls::version", VersionObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL); Tcl_CreateObjCommand(interp, "tls::misc", MiscObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL); if (interp) { Tcl_Eval(interp, tlsTclInitScript); } |
︙ | |||
1772 1773 1774 1775 1776 1777 1778 | 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 | - + + + + + | { int i; char rnd_seed[16] = "GrzSlplKqUdnnzP!"; /* 16 bytes */ int status=TCL_OK; #if defined(OPENSSL_THREADS) && defined(TCL_THREADS) size_t num_locks; |
︙ | |||
1821 1822 1823 1824 1825 1826 1827 | 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 | + - + - | do { for (i = 0; i < 16; i++) { rnd_seed[i] = 1 + (char) (255.0 * rand()/(RAND_MAX+1.0)); } RAND_seed(rnd_seed, sizeof(rnd_seed)); } while (RAND_status() != 1); } |
Modified tls.h
from [dc96a1623e]
to [6362c4c989].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 | - - | /* * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> * |
︙ |
Modified tls.tcl
from [3192efd07b]
to [90f08f912e].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 | - - | # # Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> # |
︙ |
Modified tlsBIO.c
from [66eac232ea]
to [b90d32218c].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 | - - | /* * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> * |
︙ |
Modified tlsIO.c
from [ed5e46f5ea]
to [d9df3786b9].
1 2 3 4 | 1 2 3 4 5 6 7 8 9 10 11 | - - | /* * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> * Copyright (C) 2000 Ajuba Solutions * |
︙ |
Modified tlsInt.h
from [aca790a765]
to [337abc57f7].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 | - - | /* * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> * |
︙ |
Modified tlsX509.c
from [24e0063023]
to [a24085972c].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 | - - | /* * Copyright (C) 1997-2000 Sensus Consulting Ltd. * Matt Newman <matt@sensus.org> |
︙ |
Deleted win/makefile.vc version [91ee39841d].
Deleted win/nmakehlp.c version [892a643209].
Deleted win/rules.vc version [ead277b0fc].
Deleted win/tls.rc version [93d9423ff3].