Changes In Branch crypto Through [564db0e896] Excluding Merge-Ins
This is equivalent to a diff from 327d65db23 to 564db0e896
2024-03-30
| ||
19:52 | Added option to enable and disable PKCS#7 padding check-in: 32f48d257b user: bohagan tags: crypto | |
2024-03-29
| ||
22:59 | Added AES symmetrical block cipher test vectors check-in: 564db0e896 user: bohagan tags: crypto | |
2024-03-15
| ||
23:39 | Updated make file to correct bugs check-in: 89a6207a57 user: bohagan tags: crypto | |
22:17 | Fix warnings for compile with GCC on TCL 9.0 check-in: 562bd95399 user: bohagan tags: trunk | |
2024-03-11
| ||
02:15 | Merge in build-info command and TEA updates check-in: 3d9a852fc6 user: bohagan tags: crypto | |
02:05 | Updated TEA files to latest version check-in: 327d65db23 user: bohagan tags: trunk | |
2024-03-10
| ||
23:26 | Added TCL 9.0 build-info command including support for UUID files. Altered scripts from sample extension to put tlsUuid.h in WIN_DIR not TMP_DIR. check-in: c5526c14fd user: bohagan tags: trunk | |
Modified ChangeLog
from [7400a29b58]
to [03077231f7].
|
Modified Makefile.in
from [0c075f2f94]
to [61dd86b789].
︙ | |||
378 379 380 381 382 383 384 | 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 | - + | $(srcdir)/license.terms $(srcdir)/manifest.uuid \ $(srcdir)/README.txt $(srcdir)/pkgIndex.tcl.in $(DIST_DIR)/ # TEA files $(INSTALL_DATA_DIR) $(DIST_DIR)/tclconfig $(DIST_INSTALL_DATA) $(srcdir)/tclconfig/README.txt \ $(srcdir)/tclconfig/tcl.m4 $(srcdir)/tclconfig/install-sh \ |
︙ | |||
415 416 417 418 419 420 421 | 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 | - + | -rm -f *.$(OBJEXT) core *.core -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean: clean -rm -f *.tab.c -rm -f $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log config.status |
︙ |
Modified configure
from [6f64ba163e]
to [3cb8f6f51e].
︙ | |||
5383 5384 5385 5386 5387 5388 5389 | 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393 5394 5395 5396 5397 | - + | # stub library C source files to compile in TEA_ADD_STUB_SOURCES, # and runtime Tcl library files in TEA_ADD_TCL_SOURCES. # This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS # and PKG_TCL_SOURCES. #----------------------------------------------------------------------- |
︙ | |||
9326 9327 9328 9329 9330 9331 9332 | 9326 9327 9328 9329 9330 9331 9332 9333 9334 9335 9336 9337 9338 9339 9340 | - + - - | if test -z "$TCLTLS_SSL_LIBS"; then TCLTLS_SSL_LIBS="-lcrypto -lssl" fi if test -z "$TCLTLS_SSL_CFLAGS"; then TCLTLS_SSL_CFLAGS="" fi if test -z "$TCLTLS_SSL_INCLUDES"; then |
︙ |
Modified configure.ac
from [7ae4b1d7b6]
to [2ee8d3f5de].
︙ | |||
67 68 69 70 71 72 73 | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | - + | # public headers that need to be installed in TEA_ADD_HEADERS, # stub library C source files to compile in TEA_ADD_STUB_SOURCES, # and runtime Tcl library files in TEA_ADD_TCL_SOURCES. # This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS # and PKG_TCL_SOURCES. #----------------------------------------------------------------------- |
︙ |
Added doc/cryptography.html version [30d9aec646].
Modified generic/tclOpts.h
from [2aa98ce596]
to [6a496a0d8f].
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 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | - - - + - - - + + - - - - - - - - - + + + + + + - - - + + + + - - - - - + + + + - - + + - - - - - + + + + - - - - - - + + + + - - - + + - - + - - + - - - + + - - - | /* |
Modified generic/tls.c
from [a34923e145]
to [bcc60fdf89].
︙ | |||
23 24 25 26 27 28 29 30 31 32 33 34 35 36 | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | + + + + | */ #include "tlsInt.h" #include "tclOpts.h" #include "tlsUuid.h" #include <stdio.h> #include <stdlib.h> #include <openssl/crypto.h> #include <openssl/ssl.h> #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/rsa.h> #include <openssl/safestack.h> /* Min OpenSSL version */ #if OPENSSL_VERSION_NUMBER < 0x10101000L #error "Only OpenSSL v1.1.1 or later is supported" #endif |
︙ | |||
230 231 232 233 234 235 236 | 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 | - + | static void MessageCallback(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg) { State *statePtr = (State*)arg; Tcl_Interp *interp = statePtr->interp; Tcl_Obj *cmdPtr; char *ver, *type; BIO *bio; |
︙ | |||
363 364 365 366 367 368 369 | 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 | - + | * to a string describing the SSL negotiation failure reason * *------------------------------------------------------------------- */ static int VerifyCallback(int ok, X509_STORE_CTX *ctx) { Tcl_Obj *cmdPtr; |
︙ | |||
932 933 934 935 936 937 938 | 936 937 938 939 940 941 942 943 944 945 946 947 948 949 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | /********************/ /* Commands */ /********************/ /* *------------------------------------------------------------------- * |
︙ | |||
1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 | 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 | + + + + + + + + + + + + + + | } dprintf("Returning TCL_OK with data \"%i\"", ret); Tcl_SetObjResult(interp, Tcl_NewIntObj(ret)); return TCL_OK; } static const char *command_opts [] = { "-alpn", "-cadir", "-cafile", "-cert", "-certfile", "-cipher", "-ciphers", "-ciphersuites", "-command", "-dhparams", "-key", "-keyfile", "-model", "-password", "-post_handshake", "-request", "-require", "-security_level", "-server", "-servername", "-session_id", "-ssl2", "-ssl3", "-tls1", "-tls1.1", "-tls1.2", "-tls1.3", "-validatecommand", "-vcmd", NULL}; enum _command_opts { _opt_alpn, _opt_cadir, _opt_cafile, _opt_cert, _opt_certfile, _opt_cipher, _opt_ciphers, _opt_ciphersuite, _opt_cmd, _opt_dhparams, _opt_key, _opt_keyfile, _opt_model, _opt_password, _opt_handshake, _opt_request, _opt_require, _opt_security_level, _opt_server, _opt_servername, _opt_session_id, _opt_ssl2, _opt_ssl3, _opt_tls1, _opt_tls11, _opt_tls12, _opt_tls13, _opt_validate, _opt_vcmd }; /* *------------------------------------------------------------------- * * ImportObjCmd -- * * This procedure is invoked to process the "ssl" command * |
︙ | |||
1252 1253 1254 1255 1256 1257 1258 | 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 | - - + + - + - - + + + | *------------------------------------------------------------------- */ static int ImportObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { Tcl_Channel chan; /* The channel to set a mode on. */ State *statePtr; /* client state for ssl socket */ SSL_CTX *ctx = NULL; |
︙ | |||
1312 1313 1314 1315 1316 1317 1318 | 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 | + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - | return TCL_ERROR; } /* Make sure to operate on the topmost channel */ chan = Tcl_GetTopChannel(chan); for (idx = 2; idx < objc; idx++) { if (Tcl_GetIndexFromObj(interp, objv[idx], command_opts, "option", 0, &fn) != TCL_OK) { return TCL_ERROR; } |
︙ | |||
1384 1385 1386 1387 1388 1389 1390 | 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 | - - + + - + - - + + - + - + - + - + | statePtr->flags = flags; statePtr->interp = interp; statePtr->vflags = verify; statePtr->err = ""; /* allocate script */ |
︙ | |||
1465 1466 1467 1468 1469 1470 1471 | 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 | - + - + - + - + - + - + - - + - + - - + + - + - + + | statePtr->self = Tcl_StackChannel(interp, Tls_ChannelType(), (ClientData) statePtr, (TCL_READABLE | TCL_WRITABLE), chan); dprintf("Created channel named %s", Tcl_GetChannelName(statePtr->self)); if (statePtr->self == (Tcl_Channel) NULL) { /* * No use of Tcl_EventuallyFree because no possible Tcl_Preserve. */ |
︙ | |||
1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 | 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 | + | load_private_key = 1; if (SSL_CTX_use_certificate_ASN1(ctx, cert_len, cert) <= 0) { Tcl_AppendResult(interp, "unable to set certificate: ", GET_ERR_REASON(), (char *) NULL); SSL_CTX_free(ctx); return NULL; } } else { certfile = (char*)X509_get_default_cert_file(); if (SSL_CTX_use_certificate_file(ctx, certfile, SSL_FILETYPE_PEM) <= 0) { #if 0 Tcl_AppendResult(interp, "unable to use default certificate file ", certfile, ": ", GET_ERR_REASON(), (char *) NULL); |
︙ | |||
2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 | 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 | + | /* Get certificate for peer or self */ if (objc == 2) { peer = SSL_get_peer_certificate(statePtr->ssl); } else { peer = SSL_get_certificate(statePtr->ssl); } /* Get X509 certificate info */ if (peer) { objPtr = Tls_NewX509Obj(interp, peer); if (objc == 2) { X509_free(peer); peer = NULL; } |
︙ | |||
2294 2295 2296 2297 2298 2299 2300 | 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 | - + - - - - - + + + + + + | LAPPEND_INT(interp, objPtr, "algorithm_bits", alg_bits); /* alg_bits is actual key secret bits. If use bits and secret (algorithm) bits differ, the rest of the bits are fixed, i.e. for limited export ciphers (bits < 56) */ /* Indicates which SSL/TLS protocol version first defined the cipher */ LAPPEND_STR(interp, objPtr, "min_version", SSL_CIPHER_get_version(cipher), -1); |
︙ | |||
2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 | 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 | + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - | /* CA List */ /* IF not a server, same as SSL_get0_peer_CA_list. If server same as SSL_CTX_get_client_CA_list */ listPtr = Tcl_NewListObj(0, NULL); STACK_OF(X509_NAME) *ca_list; if ((ca_list = SSL_get_client_CA_list(ssl)) != NULL) { char buffer[BUFSIZ]; for (int i = 0; i < sk_X509_NAME_num(ca_list); i++) { X509_NAME *name = sk_X509_NAME_value(ca_list, i); if (name) { X509_NAME_oneline(name, buffer, BUFSIZ); Tcl_ListObjAppendElement(interp, listPtr, Tcl_NewStringObj(buffer, -1)); } } } LAPPEND_OBJ(interp, objPtr, "caList", listPtr); LAPPEND_INT(interp, objPtr, "caListCount", sk_X509_NAME_num(ca_list)); |
︙ | |||
2697 2698 2699 2700 2701 2702 2703 | 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 | - + | * * Side effects: * Frees all the state * *------------------------------------------------------------------- */ void |
︙ | |||
2898 2899 2900 2901 2902 2903 2904 | 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 | - + - - - + + + + + | } if (TlsLibInit(0) != TCL_OK) { Tcl_AppendResult(interp, "could not initialize SSL library", (char *) NULL); return TCL_ERROR; } |
︙ | |||
3042 3043 3044 3045 3046 3047 3048 | 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 | - + | rnd_seed[i] = 1 + (char) (255.0 * rand()/(RAND_MAX+1.0)); } RAND_seed(rnd_seed, sizeof(rnd_seed)); } while (RAND_status() != 1); #endif #if defined(OPENSSL_THREADS) && defined(TCL_THREADS) |
Added generic/tlsDigest.c version [862bda43dc].
Added generic/tlsEncrypt.c version [b7199aabc5].
Modified generic/tlsIO.c
from [f313da2f0b]
to [d6aa421d6b].
︙ | |||
149 150 151 152 153 154 155 | 149 150 151 152 153 154 155 156 157 158 159 160 161 162 | - | } else { dprintf("Calling SSL_connect()"); err = SSL_connect(statePtr->ssl); } if (err > 0) { dprintf("Accept or connect was successful"); |
︙ | |||
215 216 217 218 219 220 221 | 214 215 216 217 218 219 220 221 222 223 224 225 226 227 | - | *errorCodePtr = EINVAL; Tls_Error(statePtr, "Peer has closed the connection for writing by sending the close_notify alert"); return -1; case SSL_ERROR_SYSCALL: /* Some non-recoverable, fatal I/O error occurred */ dprintf("SSL_ERROR_SYSCALL"); |
︙ | |||
387 388 389 390 391 392 393 | 385 386 387 388 389 390 391 392 393 394 395 396 397 398 | - | Tls_Error(statePtr, "EOF reached"); } #endif break; case SSL_ERROR_SYSCALL: /* Some non-recoverable, fatal I/O error occurred */ |
︙ | |||
555 556 557 558 559 560 561 | 552 553 554 555 556 557 558 559 560 561 562 563 564 565 | - | written = 0; *errorCodePtr = 0; Tls_Error(statePtr, "Peer has closed the connection for writing by sending the close_notify alert"); break; case SSL_ERROR_SYSCALL: /* Some non-recoverable, fatal I/O error occurred */ |
︙ |
Added generic/tlsInfo.c version [28c894841a].
Modified generic/tlsInt.h
from [0918403850]
to [4bfb80acb5].
︙ | |||
38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | 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 | + + + + + + | # endif #endif /* * Backwards compatibility for size type change */ #if TCL_MAJOR_VERSION < 9 && TCL_MINOR_VERSION < 7 #include <limits.h> #define TCL_SIZE_MAX INT_MAX #ifndef Tcl_Size typedef int Tcl_Size; #endif #define TCL_SIZE_MODIFIER "" #define Tcl_GetSizeIntFromObj Tcl_GetIntFromObj #define Tcl_NewSizeIntObj Tcl_NewIntObj #define Tcl_NewSizeIntFromObj Tcl_NewWideIntObj #endif #include <openssl/ssl.h> #include <openssl/err.h> #include <openssl/rand.h> #include <openssl/opensslv.h> |
︙ | |||
182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 | 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 223 224 225 226 227 228 229 230 231 232 233 | + + + + + + - + + + + + + + + + + + + + + + + | #ifdef USE_TCL_STUBS #ifndef Tcl_StackChannel #error "Unable to compile on this version of Tcl" #endif /* Tcl_GetStackedChannel */ #endif /* USE_TCL_STUBS */ #if TCL_MAJOR_VERSION < 9 typedef char tls_free_type; #else typedef void tls_free_type; #endif /* * Forward declarations */ const Tcl_ChannelType *Tls_ChannelType(void); Tcl_Channel Tls_GetParent(State *statePtr, int maskFlags); Tcl_Obj *Tls_NewX509Obj(Tcl_Interp *interp, X509 *cert); Tcl_Obj *Tls_NewCAObj(Tcl_Interp *interp, const SSL *ssl, int peer); void Tls_Error(State *statePtr, char *msg); |
Added generic/tlsKDF.c version [ae7e0986eb].
Added generic/tlsRand.c version [72e29bdc6f].
Added generic/tlsUtil.c version [e8eabbece7].
Modified generic/tlsX509.c
from [ea8ff7e7c8]
to [051a5b0d6c].
︙ | |||
79 80 81 82 83 84 85 | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | - + | */ Tcl_Obj *Tls_x509Identifier(const ASN1_OCTET_STRING *astring) { Tcl_Obj *resultPtr = NULL; int len = 0; unsigned char buffer[1024]; if (astring != NULL) { |
︙ | |||
431 432 433 434 435 436 437 | 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 | - + - + | /* Subject identifies the entity associated with the public key stored in the subject public key field. RFC 5280 section 4.1.2.6 */ len = BIO_to_Buffer(X509_NAME_print_ex(bio, X509_get_subject_name(cert), 0, flags), bio, buffer, BUFSIZ); LAPPEND_STR(interp, certPtr, "subject", buffer, (Tcl_Size) len); /* SHA1 Digest (Fingerprint) of cert - DER representation */ if (X509_digest(cert, EVP_sha1(), md, &ulen)) { |
︙ | |||
477 478 479 480 481 482 483 | 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 | - + - + | LAPPEND_STR(interp, certPtr, "purpose", Tls_x509Purpose(cert), -1); LAPPEND_OBJ(interp, certPtr, "certificatePurpose", Tls_x509Purposes(interp, cert)); /* Get extensions flags */ xflags = X509_get_extension_flags(cert); LAPPEND_INT(interp, certPtr, "extFlags", xflags); |
︙ | |||
513 514 515 516 517 518 519 | 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 | - + | LAPPEND_INT(interp, certPtr, "extCount", X509_get_ext_count(cert)); LAPPEND_OBJ(interp, certPtr, "extensions", Tls_x509Extensions(interp, cert)); /* Authority Key Identifier (AKI) is the Subject Key Identifier (SKI) of its signer (the CA). RFC 5280 section 4.2.1.1, NID_authority_key_identifier */ LAPPEND_OBJ(interp, certPtr, "authorityKeyIdentifier", Tls_x509Identifier(X509_get0_authority_key_id(cert))); |
︙ | |||
587 588 589 590 591 592 593 | 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 | - + | /* Certificate Alias. If uses a PKCS#12 structure, alias will reflect the friendlyName attribute (RFC 2985). */ { len = 0; unsigned char *string = X509_alias_get0(cert, &len); LAPPEND_STR(interp, certPtr, "alias", (char *) string, (Tcl_Size) len); |
︙ |
Modified tests/badssl.csv
from [f294744529]
to [7b5b675a52].
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 | + + + + + + - + + + + + + + + + + + + + + | # Group,Name,Constraints,Setup,Body,Cleanup,Match,Result,Output,Error Output,Return Codes command,package require tls,,,,,,,,, ,,,,,,,,,, command,# Constraints,,,,,,,,, command,source [file join [file dirname [info script]] common.tcl],,,,,,,,, ,,,,,,,,,, command,# Helper functions,,,,,,,,, command,"proc badssl {url} { set port 443 lassign [split $url "":""] url port if {$port eq """"} { set port 443 } |
︙ |
Modified tests/badssl.test
from [0bf5ddad0c]
to [e09b8a9787].
︙ | |||
10 11 12 13 14 15 16 | 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 | + + + + + + - + + + + + + + + + + + + + + | package require tls # Constraints source [file join [file dirname [info script]] common.tcl] # Helper functions proc badssl {url} { set port 443 lassign [split $url ":"] url port if {$port eq ""} { set port 443 } |
︙ |
Deleted tests/ciphers.csv version [30d3c81b12].
Deleted tests/ciphers.test version [dc4d964ab4].
Modified tests/common.tcl
from [95c47b8587]
to [3f4b3346c0].
︙ | |||
17 18 19 20 21 22 23 | 17 18 19 20 21 22 23 24 25 26 27 28 | + + + + + | # OpenSSL version ::tcltest::testConstraint OpenSSL [string match "OpenSSL*" [::tls::version]] # Legacy OpenSSL v1.1.1 vs new v3.x scan [lindex [split [::tls::version]] 1] %f version ::tcltest::testConstraint new_api [expr {$version >= 3.0}] ::tcltest::testConstraint old_api [expr {$version < 3.0}] # Load legacy provider if {$version >= 3.0} { tls::provider legacy } |
Added tests/digest.csv version [62013deed8].
Added tests/digest.test version [e9e6e071d9].
Added tests/encrypt.csv version [d5071e261f].
Added tests/encrypt.test version [0f4562d9a7].
Added tests/info.csv version [dacbd09ea3].
Added tests/info.test version [609f78c567].
Added tests/kdf.csv version [ecd5209032].
Added tests/kdf.test version [e9cb54f939].
Modified tests/make_test_files.tcl
from [862f168c9a]
to [17625961d8].
︙ | |||
70 71 72 73 74 75 76 77 78 79 80 81 82 83 | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 | + | # Open file with test case indo set in [open $filename r] array set cases [list] # Open output test file set out [open [format %s.test [file rootname $filename]] w] fconfigure $out -encoding utf-8 -translation {auto lf} array set cases [list] # Add setup commands to test file puts $out [format "# Auto generated test cases for %s" [file tail $filename]] #puts $out [format "# Auto generated test cases for %s created on %s" [file tail $filename] [clock format [clock seconds]]] # Package requires |
︙ |
Added tests/random.csv version [354daf498a].
Added tests/random.test version [13cb064c8c].
Added tests/test_vectors/Hash/BLAKE2b512.test version [878053b68e].
Added tests/test_vectors/Hash/BLAKE2b512.txt version [d3c92f5aad].
Added tests/test_vectors/Hash/BLAKE2s256.test version [4b48cf365e].
Added tests/test_vectors/Hash/BLAKE2s256.txt version [e3f8f87e87].
Added tests/test_vectors/Hash/MD2.test version [7aa85ed2f2].
Added tests/test_vectors/Hash/MD2.txt version [72dbd4087b].
Added tests/test_vectors/Hash/MD4.test version [de02bac398].
Added tests/test_vectors/Hash/MD4.txt version [e0a9e8ce64].
Added tests/test_vectors/Hash/MD5.test version [02d5c9878c].
Added tests/test_vectors/Hash/MD5.txt version [1f89db3968].
Added tests/test_vectors/Hash/MDC2.test version [a104d54869].
Added tests/test_vectors/Hash/MDC2.txt version [c90b9728d3].
Added tests/test_vectors/Hash/RIPEMD128.test version [537f06a40f].
Added tests/test_vectors/Hash/RIPEMD128.txt version [8200be1de0].
Added tests/test_vectors/Hash/RIPEMD160.test version [270ed19e2a].
Added tests/test_vectors/Hash/RIPEMD160.txt version [822adc817c].
Added tests/test_vectors/Hash/RIPEMD256.test version [5c641c09c2].
Added tests/test_vectors/Hash/RIPEMD256.txt version [df8dae9590].
Added tests/test_vectors/Hash/RIPEMD320.test version [317a9f765a].
Added tests/test_vectors/Hash/RIPEMD320.txt version [c4941d7c67].
Added tests/test_vectors/Hash/Readme.txt version [6c4218a069].
Added tests/test_vectors/Hash/SHA1.test version [b788694073].
Added tests/test_vectors/Hash/SHA1.txt version [5945652b07].
Added tests/test_vectors/Hash/SHA1LongMsg.rsp version [dbdb8addfb].
Added tests/test_vectors/Hash/SHA1LongMsg.test version [aa0f0dbbbe].
Added tests/test_vectors/Hash/SHA1ShortMsg.rsp version [ed95dce9c8].
Added tests/test_vectors/Hash/SHA1ShortMsg.test version [c53c8d2ca7].
Added tests/test_vectors/Hash/SHA224.test version [fe91ce1b6d].
Added tests/test_vectors/Hash/SHA224.txt version [8994f85662].
Added tests/test_vectors/Hash/SHA224LongMsg.rsp version [7da7ea8843].
Added tests/test_vectors/Hash/SHA224LongMsg.test version [6716118175].
Added tests/test_vectors/Hash/SHA224ShortMsg.rsp version [81d8b1b6a9].
Added tests/test_vectors/Hash/SHA224ShortMsg.test version [75e4fa0158].
Added tests/test_vectors/Hash/SHA256.test version [ebd0ad0c96].
Added tests/test_vectors/Hash/SHA256.txt version [848f077d7a].
Added tests/test_vectors/Hash/SHA256LongMsg.rsp version [9a9ff814db].
Added tests/test_vectors/Hash/SHA256LongMsg.test version [760719818f].
Added tests/test_vectors/Hash/SHA256ShortMsg.rsp version [cc5e6df184].
Added tests/test_vectors/Hash/SHA256ShortMsg.test version [c21ec20562].
Added tests/test_vectors/Hash/SHA3-224.test version [9fc3e3754f].
Added tests/test_vectors/Hash/SHA3-224.txt version [0a9192723b].
Added tests/test_vectors/Hash/SHA3-256.test version [f3a4dd335c].
Added tests/test_vectors/Hash/SHA3-256.txt version [48114e564c].
Added tests/test_vectors/Hash/SHA3-384.test version [6b46875f9b].
Added tests/test_vectors/Hash/SHA3-384.txt version [37fb9bedac].
Added tests/test_vectors/Hash/SHA3-512.test version [6da8f64028].
Added tests/test_vectors/Hash/SHA3-512.txt version [abf73210ae].
Added tests/test_vectors/Hash/SHA384.test version [e30ff48b23].
Added tests/test_vectors/Hash/SHA384.txt version [a59fdbd28c].
Added tests/test_vectors/Hash/SHA384LongMsg.rsp version [68bddc79c6].
Added tests/test_vectors/Hash/SHA384LongMsg.test version [d649a9d8c0].
Added tests/test_vectors/Hash/SHA384ShortMsg.rsp version [20b46919ed].
Added tests/test_vectors/Hash/SHA384ShortMsg.test version [af2f570629].
Added tests/test_vectors/Hash/SHA3_224LongMsg.rsp version [168d15a8b0].
Added tests/test_vectors/Hash/SHA3_224LongMsg.test version [9b8c6ad752].
Added tests/test_vectors/Hash/SHA3_224ShortMsg.rsp version [953ebf8b62].
Added tests/test_vectors/Hash/SHA3_224ShortMsg.test version [3a294388e3].
Added tests/test_vectors/Hash/SHA3_256LongMsg.rsp version [e4cdbd523e].
Added tests/test_vectors/Hash/SHA3_256LongMsg.test version [a51e956734].
Added tests/test_vectors/Hash/SHA3_256ShortMsg.rsp version [c3416d5f3b].
Added tests/test_vectors/Hash/SHA3_256ShortMsg.test version [f903bbd26a].
Added tests/test_vectors/Hash/SHA3_384LongMsg.rsp version [f10abc91a6].
Added tests/test_vectors/Hash/SHA3_384LongMsg.test version [770b8b5386].
Added tests/test_vectors/Hash/SHA3_384ShortMsg.rsp version [a36843bb9b].
Added tests/test_vectors/Hash/SHA3_384ShortMsg.test version [5c1fe28c3a].
Added tests/test_vectors/Hash/SHA3_512LongMsg.rsp version [0bbf186754].
Added tests/test_vectors/Hash/SHA3_512LongMsg.test version [9df6f986a6].
Added tests/test_vectors/Hash/SHA3_512ShortMsg.rsp version [704cd930ab].
Added tests/test_vectors/Hash/SHA3_512ShortMsg.test version [73cf5b5e94].
Added tests/test_vectors/Hash/SHA512-224.test version [8ff47a0a0e].
Added tests/test_vectors/Hash/SHA512-224.txt version [2c6688a4b5].
Added tests/test_vectors/Hash/SHA512-256.test version [87ec5e51fc].
Added tests/test_vectors/Hash/SHA512-256.txt version [8c9d8ea3f3].
Added tests/test_vectors/Hash/SHA512.test version [26e7224bc7].
Added tests/test_vectors/Hash/SHA512.txt version [6130019457].
Added tests/test_vectors/Hash/SHA512LongMsg.rsp version [7b0b7120f4].
Added tests/test_vectors/Hash/SHA512LongMsg.test version [cbaa50c9b9].
Added tests/test_vectors/Hash/SHA512ShortMsg.rsp version [9ea217fd07].
Added tests/test_vectors/Hash/SHA512ShortMsg.test version [3059eaebf0].
Added tests/test_vectors/Hash/SHA512_224LongMsg.rsp version [e09f1924d5].
Added tests/test_vectors/Hash/SHA512_224LongMsg.test version [604ca506ef].
Added tests/test_vectors/Hash/SHA512_224ShortMsg.rsp version [bfcfe7aae4].
Added tests/test_vectors/Hash/SHA512_224ShortMsg.test version [e55e8f47d1].
Added tests/test_vectors/Hash/SHA512_256LongMsg.rsp version [0c7527584a].
Added tests/test_vectors/Hash/SHA512_256LongMsg.test version [c707997f0b].
Added tests/test_vectors/Hash/SHA512_256ShortMsg.rsp version [99d45606e7].
Added tests/test_vectors/Hash/SHA512_256ShortMsg.test version [415d0b45a5].
Added tests/test_vectors/Hash/SHAKE128.test version [1d727205ad].
Added tests/test_vectors/Hash/SHAKE128.txt version [42be99e84a].
Added tests/test_vectors/Hash/SHAKE128LongMsg.rsp version [3e240fc1bf].
Added tests/test_vectors/Hash/SHAKE128LongMsg.test version [44fabe5596].
Added tests/test_vectors/Hash/SHAKE128ShortMsg.rsp version [353efe20e1].
Added tests/test_vectors/Hash/SHAKE128ShortMsg.test version [226145f845].
Added tests/test_vectors/Hash/SHAKE128VariableOut.rsp version [daf50013d2].
Added tests/test_vectors/Hash/SHAKE256.test version [211c0f99b9].
Added tests/test_vectors/Hash/SHAKE256.txt version [dc5cbee49c].
Added tests/test_vectors/Hash/SHAKE256LongMsg.rsp version [8cca1f96ad].
Added tests/test_vectors/Hash/SHAKE256LongMsg.test version [2df811874e].
Added tests/test_vectors/Hash/SHAKE256ShortMsg.rsp version [72834c5f7f].
Added tests/test_vectors/Hash/SHAKE256ShortMsg.test version [2229c179b0].
Added tests/test_vectors/Hash/SHAKE256VariableOut.rsp version [8811fe0aa0].
Added tests/test_vectors/Hash/SM3.test version [c919bfff86].
Added tests/test_vectors/Hash/SM3.txt version [79643d2e88].
Added tests/test_vectors/Hash/WHIRLPOOL.test version [085626bf56].
Added tests/test_vectors/Hash/WHIRLPOOL.txt version [11ce31a497].
Added tests/test_vectors/Hash/all.tcl version [66316a28dd].
Added tests/test_vectors/Hash/make_test.tcl version [e069950966].
Added tests/test_vectors/KDF/HKDF-SHA1.test version [0f24bd78b2].
Added tests/test_vectors/KDF/HKDF-SHA1.txt version [091164e5bd].
Added tests/test_vectors/KDF/HKDF-SHA224.test version [dab2af44bf].
Added tests/test_vectors/KDF/HKDF-SHA224.txt version [e1709aae8b].
Added tests/test_vectors/KDF/HKDF-SHA256.test version [252b5b0c05].
Added tests/test_vectors/KDF/HKDF-SHA256.txt version [df67ce3539].
Added tests/test_vectors/KDF/HKDF-SHA384.test version [49565c7872].
Added tests/test_vectors/KDF/HKDF-SHA384.txt version [cb2eac62b3].
Added tests/test_vectors/KDF/HKDF-SHA512.test version [5ccc31e9c4].
Added tests/test_vectors/KDF/HKDF-SHA512.txt version [3b3b416e62].
Added tests/test_vectors/KDF/PBKDF2-SHA1.test version [b929ed5d95].
Added tests/test_vectors/KDF/PBKDF2-SHA1.txt version [732437c2e8].
Added tests/test_vectors/KDF/PBKDF2-SHA224.test version [d25ac1a05b].
Added tests/test_vectors/KDF/PBKDF2-SHA224.txt version [f5f610fe64].
Added tests/test_vectors/KDF/PBKDF2-SHA256.test version [34e71146bc].
Added tests/test_vectors/KDF/PBKDF2-SHA256.txt version [ecc15b287a].
Added tests/test_vectors/KDF/PBKDF2-SHA384.test version [4b8ba99f25].
Added tests/test_vectors/KDF/PBKDF2-SHA384.txt version [57fec8e1a5].
Added tests/test_vectors/KDF/PBKDF2-SHA512.test version [f8af04f1ce].
Added tests/test_vectors/KDF/PBKDF2-SHA512.txt version [35b0e900f6].
Added tests/test_vectors/KDF/Scrypt.test version [d620205d39].
Added tests/test_vectors/KDF/Scrypt.txt version [fcdaf5e551].
Added tests/test_vectors/KDF/all.tcl version [66316a28dd].
Added tests/test_vectors/KDF/make_test.tcl version [81cc8928e5].
Added tests/test_vectors/MAC/CMAC-AES-128-CBC.test version [d14d6c41f8].
Added tests/test_vectors/MAC/CMAC-AES-128-CBC.txt version [e79fc9b070].
Added tests/test_vectors/MAC/CMAC-AES-192-CBC.test version [c76103756c].
Added tests/test_vectors/MAC/CMAC-AES-192-CBC.txt version [1327ebd19f].
Added tests/test_vectors/MAC/CMAC-AES-256-CBC.test version [6e63940e52].
Added tests/test_vectors/MAC/CMAC-AES-256-CBC.txt version [37559b28d2].
Added tests/test_vectors/MAC/CMAC-DES3.test version [b9e7e07b9a].
Added tests/test_vectors/MAC/CMAC-DES3.txt version [7b40c26c2f].
Added tests/test_vectors/MAC/HMAC.rsp version [23d90fe189].
Added tests/test_vectors/MAC/HMAC.test version [c9b77bcdaf].
Added tests/test_vectors/MAC/HMAC_MD5.test version [fc01310160].
Added tests/test_vectors/MAC/HMAC_MD5.txt version [28320e2e15].
Added tests/test_vectors/MAC/HMAC_RIPEMD128.test version [9121025e8e].
Added tests/test_vectors/MAC/HMAC_RIPEMD128.txt version [3e487cc771].
Added tests/test_vectors/MAC/HMAC_RIPEMD160.test version [35aae3b57b].
Added tests/test_vectors/MAC/HMAC_RIPEMD160.txt version [bb21e99891].
Added tests/test_vectors/MAC/HMAC_SHA1.test version [48dc8e00f7].
Added tests/test_vectors/MAC/HMAC_SHA1.txt version [bbeb4deaa9].
Added tests/test_vectors/MAC/HMAC_SHA224.test version [b00e1522a7].
Added tests/test_vectors/MAC/HMAC_SHA224.txt version [55c849f12e].
Added tests/test_vectors/MAC/HMAC_SHA256.test version [cb978a5d93].
Added tests/test_vectors/MAC/HMAC_SHA256.txt version [32c296d1a9].
Added tests/test_vectors/MAC/HMAC_SHA3-224.test version [a320826719].
Added tests/test_vectors/MAC/HMAC_SHA3-224.txt version [7733ead9c2].
Added tests/test_vectors/MAC/HMAC_SHA3-256.test version [93592f1dcc].
Added tests/test_vectors/MAC/HMAC_SHA3-256.txt version [c17f79ca22].
Added tests/test_vectors/MAC/HMAC_SHA3-384.test version [3b78c7f734].
Added tests/test_vectors/MAC/HMAC_SHA3-384.txt version [8df953a228].
Added tests/test_vectors/MAC/HMAC_SHA3-512.test version [9537fd8299].
Added tests/test_vectors/MAC/HMAC_SHA3-512.txt version [a1ac4ceeaf].
Added tests/test_vectors/MAC/HMAC_SHA384.test version [97f8b6bb77].
Added tests/test_vectors/MAC/HMAC_SHA384.txt version [28134b68af].
Added tests/test_vectors/MAC/HMAC_SHA512.test version [c035b2c1e6].
Added tests/test_vectors/MAC/HMAC_SHA512.txt version [ffd58ca5b8].
Added tests/test_vectors/MAC/all.tcl version [66316a28dd].
Added tests/test_vectors/MAC/make_test.tcl version [37d1b71b39].
Added tests/test_vectors/Symetric_Block/AES-128-CBC.txt version [c16c5601b6].
Added tests/test_vectors/Symetric_Block/AES-128-CFB.txt version [e8d8dc89e5].
Added tests/test_vectors/Symetric_Block/AES-128-CFB1.txt version [c6b51ac3c8].
Added tests/test_vectors/Symetric_Block/AES-128-CFB8.txt version [79d14825dd].
Added tests/test_vectors/Symetric_Block/AES-128-CTR.txt version [6faf93c35c].
Added tests/test_vectors/Symetric_Block/AES-128-ECB.txt version [e91e6ed844].
Added tests/test_vectors/Symetric_Block/AES-128-OFB.txt version [155de03b8e].
Added tests/test_vectors/Symetric_Block/AES-192-CBC.txt version [b812b68b63].
Added tests/test_vectors/Symetric_Block/AES-192-CFB.txt version [1acbbc1c0b].
Added tests/test_vectors/Symetric_Block/AES-192-CFB1.txt version [9d68d61eee].
Added tests/test_vectors/Symetric_Block/AES-192-CFB8.txt version [9840d50b6f].
Added tests/test_vectors/Symetric_Block/AES-192-CTR.txt version [a5daed1d1f].
Added tests/test_vectors/Symetric_Block/AES-192-ECB.txt version [b00a66e38d].
Added tests/test_vectors/Symetric_Block/AES-192-OFB.txt version [2d880cf856].
Added tests/test_vectors/Symetric_Block/AES-256-CBC.txt version [c9adf3749a].
Added tests/test_vectors/Symetric_Block/AES-256-CFB.txt version [69b28de263].
Added tests/test_vectors/Symetric_Block/AES-256-CFB1.txt version [07f4ee353b].
Added tests/test_vectors/Symetric_Block/AES-256-CFB8.txt version [adb3e7889a].
Added tests/test_vectors/Symetric_Block/AES-256-CTR.txt version [99fea23f29].
Added tests/test_vectors/Symetric_Block/AES-256-ECB.txt version [c13cbab895].
Added tests/test_vectors/Symetric_Block/AES-256-OFB.txt version [9d110b4297].
Added tests/test_vectors/Symetric_Block/all.tcl version [66316a28dd].
Modified win/makefile.vc
from [40f325b18a]
to [39aef5d241].
︙ | |||
23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | + + + + + + | # Define the object files and resource file that make up the extension. # Note the resource file does not makes sense if doing a static library build # hence it is under that condition. TMP_DIR is the output directory # defined by rules for object files. PRJ_OBJS = $(TMP_DIR)\tls.obj \ $(TMP_DIR)\tlsBIO.obj \ $(TMP_DIR)\tlsDigest.obj \ $(TMP_DIR)\tlsEncrypt.obj \ $(TMP_DIR)\tlsInfo.obj \ $(TMP_DIR)\tlsIO.obj \ $(TMP_DIR)\tlsKDF.obj \ $(TMP_DIR)\tlsRand.obj \ $(TMP_DIR)\tlsUtil.obj \ $(TMP_DIR)\tlsX509.obj # Define any additional project include flags # SSL_INSTALL_FOLDER = with the OpenSSL installation folder following. PRJ_INCLUDES = -I"$(SSL_INSTALL_FOLDER)\include" -I"$(OPENSSL_INSTALL_DIR)\include" # Define any additional compiler flags that might be required for the project |
︙ |