Changes In Branch nijtmans Through [93c001e9c4] Excluding Merge-Ins
This is equivalent to a diff from b5c41cdeb6 to 93c001e9c4
2024-02-22
| ||
20:02 | No need to define Tcl_Size in tlsInt.h: already handled by TEA check-in: a66c2b01b1 user: jan.nijtmans tags: nijtmans | |
17:51 | Merge trunk check-in: 0d2b96f6d8 user: jan.nijtmans tags: bohagan | |
17:51 | Forward declaration no longer necessary check-in: 93c001e9c4 user: jan.nijtmans tags: nijtmans | |
17:40 | Fix [006bd0c74e]: PATCH: BIO_CTRL_PUSH not handled. Also add some changes from androwish: [https://www.androwish.org/home/info/982ebf9d31a60440] check-in: 1b8c76f783 user: jan.nijtmans tags: nijtmans | |
2024-01-25
| ||
22:22 | Somewhat better TEA support, not complete yet. Make this the continuation of the tls-1.7 branch. main/trunk will continue with 1.8.0 check-in: b7b0bd5a8f user: jan.nijtmans tags: tls-1.7 | |
2024-01-24
| ||
14:35 | First changes needed for Tcl 9.0 check-in: 3057d6e2e0 user: jan.nijtmans tags: nijtmans | |
2023-03-04
| ||
15:44 | Merge add-support-alpn into main check-in: 4b4daeada4 user: bohagan tags: trunk | |
2022-05-30
| ||
16:12 | Create new branch named "feature-dump-keys" check-in: f6b9f887ef user: rkeene tags: feature-dump-keys | |
16:08 | Bug [e1f9a21c67]: Start of ALPN support check-in: 07bafe02de user: schelte tags: add-support-alpn | |
16:07 | Create new branch named "add-support-alpn" check-in: 283dc6f133 user: rkeene tags: add-support-alpn | |
2021-01-14
| ||
12:56 | Ticket [604bb68b5c] : rudimentary nmake build system check-in: b5c41cdeb6 user: oehhar tags: trunk | |
2020-10-15
| ||
10:54 | Corrected instructions. Removed already applied patch Closed-Leaf check-in: b6aa13660a user: oehhar tags: bug-604bb68b5c-nmake | |
2020-10-12
| ||
20:32 | add "version" element with SSL/TLS protocol version to tls::status check-in: 9c32a526ed user: resuna tags: trunk | |
Added .fossil-settings/manifest version [1e2c3d8462].
Modified ChangeLog
from [7400a29b58]
to [dc44957559].
|
Modified Makefile.in
from [500d902713]
to [413d5be116].
|
Modified README.txt
from [4d858d5c33]
to [3dc72eec51].
|
Deleted aclocal/ax_check_compile_flag.m4 version [0974cae407].
Deleted aclocal/shobj.m4 version [2123b62392].
Deleted aclocal/tcl.m4 version [0d8f54c2f7].
Deleted aclocal/tcltls_openssl.m4 version [3644ca7551].
Deleted aclocal/versionscript.m4 version [b9d44e1a68].
Modified build/makearch.info
from [f2c0aaf165]
to [b62f6e2f07].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 11 | - + | # This is the name of the utility, it will be prefixed to the tarball name UTIL="tcltls" |
︙ |
Added configure version [0f1a3ab8f5].
Modified configure.ac
from [6234df6904]
to [d5f3ebd9b3].
| 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 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 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 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 | - - - - + + + + - - - - - - - + - - + + + + + - + - - - + + + + + + - - + - - + - - - - - - - - - + + + + + + + + - - + - - - + + + - - + + + - - + + + - - - - - - - - - - - + - + - - - - - + + + + + + - - - + + + + + + + + - - - + - - - - - - - - - - + + + + + + + + + - - + + - - - + - - - - - + + - - + + - - - + - - - - - + + - - - - - - - - + + - - - + + + + + + + - - - - - - - + + + + + + + + - + + + + + - - - - - + + + + + - + - - - + + + - - - - - - + + + + + + + - - - - + + + + + - - - + - - - + + + - - + + - - - - - - - + - - - - - + + + - - - - - + + + + + + + - - + + - - - - - + + + + + - + + - - - + + - - - - - - - + + + + - - - - - - - - - - - - - - - + + + + - + - + + - - - + + - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + + - - - - - - + + - - + + - + - - - - - + + + + + + + + + - - + + |
|
Added generic/tclOpts.h version [f7b8a186b3].
Added generic/tls.c version [0d8631d8e5].
Added generic/tls.h version [5524cb9711].
Added generic/tlsBIO.c version [26205b6a4d].
Added generic/tlsIO.c version [46ff3e28a8].
Added generic/tlsInt.h version [3f639399ff].
Added generic/tlsX509.c version [6adf085ff1].
Added library/tls.tcl version [ebe93438e0].
Modified license.terms
from [767ca58173]
to [10293d3448].
︙ | |||
23 24 25 26 27 28 29 | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | - + - + | FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. GOVERNMENT USE: If you are acquiring this software on behalf of the U.S. government, the Government shall have only "Restricted Rights" |
Modified pkgIndex.tcl.in
from [6c4c62dd82]
to [c252762c40].
|
Deleted tclOpts.h version [1a6cf1121d].
Modified tests/all.tcl
from [d55b3d9c74]
to [b44ef18ced].
1 2 3 4 5 6 7 8 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | - + | # 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. |
︙ |
Modified tests/certs/ca.pem
from [deed2c9802]
to [484e3a5644].
1 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | + + + - - - + + + - - - - - - - - - - + + + + + + + + - - - + + + + + + | -----BEGIN CERTIFICATE----- MIIDkTCCAnmgAwIBAgIUPg6RCIdGBkdlV10XlcfJxHJINeowDQYJKoZIhvcNAQEL BQAwWDELMAkGA1UEBhMCQ0ExGTAXBgNVBAgMEEJyaXRpc2ggQ29sdW1iaWExEjAQ BgNVBAcMCVZhbmNvdXZlcjEaMBgGA1UECgwRU2FtcGxlIENlcnRzIEludGwwHhcN |
Modified tests/certs/client.key
from [73e1cabe1e]
to [fb4dcc3cad].
1 | 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 | - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + | -----BEGIN RSA PRIVATE KEY----- |
Modified tests/certs/client.pem
from [c9c6acad76]
to [2050e8c953].
1 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | - - - - - - - - - + + + + + + + + + + + + - - - + + + + + | -----BEGIN CERTIFICATE----- |
Modified tests/certs/client.req
from [85521da890]
to [5ffe930c8b].
1 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | - - - - - - + + + + + + + + + - - - + + + + + + | -----BEGIN CERTIFICATE REQUEST----- |
Modified tests/certs/file.srl
from [0908cbeb2f]
to [662a919451].
| 1 | - + |
|
Modified tests/certs/privkey.pem
from [8b0cd2f057]
to [68364dca5f].
| 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 | - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + |
|
Modified tests/certs/server.key
from [5e8ad5b667]
to [059d0c4e1d].
1 | 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 | - - - + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + | -----BEGIN RSA PRIVATE KEY----- |
Modified tests/certs/server.pem
from [f68c9dc63c]
to [fafd25f6df].
1 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | - - - - - - - - - + + + + + + + + + + + + - - - + + + + + | -----BEGIN CERTIFICATE----- |
Modified tests/certs/server.req
from [026a8de463]
to [984c60695f].
1 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | - - - - - - + + + + + + + + + - - - + + + + + + | -----BEGIN CERTIFICATE REQUEST----- |
Modified tests/oldTests/server.pem
from [91b4eb6112]
to [c1f4fc93d5].
︙ | |||
267 268 269 270 271 272 273 | 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 | - + | cnlwdFNvZnQgRGV2IENBMB4XDTk3MDMyMjEzMzQwNFoXDTk4MDMyMjEzMzQwNFow gYIxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhC cmlzYmFuZTEaMBgGA1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxFDASBgNVBAsTC2Rl dmVsb3BtZW50MRkwFwYDVQQDExBDcnlwdFNvZnQgRGV2IENBMFwwDQYJKoZIhvcN AQEBBQADSwAwSAJBAOAOAqogG5QwAmLhzyO4CoRnx/wVy4NZP4dxJy83O1EnL0rw OdsamJKvPOLHgSXo3gDu9uVyvCf/QJmZAmC5ml8CAwEAATANBgkqhkiG9w0BAQQF AANBADRRS/GVdd7rAqRW6SdmgLJduOU2yq3avBu99kRqbp9A/dLu6r6jU+eP4oOA |
︙ |
Modified tests/oldTests/tlsHttp.tcl
from [a53b6ea2fa]
to [9ac8651bfa].
︙ | |||
8 9 10 11 12 13 14 | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | - + | source tls.tcl package require http # # Initialize context # #tls::init -certfile client.pem -cafile server.pem -ssl2 1 -ssl3 1 -tls1 0 ;#-cipher RC4-MD5 |
︙ |
Modified tests/oldTests/tlsSrv.tcl
from [03126ed641]
to [cb7a0f8fc4].
︙ | |||
15 16 17 18 19 20 21 | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | - + | proc reflectCB {chan {verbose 0}} { set x hello if {[catch {read $chan 1024} data]} { puts stderr "EOF ($data)" catch {close $chan} return } |
︙ | |||
40 41 42 43 44 45 46 | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | - + - + | return } puts [tls::status $chan] fconfigure $chan -buffering none -blocking 0 fileevent $chan readable [list reflectCB $chan 1] } |
Modified tests/oldTests/tlsSrv2.tcl
from [26eb405e56]
to [94b6f94d30].
︙ | |||
14 15 16 17 18 19 20 | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | - + | # proc reflectCB {chan {verbose 0}} { if {[catch {read $chan 1024} data]} { puts stderr "EOF ($data)" catch {close $chan} return } |
︙ |
Modified tests/simpleClient.tcl
from [abd896c23b]
to [4d694417ae].
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | #!/bin/sh # The next line is executed by /bin/sh, but not tcl \ |
︙ |
Modified tests/simpleServer.tcl
from [ca9a28f88d]
to [0be01a94d0].
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | #!/bin/sh # The next line is executed by /bin/sh, but not tcl \ |
︙ |
Modified tests/tlsIO.test
from [1df3d39a1f]
to [08483551ff].
1 2 3 4 5 6 7 | 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 | - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + | # Commands tested in this file: socket. -*- tcl -*- # # This file contains a collection of tests for one or more of the Tcl # built-in commands. Sourcing this file into Tcl runs the tests and # generates output for errors. No output means no errors were found. # # Copyright (c) 1994-1996 Sun Microsystems, Inc. |
︙ | |||
424 425 426 427 428 429 430 | 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 | - + - + | removeFile script set f [open script w] puts $f [list set auto_path $auto_path] puts $f { package require tls set timer [after 2000 "set x done"] } |
︙ | |||
564 565 566 567 568 569 570 | 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 | - + | proc echo {s} { global i set l [gets $s] if {[eof $s]} { global x close $s set x done |
︙ | |||
631 632 633 634 635 636 637 | 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 | - + | proc readit {s} { global done gets $s close $s set done 1 } set cs [tls::socket -certfile $clientCert -cafile $caCert \ |
︙ | |||
1038 1039 1040 1041 1042 1043 1044 | 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 | - + | proc accept {s a p} { global x set x [fconfigure $s -sockname] close $s } set s1 [tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ |
︙ | |||
1091 1092 1093 1094 1095 1096 1097 | 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 | - + | # Only OpenSSL 0.9.5a on Windows seems to need the after (delayed) # close, but it works just the same for all others. -hobbs after 500 close $s set x done } set s1 [tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ |
︙ | |||
1135 1136 1137 1138 1139 1140 1141 | 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 | - + | -buffering none] } set s [tls::socket \ -certfile $serverCert -cafile $caCert -keyfile $serverKey \ -server accept 8831] set c [tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ |
︙ | |||
1182 1183 1184 1185 1186 1187 1188 | 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 | - + | close $s } set s [tls::socket \ -certfile $serverCert -cafile $caCert -keyfile $serverKey \ -server accept 8832] set c [tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ |
︙ | |||
1226 1227 1228 1229 1230 1231 1232 | 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 | - + - + | } } proc timerproc {} { global done count c set done true set count {timer went off, eof is not sticky} close $c |
︙ | |||
1461 1462 1463 1464 1465 1466 1467 | 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 | - + | gets $s3 } close $s1 close $s2 close $s3 sendCommand {close $socket10_9_test_server} set i |
︙ | |||
1938 1939 1940 1941 1942 1943 1944 | 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 | - + - + - + - + | proc echo {s} { global i set l [gets $s] if {[eof $s]} { global x close $s set x done |
︙ | |||
2015 2016 2017 2018 2019 2020 2021 | 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 | - + - + - + - + - + + | -buffering none] } set s [tls::socket \ -certfile $serverCert -cafile $caCert -keyfile $serverKey \ -server accept 8831] set c [tls::socket \ -certfile $clientCert -cafile $caCert -keyfile $clientKey \ |
︙ |
Deleted tls.c version [b7a88587d1].
Deleted tls.h version [625cff2305].
Modified tls.htm
from [54230bffc5]
to [96f50e582d].
| 1 2 3 4 5 6 7 8 | - + |
|
︙ |
Deleted tls.tcl version [ae8c7a0664].
Deleted tlsBIO.c version [7f6303ee40].
Deleted tlsIO.c version [a0890258d8].
Deleted tlsInt.h version [b78d815874].
Deleted tlsX509.c version [ecfb13f8ce].
Modified win/README.txt
from [c9eebede2e]
to [a5d881083e].
1 2 3 4 | 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 | + - - + + - - + - - - + - - - - + - - - - - - - + - - + - - + - - - - - + - - - + + - - + + - + + - + + - + + - + - - - + + + | Windows DLL Build instructions using nmake build system 2020-10-15 Harald.Oehlmann@elmicron.de 2023-08-22 Kevin Walzer (kw@codebykevin.com) Properties: |
Added win/gitmanifest.in version [efa71fcbca].
Modified win/makefile.vc
from [88282c8491]
to [1a797b754a].
|
Added win/nmakehlp.c version [570fb959d3].
Added win/rules-ext.vc version [50db9d785c].
Added win/rules.vc version [5be8f10e0e].
Added win/svnmanifest.in version [ea528c30fc].
Modified win/targets.vc
from [77a0a274fa]
to [3627f33607].
1 2 3 4 5 6 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | - + | #------------------------------------------------------------- -*- makefile -*- # targets.vc -- # # Part of the nmake based build system for Tcl and its extensions. # This file defines some standard targets for the convenience of extensions # and can be optionally included by the extension makefile. |
︙ |
Added win/x86_64-w64-mingw32-nmakehlp.exe version [078ee83504].