Update of /project/crypticl/cvsroot/crypticl/src In directory clnet:/tmp/cvs-serv27121
Modified Files: sha256.lisp sha.lisp rsa.lisp md5.lisp idea.lisp aes.lisp Log Message: Unify output from load time tests.
--- /project/crypticl/cvsroot/crypticl/src/sha256.lisp 2007/01/18 21:37:02 1.7 +++ /project/crypticl/cvsroot/crypticl/src/sha256.lisp 2007/01/18 21:50:35 1.8 @@ -432,7 +432,7 @@ (list "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1") ))) - (format t "~&Testing SHA-256 short vectors...") + (format t "~&SHA-256 short vectors...") (dolist (x test-list (format t "OK.")) (let ((in (first x)) (ex (second x)) --- /project/crypticl/cvsroot/crypticl/src/sha.lisp 2007/01/18 21:37:02 1.8 +++ /project/crypticl/cvsroot/crypticl/src/sha.lisp 2007/01/18 21:50:35 1.9 @@ -388,8 +388,8 @@ "84983e441c3bd26ebaae4aa1f95129e5e54670f1") (list #300(2 2 2) "e697e7834a688d2c982003a312da660a17a0fc9d")))) - (format t "Testing SHA-1.~%") - (dolist (x test-list (format t "Short vectors OK.~%")) + (format t "~&SHA-1 short vectors...") + (dolist (x test-list (format t "OK.")) (let ((in (first x)) (ex (second x))) (assert (string= (octet-vector-to-hex-string --- /project/crypticl/cvsroot/crypticl/src/rsa.lisp 2007/01/17 22:00:52 1.6 +++ /project/crypticl/cvsroot/crypticl/src/rsa.lisp 2007/01/18 21:50:37 1.7 @@ -443,7 +443,7 @@
(otherwise (error "Unknown spec ~A" spec))))) - (format t "~& ~A test suite OK." spec)) + (format t "~&~A test suite OK." spec))
(defun test-RSA() --- /project/crypticl/cvsroot/crypticl/src/md5.lisp 2007/01/17 22:00:52 1.5 +++ /project/crypticl/cvsroot/crypticl/src/md5.lisp 2007/01/18 21:50:37 1.6 @@ -427,7 +427,7 @@ "md5 test octet version for long vector~%")) (otherwise (error "Unknown spec ~A" spec))))) - (format t "~& ~A test suite OK." spec)) + (format t "~&~A test suite OK." spec))
(defun test-MD5() --- /project/crypticl/cvsroot/crypticl/src/idea.lisp 2007/01/17 22:00:52 1.5 +++ /project/crypticl/cvsroot/crypticl/src/idea.lisp 2007/01/18 21:50:37 1.6 @@ -524,7 +524,7 @@ (vector-check in input "IDEA CLOS decryption error"))) (otherwise (error "Unknown spec ~A" spec))))) - (format t "~& ~A test suite OK." spec)) + (format t "~&~A test suite OK." spec))
(defun test-IDEA() --- /project/crypticl/cvsroot/crypticl/src/aes.lisp 2007/01/17 22:00:52 1.6 +++ /project/crypticl/cvsroot/crypticl/src/aes.lisp 2007/01/18 21:50:37 1.7 @@ -684,7 +684,7 @@ (clear (hexo clear-org)) (key (hexo key-org)) (iv (hexo iv-org))) - (format t "~&Testing AES CLOS...") + (format t "~&AES CLOS...")
(formatv t "~&Clear text:~%~A" (hex clear)) (init-encrypt aa key :iv iv) @@ -723,7 +723,7 @@
(defun aes-test-suite-fips-197 () "Offical FIPS 197 test vector (for ECB mode obviously)." - (format t "~&Testing AES on official FIPS 197 test vector...") + (format t "~&AES on official FIPS 197 test vector...") (let* ((fips-clear "00112233445566778899aabbccddeeff") (fips-key "000102030405060708090a0b0c0d0e0f") (fips-ciphertext "69c4e0d86a7b0430d8cdb78070b4c55a") @@ -743,7 +743,7 @@ (key (generate-key 'AES 128)) (iv #16(2)) (clear #500(3))) - (format t "~&Testing AES long vector...") + (format t "~&AES long vector...") (init-encrypt aa key :iv iv) (setf tmp (encrypt aa clear)) (init-decrypt aa key :iv iv) @@ -755,9 +755,7 @@ (defun test-AES () (aes-test-suite-fips-197) (aes-test-suite-CLOS) - (aes-test-suite-long) - (format t "~&AES OK.")) - + (aes-test-suite-long))
;;;;;;;; ;;; Debug helpers