[crypticl-cvs] CVS update: crypticl/src/crypticl-package.lisp crypticl/src/dsa.lisp crypticl/src/keygenerator.lisp crypticl/src/rsa.lisp

[Taale Skogan]

Update of /project/crypticl/cvsroot/crypticl/src
In directory common-lisp.net:/tmp/cvs-serv17529/src

Modified Files:
	crypticl-package.lisp dsa.lisp keygenerator.lisp rsa.lisp 
Log Message:
Minor mods to get Obol runtime to load.

Date: Sun Nov 14 00:10:39 2004
Author: tskogan

Index: crypticl/src/crypticl-package.lisp
diff -u crypticl/src/crypticl-package.lisp:1.4 crypticl/src/crypticl-package.lisp:1.5
--- crypticl/src/crypticl-package.lisp:1.4	Sun Nov  7 21:23:33 2004
+++ crypticl/src/crypticl-package.lisp	Sun Nov 14 00:10:39 2004
@@ -14,6 +14,7 @@
 (in-package cl-user)
 
 (defpackage crypticl
+  (:nicknames clc)
   (:use common-lisp)
   (:export 
    get-secret-Diffie-Hellman
@@ -82,6 +83,6 @@
       (run-tests))))
 
 
-(load-package)
+;;(load-package)
 
 


Index: crypticl/src/dsa.lisp
diff -u crypticl/src/dsa.lisp:1.4 crypticl/src/dsa.lisp:1.5
--- crypticl/src/dsa.lisp:1.4	Sun Nov  7 21:23:33 2004
+++ crypticl/src/dsa.lisp	Sun Nov 14 00:10:39 2004
@@ -276,7 +276,6 @@
 (defun dsa-generate-keys (bitsize)
   (declare (ignore bitsize))
   "Return a DSAKeyPair"
-  (format t "~&Generating DSA keys, this may take some time...")
   (let ((alg (make-DSA :defaultp t)))
     (make-DSAKeyPair (p alg) (q alg) (g alg) (x alg) (y alg))))
 


Index: crypticl/src/keygenerator.lisp
diff -u crypticl/src/keygenerator.lisp:1.4 crypticl/src/keygenerator.lisp:1.5
--- crypticl/src/keygenerator.lisp:1.4	Sun Nov  7 21:23:33 2004
+++ crypticl/src/keygenerator.lisp	Sun Nov 14 00:10:39 2004
@@ -52,12 +52,7 @@
     (make-SymmetricKey (random-secure-octets octet-size) algorithm)))
 
 
-
-
-;; Can be used by lobo   
-(defgeneric key-from-encoding (keytype encoding))
-
-(defmethod key-from-encoding ((keytype string) encoding)
+(defun key-from-encoding (keytype encoding)
   "dispatch on keytype"
   (do ((fun (get-key-from-encoding keytype) 
 	    (get-key-from-encoding keytype)))


Index: crypticl/src/rsa.lisp
diff -u crypticl/src/rsa.lisp:1.3 crypticl/src/rsa.lisp:1.4
--- crypticl/src/rsa.lisp:1.3	Sun Nov  7 13:04:17 2004
+++ crypticl/src/rsa.lisp	Sun Nov 14 00:10:39 2004
@@ -386,8 +386,6 @@
 
 (defun rsa-generate-keys (bitsize)
   "Returns list with (public exponent, private exponent, modulus)"
-  (format t 
-	  "~&Generating ~A bits RSA keys, this may take some time..." bitsize)
   (let* ((e 17)
 	 (p (rsa-get-prime (floor bitsize 2) e))
 	 (q (rsa-get-prime (floor bitsize 2) e))