crypticl-cvs

crypticl-cvs@common-lisp.net

111 discussions

[crypticl-cvs] CVS crypticl/doc/html
by tskogan 17 Jan '07

17 Jan '07

Update of /project/crypticl/cvsroot/crypticl/doc/html In directory clnet:/tmp/cvs-serv30348 Modified Files: index.html Log Message: Corrections and updates. --- /project/crypticl/cvsroot/crypticl/doc/html/index.html 2005/10/02 14:54:51 1.4 +++ /project/crypticl/cvsroot/crypticl/doc/html/index.html 2007/01/17 22:12:16 1.5 @@ -16,9 +16,9 @@ <h3>Introduction</h3> - <p>Crypticl is a library of cryptographic functions written in Common Lisp. The goal is to provide flexible, high level cryptographic abstractions on top of a kernel of core cryptographic primitives. The core currently includes AES, IDEA, SHA-1, DSA and RSA primitives. It is distributed under an MIT-style license.</p> + <p>Crypticl is a library of cryptographic functions written in Common Lisp. The goal is to provide flexible, high level cryptographic abstractions on top of a kernel of core cryptographic primitives. The core currently includes AES, IDEA, MD5, SHA-1, SHA-256, DSA and RSA primitives. It is distributed under an MIT-style license.</p> -<p>The library will be limited to common, secure algorithms and not try to implement all available cryptographic algorithms. Hence AES is included and DES is not and MD5 will be removed due to recently discovered weaknesses. +<p>The library will be limited to common, secure algorithms and not try to implement all available cryptographic algorithms. Hence AES is included and DES is not. <!-- <h3>Mailing Lists</h3> @@ -44,7 +44,7 @@ <h3>Obol</h3> Obol is a special purpose programming language for implementing security -protocols of the kind used in SSL, SSH and Kerberos. I have included an <a href="http://common-lisp.net/cgi-bin/viewcvs.cgi/obol/?cvsroot=crypticl">implementation of Obol</a> and the language runtime in the cvs repository. The implementation uses crypticl to implement the cryptographic core of the Obol runtime and illustrates how crypticl can be used by an application. +protocols of the kind used in SSL, SSH and Kerberos. I have included an <a href="http://common-lisp.net/cgi-bin/viewcvs.cgi/obol/?cvsroot=crypticl">implementation of Obol</a> and the language runtime in the CVS repository. The implementation uses Crypticl to implement the cryptographic core of the Obol runtime and illustrates how Crypticl can be used by an application. <h3>Download</h3> @@ -60,7 +60,7 @@ <div class="footer"> - Tåle Skogan 2. October 2005. + Taale Skogan 17. January 2007. </div> <div class="check">

1 0

[crypticl-cvs] CVS crypticl/doc
by tskogan 17 Jan '07

17 Jan '07

Update of /project/crypticl/cvsroot/crypticl/doc In directory clnet:/tmp/cvs-serv29476/doc Modified Files: README ChangeLog Log Message: Removed email addresses (to reduce spam). --- /project/crypticl/cvsroot/crypticl/doc/README 2005/10/01 16:52:18 1.6 +++ /project/crypticl/cvsroot/crypticl/doc/README 2007/01/17 22:00:57 1.7 @@ -44,4 +44,4 @@ Frode V. Fjeld AUTHOR -Tåle Skogan tasko(a)frisurf.no \ No newline at end of file +Taale Skogan \ No newline at end of file --- /project/crypticl/cvsroot/crypticl/doc/ChangeLog 2005/10/01 19:13:36 1.14 +++ /project/crypticl/cvsroot/crypticl/doc/ChangeLog 2007/01/17 22:00:57 1.15 @@ -1,18 +1,24 @@ -01-10-2005 Taale Skogan<tasko(a)frisurf.no> +17-01-2007 Taale Skogan + Removed email addresses (spam). + +16-01-2007 Taale Skogan + Implemented SHA-256. + +01-10-2005 Taale Skogan * doc/html/index.html: releasing version 0.1. --------------------------------- TAG 0.1.1 ------------------------------- -01-10-2005 Taale Skogan<tasko(a)frisurf.no> +01-10-2005 Taale Skogan * doc/USERGUIDE: minor changes. * doc/README: minor layout changes. * src/common.lisp: make print-external-symbols work from top level of another package as intended. -07-11-2004 Taale Skogan<tasko(a)frisurf.no> +07-11-2004 Taale Skogan Updated front page with comment on MD5. MD5 will be removed. * doc/html/index.html -25-11-2004 Taale Skogan<tasko(a)frisurf.no> +25-11-2004 Taale Skogan Removed allegro specific excl: function. Still one left. Using aa instead of the norwegian character å in my name. Renamed various versions of TO DO: to To do: at the top of the files. @@ -23,35 +29,35 @@ * doc/README: updated with TODO entry. * doc/TODO: added file. -2004-11-24 Tage Stabell-Kulo <tage(a)tagehome.pasta.cs.uit.no> +2004-11-24 Tage Stabell-Kulo * src/sha1.lisp: Added more verbose printout. * src/aes.lisp: Changed variable S to Sbox and T to tmp. --------------------------------- TAG 0.1.0 ------------------------------- -24-11-2004 Taale Skogan<tasko(a)frisurf.no> +24-11-2004 Taale Skogan * doc/README: tag instructions. -23-11-2004 Taale Skogan<tasko(a)frisurf.no> +23-11-2004 Taale Skogan * doc/README: new install instructions. -15-11-2004 Taale Skogan<tasko(a)frisurf.no> +15-11-2004 Taale Skogan * src/crypticl-package.lisp: place load code in separate file. * src/load.lisp: load function. -14-11-2004 Taale Skogan<tasko(a)frisurf.no> +14-11-2004 Taale Skogan Minor modifications to get Obol runtime to load. -07-11-2004 Taale Skogan<tasko(a)frisurf.no> +07-11-2004 Taale Skogan Adding to USERGUIDE. -07-11-2004 Taale Skogan<tasko(a)frisurf.no> +07-11-2004 Taale Skogan Refactoring key generation. Put key generation code in each algorithm and make the algorithm resonsible for registering the interface. Put KeyStore in separate file. -06-11-2004 Taale Skogan<tasko(a)frisurf.no> +06-11-2004 Taale Skogan Cleaning up load. Completing renaming from CLC to Crypticl. * src/load.lisp: deleted. Functionality moved to crypticl-package.lisp. @@ -61,6 +67,6 @@ interface new-instance. * src/crypticl-package.lisp: Cleaning up load. -09-09-2004 Taale Skogan<tasko(a)frisurf.no> +09-09-2004 Taale Skogan Using max column 80. * doc/README: max column 80. \ No newline at end of file

1 0

[crypticl-cvs] CVS crypticl/src
by tskogan 17 Jan '07

17 Jan '07

Update of /project/crypticl/cvsroot/crypticl/src In directory clnet:/tmp/cvs-serv29476/src Modified Files: utilities.lisp test.lisp rsa.lisp random.lisp numtheory.lisp md5.lisp load.lisp keystore.lisp keygenerator.lisp idea.lisp dsa.lisp diffie-hellman.lisp des.lisp crypticl-package.lisp common.lisp aes.lisp LICENSE Log Message: Removed email addresses (to reduce spam). --- /project/crypticl/cvsroot/crypticl/src/utilities.lisp 2007/01/07 15:55:17 1.5 +++ /project/crypticl/cvsroot/crypticl/src/utilities.lisp 2007/01/17 22:00:52 1.6 @@ -2,7 +2,7 @@ ;;;; The Crypticl cryptographic library. ;;;; ;;;; Description: Non-cryptopgrahic utilities -;;;; Author: Taale Skogan <tasko(a)frisurf.no> +;;;; Author: Taale Skogan ;;;; Distribution: See the accompanying file LICENSE. ;;To do: --- /project/crypticl/cvsroot/crypticl/src/test.lisp 2007/01/16 23:46:06 1.5 +++ /project/crypticl/cvsroot/crypticl/src/test.lisp 2007/01/17 22:00:52 1.6 @@ -2,7 +2,7 @@ ;;;; The Crypticl cryptographic library. ;;;; ;;;; Description: Test code for the library. -;;;; Author: Taale Skogan <tasko(a)frisurf.no> +;;;; Author: Taale Skogan ;;;; Distribution: See the accompanying file LICENSE. (in-package crypticl) --- /project/crypticl/cvsroot/crypticl/src/rsa.lisp 2004/11/25 21:56:53 1.5 +++ /project/crypticl/cvsroot/crypticl/src/rsa.lisp 2007/01/17 22:00:52 1.6 @@ -2,7 +2,7 @@ ;;;; The Crypticl cryptographic library. ;;;; ;;;; Description: RSA encryption/decryption according to PKCS#1 -;;;; Author: Taale Skogan <tasko(a)frisurf.no> +;;;; Author: Taale Skogan ;;;; Distribution: See the accompanying file LICENSE. ;;; References: --- /project/crypticl/cvsroot/crypticl/src/random.lisp 2004/11/25 21:56:52 1.3 +++ /project/crypticl/cvsroot/crypticl/src/random.lisp 2007/01/17 22:00:52 1.4 @@ -2,7 +2,7 @@ ;;;; The Crypticl cryptographic library. ;;;; ;;;; Description: Pseudo random number generation. -;;;; Author: Taale Skogan <tasko(a)frisurf.no> +;;;; Author: Taale Skogan ;;;; Distribution: See the accompanying file LICENSE. --- /project/crypticl/cvsroot/crypticl/src/numtheory.lisp 2004/11/25 21:56:52 1.3 +++ /project/crypticl/cvsroot/crypticl/src/numtheory.lisp 2007/01/17 22:00:52 1.4 @@ -2,7 +2,7 @@ ;;;; The Crypticl cryptographic library. ;;;; ;;;; Description: Number theoretic utilities, including primality testing. -;;;; Author: Taale Skogan <tasko(a)frisurf.no> +;;;; Author: Taale Skogan ;;;; Distribution: See the accompanying file LICENSE. ;;; References: --- /project/crypticl/cvsroot/crypticl/src/md5.lisp 2007/01/06 12:56:16 1.4 +++ /project/crypticl/cvsroot/crypticl/src/md5.lisp 2007/01/17 22:00:52 1.5 @@ -2,7 +2,7 @@ ;;;; The Crypticl cryptographic library. ;;;; ;;;; Description: The RSA MD5 message digest algorithm from Internet RFC 1321. -;;;; Author: Taale Skogan <tasko(a)frisurf.no> +;;;; Author: Taale Skogan ;;;; Distribution: See the accompanying file LICENSE. ;;;; Credit: Low level code based on implementation by Mark Nahabedian with ;;;; enhancements by Tony Eng. --- /project/crypticl/cvsroot/crypticl/src/load.lisp 2004/11/25 21:56:52 1.6 +++ /project/crypticl/cvsroot/crypticl/src/load.lisp 2007/01/17 22:00:52 1.7 @@ -6,7 +6,7 @@ ;;;; Usage: Loading this file will load the rest of the library. ;;;; After loading you can list the public interface with ;;;; (crypticl:print-external-symbols) from the top-level. -;;;; Author: Taale Skogan <tasko(a)frisurf.no> +;;;; Author: Taale Skogan ;;;; Distribution: See the accompanying file LICENSE. ;;To do: --- /project/crypticl/cvsroot/crypticl/src/keystore.lisp 2004/11/25 21:56:52 1.3 +++ /project/crypticl/cvsroot/crypticl/src/keystore.lisp 2007/01/17 22:00:52 1.4 @@ -2,7 +2,7 @@ ;;;; The Crypticl cryptographic library. ;;;; ;;;; Description: Simple key store utility. -;;;; Author: Taale Skogan <tasko(a)frisurf.no> +;;;; Author: Taale Skogan ;;;; Distribution: See the accompanying file LICENSE. ;;To do: --- /project/crypticl/cvsroot/crypticl/src/keygenerator.lisp 2004/11/25 21:56:52 1.6 +++ /project/crypticl/cvsroot/crypticl/src/keygenerator.lisp 2007/01/17 22:00:52 1.7 @@ -2,7 +2,7 @@ ;;;; The Crypticl cryptographic library. ;;;; ;;;; Description: Interface for key generation. -;;;; Author: Taale Skogan <tasko(a)frisurf.no> +;;;; Author: Taale Skogan ;;;; Distribution: See the accompanying file LICENSE. ;;To do: --- /project/crypticl/cvsroot/crypticl/src/idea.lisp 2004/11/25 21:56:52 1.4 +++ /project/crypticl/cvsroot/crypticl/src/idea.lisp 2007/01/17 22:00:52 1.5 @@ -2,7 +2,7 @@ ;;;; The Crypticl cryptographic library. ;;;; ;;;; Description: IDEA - International Data Encryption Algorithm -;;;; Author: Taale Skogan <tasko(a)frisurf.no> +;;;; Author: Taale Skogan ;;;; Distribution: See the accompanying file LICENSE. ;;; Based on the references [1] and [2]. --- /project/crypticl/cvsroot/crypticl/src/dsa.lisp 2004/11/25 21:56:52 1.6 +++ /project/crypticl/cvsroot/crypticl/src/dsa.lisp 2007/01/17 22:00:52 1.7 @@ -2,7 +2,7 @@ ;;;; The Crypticl cryptographic library. ;;;; ;;;; Description: The Digital Signature Algorithm (DSA). -;;;; Author: Taale Skogan <tasko(a)frisurf.no> +;;;; Author: Taale Skogan ;;;; Distribution: See the accompanying file LICENSE. ;;; Implementation based on the Digital Signature Standard (DSS) ([1]). --- /project/crypticl/cvsroot/crypticl/src/diffie-hellman.lisp 2004/11/25 21:56:52 1.5 +++ /project/crypticl/cvsroot/crypticl/src/diffie-hellman.lisp 2007/01/17 22:00:52 1.6 @@ -2,7 +2,7 @@ ;;;; The Crypticl cryptographic library. ;;;; ;;;; Description: Diffie-Hellman -;;;; Author: Taale Skogan <tasko(a)frisurf.no> +;;;; Author: Taale Skogan ;;;; Distribution: See the accompanying file LICENSE. --- /project/crypticl/cvsroot/crypticl/src/des.lisp 2004/11/25 21:56:52 1.3 +++ /project/crypticl/cvsroot/crypticl/src/des.lisp 2007/01/17 22:00:52 1.4 @@ -2,7 +2,7 @@ ;;;; The Crypticl cryptographic library. ;;;; ;;;; Description: A void DES implementation. -;;;; Author: Taale Skogan <tasko(a)frisurf.no> +;;;; Author: Taale Skogan ;;;; Distribution: See the accompanying file LICENSE. ;;; DES has not been implemented, but a DES class and some --- /project/crypticl/cvsroot/crypticl/src/crypticl-package.lisp 2004/11/25 21:56:52 1.7 +++ /project/crypticl/cvsroot/crypticl/src/crypticl-package.lisp 2007/01/17 22:00:52 1.8 @@ -6,7 +6,7 @@ ;;;; Usage: Loading this file will load the rest of the library. ;;;; After loading you can list the public interface with ;;;; (crypticl:print-external-symbols) from the top-level. -;;;; Author: Taale Skogan <tasko(a)frisurf.no> +;;;; Author: Taale Skogan ;;;; Distribution: See the accompanying file LICENSE. ;;To do: --- /project/crypticl/cvsroot/crypticl/src/common.lisp 2007/01/16 23:44:32 1.6 +++ /project/crypticl/cvsroot/crypticl/src/common.lisp 2007/01/17 22:00:52 1.7 @@ -2,7 +2,7 @@ ;;;; The Crypticl cryptographic library. ;;;; ;;;; Description: Common functionality. -;;;; Author: Taale Skogan <tasko(a)frisurf.no> +;;;; Author: Taale Skogan ;;;; Distribution: See the accompanying file LICENSE. ;; To do: --- /project/crypticl/cvsroot/crypticl/src/aes.lisp 2004/11/25 21:56:51 1.5 +++ /project/crypticl/cvsroot/crypticl/src/aes.lisp 2007/01/17 22:00:52 1.6 @@ -2,7 +2,7 @@ ;;;; The Crypticl cryptographic library. ;;;; ;;;; Description: AES -;;;; Author: Taale Skogan <tasko(a)frisurf.no> +;;;; Author: Taale Skogan ;;;; Distribution: See the accompanying file LICENSE. ;;To do: --- /project/crypticl/cvsroot/crypticl/src/LICENSE 2004/09/20 19:13:36 1.1.1.1 +++ /project/crypticl/cvsroot/crypticl/src/LICENSE 2007/01/17 22:00:55 1.2 @@ -1,11 +1,11 @@ ###################################################################### ## -## Copyright (C) 2003 -## Tåle Skogan +## Copyright (C) 2003-2007 +## Taale Skogan ## ## Filename: LICENSE ## Description: Defines the terms under which this software may be copied. -## Author: Tåle Skogan, tasko(a)frisurf.no +## Author: Taale Skogan ## ###################################################################### Redistribution and use in source and binary forms, with or without

1 0

[crypticl-cvs] CVS crypticl/doc
by tskogan 16 Jan '07

16 Jan '07

Update of /project/crypticl/cvsroot/crypticl/doc In directory clnet:/tmp/cvs-serv25835 Modified Files: TODO Log Message: updates --- /project/crypticl/cvsroot/crypticl/doc/TODO 2007/01/07 18:02:27 1.2 +++ /project/crypticl/cvsroot/crypticl/doc/TODO 2007/01/16 23:49:39 1.3 @@ -1,16 +1,15 @@ TODO list for Crypticl ====================== --Get high entropy seed for PRNG on windows +-Get high entropy seed for PRNG on Windows -Replace use of SHA-1 in PRNG with a block cipher (AES) in counter mode. -Study the Fortuna PRNG. -more example applications to test and improve the api -SHA-512? --CLOS version of SHA-256 --Cleanup test result output and refactor test code. Only run some test by default -so not to exhaust the Allegro heap. Document how to run the full test -set. Less verbose test output by default, only report "All Crypticl tests OK" -or similar on success. +-Cleanup test result output and refactor test code. Only run some test + by default so not to exhaust the Allegro heap. Document how to run the + full test set. Less verbose test output by default, only report "All +Crypticl tests OK" or similar on success. -Port to Allegro 8 (or higher) -Port to SBCL

1 0

[crypticl-cvs] CVS crypticl/src
by tskogan 16 Jan '07

16 Jan '07

Update of /project/crypticl/cvsroot/crypticl/src In directory clnet:/tmp/cvs-serv25684 Modified Files: test.lisp Log Message: Add SHA-256 tests to load-tests. --- /project/crypticl/cvsroot/crypticl/src/test.lisp 2004/11/25 21:56:53 1.4 +++ /project/crypticl/cvsroot/crypticl/src/test.lisp 2007/01/16 23:46:06 1.5 @@ -53,6 +53,8 @@ (test-AES) (test-RSA) (test-IDEA) - (test-DSA)) + (test-DSA) + (test-SHA-256) + (format t "~&All Crypticl load-time tests successful!")) (run-tests) \ No newline at end of file

1 0

[crypticl-cvs] CVS crypticl/src
by tskogan 16 Jan '07

16 Jan '07

Update of /project/crypticl/cvsroot/crypticl/src In directory clnet:/tmp/cvs-serv25650 Modified Files: sha.lisp Log Message: Fix comment (update, not add). --- /project/crypticl/cvsroot/crypticl/src/sha.lisp 2007/01/07 00:44:12 1.6 +++ /project/crypticl/cvsroot/crypticl/src/sha.lisp 2007/01/16 23:45:21 1.7 @@ -273,7 +273,7 @@ (defmethod store-state ((obj SHA1) octet-vector offset end octet-count) - "Store state between calls to add" + "Store state between calls to update." (let ((leftover-offset (leftover-count obj)) (octets-left (- end offset)))

1 0

[crypticl-cvs] CVS crypticl/src
by tskogan 16 Jan '07

16 Jan '07

Update of /project/crypticl/cvsroot/crypticl/src In directory clnet:/tmp/cvs-serv25483 Modified Files: common.lisp Log Message: Comment on the implementation dependent nature of byte-code. --- /project/crypticl/cvsroot/crypticl/src/common.lisp 2007/01/06 12:42:11 1.5 +++ /project/crypticl/cvsroot/crypticl/src/common.lisp 2007/01/16 23:44:32 1.6 @@ -131,6 +131,7 @@ (end (length string))) (flet ((string-reader () (if (< i end) + ;;XXX Can return more than a 8 bit value with Unicode strings (prog1 (char-code (aref string i)) ;return this (incf i)) ;Can't use 1+ nil)))

1 0

[crypticl-cvs] CVS crypticl/src
by tskogan 16 Jan '07

16 Jan '07

Update of /project/crypticl/cvsroot/crypticl/src In directory clnet:/tmp/cvs-serv25386 Modified Files: sha256.lisp Log Message: Test CLOS api. Put api at the head of the file. Cleanup. --- /project/crypticl/cvsroot/crypticl/src/sha256.lisp 2007/01/16 00:53:33 1.5 +++ /project/crypticl/cvsroot/crypticl/src/sha256.lisp 2007/01/16 23:43:12 1.6 @@ -4,6 +4,7 @@ ;;;; Description: The SHA-256 hash algorithm ;;;; Author: Taale Skogan ;;;; Distribution: See the accompanying file LICENSE. +;;;; Initial version: 16.01.2007 ;;; Based on reference [1] from http://csrc.nist.gov/cryptval/shs.htm @@ -17,9 +18,107 @@ (in-package crypticl) -;;; SHA-256 uses a sequence of 64 32-bit word constants. They -;;; are referred to as K0,...,K63. -(defvar *sha-256-constants* +;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; +;;; Low-level function API +;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;; +(defun sha-256-on-octet-vector (octet-vector) + "Return SHA-256 hash of byte array/octet vector" + (sha-256-encode + (make-buffer-filler + (make-byte-array-reader-function octet-vector)))) + +(defun sha-256-on-string (string) + "Return SHA-256 hash of a string. + +NB! With this function the hash value depends on the encoding of string +and implementation specific details of the Common Lisp distribution you +are using (see make-string-reader-function and its' use of char-code +for more details). For more control, decode the string to a byte array +yourself and use the byte array interface sha-256-on-octet-vector instead. +" + (sha-256-encode + (make-buffer-filler + (make-string-reader-function string)))) + +(defun sha-256-on-octet-stream (stream) + "Return SHA-256 hash of stream." + (sha-256-encode + (make-buffer-filler #'(lambda () (read-byte stream nil))))) + +(defun sha-256-file (path) + "Return SHA-256 hash of a file." + (with-open-file (str path) + (sha-256-on-octet-stream str))) + + +;;;;;;;;;;;;; +;;; +;;; CLOS API +;;; +;;;;;;;;;;;;; +(defun make-SHA-256 () + "Constructor for the SHA-256 class" + (let ((obj (make-instance 'SHA-256 :algorithm "SHA-256"))) + (reset obj) + obj)) + +(defmethod reset ((obj SHA-256)) + (initial-sha-256-hash-value (a obj) (b obj) (c obj) (d obj) + (e obj) (f obj) (g obj) (h obj)) + (setf (octet-count obj) 0 + (leftover-count obj) 0 + (called-hash obj) nil + (fresh obj) t)) + +(defmethod hash ((obj SHA-256) &optional data (start 0) (end (length data))) + "Return SHA-256 hash of all bytes added so far. + +Note that calling hash on an empty object object makes no sense but the spec +seems to be that we run algorithm on the initial state and return a full +256 bits hash even when the message length is 0. + +Calling it a second time without adding data returns the previous value. +" + (when (and (not data) (called-hash obj)) + ;; Return previous hash value when we have one and no data has been + ;; added since last call to hash. + (return-from hash (sha-256-make-octet-vector + (a obj) (b obj) (c obj) (d obj) + (e obj) (f obj) (g obj) (h obj)))) + (when data + (typecase data + (vector (sha-256-add-octet-vector obj data start end)) + (otherwise + (error "Hash on data type ~A not implemented." (type-of data))))) + + (setf (called-hash obj) t) + (sha-256-final obj)) + +(defmethod update ((obj SHA-256) (octet-vector vector) + &optional (start 0) (end (length octet-vector))) + "Add bytes to SHA-256 hash object. + +Will compute the intermediate hash value and not store the input. Useful +for hashing a large file that doesn't fit in memory or a data stream. + +When all bytes have been added you get the hash value by calling the +hash method." + ;; Reset object if we have called hash + (when (called-hash obj) + (reset obj)) + + (sha-256-add-octet-vector obj octet-vector start end) + (setf (fresh obj) nil)) + + +;;;;;;;;;;;;;;;;;;; +;;; +;;; Implementation +;;; +;;;;;;;;;;;;;;;;;;; +(defparameter *sha-256-constants* (make-array 64 :element-type '(unsigned-byte 32) :initial-contents @@ -38,7 +137,8 @@ #x19a4c116 #x1e376c08 #x2748774c #x34b0bcb5 #x391c0cb3 #x4ed8aa4a #x5b9cca4f #x682e6ff3 #x748f82ee #x78a5636f #x84c87814 #x8cc70208 - #x90befffa #xa4506ceb #xbef9a3f7 #xc67178f2))) + #x90befffa #xa4506ceb #xbef9a3f7 #xc67178f2)) + "SHA-256 uses a sequence of 64 32-bit word constants.") (defun sha-256-constant (i) (aref *sha-256-constants* i)) @@ -114,7 +214,7 @@ g (32-add g gg) h (32-add h hh)))) - ;; Return hash value. + ;; Return hash value as array. (sha-256-make-octet-vector a b c d e f g h))) (defmacro sha-256-make-octet-vector (a b c d e f g h) @@ -193,36 +293,11 @@ w)) -;;;;;;;;;;;;; -;;; -;;; Low-level function API -;;; -;;;;;;;;;;;;; -(defun sha-256-on-octet-vector (octet-vector) - "Return SHA-256 hash of byte array/octect vector" - (sha-256-encode - (make-buffer-filler - (make-byte-array-reader-function octet-vector)))) - -(defun sha-256-on-string (string) - "Return SHA-256 hash of a string. - -NB! With this function the hash value depends on the encoding of string -and implementation specific details of the Common Lisp distribution you -are using (see make-string-reader-function and its' use of char-code -for more details). For more control, decode the string to a byte array -yourself and use the byte array interface sha-256-on-octet-vector instead. -" - (sha-256-encode - (make-buffer-filler - (make-string-reader-function string)))) - - -;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;; ;;; ;;; CLOS internals ;;; -;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;; (defclass SHA-256 (Hash) ((octet-count :accessor octet-count ;octets processed so far :initform 0) @@ -243,6 +318,7 @@ (g :accessor g) (h :accessor h))) + (defmethod store-leftover ((obj SHA-256) octet-vector offset end octet-count) "Store leftover bytes between calls to update" (let ((leftover-offset (leftover-count obj)) @@ -279,7 +355,6 @@ (sha-256-encode-block obj vec)))) - (defmethod sha-256-final ((obj SHA-256)) (let ((vec (make-array 16 :element-type '(unsigned-byte 32))) (buffer-filler @@ -311,6 +386,7 @@ (g obj) (32-add (g obj) gg) (h obj) (32-add (h obj) hh)))) + ;;; TODO identical to SHA1 method i sha.lisp so reuse (defmethod fill-vector ((obj SHA-256) return-vector octet-vector start) "Return the next 512 bits for hashing. @@ -353,79 +429,21 @@ ;; Return offset in input vector. (+ start used))) -;;;;;;;;;;;;; -;;; -;;; CLOS API -;;; -;;;;;;;;;;;;; -(defun make-SHA256 () - "Constructor for the SHA-256 class" - (let ((obj (make-instance 'SHA-256 :algorithm "SHA-256"))) - (reset obj) - obj)) - -(defmethod reset ((obj SHA-256)) - (initial-sha-256-hash-value (a obj) (b obj) (c obj) (d obj) - (e obj) (f obj) (g obj) (h obj)) - (setf (octet-count obj) 0 - (leftover-count obj) 0 - (called-hash obj) nil - (fresh obj) t)) - -(defmethod hash ((obj SHA-256) &optional data (start 0) (end (length data))) - "Return SHA-256 hash of all bytes added so far. - -Note that calling hash on an empty object object makes no sense and we -return nil. - -XXX Calling it a second time without adding data? The same value as the first -time? -" - (when (and (fresh obj) (not data)) - ;; Returning a hash value on no data makes no sense. - (return-from hash nil)) - (when (and (not data) (called-hash obj)) - ;; Return previous hash value when we have one and no data has been - ;; added since last call to hash. - (return-from hash (sha-256-make-octet-vector (a obj) (b obj) (c obj) (d obj) - (e obj) (f obj) (g obj) (h obj)))) - (when data - (typecase data - (vector (sha-256-add-octet-vector obj data start end)) - (otherwise - (error "Hash on data type ~A not implemented." (type-of data))))) - - (setf (called-hash obj) t) - (sha-256-final obj)) - - -(defmethod update ((obj SHA-256) (octet-vector vector) - &optional (start 0) (end (length octet-vector))) - "Add bytes to SHA-256 hash object. - -Will compute the intermediate hash value and not store the input. Useful -for hashing a large file that doesn't fit in memory or a data stream. - -When all bytes have been added you get the hash value by calling the -hash method." - ;; Reset object if we have called hash - (when (called-hash obj) - (reset obj)) - - (sha-256-add-octet-vector obj octet-vector start end) - (setf (fresh obj) nil)) - - -(register-constructor 'SHA256 #'make-SHA256) ;;;;;;;;;;;;;;;;;; ;;;; ;;;; Tests ;;;; ;;;;;;;;;;;;;;;;;; -(defun test-sha-256 () +(defun run-all-sha-256-tests () + "Run all tests." (test-sha-256-short) - (test-sha-256-long)) + (test-sha-256-long) + (run-shavs-256)) + +(defun test-SHA-256 () + "Run these tests at load time." + (test-sha-256-short)) (defun test-sha-256-short () "Test vector 1 and 2 are taken from reference FIPS 180-2." @@ -436,11 +454,11 @@ (list "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1") ))) - (format t "Testing SHA-256.~%") - (dolist (x test-list (format t "Short messages OK.~%")) + (format t "~&Testing SHA-256 short vectors...") + (dolist (x test-list (format t "OK.")) (let ((in (first x)) (ex (second x)) - (obj (make-SHA256))) + (obj (make-SHA-256))) ;; low-level API (assert (string= (hex (sha-256-on-string in)) ex) () "sha-256 test for input string ~A~%" in) @@ -527,18 +545,57 @@ (defun shavs-256 (len msg md) (when (= len 0) (setf msg "")) - (assert (string= (hex (sha-256-on-octet-vector (hexo msg))) - md) - nil (format nil "Failed on msg ~A" msg))) + (let ((bts (hexo msg)) ; msg as bytes + (obj (make-SHA-256))) + + ;; Low-level API + (assert (string= (hex (sha-256-on-octet-vector bts)) md) () + "sha-256 failed low-level hash on msg '~A'" msg) + + ;; CLOS API + ;; hash all in one + (assert (string= (hex (hash obj bts)) md) () + "sha-256 failed all-in-on-hash on msg '~A'" msg) + + ;; update with all, then hash + (reset obj) + (update obj bts) + (assert (string= (hex (hash obj)) md) () + "sha-256 failed single-update-hash on msg '~A'" msg) + ;; update multiple times, then hash + (reset obj) + (let ((size (length bts))) + (do* ((pos 0 (+ pos next)) + (next (shavs-next-update-size pos size) + (shavs-next-update-size pos size)) + (end (+ pos next) (+ pos next))) + ((> end size)) + ;;(format t "size ~2@A pos ~2@A next ~2@A end ~2@A~%" size pos next end) + (update obj (subseq bts pos end)))) + (assert (string= (hex (hash obj)) md) () + "sha-256 failed multiple-updates-hash on msg '~A'" md) + )) -(defun run-shavs (&optional (path "../test/SHA256ShortMsg.txt")) +(defun shavs-next-update-size (pos size) + ;; 60 a bit bigger than the msg block size (64 bytes) + (let ((next (random 100)) + (leftover (- size pos))) + (max 1 ; always advance at least once + (if (>= next leftover) + leftover + next)))) + +(defun run-shavs-on-string (string) + (with-input-from-string (str string) + (shavs str))) + +(defun run-shavs-256 (&optional (path "../test/SHA256ShortMsg.txt")) "Verify SHA-256 against SHAVS test vectors from file. NB The long test vectors are in the file ../test/SHA256LongMsg.txt" (with-open-file (str path) (shavs str))) -(defun run-shavs-on-string (string) - (with-input-from-string (str string) - (shavs str))) \ No newline at end of file + +(register-constructor 'SHA-256 #'make-SHA-256) \ No newline at end of file

1 0

[crypticl-cvs] CVS crypticl/src
by tskogan 16 Jan '07

16 Jan '07

Update of /project/crypticl/cvsroot/crypticl/src In directory clnet:/tmp/cvs-serv4297 Modified Files: sha256.lisp Log Message: Initial version of CLOS api. Needs clean up and more test cases including SHAVS and semantics of border cases. --- /project/crypticl/cvsroot/crypticl/src/sha256.lisp 2007/01/07 15:55:17 1.4 +++ /project/crypticl/cvsroot/crypticl/src/sha256.lisp 2007/01/16 00:53:33 1.5 @@ -191,24 +191,243 @@ (sigma-0 (aref w (- i 15))) (aref w (- i 16))))) w)) - -(defun sha-256-on-string (string) - "Return SHA-256 hash of string" - (sha-256-encode - (make-buffer-filler - (make-string-reader-function string)))) + +;;;;;;;;;;;;; +;;; +;;; Low-level function API +;;; +;;;;;;;;;;;;; (defun sha-256-on-octet-vector (octet-vector) "Return SHA-256 hash of byte array/octect vector" (sha-256-encode (make-buffer-filler (make-byte-array-reader-function octet-vector)))) +(defun sha-256-on-string (string) + "Return SHA-256 hash of a string. + +NB! With this function the hash value depends on the encoding of string +and implementation specific details of the Common Lisp distribution you +are using (see make-string-reader-function and its' use of char-code +for more details). For more control, decode the string to a byte array +yourself and use the byte array interface sha-256-on-octet-vector instead. +" + (sha-256-encode + (make-buffer-filler + (make-string-reader-function string)))) + + +;;;;;;;;;;;;; +;;; +;;; CLOS internals +;;; +;;;;;;;;;;;;; +(defclass SHA-256 (Hash) + ((octet-count :accessor octet-count ;octets processed so far + :initform 0) + (leftover-octets :accessor leftover-octets ;unprocessed octets + :initform (make-array 64 :element-type '(unsigned-byte 8))) + (leftover-count :accessor leftover-count ;number of unprocessed octets + :initform 0) + (fresh :accessor fresh :initform t) + ;; True if we have called hash and need to reset the object state. + (called-hash :accessor called-hash :initform nil) + ;; SHA-256 state: 8 32 bits words. + (a :accessor a) + (b :accessor b) + (c :accessor c) + (d :accessor d) + (e :accessor e) + (f :accessor f) + (g :accessor g) + (h :accessor h))) + +(defmethod store-leftover ((obj SHA-256) octet-vector offset end octet-count) + "Store leftover bytes between calls to update" + (let ((leftover-offset (leftover-count obj)) + (octets-left (- end offset))) + + ;; We know there are less than 64 octets left so they all fit + ;; in the leftover-octets array in obj. + (dotimes (i octets-left) + (setf (aref (leftover-octets obj) (+ leftover-offset i)) + (aref octet-vector (+ offset i)))) + + (setf (octet-count obj) octet-count) + (setf (leftover-count obj) (+ leftover-offset octets-left)))) + + +(defmethod sha-256-add-octet-vector ((obj SHA-256) octet-vector start end) + "Compute intermediate hash value, and store leftover bytes. + +Consume a multiple of 512 bits (64 bytes) blocks and compute the +intermediate hash value. Store any leftover bytes while waiting +for more data (cannot pad at this point). +" + (let ((vec (make-array 16 :element-type '(unsigned-byte 32))) + (input-size (- end start)) + (offset start)) + + ;; First consume leftover bytes from previous rounds. + ;; We consume 64 bytes (512 bits; the size of the message schedule) + ;; each round until there is less than left. Store leftovers. + (do ((left (+ (leftover-count obj) input-size) (- left 64)) + (oct-count (octet-count obj) (+ 64 oct-count))) + ((< left 64) (store-leftover obj octet-vector offset end oct-count)) + (setf offset (fill-vector obj vec octet-vector offset)) + (sha-256-encode-block obj vec)))) + + +(defmethod sha-256-final ((obj SHA-256)) + (let ((vec (make-array 16 :element-type '(unsigned-byte 32))) + (buffer-filler + (make-buffer-filler + (make-byte-array-reader-function + (leftover-octets obj) (leftover-count obj)) + (octet-count obj)))) + + ;; Loops at most two times. + (while (funcall buffer-filler vec) + (sha-256-encode-block obj vec)) + + ;; Return hash. + (sha-256-make-octet-vector (a obj) (b obj) (c obj) (d obj) + (e obj) (f obj) (g obj) (h obj)))) + + +(defmethod sha-256-encode-block ((obj SHA-256) mb) + "Encode a single 512 bits block and add the state to the object." + (multiple-value-bind (aa bb cc dd ee ff gg hh) + (do-sha-256-message-block (a obj) (b obj) (c obj) (d obj) + (e obj) (f obj) (g obj) (h obj) mb) + (setf (a obj) (32-add (a obj) aa) + (b obj) (32-add (b obj) bb) + (c obj) (32-add (c obj) cc) + (d obj) (32-add (d obj) dd) + (e obj) (32-add (e obj) ee) + (f obj) (32-add (f obj) ff) + (g obj) (32-add (g obj) gg) + (h obj) (32-add (h obj) hh)))) + +;;; TODO identical to SHA1 method i sha.lisp so reuse +(defmethod fill-vector ((obj SHA-256) return-vector octet-vector start) + "Return the next 512 bits for hashing. + +Return a 16 * 32 bit vector filled with leftover octets from previous +rounds and octets from the input vector. We know that we have at +least 64 bytes." + (let ((offset 0) ;offset in the tmp vevtor v. + (used 0) ;Num octets used from input vector. + (v (make-array 64 :element-type '(unsigned-byte 8)))) + + ;; Get leftover octets from previous calls to add. + ;; We kown that obj contains < 64 bytes. + (dotimes (i (leftover-count obj)) + (setf (aref v offset) (aref (leftover-octets obj) offset)) + (incf offset)) + + ;; No leftover octets so we reset the leftover count. + (setf (leftover-count obj) 0) + + ;; How many octets do we need from input vector. + (setf used (- 64 offset)) + + ;; Fill the remaining entries. + (dotimes (i used) + (setf (aref v (+ offset i)) (aref octet-vector (+ start i)))) + + ;; Transfer to new format. + (dotimes (word 16) + (let ((b3 (aref v (* word 4))) + (b2 (aref v (+ (* word 4) 1))) + (b1 (aref v (+ (* word 4) 2))) + (b0 (aref v (+ (* word 4) 3)))) + (setf (aref return-vector word) + (dpb b3(byte 8 24) + (dpb b2 (byte 8 16) + (dpb b1 (byte 8 8) + b0)))))) + + ;; Return offset in input vector. + (+ start used))) + +;;;;;;;;;;;;; +;;; +;;; CLOS API +;;; +;;;;;;;;;;;;; +(defun make-SHA256 () + "Constructor for the SHA-256 class" + (let ((obj (make-instance 'SHA-256 :algorithm "SHA-256"))) + (reset obj) + obj)) + +(defmethod reset ((obj SHA-256)) + (initial-sha-256-hash-value (a obj) (b obj) (c obj) (d obj) + (e obj) (f obj) (g obj) (h obj)) + (setf (octet-count obj) 0 + (leftover-count obj) 0 + (called-hash obj) nil + (fresh obj) t)) + +(defmethod hash ((obj SHA-256) &optional data (start 0) (end (length data))) + "Return SHA-256 hash of all bytes added so far. + +Note that calling hash on an empty object object makes no sense and we +return nil. + +XXX Calling it a second time without adding data? The same value as the first +time? +" + (when (and (fresh obj) (not data)) + ;; Returning a hash value on no data makes no sense. + (return-from hash nil)) + (when (and (not data) (called-hash obj)) + ;; Return previous hash value when we have one and no data has been + ;; added since last call to hash. + (return-from hash (sha-256-make-octet-vector (a obj) (b obj) (c obj) (d obj) + (e obj) (f obj) (g obj) (h obj)))) + (when data + (typecase data + (vector (sha-256-add-octet-vector obj data start end)) + (otherwise + (error "Hash on data type ~A not implemented." (type-of data))))) + + (setf (called-hash obj) t) + (sha-256-final obj)) + + +(defmethod update ((obj SHA-256) (octet-vector vector) + &optional (start 0) (end (length octet-vector))) + "Add bytes to SHA-256 hash object. + +Will compute the intermediate hash value and not store the input. Useful +for hashing a large file that doesn't fit in memory or a data stream. + +When all bytes have been added you get the hash value by calling the +hash method." + ;; Reset object if we have called hash + (when (called-hash obj) + (reset obj)) + + (sha-256-add-octet-vector obj octet-vector start end) + (setf (fresh obj) nil)) + + +(register-constructor 'SHA256 #'make-SHA256) + +;;;;;;;;;;;;;;;;;; ;;;; -;;;; tests +;;;; Tests ;;;; +;;;;;;;;;;;;;;;;;; (defun test-sha-256 () + (test-sha-256-short) + (test-sha-256-long)) + +(defun test-sha-256-short () "Test vector 1 and 2 are taken from reference FIPS 180-2." (let ((test-list (list @@ -220,12 +439,28 @@ (format t "Testing SHA-256.~%") (dolist (x test-list (format t "Short messages OK.~%")) (let ((in (first x)) - (ex (second x))) - (assert (string= (hex (sha-256-on-string in)) ex)() + (ex (second x)) + (obj (make-SHA256))) + ;; low-level API + (assert (string= (hex (sha-256-on-string in)) ex) () "sha-256 test for input string ~A~%" in) - ))) + + ;; CLOS API + ;; Test hash only. + (reset obj) + (assert (string= (hex (hash obj (string-to-octets in))) ex) () + "sha-256 CLOS test for input string ~A~%" in) + + ;; Test update and hash. + (reset obj) + (update obj (string-to-octets in)) + (assert (string= (hex (hash obj)) ex) () + "sha-256 CLOS update+hash test for input string ~A~%" in) + )))) - ;;; Test long message + +(defun test-sha-256-long () + "Test long message." (format t "Testing long messages. This may take some seconds...~%") ;; only "a"s, ascii code of a is 97. (assert (string= (hex (sha-256-on-string

1 0

[crypticl-cvs] CVS crypticl/doc
by tskogan 07 Jan '07

07 Jan '07

Update of /project/crypticl/cvsroot/crypticl/doc In directory clnet:/tmp/cvs-serv28233 Modified Files: TODO Log Message: updated --- /project/crypticl/cvsroot/crypticl/doc/TODO 2004/11/25 21:59:05 1.1 +++ /project/crypticl/cvsroot/crypticl/doc/TODO 2007/01/07 18:02:27 1.2 @@ -1,7 +1,16 @@ TODO list for Crypticl ====================== --random numbers on windows --applications --sha256, sha512 +-Get high entropy seed for PRNG on windows +-Replace use of SHA-1 in PRNG with a block cipher (AES) in counter mode. +-Study the Fortuna PRNG. +-more example applications to test and improve the api +-SHA-512? +-CLOS version of SHA-256 +-Cleanup test result output and refactor test code. Only run some test by default +so not to exhaust the Allegro heap. Document how to run the full test +set. Less verbose test output by default, only report "All Crypticl tests OK" +or similar on success. +-Port to Allegro 8 (or higher) +-Port to SBCL

1 0

← Newer
1
2
3
4
5
6
7
8
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

crypticl-cvs