Changes In Branch tls-1-7 Through [f0312b63df] Excluding Merge-Ins
This is equivalent to a diff from 6aedc8c1b5 to f0312b63df
2016-12-08
| ||
04:26 | Merged in work for TclTLS 1.7 to trunk check-in: 0409513536 user: rkeene tags: trunk | |
2016-12-02
| ||
19:50 | Made version number semver check-in: f5cb9df1f2 user: rkeene tags: tls-1-7 | |
19:39 | Cleanup BIO creation to be more correct check-in: f0312b63df user: rkeene tags: tls-1-7 | |
19:00 | Minor casting to address compiler warnings check-in: e3b94c4a74 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 [f82bd5334b].
Added HEADER version [786e922403].
Modified Makefile.in
from [de778baab4]
to [f8fac04f72].
| 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 aclocal/shobj.m4 version [a12856793f].
Added aclocal/tcl.m4 version [154523ce1b].
Added aclocal/versionscript.m4 version [b9d44e1a68].
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 [f1c9899613].
| 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 91 92 93 94 95 96 97 98 99 100 101 | - - - - - + - - - - - - - - + + - - - + + - - - - - + + + - - - + + - - + - - + - - - - - - - - + + - - - - - - - + - - + - - + - - - - - - - - - - - - - - - + - - - - - - + - - - - + + + + - + + - - - - + + - + - - - - - - + + - - - - - - - - - + - + + - - - + + + + + + - - + + - - - + - - + - - + - - - - - - + - - + - - - - - - + + + - - + - - - - - - + - - - - - - + - - + - - + - - - - + - - - - + + + + + - - - - - - - + - - - - - - - + - - + - - + - - - + + - - - + + + - - - - - - + + + + + + + - - + + + - - - - + + + - - + - - - - - - - + - - + - - - + - + |
|
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 [606371c2d5].
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 * |
︙ | |||
63 64 65 66 67 68 69 | 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 | - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | static int UnimportObjCmd _ANSI_ARGS_ ((ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])); static SSL_CTX *CTX_Init _ANSI_ARGS_((State *statePtr, int proto, char *key, char *cert, char *CAdir, char *CAfile, char *ciphers, char *DHparams)); |
︙ | |||
166 167 168 169 170 171 172 | 121 122 123 124 125 126 127 128 129 130 131 132 133 134 | - | /* * Threaded operation requires locking callbacks * Based from /crypto/cryptlib.c of OpenSSL and NSOpenSSL. */ static Tcl_Mutex locks[CRYPTO_NUM_LOCKS]; static Tcl_Mutex init_mx; |
︙ | |||
312 313 314 315 316 317 318 | 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 | - + | int length; SSL *ssl = (SSL*)X509_STORE_CTX_get_app_data(ctx); X509 *cert = X509_STORE_CTX_get_current_cert(ctx); State *statePtr = (State*)SSL_get_app_data(ssl); int depth = X509_STORE_CTX_get_error_depth(ctx); int err = X509_STORE_CTX_get_error(ctx); |
︙ | |||
361 362 363 364 365 366 367 | 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 | - + | /* It got an error - reject the certificate. */ Tcl_BackgroundError( statePtr->interp); ok = 0; } else { result = Tcl_GetObjResult(statePtr->interp); string = Tcl_GetStringFromObj(result, &length); /* An empty result leaves verification unchanged. */ |
︙ | |||
1521 1522 1523 1524 1525 1526 1527 | 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 | - - - - - - - + + + + + + + | ASN1_INTEGER_set(X509_get_serialNumber(cert),serial); X509_gmtime_adj(X509_get_notBefore(cert),0); X509_gmtime_adj(X509_get_notAfter(cert),(long)60*60*24*days); X509_set_pubkey(cert,pkey); name=X509_get_subject_name(cert); |
︙ | |||
1615 1616 1617 1618 1619 1620 1621 | 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 | - + - + | if (statePtr->timer != (Tcl_TimerToken) NULL) { Tcl_DeleteTimerHandler(statePtr->timer); statePtr->timer = NULL; } if (statePtr->bio) { /* This will call SSL_shutdown. Bug 1414045 */ |
︙ | |||
1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 | 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 | + + + + | *------------------------------------------------------------------- */ int Tls_Init(Tcl_Interp *interp) /* Interpreter in which the package is * to be made available. */ { const 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 | 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 | + + + + - + | 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); } |
︙ | |||
1763 1764 1765 1766 1767 1768 1769 | 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 | - - + + - + + + + + + - - + - - | * initilizes SSL library * * Result: * none * *------------------------------------------------------* */ |
︙ | |||
1820 1821 1822 1823 1824 1825 1826 | 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 | - - + - | srand((unsigned int) time((time_t *) NULL)); 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 [4953796f1e].
1 2 3 | 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 | - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - + + - - + + | /* * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> * |
︙ | |||
92 93 94 95 96 97 98 | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 | - - + + - - + + | BIO *bio; char *buf; int bufLen; { Tcl_Channel chan = Tls_GetParent((State*)bio->ptr); int ret = 0; |
︙ | |||
139 140 141 142 143 144 145 | 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 | - - - + + + | long num; void *ptr; { Tcl_Channel chan = Tls_GetParent((State*)bio->ptr); long ret = 1; int *ip; |
︙ | |||
178 179 180 181 182 183 184 | 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 | - + - + - + | case BIO_CTRL_GET_CLOSE: ret = bio->shutdown; break; case BIO_CTRL_SET_CLOSE: bio->shutdown = (int)num; break; case BIO_CTRL_EOF: |
︙ |
Modified tlsIO.c
from [ed5e46f5ea]
to [6426f40f98].
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 * |
︙ | |||
282 283 284 285 286 287 288 | 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 | - + | */ static int TlsCloseProc(ClientData instanceData, /* The socket to close. */ Tcl_Interp *interp) /* For error reporting - unused. */ { State *statePtr = (State *) instanceData; |
︙ | |||
330 331 332 333 334 335 336 | 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 | - + | int *errorCodePtr) /* Where to store error code. */ { State *statePtr = (State *) instanceData; int bytesRead; /* How many bytes were read? */ *errorCodePtr = 0; |
︙ | |||
365 366 367 368 369 370 371 | 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 | - + - + - + | * Alternatively, we may want to handle the <0 return codes from * BIO_read specially (as advised in the RSA docs). TLS's lower level BIO * functions play with the retry flags though, and this seems to work * correctly. Similar fix in TlsOutputProc. - hobbs */ ERR_clear_error(); bytesRead = BIO_read(statePtr->bio, buf, bufSize); |
︙ | |||
419 420 421 422 423 424 425 | 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 | - + - + - - + + - + - + - + - + - + - + - + | int *errorCodePtr) /* Where to store error code. */ { State *statePtr = (State *) instanceData; int written, err; *errorCodePtr = 0; |
︙ | |||
549 550 551 552 553 554 555 556 557 558 559 560 | 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 | + - | return TCL_OK; } /* * Request for a specific option has to fail, we don't have any. */ return TCL_ERROR; } else { #if 0 size_t len = 0; if (optionName != (char *) NULL) { len = strlen(optionName); } |
︙ | |||
595 596 597 598 599 600 601 | 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 | - + | TlsWatchProc(ClientData instanceData, /* The socket state. */ int mask) /* Events of interest; an OR-ed * combination of TCL_READABLE, * TCL_WRITABLE and TCL_EXCEPTION. */ { State *statePtr = (State *) instanceData; |
︙ | |||
774 775 776 777 778 779 780 | 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 | - + | static void TlsChannelHandler (clientData, mask) ClientData clientData; int mask; { State *statePtr = (State *) clientData; |
︙ | |||
883 884 885 886 887 888 889 | 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 | - + | int Tls_WaitForConnect( statePtr, errorCodePtr) State *statePtr; int *errorCodePtr; /* Where to store error code. */ { int err; |
︙ | |||
922 923 924 925 926 927 928 | 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 | - + - + - + - + | Tls_Error(statePtr, (char *)ERR_reason_error_string(ERR_get_error())); statePtr->flags |= TLS_TCL_HANDSHAKE_FAILED; *errorCodePtr = ECONNABORTED; return -1; } else if (BIO_should_retry(statePtr->bio)) { if (statePtr->flags & TLS_TCL_ASYNC) { |
︙ |
Modified tlsInt.h
from [aca790a765]
to [e68c6c8bb5].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 | - - | /* * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> * |
︙ | |||
74 75 76 77 78 79 80 | 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | - - + + - + | #ifndef ECONNABORTED #define ECONNABORTED 130 /* Software caused connection abort */ #endif #ifndef ECONNRESET #define ECONNRESET 131 /* Connection reset by peer */ #endif |
︙ | |||
252 253 254 255 256 257 258 | 250 251 252 253 254 255 256 257 258 259 | - | EXTERN Tcl_Obj* Tls_NewX509Obj _ANSI_ARGS_ (( Tcl_Interp *interp, X509 *cert)); EXTERN void Tls_Error _ANSI_ARGS_ ((State *statePtr, char *msg)); EXTERN void Tls_Free _ANSI_ARGS_ ((char *blockPtr)); EXTERN void Tls_Clean _ANSI_ARGS_ ((State *statePtr)); EXTERN int Tls_WaitForConnect _ANSI_ARGS_(( State *statePtr, int *errorCodePtr)); |
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].