[kaffe] CVS kaffe (robilad): Resynced with GNU Crypto

Kaffe CVS cvs-commits at kaffe.org
Sun Oct 17 12:33:20 PDT 2004


PatchSet 5305 
Date: 2004/10/17 19:06:45
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Crypto

Members: 
	ChangeLog:1.2857->1.2858 
	libraries/javalib/Makefile.am:1.250->1.251 
	libraries/javalib/Makefile.in:1.330->1.331 
	libraries/javalib/all.files:1.38->1.39 
	libraries/javalib/gnu/crypto/Registry.java:1.1->1.2 
	libraries/javalib/gnu/crypto/auth/callback/GnuCallbacks.java:1.1->1.2 
	libraries/javalib/gnu/crypto/hash/BaseHash.java:1.1->1.2 
	libraries/javalib/gnu/crypto/hash/IMessageDigest.java:1.3->1.4 
	libraries/javalib/gnu/crypto/jce/GnuCrypto.java:1.1->1.2 
	libraries/javalib/gnu/crypto/jce/key/AnubisSecretKeyFactoryImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/key/Cast5SecretKeyFactoryImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/key/DESSecretKeyFactoryImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/key/DESedeSecretKeyFactoryImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/key/KhazadSecretKeyFactoryImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/key/SecretKeyFactoryImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/key/SerpentSecretKeyFactoryImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/key/SquareSecretKeyFactoryImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/key/TwofishSecretKeyFactoryImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/mac/HMacMD2Spi.java:1.1->1.2 
	libraries/javalib/gnu/crypto/jce/mac/HMacMD4Spi.java:1.1->1.2 
	libraries/javalib/gnu/crypto/jce/mac/HMacMD5Spi.java:1.1->1.2 
	libraries/javalib/gnu/crypto/jce/mac/HMacRipeMD128Spi.java:1.1->1.2 
	libraries/javalib/gnu/crypto/jce/mac/HMacRipeMD160Spi.java:1.1->1.2 
	libraries/javalib/gnu/crypto/jce/mac/HMacSHA160Spi.java:1.1->1.2 
	libraries/javalib/gnu/crypto/jce/mac/HMacSHA256Spi.java:1.1->1.2 
	libraries/javalib/gnu/crypto/jce/mac/HMacSHA384Spi.java:1.1->1.2 
	libraries/javalib/gnu/crypto/jce/mac/HMacSHA512Spi.java:1.1->1.2 
	libraries/javalib/gnu/crypto/jce/mac/HMacWhirlpoolSpi.java:1.1->1.2 
	libraries/javalib/gnu/crypto/jce/mac/MacAdapter.java:1.1->1.2 
	libraries/javalib/gnu/crypto/jce/mac/OMacAnubisImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/mac/OMacBlowfishImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/mac/OMacCast5Impl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/mac/OMacDESImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/mac/OMacKhazadImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/mac/OMacRijndaelImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/mac/OMacSerpentImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/mac/OMacSquareImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/mac/OMacTripleDESImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/mac/OMacTwofishImpl.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/jce/mac/TMMH16Spi.java:1.1->1.2 
	libraries/javalib/gnu/crypto/jce/mac/UHash32Spi.java:1.1->1.2 
	libraries/javalib/gnu/crypto/jce/mac/UMac32Spi.java:1.1->1.2 
	libraries/javalib/gnu/crypto/mac/BaseMac.java:1.1->1.2 
	libraries/javalib/gnu/crypto/mac/HMac.java:1.1->1.2 
	libraries/javalib/gnu/crypto/mac/HMacFactory.java:1.1->1.2 
	libraries/javalib/gnu/crypto/mac/IMac.java:1.3->1.4 
	libraries/javalib/gnu/crypto/mac/MacFactory.java:1.1->1.2 
	libraries/javalib/gnu/crypto/mac/MacInputStream.java:1.1->1.2 
	libraries/javalib/gnu/crypto/mac/MacOutputStream.java:1.1->1.2 
	libraries/javalib/gnu/crypto/mac/OMAC.java:1.1->1.2 
	libraries/javalib/gnu/crypto/mac/TMMH16.java:1.1->1.2 
	libraries/javalib/gnu/crypto/mac/UHash32.java:1.1->1.2 
	libraries/javalib/gnu/crypto/mac/UMac32.java:1.1->1.2 
	libraries/javalib/gnu/crypto/mode/EAX.java:1.1->1.2 
	libraries/javalib/gnu/crypto/pad/SSL3.java:1.1->1.2 
	libraries/javalib/gnu/crypto/prng/ARCFour.java:1.1->1.2 
	libraries/javalib/gnu/crypto/prng/BasePRNG.java:1.1->1.2 
	libraries/javalib/gnu/crypto/prng/CSPRNG.java:1.1->1.2 
	libraries/javalib/gnu/crypto/prng/EntropySource.java:1.1->1.2 
	libraries/javalib/gnu/crypto/prng/Fortuna.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/prng/ICMGenerator.java:1.1->1.2 
	libraries/javalib/gnu/crypto/prng/IPBE.java:1.1->1.2 
	libraries/javalib/gnu/crypto/prng/IRandom.java:1.3->1.4 
	libraries/javalib/gnu/crypto/prng/LimitReachedException.java:1.3->1.4 
	libraries/javalib/gnu/crypto/prng/MDGenerator.java:1.1->1.2 
	libraries/javalib/gnu/crypto/prng/PBKDF2.java:1.1->1.2 
	libraries/javalib/gnu/crypto/prng/PRNGFactory.java:1.1->1.2 
	libraries/javalib/gnu/crypto/prng/RandomEvent.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/prng/RandomEventListener.java:INITIAL->1.1 
	libraries/javalib/gnu/crypto/prng/UMacGenerator.java:1.1->1.2 
	libraries/javalib/org/metastatic/jessie/provider/SSLRandom.java:1.1->1.2 
	libraries/javalib/org/metastatic/jessie/provider/SynchronizedRandom.java:1.1->1.2 
	libraries/javalib/org/metastatic/jessie/provider/TLSRandom.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2857 kaffe/ChangeLog:1.2858
--- kaffe/ChangeLog:1.2857	Sun Oct 17 14:38:27 2004
+++ kaffe/ChangeLog	Sun Oct 17 19:06:45 2004
@@ -1,3 +1,206 @@
+2004-10-17  Dalibor Topic  <robilad at kaffe.org>
+
+	* libraries/javalib/gnu/crypto/jce/key/AnubisSecretKeyFactoryImpl.java,
+	libraries/javalib/gnu/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java,
+	libraries/javalib/gnu/crypto/jce/key/Cast5SecretKeyFactoryImpl.java,
+	libraries/javalib/gnu/crypto/jce/key/DESSecretKeyFactoryImpl.java,
+	libraries/javalib/gnu/crypto/jce/key/DESedeSecretKeyFactoryImpl.java,
+	libraries/javalib/gnu/crypto/jce/key/KhazadSecretKeyFactoryImpl.java,
+	libraries/javalib/gnu/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java,
+	libraries/javalib/gnu/crypto/jce/key/SecretKeyFactoryImpl.java,
+	libraries/javalib/gnu/crypto/jce/key/SerpentSecretKeyFactoryImpl.java,
+	libraries/javalib/gnu/crypto/jce/key/SquareSecretKeyFactoryImpl.java,
+	libraries/javalib/gnu/crypto/jce/key/TwofishSecretKeyFactoryImpl.java,
+	libraries/javalib/gnu/crypto/jce/mac/OMacAnubisImpl.java,
+	libraries/javalib/gnu/crypto/jce/mac/OMacBlowfishImpl.java,
+	libraries/javalib/gnu/crypto/jce/mac/OMacCast5Impl.java,
+	libraries/javalib/gnu/crypto/jce/mac/OMacDESImpl.java,
+	libraries/javalib/gnu/crypto/jce/mac/OMacKhazadImpl.java,
+	libraries/javalib/gnu/crypto/jce/mac/OMacRijndaelImpl.java,
+	libraries/javalib/gnu/crypto/jce/mac/OMacSerpentImpl.java,
+	libraries/javalib/gnu/crypto/jce/mac/OMacSquareImpl.java,
+	libraries/javalib/gnu/crypto/jce/mac/OMacTripleDESImpl.java,
+	libraries/javalib/gnu/crypto/jce/mac/OMacTwofishImpl.java,
+	libraries/javalib/gnu/crypto/prng/Fortuna.java,
+	libraries/javalib/gnu/crypto/prng/RandomEvent.java,
+	libraries/javalib/gnu/crypto/prng/RandomEventListener.java:
+	New files taken from GNU Crypto.
+
+	* libraries/javalib/Makefile.am,
+	libraries/javalib/Makefile.in,
+	libraries/javalib/all.files:
+	Regenerated.
+
+	* libraries/javalib/gnu/crypto/Registry.java,
+	libraries/javalib/gnu/crypto/auth/callback/GnuCallbacks.java,
+	libraries/javalib/gnu/crypto/hash/BaseHash.java,
+	libraries/javalib/gnu/crypto/hash/IMessageDigest.java,
+	libraries/javalib/gnu/crypto/jce/GnuCrypto.java,
+	libraries/javalib/gnu/crypto/jce/mac/HMacMD2Spi.java,
+	libraries/javalib/gnu/crypto/jce/mac/HMacMD4Spi.java,
+	libraries/javalib/gnu/crypto/jce/mac/HMacMD5Spi.java,
+	libraries/javalib/gnu/crypto/jce/mac/HMacRipeMD128Spi.java,
+	libraries/javalib/gnu/crypto/jce/mac/HMacRipeMD160Spi.java,
+	libraries/javalib/gnu/crypto/jce/mac/HMacSHA160Spi.java,
+	libraries/javalib/gnu/crypto/jce/mac/HMacSHA256Spi.java,
+	libraries/javalib/gnu/crypto/jce/mac/HMacSHA384Spi.java,
+	libraries/javalib/gnu/crypto/jce/mac/HMacSHA512Spi.java,
+	libraries/javalib/gnu/crypto/jce/mac/HMacWhirlpoolSpi.java,
+	libraries/javalib/gnu/crypto/jce/mac/MacAdapter.java,
+	libraries/javalib/gnu/crypto/jce/mac/TMMH16Spi.java,
+	libraries/javalib/gnu/crypto/jce/mac/UHash32Spi.java,
+	libraries/javalib/gnu/crypto/jce/mac/UMac32Spi.java,
+	libraries/javalib/gnu/crypto/mac/BaseMac.java,
+	libraries/javalib/gnu/crypto/mac/HMac.java,
+	libraries/javalib/gnu/crypto/mac/HMacFactory.java,
+	libraries/javalib/gnu/crypto/mac/IMac.java,
+	libraries/javalib/gnu/crypto/mac/MacFactory.java,
+	libraries/javalib/gnu/crypto/mac/MacInputStream.java,
+	libraries/javalib/gnu/crypto/mac/MacOutputStream.java,
+	libraries/javalib/gnu/crypto/mac/OMAC.java,
+	libraries/javalib/gnu/crypto/mac/TMMH16.java,
+	libraries/javalib/gnu/crypto/mac/UHash32.java,
+	libraries/javalib/gnu/crypto/mac/UMac32.java,
+	libraries/javalib/gnu/crypto/mode/EAX.java,
+	libraries/javalib/gnu/crypto/pad/SSL3.java,
+	libraries/javalib/gnu/crypto/prng/ARCFour.java,
+	libraries/javalib/gnu/crypto/prng/BasePRNG.java,
+	libraries/javalib/gnu/crypto/prng/CSPRNG.java,
+	libraries/javalib/gnu/crypto/prng/EntropySource.java,
+	libraries/javalib/gnu/crypto/prng/ICMGenerator.java,
+	libraries/javalib/gnu/crypto/prng/IPBE.java,
+	libraries/javalib/gnu/crypto/prng/IRandom.java,
+	libraries/javalib/gnu/crypto/prng/LimitReachedException.java,
+	libraries/javalib/gnu/crypto/prng/MDGenerator.java,
+	libraries/javalib/gnu/crypto/prng/PBKDF2.java,
+	libraries/javalib/gnu/crypto/prng/PRNGFactory.java,
+	libraries/javalib/gnu/crypto/prng/UMacGenerator.java:
+	Resynced with GNU Crypto.
+
+	* libraries/javalib/org/metastatic/jessie/provider/SSLRandom.java,
+	libraries/javalib/org/metastatic/jessie/provider/SynchronizedRandom.java,
+	libraries/javalib/org/metastatic/jessie/provider/TLSRandom.java:
+	Adapted for GNU Classspath IRandom fixes.
+
+	2004-10-12  Casey Marshall  <csm at gnu.org>
+
+        * source/gnu/crypto/auth/callback/GnuCallbacks.java
+        (<init>): don't reference AWT callbacks statically.
+
+        * source/gnu/crypto/mac/TMMH16.java
+        (<init>): removed copying constructor.
+        (clone): removed.
+
+        * build.xml: added gcjlib targets.
+
+	2004-10-11  Casey Marshall  <csm at gnu.org>
+
+        * source/gnu/crypto/jce/GnuCrypto.java
+        (<init>): added more Hmac aliases.
+
+	2004-10-10  Casey Marshall  <csm at gnu.org>
+
+        * source/gnu/crypto/jce/GnuCrypto.java
+        (<init>): added SecretKeyFactoryImpl classes; Hmac aliases.
+        * source/gnu/crypto/jce/mac/MacAdapter.java: implement Cloneable.
+        (<init>): removed 'copying' constructor.
+        (clone): call 'super.clone'; declare to throw
+        CloneNotSupportedException.
+        * source/gnu/crypto/mac/BaseMac.java
+        (clone): implemented using 'Object.clone'.
+        * source/gnu/crypto/mac/HMac.java: implement Cloneable.
+        (clone): removed.
+        * source/gnu/crypto/mac/IMac.java: don't extend Cloneable.
+        (clone): declare to throw CloneNotSupportedException.
+        * source/gnu/crypto/prng/ARCFour.java: implement Cloneable.
+        (clone): removed.
+        * source/gnu/crypto/prng/BasePRNG.java
+        (clone): implement using 'Object.clone'.
+        * source/gnu/crypto/prng/Fortuna.java
+        (clone): removed.
+        (Generator.clone): removed.
+        * source/gnu/crypto/prng/ICMGenerator.java: implement Cloneable.
+        (<init>): removed copying constructor.
+        (clone): removed.
+        * source/gnu/crypto/prng/IRandom.java
+        (clone): declare to throw CloneNotSupportedException.
+        * source/gnu/crypto/prng/MDGenerator.java: implement Cloneable.
+        (<init>): removed copying constructor.
+        (clone): removed.
+        * source/gnu/crypto/prng/PBKDF2.java
+        (clone): removed.
+        * source/gnu/crypto/prng/UMacGenerator.java: implement Cloneable.
+        (<init>): removed copying constructor.
+        (clone): removed.
+        * source/gnu/crypto/mode/EAX.java
+        (<init>): don't use IMac.clone to create mac instances.
+
+        * source/gnu/crypto/jce/key/AnubisSecretKeyFactoryImpl.java
+        * source/gnu/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java
+        * source/gnu/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java
+        * source/gnu/crypto/jce/key/SecretKeyFactoryImpl.java
+        * source/gnu/crypto/jce/key/Cast5SecretKeyFactoryImpl.java
+        * source/gnu/crypto/jce/key/SerpentSecretKeyFactoryImpl.java
+        * source/gnu/crypto/jce/key/DESSecretKeyFactoryImpl.java
+        * source/gnu/crypto/jce/key/SquareSecretKeyFactoryImpl.java
+        * source/gnu/crypto/jce/key/DESedeSecretKeyFactoryImpl.java
+        * source/gnu/crypto/jce/key/TwofishSecretKeyFactoryImpl.java
+        * source/gnu/crypto/jce/key/KhazadSecretKeyFactoryImpl.java
+        New files.
+
+	2004-08-19  Casey Marshall <csm at gnu.org>
+
+        * source/gnu/crypto/prng/BasePRNG.java
+        (nextBytes): fix bounds check. Use `while' not `do-while' loop.
+
+	2004-08-19  Casey Marshall <csm at gnu.org>
+
+        * source/gnu/crypto/Registry.java.in
+        (FORTUNA_PRNG): new constant.
+        (FORTUNA_GENERATOR_PRNG): new constant.
+        * source/gnu/crypto/hash/BaseHash.java
+        (update(byte[])): new method.
+        * source/gnu/crypto/hash/IMessageDigest.java
+        (update(byte[])): new method.
+        * source/gnu/crypto/prng/BasePRNG.java
+        (addRandomBytes(byte[])): new method.
+        * source/gnu/crypto/prng/Fortuna.java: new file.
+        * source/gnu/crypto/prng/IRandom.java
+        (addRandomBytes(byte[])): new method.
+        * source/gnu/crypto/prng/RandomEvent.java: new file.
+        * source/gnu/crypto/prng/RandomEventListener.java: new file.
+
+	2004-08-18  Casey Marshall <csm at gnu.org>
+
+        * source/gnu/crypto/pad/SSL3.java
+        (pad): commented out call to `PRNG.nextBytes'; this seems to cause
+        `make check' to hang for some reason.
+        * source/gnu/crypto/prng/CSPRNG.java
+        (SPINNER_COUNT): new constant.
+        (SPINNER_THREADS): new constant.
+        (<clinit>): initialize `SPINNER_THREADS' along with `SPINNERS'.
+        (fastPoll): use `SPINNER_COUNT'. Access Spinner.counter directly.
+        (Spinner): implement Runnable; don't extend Thread.
+        (Poller.run): kill-and-wait-on the process if we get an
+        exception.
+
+	2004-08-18  Casey Marshall <csm at gnu.org>
+
+        * source/gnu/crypto/jce/GnuCrypto.java
+        (<init>): use new OMac classes.
+        * source/gnu/crypto/jce/mac/OMacAnubisImpl.java,
+        * source/gnu/crypto/jce/mac/OMacBlowfishImpl.java,
+        * source/gnu/crypto/jce/mac/OMacCast5Impl.java,
+        * source/gnu/crypto/jce/mac/OMacDESImpl.java,
+        * source/gnu/crypto/jce/mac/OMacImpl.java,
+        * source/gnu/crypto/jce/mac/OMacKhazadImpl.java,
+        * source/gnu/crypto/jce/mac/OMacRijndaelImpl.java,
+        * source/gnu/crypto/jce/mac/OMacSerpentImpl.java,
+        * source/gnu/crypto/jce/mac/OMacSquareImpl.java,
+        * source/gnu/crypto/jce/mac/OMacTripleDESImpl.java,
+        * source/gnu/crypto/jce/mac/OMacTwofishImpl.java
+        new files.
+
 2004-10-17  Guilhem Lavaux  <guilhem at kaffe.org>
 
 	* kaffe/kaffevm/thread.c
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.250 kaffe/libraries/javalib/Makefile.am:1.251
--- kaffe/libraries/javalib/Makefile.am:1.250	Sun Oct 10 18:43:15 2004
+++ kaffe/libraries/javalib/Makefile.am	Sun Oct 17 19:06:49 2004
@@ -444,16 +444,27 @@
 	gnu/crypto/jce/hash/WhirlpoolSpi.java
 gnu_crypto_jce_key_SRCS = \
 	gnu/crypto/jce/key/AnubisKeyGeneratorImpl.java \
+	gnu/crypto/jce/key/AnubisSecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/BlowfishKeyGeneratorImpl.java \
+	gnu/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/Cast5KeyGeneratorImpl.java \
+	gnu/crypto/jce/key/Cast5SecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/DESKeyGeneratorImpl.java \
+	gnu/crypto/jce/key/DESSecretKeyFactoryImpl.java \
+	gnu/crypto/jce/key/DESedeSecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/KhazadKeyGeneratorImpl.java \
+	gnu/crypto/jce/key/KhazadSecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/RijndaelKeyGeneratorImpl.java \
+	gnu/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java \
+	gnu/crypto/jce/key/SecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/SecretKeyGeneratorImpl.java \
 	gnu/crypto/jce/key/SerpentKeyGeneratorImpl.java \
+	gnu/crypto/jce/key/SerpentSecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/SquareKeyGeneratorImpl.java \
+	gnu/crypto/jce/key/SquareSecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/TripleDESKeyGeneratorImpl.java \
-	gnu/crypto/jce/key/TwofishKeyGeneratorImpl.java
+	gnu/crypto/jce/key/TwofishKeyGeneratorImpl.java \
+	gnu/crypto/jce/key/TwofishSecretKeyFactoryImpl.java
 gnu_crypto_jce_keyring_SRCS = \
 	gnu/crypto/jce/keyring/GnuKeyring.java
 gnu_crypto_jce_mac_SRCS = \
@@ -470,7 +481,17 @@
 	gnu/crypto/jce/mac/HMacTigerSpi.java \
 	gnu/crypto/jce/mac/HMacWhirlpoolSpi.java \
 	gnu/crypto/jce/mac/MacAdapter.java \
+	gnu/crypto/jce/mac/OMacAnubisImpl.java \
+	gnu/crypto/jce/mac/OMacBlowfishImpl.java \
+	gnu/crypto/jce/mac/OMacCast5Impl.java \
+	gnu/crypto/jce/mac/OMacDESImpl.java \
 	gnu/crypto/jce/mac/OMacImpl.java \
+	gnu/crypto/jce/mac/OMacKhazadImpl.java \
+	gnu/crypto/jce/mac/OMacRijndaelImpl.java \
+	gnu/crypto/jce/mac/OMacSerpentImpl.java \
+	gnu/crypto/jce/mac/OMacSquareImpl.java \
+	gnu/crypto/jce/mac/OMacTripleDESImpl.java \
+	gnu/crypto/jce/mac/OMacTwofishImpl.java \
 	gnu/crypto/jce/mac/TMMH16Spi.java \
 	gnu/crypto/jce/mac/UHash32Spi.java \
 	gnu/crypto/jce/mac/UMac32Spi.java
@@ -673,6 +694,7 @@
 	gnu/crypto/prng/BasePRNG.java \
 	gnu/crypto/prng/CSPRNG.java \
 	gnu/crypto/prng/EntropySource.java \
+	gnu/crypto/prng/Fortuna.java \
 	gnu/crypto/prng/ICMGenerator.java \
 	gnu/crypto/prng/IPBE.java \
 	gnu/crypto/prng/IRandom.java \
@@ -680,6 +702,8 @@
 	gnu/crypto/prng/MDGenerator.java \
 	gnu/crypto/prng/PBKDF2.java \
 	gnu/crypto/prng/PRNGFactory.java \
+	gnu/crypto/prng/RandomEvent.java \
+	gnu/crypto/prng/RandomEventListener.java \
 	gnu/crypto/prng/UMacGenerator.java
 gnu_crypto_sasl_SRCS = \
 	gnu/crypto/sasl/AuthInfo.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.330 kaffe/libraries/javalib/Makefile.in:1.331
--- kaffe/libraries/javalib/Makefile.in:1.330	Sun Oct 10 18:43:15 2004
+++ kaffe/libraries/javalib/Makefile.in	Sun Oct 17 19:06:50 2004
@@ -800,16 +800,27 @@
 
 gnu_crypto_jce_key_SRCS = \
 	gnu/crypto/jce/key/AnubisKeyGeneratorImpl.java \
+	gnu/crypto/jce/key/AnubisSecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/BlowfishKeyGeneratorImpl.java \
+	gnu/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/Cast5KeyGeneratorImpl.java \
+	gnu/crypto/jce/key/Cast5SecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/DESKeyGeneratorImpl.java \
+	gnu/crypto/jce/key/DESSecretKeyFactoryImpl.java \
+	gnu/crypto/jce/key/DESedeSecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/KhazadKeyGeneratorImpl.java \
+	gnu/crypto/jce/key/KhazadSecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/RijndaelKeyGeneratorImpl.java \
+	gnu/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java \
+	gnu/crypto/jce/key/SecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/SecretKeyGeneratorImpl.java \
 	gnu/crypto/jce/key/SerpentKeyGeneratorImpl.java \
+	gnu/crypto/jce/key/SerpentSecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/SquareKeyGeneratorImpl.java \
+	gnu/crypto/jce/key/SquareSecretKeyFactoryImpl.java \
 	gnu/crypto/jce/key/TripleDESKeyGeneratorImpl.java \
-	gnu/crypto/jce/key/TwofishKeyGeneratorImpl.java
+	gnu/crypto/jce/key/TwofishKeyGeneratorImpl.java \
+	gnu/crypto/jce/key/TwofishSecretKeyFactoryImpl.java
 
 gnu_crypto_jce_keyring_SRCS = \
 	gnu/crypto/jce/keyring/GnuKeyring.java
@@ -828,7 +839,17 @@
 	gnu/crypto/jce/mac/HMacTigerSpi.java \
 	gnu/crypto/jce/mac/HMacWhirlpoolSpi.java \
 	gnu/crypto/jce/mac/MacAdapter.java \
+	gnu/crypto/jce/mac/OMacAnubisImpl.java \
+	gnu/crypto/jce/mac/OMacBlowfishImpl.java \
+	gnu/crypto/jce/mac/OMacCast5Impl.java \
+	gnu/crypto/jce/mac/OMacDESImpl.java \
 	gnu/crypto/jce/mac/OMacImpl.java \
+	gnu/crypto/jce/mac/OMacKhazadImpl.java \
+	gnu/crypto/jce/mac/OMacRijndaelImpl.java \
+	gnu/crypto/jce/mac/OMacSerpentImpl.java \
+	gnu/crypto/jce/mac/OMacSquareImpl.java \
+	gnu/crypto/jce/mac/OMacTripleDESImpl.java \
+	gnu/crypto/jce/mac/OMacTwofishImpl.java \
 	gnu/crypto/jce/mac/TMMH16Spi.java \
 	gnu/crypto/jce/mac/UHash32Spi.java \
 	gnu/crypto/jce/mac/UMac32Spi.java
@@ -1049,6 +1070,7 @@
 	gnu/crypto/prng/BasePRNG.java \
 	gnu/crypto/prng/CSPRNG.java \
 	gnu/crypto/prng/EntropySource.java \
+	gnu/crypto/prng/Fortuna.java \
 	gnu/crypto/prng/ICMGenerator.java \
 	gnu/crypto/prng/IPBE.java \
 	gnu/crypto/prng/IRandom.java \
@@ -1056,6 +1078,8 @@
 	gnu/crypto/prng/MDGenerator.java \
 	gnu/crypto/prng/PBKDF2.java \
 	gnu/crypto/prng/PRNGFactory.java \
+	gnu/crypto/prng/RandomEvent.java \
+	gnu/crypto/prng/RandomEventListener.java \
 	gnu/crypto/prng/UMacGenerator.java
 
 gnu_crypto_sasl_SRCS = \
Index: kaffe/libraries/javalib/all.files
diff -u kaffe/libraries/javalib/all.files:1.38 kaffe/libraries/javalib/all.files:1.39
--- kaffe/libraries/javalib/all.files:1.38	Sun Oct 10 18:43:16 2004
+++ kaffe/libraries/javalib/all.files	Sun Oct 17 19:06:50 2004
@@ -110,16 +110,27 @@
 gnu/crypto/jce/hash/TigerSpi.java
 gnu/crypto/jce/hash/WhirlpoolSpi.java
 gnu/crypto/jce/key/AnubisKeyGeneratorImpl.java
+gnu/crypto/jce/key/AnubisSecretKeyFactoryImpl.java
 gnu/crypto/jce/key/BlowfishKeyGeneratorImpl.java
+gnu/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java
 gnu/crypto/jce/key/Cast5KeyGeneratorImpl.java
+gnu/crypto/jce/key/Cast5SecretKeyFactoryImpl.java
 gnu/crypto/jce/key/DESKeyGeneratorImpl.java
+gnu/crypto/jce/key/DESSecretKeyFactoryImpl.java
+gnu/crypto/jce/key/DESedeSecretKeyFactoryImpl.java
 gnu/crypto/jce/key/KhazadKeyGeneratorImpl.java
+gnu/crypto/jce/key/KhazadSecretKeyFactoryImpl.java
 gnu/crypto/jce/key/RijndaelKeyGeneratorImpl.java
+gnu/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java
+gnu/crypto/jce/key/SecretKeyFactoryImpl.java
 gnu/crypto/jce/key/SecretKeyGeneratorImpl.java
 gnu/crypto/jce/key/SerpentKeyGeneratorImpl.java
+gnu/crypto/jce/key/SerpentSecretKeyFactoryImpl.java
 gnu/crypto/jce/key/SquareKeyGeneratorImpl.java
+gnu/crypto/jce/key/SquareSecretKeyFactoryImpl.java
 gnu/crypto/jce/key/TripleDESKeyGeneratorImpl.java
 gnu/crypto/jce/key/TwofishKeyGeneratorImpl.java
+gnu/crypto/jce/key/TwofishSecretKeyFactoryImpl.java
 gnu/crypto/jce/keyring/GnuKeyring.java
 gnu/crypto/jce/mac/HMacHavalSpi.java
 gnu/crypto/jce/mac/HMacMD2Spi.java
@@ -134,7 +145,17 @@
 gnu/crypto/jce/mac/HMacTigerSpi.java
 gnu/crypto/jce/mac/HMacWhirlpoolSpi.java
 gnu/crypto/jce/mac/MacAdapter.java
+gnu/crypto/jce/mac/OMacAnubisImpl.java
+gnu/crypto/jce/mac/OMacBlowfishImpl.java
+gnu/crypto/jce/mac/OMacCast5Impl.java
+gnu/crypto/jce/mac/OMacDESImpl.java
 gnu/crypto/jce/mac/OMacImpl.java
+gnu/crypto/jce/mac/OMacKhazadImpl.java
+gnu/crypto/jce/mac/OMacRijndaelImpl.java
+gnu/crypto/jce/mac/OMacSerpentImpl.java
+gnu/crypto/jce/mac/OMacSquareImpl.java
+gnu/crypto/jce/mac/OMacTripleDESImpl.java
+gnu/crypto/jce/mac/OMacTwofishImpl.java
 gnu/crypto/jce/mac/TMMH16Spi.java
 gnu/crypto/jce/mac/UHash32Spi.java
 gnu/crypto/jce/mac/UMac32Spi.java
@@ -319,6 +340,7 @@
 gnu/crypto/prng/BasePRNG.java
 gnu/crypto/prng/CSPRNG.java
 gnu/crypto/prng/EntropySource.java
+gnu/crypto/prng/Fortuna.java
 gnu/crypto/prng/ICMGenerator.java
 gnu/crypto/prng/IPBE.java
 gnu/crypto/prng/IRandom.java
@@ -326,6 +348,8 @@
 gnu/crypto/prng/MDGenerator.java
 gnu/crypto/prng/PBKDF2.java
 gnu/crypto/prng/PRNGFactory.java
+gnu/crypto/prng/RandomEvent.java
+gnu/crypto/prng/RandomEventListener.java
 gnu/crypto/prng/UMacGenerator.java
 gnu/crypto/sasl/AuthInfo.java
 gnu/crypto/sasl/AuthInfoProviderFactory.java
Index: kaffe/libraries/javalib/gnu/crypto/Registry.java
diff -u kaffe/libraries/javalib/gnu/crypto/Registry.java:1.1 kaffe/libraries/javalib/gnu/crypto/Registry.java:1.2
--- kaffe/libraries/javalib/gnu/crypto/Registry.java:1.1	Wed Jul 21 01:41:15 2004
+++ kaffe/libraries/javalib/gnu/crypto/Registry.java	Sun Oct 17 19:06:51 2004
@@ -2,7 +2,7 @@
 package gnu.crypto;
 
 // ----------------------------------------------------------------------------
-// $Id: Registry.java,v 1.1 2004/07/21 01:41:15 dalibor Exp $
+// $Id: Registry.java,v 1.2 2004/10/17 19:06:51 robilad Exp $
 //
 // Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 //
@@ -48,7 +48,7 @@
  * A placeholder for <i>names</i> and <i>literals</i> used throughout this
  * library.
  *
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
 public interface Registry {
 
@@ -184,6 +184,12 @@
 
    /** The continuously-seeded pseudo-random number generator. */
    String CSPRNG_PRNG = "csprng";
+
+   /** The Fortuna PRNG. */
+   String FORTUNA_PRNG = "fortuna";
+
+   /** The Fortuna generator PRNG. */
+   String FORTUNA_GENERATOR_PRNG = "fortuna-generator";
 
    // Asymmetric keypair generators............................................
 
Index: kaffe/libraries/javalib/gnu/crypto/auth/callback/GnuCallbacks.java
diff -u kaffe/libraries/javalib/gnu/crypto/auth/callback/GnuCallbacks.java:1.1 kaffe/libraries/javalib/gnu/crypto/auth/callback/GnuCallbacks.java:1.2
--- kaffe/libraries/javalib/gnu/crypto/auth/callback/GnuCallbacks.java:1.1	Wed Jul 21 01:41:18 2004
+++ kaffe/libraries/javalib/gnu/crypto/auth/callback/GnuCallbacks.java	Sun Oct 17 19:06:51 2004
@@ -53,8 +53,9 @@
         {
           put("CallbackHandler.Default", DefaultCallbackHandler.class.getName());
           put("CallbackHandler.Console", ConsoleCallbackHandler.class.getName());
-          put("CallbackHandler.AWT", AWTCallbackHandler.class.getName());
 
+          // We might not want/have AWT.
+          put("CallbackHandler.AWT", "gnu.crypto.auth.callback.AWTCallbackHandler");
           // SWT may not be available, so we cannot link this statically.
           put("CallbackHandler.SWT", "gnu.crypto.auth.callback.SWTCallbackHandler");
 
Index: kaffe/libraries/javalib/gnu/crypto/hash/BaseHash.java
diff -u kaffe/libraries/javalib/gnu/crypto/hash/BaseHash.java:1.1 kaffe/libraries/javalib/gnu/crypto/hash/BaseHash.java:1.2
--- kaffe/libraries/javalib/gnu/crypto/hash/BaseHash.java:1.1	Wed Jul 21 01:41:25 2004
+++ kaffe/libraries/javalib/gnu/crypto/hash/BaseHash.java	Sun Oct 17 19:06:52 2004
@@ -1,7 +1,7 @@
 package gnu.crypto.hash;
 
 // ----------------------------------------------------------------------------
-// $Id: BaseHash.java,v 1.1 2004/07/21 01:41:25 dalibor Exp $
+// $Id: BaseHash.java,v 1.2 2004/10/17 19:06:52 robilad Exp $
 //
 // Copyright (C) 2001, 2002, Free Software Foundation, Inc.
 //
@@ -46,7 +46,7 @@
 /**
  * <p>A base abstract class to facilitate hash implementations.</p>
  *
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
 public abstract class BaseHash implements IMessageDigest {
 
@@ -117,6 +117,10 @@
       if (i == (blockSize - 1)) {
          transform(buffer, 0);
       }
+   }
+
+   public void update(byte[] b) {
+      update(b, 0, b.length);
    }
 
    public void update(byte[] b, int offset, int len) {
Index: kaffe/libraries/javalib/gnu/crypto/hash/IMessageDigest.java
diff -u kaffe/libraries/javalib/gnu/crypto/hash/IMessageDigest.java:1.3 kaffe/libraries/javalib/gnu/crypto/hash/IMessageDigest.java:1.4
--- kaffe/libraries/javalib/gnu/crypto/hash/IMessageDigest.java:1.3	Wed Jul 21 01:41:25 2004
+++ kaffe/libraries/javalib/gnu/crypto/hash/IMessageDigest.java	Sun Oct 17 19:06:52 2004
@@ -1,7 +1,7 @@
 package gnu.crypto.hash;
 
 // ----------------------------------------------------------------------------
-// $Id: IMessageDigest.java,v 1.3 2004/07/21 01:41:25 dalibor Exp $
+// $Id: IMessageDigest.java,v 1.4 2004/10/17 19:06:52 robilad Exp $
 //
 // Copyright (C) 2001, 2002, Free Software Foundation, Inc.
 //
@@ -49,7 +49,7 @@
  * <p>A hash (or message digest) algorithm produces its output by iterating a
  * basic compression function on blocks of data.</p>
  *
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
  */
 public interface IMessageDigest extends Cloneable {
 
@@ -86,6 +86,16 @@
     * @param b the input byte to digest.
     */
    void update(byte b);
+
+   /**
+    * <p>Continues a message digest operation, by filling the buffer, processing
+    * data in the algorithm's HASH_SIZE-bit block(s), updating the context and
+    * count, and buffering the remaining bytes in buffer for the next
+    * operation.</p>
+    *
+    * @param in the input block.
+    */
+   void update(byte[] in);
 
    /**
     * <p>Continues a message digest operation, by filling the buffer, processing
Index: kaffe/libraries/javalib/gnu/crypto/jce/GnuCrypto.java
diff -u kaffe/libraries/javalib/gnu/crypto/jce/GnuCrypto.java:1.1 kaffe/libraries/javalib/gnu/crypto/jce/GnuCrypto.java:1.2
--- kaffe/libraries/javalib/gnu/crypto/jce/GnuCrypto.java:1.1	Wed Jul 21 01:41:27 2004
+++ kaffe/libraries/javalib/gnu/crypto/jce/GnuCrypto.java	Sun Oct 17 19:06:52 2004
@@ -1,7 +1,7 @@
 package gnu.crypto.jce;
 
 // --------------------------------------------------------------------------
-// $Id: GnuCrypto.java,v 1.1 2004/07/21 01:41:27 dalibor Exp $
+// $Id: GnuCrypto.java,v 1.2 2004/10/17 19:06:52 robilad Exp $
 //
 // Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 //
@@ -58,7 +58,7 @@
  * <p>The GNU Crypto implementation of the Java Cryptographic Extension (JCE)
  * Provider.</p>
  *
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  * @see java.security.Provider
  */
 public final class GnuCrypto extends Provider {
@@ -340,6 +340,21 @@
                put("SecretKeyFactory.PBKDF2WithHMacWhirlpool",
                    gnu.crypto.jce.PBKDF2SecretKeyFactory.HMacWhirlpool.class.getName());
 
+               // Simple SecretKeyFactory implementations.
+               put ("SecretKeyFactory.Anubis", gnu.crypto.jce.key.AnubisSecretKeyFactoryImpl.class.getName());
+               put ("SecretKeyFactory.Blowfish", gnu.crypto.jce.key.BlowfishSecretKeyFactoryImpl.class.getName());
+               put ("SecretKeyFactory.Cast5", gnu.crypto.jce.key.Cast5SecretKeyFactoryImpl.class.getName());
+               put ("SecretKeyFactory.DES", gnu.crypto.jce.key.DESSecretKeyFactoryImpl.class.getName());
+               put ("SecretKeyFactory.Khazad", gnu.crypto.jce.key.KhazadSecretKeyFactoryImpl.class.getName());
+               put ("SecretKeyFactory.Rijndael", gnu.crypto.jce.key.RijndaelSecretKeyFactoryImpl.class.getName());
+               put ("SecretKeyFactory.Serpent", gnu.crypto.jce.key.SerpentSecretKeyFactoryImpl.class.getName());
+               put ("SecretKeyFactory.Square", gnu.crypto.jce.key.SquareSecretKeyFactoryImpl.class.getName());
+               put ("SecretKeyFactory.TripleDES", gnu.crypto.jce.key.DESedeSecretKeyFactoryImpl.class.getName());
+               put ("Alg.Alias.SecretKeyFactory.AES", "Rijndael");
+               put ("Alg.Alias.SecretKeyFactory.DESede", "TripleDES");
+               put ("Alg.Alias.SecretKeyFactory.3-DES", "TripleDES");
+               put ("Alg.Alias.SecretKeyFactory.3DES", "TripleDES");
+
                put("AlgorithmParameters.BlockCipherParameters",
                    gnu.crypto.jce.params.BlockCipherParameters.class.getName());
 
@@ -360,16 +375,16 @@
                put("Mac.UHASH32", gnu.crypto.jce.mac.UHash32Spi.class.getName());
                put("Mac.UMAC32", gnu.crypto.jce.mac.UMac32Spi.class.getName());
 
-               put("Mac.OMAC-ANUBIS", gnu.crypto.jce.mac.OMacImpl.Anubis.class.getName());
-               put("Mac.OMAC-BLOWFISH", gnu.crypto.jce.mac.OMacImpl.Blowfish.class.getName());
-               put("Mac.OMAC-CAST5", gnu.crypto.jce.mac.OMacImpl.Cast5.class.getName());
-               put("Mac.OMAC-DES", gnu.crypto.jce.mac.OMacImpl.DES.class.getName());
-               put("Mac.OMAC-KHAZAD", gnu.crypto.jce.mac.OMacImpl.Khazad.class.getName());
-               put("Mac.OMAC-RIJNDAEL", gnu.crypto.jce.mac.OMacImpl.Rijndael.class.getName());
-               put("Mac.OMAC-SERPENT", gnu.crypto.jce.mac.OMacImpl.Serpent.class.getName());
-               put("Mac.OMAC-SQUARE", gnu.crypto.jce.mac.OMacImpl.Square.class.getName());
-               put("Mac.OMAC-TRIPLEDES", gnu.crypto.jce.mac.OMacImpl.TripleDES.class.getName());
-               put("Mac.OMAC-TWOFISH", gnu.crypto.jce.mac.OMacImpl.Twofish.class.getName());
+               put("Mac.OMAC-ANUBIS", gnu.crypto.jce.mac.OMacAnubisImpl.class.getName());
+               put("Mac.OMAC-BLOWFISH", gnu.crypto.jce.mac.OMacBlowfishImpl.class.getName());
+               put("Mac.OMAC-CAST5", gnu.crypto.jce.mac.OMacCast5Impl.class.getName());
+               put("Mac.OMAC-DES", gnu.crypto.jce.mac.OMacDESImpl.class.getName());
+               put("Mac.OMAC-KHAZAD", gnu.crypto.jce.mac.OMacKhazadImpl.class.getName());
+               put("Mac.OMAC-RIJNDAEL", gnu.crypto.jce.mac.OMacRijndaelImpl.class.getName());
+               put("Mac.OMAC-SERPENT", gnu.crypto.jce.mac.OMacSerpentImpl.class.getName());
+               put("Mac.OMAC-SQUARE", gnu.crypto.jce.mac.OMacSquareImpl.class.getName());
+               put("Mac.OMAC-TRIPLEDES", gnu.crypto.jce.mac.OMacTripleDESImpl.class.getName());
+               put("Mac.OMAC-TWOFISH", gnu.crypto.jce.mac.OMacTwofishImpl.class.getName());
 
                // Aliases
                put("Alg.Alias.AlgorithmParameters.AES", "BlockCipherParameters");
@@ -399,6 +414,25 @@
                put("Alg.Alias.Mac.HMAC-RIPEMD-128", "HMAC-RIPEMD128");
                put("Alg.Alias.Mac.OMAC-AES", "OMAC-RIJNDAEL");
                put("Alg.Alias.Mac.OMAC-3DES", "OMAC-3DES");
+               put("Alg.Alias.Mac.HmacMD4", "HMAC-MD4");
+               put("Alg.Alias.Mac.HmacMD5", "HMAC-MD5");
+               put("Alg.Alias.Mac.HmacSHA-1", "HMAC-SHA-1");
+               put("Alg.Alias.Mac.HmacSHA1", "HMAC-SHA1");
+               put("Alg.Alias.Mac.HmacSHA-160", "HMAC-SHA-160");
+               put("Alg.Alias.Mac.HmacSHA160", "HMAC-SHA-160");
+               put("Alg.Alias.Mac.HmacSHA-256", "HMAC-SHA-256");
+               put("Alg.Alias.Mac.HmacSHA256", "HMAC-SHA-256");
+               put("Alg.Alias.Mac.HmacSHA-384", "HMAC-SHA-384");
+               put("Alg.Alias.Mac.HmacSHA384", "HMAC-SHA-384");
+               put("Alg.Alias.Mac.HmacSHA-512", "HMAC-SHA-512");
+               put("Alg.Alias.Mac.HmacSHA512", "HMAC-SHA-512");
+               put("Alg.Alias.Mac.HmacRIPEMD128", "HMAC-RIPEMD128");
+               put("Alg.Alias.Mac.HmacRIPEMD-128", "HMAC-RIPEMD128");
+               put("Alg.Alias.Mac.HmacRIPEMD160", "HMAC-RIPEMD160");
+               put("Alg.Alias.Mac.HmacRIPEMD-160", "HMAC-RIPEMD160");
+               put("Alg.Alias.Mac.HmacTiger", "HMAC-TIGER");
+               put("Alg.Alias.Mac.HmacHaval", "HMAC-HAVAL");
+               put("Alg.Alias.Mac.HmacWhirlpool", "HMAC-WHIRLPOOL");
 
                return null;
             }
===================================================================
Checking out kaffe/libraries/javalib/gnu/crypto/jce/key/AnubisSecretKeyFactoryImpl.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/crypto/jce/key/AnubisSecretKeyFactoryImpl.java,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/crypto/jce/key/AnubisSecretKeyFactoryImpl.java	Sun Oct 17 19:33:19 2004
@@ -0,0 +1,56 @@
+/* AnubisSecretKeyFactoryImpl.java -- simple byte array-wrapping factory.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Crypto.
+
+GNU Crypto is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+GNU Crypto is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; see the file COPYING.  If not, write to the
+
+   Free Software Foundation Inc.,
+   59 Temple Place - Suite 330,
+   Boston, MA 02111-1307
+   USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.  */
+
+
+package gnu.crypto.jce.key;
+
+import java.security.InvalidKeyException;
+import java.security.spec.InvalidKeySpecException;
+
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactorySpi;
+import javax.crypto.spec.SecretKeySpec;
+
+public class AnubisSecretKeyFactoryImpl extends SecretKeyFactoryImpl
+{
+  public AnubisSecretKeyFactoryImpl()
+  {
+  }
+}
===================================================================
Checking out kaffe/libraries/javalib/gnu/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java	Sun Oct 17 19:33:20 2004
@@ -0,0 +1,56 @@
+/* BlowfishSecretKeyFactoryImpl.java -- simple byte array-wrapping factory.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Crypto.
+
+GNU Crypto is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+GNU Crypto is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; see the file COPYING.  If not, write to the
+
+   Free Software Foundation Inc.,
+   59 Temple Place - Suite 330,
+   Boston, MA 02111-1307
+   USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.  */
+
+
+package gnu.crypto.jce.key;
+
+import java.security.InvalidKeyException;
+import java.security.spec.InvalidKeySpecException;
+
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactorySpi;
+import javax.crypto.spec.SecretKeySpec;
+
+public class BlowfishSecretKeyFactoryImpl extends SecretKeyFactoryImpl
+{
+  public BlowfishSecretKeyFactoryImpl()
+  {
+  }
+}
===================================================================
Checking out kaffe/libraries/javalib/gnu/crypto/jce/key/Cast5SecretKeyFactoryImpl.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/crypto/jce/key/Cast5SecretKeyFactoryImpl.java,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/crypto/jce/key/Cast5SecretKeyFactoryImpl.java	Sun Oct 17 19:33:20 2004
@@ -0,0 +1,56 @@
+/* Cast5SecretKeyFactoryImpl.java -- simple byte array-wrapping factory.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Crypto.
+
+GNU Crypto is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+GNU Crypto is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; see the file COPYING.  If not, write to the
+
+   Free Software Foundation Inc.,
+   59 Temple Place - Suite 330,
+   Boston, MA 02111-1307
+   USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.  */
+
+
+package gnu.crypto.jce.key;
+
+import java.security.InvalidKeyException;
+import java.security.spec.InvalidKeySpecException;
+
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactorySpi;
+import javax.crypto.spec.SecretKeySpec;
+
+public class Cast5SecretKeyFactoryImpl extends SecretKeyFactoryImpl
+{
+  public Cast5SecretKeyFactoryImpl()
+  {
+  }
+}
===================================================================
Checking out kaffe/libraries/javalib/gnu/crypto/jce/key/DESSecretKeyFactoryImpl.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/crypto/jce/key/DESSecretKeyFactoryImpl.java,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/crypto/jce/key/DESSecretKeyFactoryImpl.java	Sun Oct 17 19:33:20 2004
@@ -0,0 +1,84 @@
+/* DESSecretKeyFactoryImpl.java -- DES key factory.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Crypto.
+
+GNU Crypto is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+GNU Crypto is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; see the file COPYING.  If not, write to the
+
+   Free Software Foundation Inc.,
+   59 Temple Place - Suite 330,
+   Boston, MA 02111-1307
+   USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.  */
+
+
+package gnu.crypto.jce.key;
+
+import java.security.InvalidKeyException;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
+
+import javax.crypto.SecretKey;
+import javax.crypto.spec.DESKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+
+public class DESSecretKeyFactoryImpl extends SecretKeyFactoryImpl
+{
+
+  public DESSecretKeyFactoryImpl()
+  {
+  }
+
+  protected SecretKey engineGenerateSecret (KeySpec spec)
+    throws InvalidKeySpecException
+  {
+    if (spec instanceof DESKeySpec)
+      return new SecretKeySpec (((DESKeySpec) spec).getKey(), "DES");
+    return super.engineGenerateSecret (spec);
+  }
+
+  protected KeySpec engineGetKeySpec (SecretKey key, Class spec)
+    throws InvalidKeySpecException
+  {
+    if (spec.isAssignableFrom (DESKeySpec.class))
+      try
+        {
+          return new DESKeySpec (key.getEncoded());
+        }
+      catch (InvalidKeyException ike)
+        {
+          InvalidKeySpecException ikse = new InvalidKeySpecException
+            ("can't create DES key spec");
+          ikse.initCause (ike);
+          throw ikse;
+        }
+    return super.engineGetKeySpec (key, spec);

*** Patch too long, truncated ***




More information about the kaffe mailing list