Index: ChangeLog ================================================================== --- ChangeLog +++ ChangeLog @@ -1,5 +1,12 @@ +TclTLS 1.7.22 +========== + +Release Date: Mon Oct 12 15:40:16 CDT 2020 + +https://tcltls.rkeene.org/ + 2015-05-01 Andreas Kupries * configure.in: Bump to version 1.6.5. * win/makefile.vc: * configure: regen with ac-2.59 Index: generic/tlsInt.h ================================================================== --- generic/tlsInt.h +++ generic/tlsInt.h @@ -35,10 +35,11 @@ # define CONST86 const # else # define CONST86 # endif #endif + /* * Backwards compatibility for size type change */ #if TCL_MAJOR_VERSION < 9 && TCL_MINOR_VERSION < 7 #include ADDED tests/test_vectors/Symetric_Block/AES-128-CBC.txt Index: tests/test_vectors/Symetric_Block/AES-128-CBC.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-128-CBC.txt @@ -0,0 +1,12 @@ +# AES-128-CBC +# From NIST SP_800-38A Appendix F.2 + + +# CBC-AES128.Encrypt and CBC-AES128.Decrypt +Klen = 16 +Ilen = 16 +Len = 64 +Key = 2b7e151628aed2a6abf7158809cf4f3c +IV = 000102030405060708090a0b0c0d0e0f +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 +Ciphertext = 7649abac8119b246cee98e9b12e9197d5086cb9b507219ee95db113a917678b273bed6b8e3c1743b7116e69e222295163ff1caa1681fac09120eca307586e1a7 ADDED tests/test_vectors/Symetric_Block/AES-128-CFB.txt Index: tests/test_vectors/Symetric_Block/AES-128-CFB.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-128-CFB.txt @@ -0,0 +1,12 @@ +# AES-128-CFB128 +# From NIST SP_800-38A Appendix F.3 + + +# CFB128-AES128.Encrypt and CFB128-AES128.Decrypt +Klen = 16 +Ilen = 16 +Len = 64 +Key = 2b7e151628aed2a6abf7158809cf4f3c +IV = 000102030405060708090a0b0c0d0e0f +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 +Ciphertext = 3b3fd92eb72dad20333449f8e83cfb4ac8a64537a0b3a93fcde3cdad9f1ce58b26751f67a3cbb140b1808cf187a4f4dfc04b05357c5d1c0eeac4c66f9ff7f2e6 ADDED tests/test_vectors/Symetric_Block/AES-128-CFB1.txt Index: tests/test_vectors/Symetric_Block/AES-128-CFB1.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-128-CFB1.txt @@ -0,0 +1,14 @@ +# AES-128-CFB1 +# From NIST SP_800-38A Appendix F.3 + + +# CFB1-AES128.Encrypt and CFB1-AES128.Decrypt +Klen = 16 +Ilen = 16 +Len = 2 +Key = 2b7e151628aed2a6abf7158809cf4f3c +IV = 000102030405060708090a0b0c0d0e0f +# b:0110101111000001 +Plaintext = 6bc1 +# b:0110100010110011 +Ciphertext = 68b3 ADDED tests/test_vectors/Symetric_Block/AES-128-CFB8.txt Index: tests/test_vectors/Symetric_Block/AES-128-CFB8.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-128-CFB8.txt @@ -0,0 +1,12 @@ +# AES-128-CFB8 +# From NIST SP_800-38A Appendix F.3 + + +# CFB8-AES128.Encrypt and CFB8-AES128.Decrypt +Klen = 16 +Ilen = 16 +Len = 18 +Key = 2b7e151628aed2a6abf7158809cf4f3c +IV = 000102030405060708090a0b0c0d0e0f +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d +Ciphertext = 3b79424c9c0dd436bace9e0ed4586a4f32b9 ADDED tests/test_vectors/Symetric_Block/AES-128-CTR.txt Index: tests/test_vectors/Symetric_Block/AES-128-CTR.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-128-CTR.txt @@ -0,0 +1,12 @@ +# AES-128-CTR +# From NIST SP_800-38A Appendix F.4 + + +# CTR-AES128.Encrypt and CTR-AES128.Decrypt +Klen = 16 +Ilen = 16 +Len = 64 +Key = 2b7e151628aed2a6abf7158809cf4f3c +IV = f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 +Ciphertext = 874d6191b620e3261bef6864990db6ce9806f66b7970fdff8617187bb9fffdff5ae4df3edbd5d35e5b4f09020db03eab1e031dda2fbe03d1792170a0f3009cee ADDED tests/test_vectors/Symetric_Block/AES-128-ECB.txt Index: tests/test_vectors/Symetric_Block/AES-128-ECB.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-128-ECB.txt @@ -0,0 +1,10 @@ +# AES-128-ECB +# From NIST SP_800-38A Appendix F.1 + + +# ECB-AES128.Encrypt and ECB-AES128.Decrypt +Klen = 16 +Len = 64 +Key = 2b7e151628aed2a6abf7158809cf4f3c +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 +Ciphertext = 3ad77bb40d7a3660a89ecaf32466ef97f5d3d58503b9699de785895a96fdbaaf43b1cd7f598ece23881b00e3ed0306887b0c785e27e8ad3f8223207104725dd4 ADDED tests/test_vectors/Symetric_Block/AES-128-OFB.txt Index: tests/test_vectors/Symetric_Block/AES-128-OFB.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-128-OFB.txt @@ -0,0 +1,12 @@ +# AES-128-OFB128 +# From NIST SP_800-38A Appendix F.4 + + +# OFB128-AES128.Encrypt and OFB128-AES128.Decrypt +Klen = 16 +Ilen = 16 +Len = 64 +Key = 2b7e151628aed2a6abf7158809cf4f3c +IV = 000102030405060708090a0b0c0d0e0f +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 +Ciphertext = 3b3fd92eb72dad20333449f8e83cfb4a7789508d16918f03f53c52dac54ed8259740051e9c5fecf64344f7a82260edcc304c6528f659c77866a510d9c1d6ae5e ADDED tests/test_vectors/Symetric_Block/AES-192-CBC.txt Index: tests/test_vectors/Symetric_Block/AES-192-CBC.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-192-CBC.txt @@ -0,0 +1,12 @@ +# AES-192-CBC +# From NIST SP_800-38A Appendix F.2 + + +# CBC-AES192.Encrypt and CBC-AES192.Decrypt +Klen = 24 +Ilen = 16 +Len = 64 +Key = 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b +IV = 000102030405060708090a0b0c0d0e0f +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 +Ciphertext = 4f021db243bc633d7178183a9fa071e8b4d9ada9ad7dedf4e5e738763f69145a571b242012fb7ae07fa9baac3df102e008b0e27988598881d920a9e64f5615cd ADDED tests/test_vectors/Symetric_Block/AES-192-CFB.txt Index: tests/test_vectors/Symetric_Block/AES-192-CFB.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-192-CFB.txt @@ -0,0 +1,12 @@ +# AES-192-CFB128 +# From NIST SP_800-38A Appendix F.3 + + +# CFB128-AES192.Encrypt and CFB128-AES192.Decrypt +Klen = 24 +Ilen = 16 +Len = 64 +Key = 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b +IV = 000102030405060708090a0b0c0d0e0f +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 +Ciphertext = cdc80d6fddf18cab34c25909c99a417467ce7f7f81173621961a2b70171d3d7a2e1e8a1dd59b88b1c8e60fed1efac4c9c05f9f9ca9834fa042ae8fba584b09ff ADDED tests/test_vectors/Symetric_Block/AES-192-CFB1.txt Index: tests/test_vectors/Symetric_Block/AES-192-CFB1.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-192-CFB1.txt @@ -0,0 +1,14 @@ +# AES-192-CFB1 +# From NIST SP_800-38A Appendix F.3 + + +# CFB1-AES192.Encrypt and CFB1-AES192.Decrypt +Klen = 24 +Ilen = 16 +Len = 2 +Key = 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b +IV = 000102030405060708090a0b0c0d0e0f +# b:0110101111000001 +Plaintext = 6bc1 +# b:1001001101011001 +Ciphertext = 9359 ADDED tests/test_vectors/Symetric_Block/AES-192-CFB8.txt Index: tests/test_vectors/Symetric_Block/AES-192-CFB8.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-192-CFB8.txt @@ -0,0 +1,12 @@ +# AES-192-CFB8 +# From NIST SP_800-38A Appendix F.3 + + +# CFB8-AES192.Encrypt and CFB8-AES192.Decrypt +Klen = 24 +Ilen = 16 +Len = 18 +Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B +IV = 000102030405060708090a0b0c0d0e0f +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d +Ciphertext = cda2521ef0a905ca44cd057cbf0d47a0678a ADDED tests/test_vectors/Symetric_Block/AES-192-CTR.txt Index: tests/test_vectors/Symetric_Block/AES-192-CTR.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-192-CTR.txt @@ -0,0 +1,12 @@ +# AES-192-CTR +# From NIST SP_800-38A Appendix F.4 + + +# CTR-AES192.Encrypt and CTR-AES192.Decrypt +Klen = 24 +Ilen = 16 +Len = 64 +Key = 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b +IV = f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 +Ciphertext = 1abc932417521ca24f2b0459fe7e6e0b090339ec0aa6faefd5ccc2c6f4ce8e941e36b26bd1ebc670d1bd1d665620abf74f78a7f6d29809585a97daec58c6b050 ADDED tests/test_vectors/Symetric_Block/AES-192-ECB.txt Index: tests/test_vectors/Symetric_Block/AES-192-ECB.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-192-ECB.txt @@ -0,0 +1,10 @@ +# AES-192-ECB +# From NIST SP_800-38A Appendix F.1 + + +# ECB-AES192.Encrypt and ECB-AES192.Decrypt +Klen = 24 +Len = 64 +Key = 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 +Ciphertext = bd334f1d6e45f25ff712a214571fa5cc974104846d0ad3ad7734ecb3ecee4eefef7afd2270e2e60adce0ba2face6444e9a4b41ba738d6c72fb16691603c18e0e ADDED tests/test_vectors/Symetric_Block/AES-192-OFB.txt Index: tests/test_vectors/Symetric_Block/AES-192-OFB.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-192-OFB.txt @@ -0,0 +1,12 @@ +# AES-192-OFB128 +# From NIST SP_800-38A Appendix F.4 + + +# OFB128-AES192.Encrypt and OFB128-AES192.Decrypt +Klen = 24 +Ilen = 16 +Len = 64 +Key = 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b +IV = 000102030405060708090a0b0c0d0e0f +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 +Ciphertext = cdc80d6fddf18cab34c25909c99a4174fcc28b8d4c63837c09e81700c11004018d9a9aeac0f6596f559c6d4daf59a5f26d9f200857ca6c3e9cac524bd9acc92a ADDED tests/test_vectors/Symetric_Block/AES-256-CBC.txt Index: tests/test_vectors/Symetric_Block/AES-256-CBC.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-256-CBC.txt @@ -0,0 +1,12 @@ +# AES-256-CBC +# From NIST SP_800-38A Appendix F.2 + + +# CBC-AES256.Encrypt and CBC-AES256.Decrypt +Klen = 32 +Ilen = 16 +Len = 64 +Key = 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4 +IV = 000102030405060708090a0b0c0d0e0f +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 +Ciphertext = f58c4c04d6e5f1ba779eabfb5f7bfbd69cfc4e967edb808d679f777bc6702c7d39f23369a9d9bacfa530e26304231461b2eb05e2c39be9fcda6c19078c6a9d1b ADDED tests/test_vectors/Symetric_Block/AES-256-CFB.txt Index: tests/test_vectors/Symetric_Block/AES-256-CFB.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-256-CFB.txt @@ -0,0 +1,12 @@ +# AES-256-CFB128 +# From NIST SP_800-38A Appendix F.3 + + +# CFB128-AES256.Encrypt and CFB128-AES256.Decrypt +Klen = 32 +Ilen = 16 +Len = 64 +Key = 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4 +IV = 000102030405060708090a0b0c0d0e0f +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 +Ciphertext = dc7e84bfda79164b7ecd8486985d386039ffed143b28b1c832113c6331e5407bdf10132415e54b92a13ed0a8267ae2f975a385741ab9cef82031623d55b1e471 ADDED tests/test_vectors/Symetric_Block/AES-256-CFB1.txt Index: tests/test_vectors/Symetric_Block/AES-256-CFB1.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-256-CFB1.txt @@ -0,0 +1,14 @@ +# AES-256-CFB1 +# From NIST SP_800-38A Appendix F.3 + + +# CFB1-AES256.Encrypt and CFB1-AES256.Decrypt +Klen = 32 +Ilen = 16 +Len = 2 +Key = 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4 +IV = 000102030405060708090a0b0c0d0e0f +# b:0110101111000001 +Plaintext = 6bc1 +# b:1001000000101001 +Ciphertext = 9029 ADDED tests/test_vectors/Symetric_Block/AES-256-CFB8.txt Index: tests/test_vectors/Symetric_Block/AES-256-CFB8.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-256-CFB8.txt @@ -0,0 +1,12 @@ +# AES-256-CFB8 +# From NIST SP_800-38A Appendix F.3 + + +# CFB8-AES256.Encrypt and CFB8-AES256.Decrypt +Klen = 32 +Ilen = 16 +Len = 18 +Key = 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4 +IV = 000102030405060708090a0b0c0d0e0f +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d +Ciphertext = dc1f1a8520a64db55fcc8ac554844e889700 ADDED tests/test_vectors/Symetric_Block/AES-256-CTR.txt Index: tests/test_vectors/Symetric_Block/AES-256-CTR.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-256-CTR.txt @@ -0,0 +1,12 @@ +# AES-256-CTR +# From NIST SP_800-38A Appendix F.4 + + +# CTR-AES256.Encrypt and CTR-AES256.Decrypt +Klen = 32 +Ilen = 16 +Len = 64 +Key = 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4 +IV = f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 +Ciphertext = 601ec313775789a5b7a7f504bbf3d228f443e3ca4d62b59aca84e990cacaf5c52b0930daa23de94ce87017ba2d84988ddfc9c58db67aada613c2dd08457941a6 ADDED tests/test_vectors/Symetric_Block/AES-256-ECB.txt Index: tests/test_vectors/Symetric_Block/AES-256-ECB.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-256-ECB.txt @@ -0,0 +1,10 @@ +# AES-256-ECB +# From NIST SP_800-38A Appendix F.1 + + +# ECB-AES256.Encrypt and ECB-AES256.Decrypt +Klen = 32 +Len = 64 +Key = 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4 +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 +Ciphertext = f3eed1bdb5d2a03c064b5a7e3db181f8591ccb10d410ed26dc5ba74a31362870b6ed21b99ca6f4f9f153e7b1beafed1d23304b7a39f9f3ff067d8d8f9e24ecc7 ADDED tests/test_vectors/Symetric_Block/AES-256-OFB.txt Index: tests/test_vectors/Symetric_Block/AES-256-OFB.txt ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/AES-256-OFB.txt @@ -0,0 +1,12 @@ +# AES-256-OFB128 +# From NIST SP_800-38A Appendix F.4 + + +# OFB128-AES256.Encrypt and OFB128-AES256.Decrypt +Klen = 32 +Ilen = 16 +Len = 64 +Key = 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4 +IV = 000102030405060708090a0b0c0d0e0f +Plaintext = 6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710 +Ciphertext = dc7e84bfda79164b7ecd8486985d38604febdc6740d20b3ac88f6ad82a4fb08d71ab47a086e86eedf39d1c5bba97c4080126141d67f37be8538f5a8be740e484 ADDED tests/test_vectors/Symetric_Block/all.tcl Index: tests/test_vectors/Symetric_Block/all.tcl ================================================================== --- /dev/null +++ tests/test_vectors/Symetric_Block/all.tcl @@ -0,0 +1,44 @@ +# 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 $ + +if {[lsearch [namespace children] ::tcltest] == -1} { + package require tcltest + namespace import ::tcltest::* +} + +set ::tcltest::testSingleFile false +set ::tcltest::testsDirectory [file dir [info script]] + +# We should ensure that the testsDirectory is absolute. +# This was introduced in Tcl 8.3+'s tcltest, so we need a catch. +catch {::tcltest::normalizePath ::tcltest::testsDirectory} + +# +# Run all tests in current and any sub directories with an all.tcl file. +# +set ::exitCode 0 +if {[package vsatisfies [package require tcltest] 2.5-]} { + if {[::tcltest::runAllTests] == 1} { + set ::exitCode 1 + } + +} else { + # Hook to determine if any of the tests failed. Then we can exit with the + # proper exit code: 0=all passed, 1=one or more failed + proc tcltest::cleanupTestsHook {} { + variable numTests + set ::exitCode [expr {$numTests(Total) == 0 || $numTests(Failed) > 0}] + } + ::tcltest::runAllTests +} + +# Exit code: 0=all passed, 1=one or more failed +return $::exitCode