--- a/ChangeLog	Thu Jun 21 16:06:05 2007 +0100
+++ b/ChangeLog	Tue Jun 26 16:11:37 2007 +0100
@@ -1,3 +1,465 @@
+2007-06-22  Andrew Haley  <aph@redhat.com>
+
+	* Makefile.am (ICEDTEA_PATCHES): Add icedtea-debuginfo.patch.
+	Add -g option to all Java compilations.
+	(ICEDTEA_COPY_SRC): Copy a bunch of files needed to build GNU
+	crypto.
+	* jce/gnu/java/security/hash/BaseHash.java,
+	jce/gnu/java/security/hash/HashFactory.java,
+	jce/gnu/java/security/hash/Haval.java,
+	jce/gnu/java/security/hash/IMessageDigest.java,
+	jce/gnu/java/security/hash/MD2.java,
+	jce/gnu/java/security/hash/MD4.java,
+	jce/gnu/java/security/hash/MD5.java,
+	jce/gnu/java/security/hash/RipeMD128.java,
+	jce/gnu/java/security/hash/RipeMD160.java,
+	jce/gnu/java/security/hash/Sha160.java,
+	jce/gnu/java/security/hash/Sha256.java,
+	jce/gnu/java/security/hash/Sha384.java,
+	jce/gnu/java/security/hash/Sha512.java,
+	jce/gnu/java/security/hash/Tiger.java,
+	jce/gnu/java/security/hash/Whirlpool.java,
+	jce/gnu/java/security/jce/hash/HavalSpi.java,
+	jce/gnu/java/security/jce/hash/MD2Spi.java,
+	jce/gnu/java/security/jce/hash/MD4Spi.java,
+	jce/gnu/java/security/jce/hash/MD5Spi.java,
+	jce/gnu/java/security/jce/hash/MessageDigestAdapter.java,
+	jce/gnu/java/security/jce/hash/RipeMD128Spi.java,
+	jce/gnu/java/security/jce/hash/RipeMD160Spi.java,
+	jce/gnu/java/security/jce/hash/Sha160Spi.java,
+	jce/gnu/java/security/jce/hash/Sha256Spi.java,
+	jce/gnu/java/security/jce/hash/Sha384Spi.java,
+	jce/gnu/java/security/jce/hash/Sha512Spi.java,
+	jce/gnu/java/security/jce/hash/TigerSpi.java,
+	jce/gnu/java/security/jce/hash/WhirlpoolSpi.java,
+	jce/gnu/java/security/jce/prng/HavalRandomSpi.java,
+	jce/gnu/java/security/jce/prng/MD2RandomSpi.java,
+	jce/gnu/java/security/jce/prng/MD4RandomSpi.java,
+	jce/gnu/java/security/jce/prng/MD5RandomSpi.java,
+	jce/gnu/java/security/jce/prng/RipeMD128RandomSpi.java,
+	jce/gnu/java/security/jce/prng/RipeMD160RandomSpi.java,
+	jce/gnu/java/security/jce/prng/SecureRandomAdapter.java,
+	jce/gnu/java/security/jce/prng/Sha160RandomSpi.java,
+	jce/gnu/java/security/jce/prng/Sha256RandomSpi.java,
+	jce/gnu/java/security/jce/prng/Sha384RandomSpi.java,
+	jce/gnu/java/security/jce/prng/Sha512RandomSpi.java,
+	jce/gnu/java/security/jce/prng/TigerRandomSpi.java,
+	jce/gnu/java/security/jce/prng/WhirlpoolRandomSpi.java,
+	jce/gnu/java/security/jce/sig/DSSKeyFactory.java,
+	jce/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java,
+	jce/gnu/java/security/jce/sig/DSSParameters.java,
+	jce/gnu/java/security/jce/sig/DSSParametersGenerator.java,
+	jce/gnu/java/security/jce/sig/DSSRawSignatureSpi.java,
+	jce/gnu/java/security/jce/sig/EncodedKeyFactory.java,
+	jce/gnu/java/security/jce/sig/KeyPairGeneratorAdapter.java,
+	jce/gnu/java/security/jce/sig/MD2withRSA.java,
+	jce/gnu/java/security/jce/sig/MD5withRSA.java,
+	jce/gnu/java/security/jce/sig/RSAKeyFactory.java,
+	jce/gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java,
+	jce/gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.java,
+	jce/gnu/java/security/jce/sig/SHA160withDSS.java,
+	jce/gnu/java/security/jce/sig/SHA160withRSA.java,
+	jce/gnu/java/security/jce/sig/SHA256withRSA.java,
+	jce/gnu/java/security/jce/sig/SHA384withRSA.java,
+	jce/gnu/java/security/jce/sig/SHA512withRSA.java,
+	jce/gnu/java/security/jce/sig/SignatureAdapter.java,
+	jce/gnu/java/security/key/IKeyPairCodec.java,
+	jce/gnu/java/security/key/IKeyPairGenerator.java,
+	jce/gnu/java/security/key/KeyPairCodecFactory.java,
+	jce/gnu/java/security/key/KeyPairGeneratorFactory.java,
+	jce/gnu/java/security/key/dss/DSSKey.java,
+	jce/gnu/java/security/key/dss/DSSKeyPairGenerator.java,
+	jce/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java,
+	jce/gnu/java/security/key/dss/DSSKeyPairRawCodec.java,
+	jce/gnu/java/security/key/dss/DSSKeyPairX509Codec.java,
+	jce/gnu/java/security/key/dss/DSSPrivateKey.java,
+	jce/gnu/java/security/key/dss/DSSPublicKey.java,
+	jce/gnu/java/security/key/dss/FIPS186.java,
+	jce/gnu/java/security/key/rsa/GnuRSAKey.java,
+	jce/gnu/java/security/key/rsa/GnuRSAPrivateKey.java,
+	jce/gnu/java/security/key/rsa/GnuRSAPublicKey.java,
+	jce/gnu/java/security/key/rsa/RSAKeyPairGenerator.java,
+	jce/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java,
+	jce/gnu/java/security/key/rsa/RSAKeyPairRawCodec.java,
+	jce/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java,
+	jce/gnu/java/security/prng/BasePRNG.java,
+	jce/gnu/java/security/prng/EntropySource.java,
+	jce/gnu/java/security/prng/IRandom.java,
+	jce/gnu/java/security/prng/LimitReachedException.java,
+	jce/gnu/java/security/prng/MDGenerator.java,
+	jce/gnu/java/security/prng/PRNGFactory.java,
+	jce/gnu/java/security/prng/RandomEvent.java,
+	jce/gnu/java/security/prng/RandomEventListener.java,
+	jce/gnu/java/security/provider/CollectionCertStoreImpl.java,
+	jce/gnu/java/security/provider/DefaultPolicy.java,
+	jce/gnu/java/security/provider/Gnu.java,
+	jce/gnu/java/security/provider/PKIXCertPathValidatorImpl.java,
+	jce/gnu/java/security/provider/X509CertificateFactory.java,
+	jce/gnu/java/security/provider/package.html,
+	jce/gnu/java/security/sig/BaseSignature.java,
+	jce/gnu/java/security/sig/ISignature.java,
+	jce/gnu/java/security/sig/ISignatureCodec.java,
+	jce/gnu/java/security/sig/SignatureCodecFactory.java,
+	jce/gnu/java/security/sig/SignatureFactory.java,
+	jce/gnu/java/security/sig/dss/DSSSignature.java,
+	jce/gnu/java/security/sig/dss/DSSSignatureRawCodec.java,
+	jce/gnu/java/security/sig/dss/DSSSignatureX509Codec.java,
+	jce/gnu/java/security/sig/rsa/EME_PKCS1_V1_5.java,
+	jce/gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.java,
+	jce/gnu/java/security/sig/rsa/EMSA_PSS.java,
+	jce/gnu/java/security/sig/rsa/RSA.java,
+	jce/gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.java,
+	jce/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.java,
+	jce/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.java,
+	jce/gnu/java/security/sig/rsa/RSAPSSSignature.java,
+	jce/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java,
+	jce/gnu/java/security/sig/rsa/RSASignatureFactory.java,
+	jce/gnu/java/security/util/ByteArray.java,
+	jce/gnu/java/security/util/ByteBufferOutputStream.java,
+	jce/gnu/java/security/util/DerUtil.java,
+	jce/gnu/java/security/util/ExpirableObject.java,
+	jce/gnu/java/security/util/FormatUtil.java,
+	jce/gnu/java/security/util/IntegerUtil.java,
+	jce/gnu/java/security/util/PRNG.java,
+	jce/gnu/java/security/util/Prime.java,
+	jce/gnu/java/security/util/Sequence.java,
+	jce/gnu/java/security/util/SimpleList.java,
+	jce/gnu/java/security/util/Util.java,
+	jce/gnu/java/security/util/package.html,
+	jce/gnu/java/security/x509/GnuPKIExtension.java,
+	jce/gnu/java/security/x509/PolicyNodeImpl.java,
+	jce/gnu/java/security/x509/X500DistinguishedName.java,
+	jce/gnu/java/security/x509/X509CRL.java,
+	jce/gnu/java/security/x509/X509CRLEntry.java,
+	jce/gnu/java/security/x509/X509CRLSelectorImpl.java,
+	jce/gnu/java/security/x509/X509CertPath.java,
+	jce/gnu/java/security/x509/X509CertSelectorImpl.java,
+	jce/gnu/java/security/x509/X509Certificate.java,
+	jce/gnu/java/security/x509/ext/AuthorityKeyIdentifier.java,
+	jce/gnu/java/security/x509/ext/BasicConstraints.java,
+	jce/gnu/java/security/x509/ext/CRLNumber.java,
+	jce/gnu/java/security/x509/ext/CertificatePolicies.java,
+	jce/gnu/java/security/x509/ext/ExtendedKeyUsage.java,
+	jce/gnu/java/security/x509/ext/Extension.java,
+	jce/gnu/java/security/x509/ext/GeneralName.java,
+	jce/gnu/java/security/x509/ext/GeneralNames.java,
+	jce/gnu/java/security/x509/ext/GeneralSubtree.java,
+	jce/gnu/java/security/x509/ext/IssuerAlternativeNames.java,
+	jce/gnu/java/security/x509/ext/KeyUsage.java,
+	jce/gnu/java/security/x509/ext/NameConstraints.java,
+	jce/gnu/java/security/x509/ext/PolicyConstraint.java,
+	jce/gnu/java/security/x509/ext/PolicyMappings.java,
+	jce/gnu/java/security/x509/ext/PrivateKeyUsagePeriod.java,
+	jce/gnu/java/security/x509/ext/ReasonCode.java,
+	jce/gnu/java/security/x509/ext/SubjectAlternativeNames.java,
+	jce/gnu/java/security/x509/ext/SubjectKeyIdentifier.java,
+	jce/gnu/java/security/x509/ext/package.html,
+	jce/gnu/java/security/x509/package.html,
+	jce/gnu/javax/crypto/RSACipherImpl.java,
+	jce/gnu/javax/crypto/assembly/Assembly.java,
+	jce/gnu/javax/crypto/assembly/Cascade.java,
+	jce/gnu/javax/crypto/assembly/CascadeStage.java,
+	jce/gnu/javax/crypto/assembly/CascadeTransformer.java,
+	jce/gnu/javax/crypto/assembly/DeflateTransformer.java,
+	jce/gnu/javax/crypto/assembly/Direction.java,
+	jce/gnu/javax/crypto/assembly/LoopbackTransformer.java,
+	jce/gnu/javax/crypto/assembly/ModeStage.java,
+	jce/gnu/javax/crypto/assembly/Operation.java,
+	jce/gnu/javax/crypto/assembly/PaddingTransformer.java,
+	jce/gnu/javax/crypto/assembly/Stage.java,
+	jce/gnu/javax/crypto/assembly/Transformer.java,
+	jce/gnu/javax/crypto/assembly/TransformerException.java,
+	jce/gnu/javax/crypto/cipher/Anubis.java,
+	jce/gnu/javax/crypto/cipher/BaseCipher.java,
+	jce/gnu/javax/crypto/cipher/Blowfish.java,
+	jce/gnu/javax/crypto/cipher/Cast5.java,
+	jce/gnu/javax/crypto/cipher/CipherFactory.java,
+	jce/gnu/javax/crypto/cipher/DES.java,
+	jce/gnu/javax/crypto/cipher/IBlockCipher.java,
+	jce/gnu/javax/crypto/cipher/IBlockCipherSpi.java,
+	jce/gnu/javax/crypto/cipher/Khazad.java,
+	jce/gnu/javax/crypto/cipher/NullCipher.java,
+	jce/gnu/javax/crypto/cipher/Rijndael.java,
+	jce/gnu/javax/crypto/cipher/Serpent.java,
+	jce/gnu/javax/crypto/cipher/Square.java,
+	jce/gnu/javax/crypto/cipher/TripleDES.java,
+	jce/gnu/javax/crypto/cipher/Twofish.java,
+	jce/gnu/javax/crypto/cipher/WeakKeyException.java,
+	jce/gnu/javax/crypto/jce/DiffieHellmanImpl.java,
+	jce/gnu/javax/crypto/jce/GnuCrypto.java,
+	jce/gnu/javax/crypto/jce/GnuSasl.java,
+	jce/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java,
+	jce/gnu/javax/crypto/jce/cipher/AES128KeyWrapSpi.java,
+	jce/gnu/javax/crypto/jce/cipher/AES192KeyWrapSpi.java,
+	jce/gnu/javax/crypto/jce/cipher/AES256KeyWrapSpi.java,
+	jce/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.java,
+	jce/gnu/javax/crypto/jce/cipher/AESSpi.java,
+	jce/gnu/javax/crypto/jce/cipher/ARCFourSpi.java,
+	jce/gnu/javax/crypto/jce/cipher/AnubisSpi.java,
+	jce/gnu/javax/crypto/jce/cipher/BlowfishSpi.java,
+	jce/gnu/javax/crypto/jce/cipher/Cast5Spi.java,
+	jce/gnu/javax/crypto/jce/cipher/CipherAdapter.java,
+	jce/gnu/javax/crypto/jce/cipher/DESSpi.java,
+	jce/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java,
+	jce/gnu/javax/crypto/jce/cipher/KhazadSpi.java,
+	jce/gnu/javax/crypto/jce/cipher/NullCipherSpi.java,
+	jce/gnu/javax/crypto/jce/cipher/PBES2.java,
+	jce/gnu/javax/crypto/jce/cipher/RijndaelSpi.java,
+	jce/gnu/javax/crypto/jce/cipher/SerpentSpi.java,
+	jce/gnu/javax/crypto/jce/cipher/SquareSpi.java,
+	jce/gnu/javax/crypto/jce/cipher/TripleDESKeyWrapSpi.java,
+	jce/gnu/javax/crypto/jce/cipher/TripleDESSpi.java,
+	jce/gnu/javax/crypto/jce/cipher/TwofishSpi.java,
+	jce/gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.java,
+	jce/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java,
+	jce/gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.java,
+	jce/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java,
+	jce/gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.java,
+	jce/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java,
+	jce/gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.java,
+	jce/gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.java,
+	jce/gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.java,
+	jce/gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.java,
+	jce/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java,
+	jce/gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.java,
+	jce/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java,
+	jce/gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.java,
+	jce/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java,
+	jce/gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.java,
+	jce/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java,
+	jce/gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.java,
+	jce/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java,
+	jce/gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.java,
+	jce/gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.java,
+	jce/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java,
+	jce/gnu/javax/crypto/jce/keyring/GnuKeyring.java,
+	jce/gnu/javax/crypto/jce/mac/HMacHavalSpi.java,
+	jce/gnu/javax/crypto/jce/mac/HMacMD2Spi.java,
+	jce/gnu/javax/crypto/jce/mac/HMacMD4Spi.java,
+	jce/gnu/javax/crypto/jce/mac/HMacMD5Spi.java,
+	jce/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java,
+	jce/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java,
+	jce/gnu/javax/crypto/jce/mac/HMacSHA160Spi.java,
+	jce/gnu/javax/crypto/jce/mac/HMacSHA256Spi.java,
+	jce/gnu/javax/crypto/jce/mac/HMacSHA384Spi.java,
+	jce/gnu/javax/crypto/jce/mac/HMacSHA512Spi.java,
+	jce/gnu/javax/crypto/jce/mac/HMacTigerSpi.java,
+	jce/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java,
+	jce/gnu/javax/crypto/jce/mac/MacAdapter.java,
+	jce/gnu/javax/crypto/jce/mac/OMacAnubisImpl.java,
+	jce/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.java,
+	jce/gnu/javax/crypto/jce/mac/OMacCast5Impl.java,
+	jce/gnu/javax/crypto/jce/mac/OMacDESImpl.java,
+	jce/gnu/javax/crypto/jce/mac/OMacImpl.java,
+	jce/gnu/javax/crypto/jce/mac/OMacKhazadImpl.java,
+	jce/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.java,
+	jce/gnu/javax/crypto/jce/mac/OMacSerpentImpl.java,
+	jce/gnu/javax/crypto/jce/mac/OMacSquareImpl.java,
+	jce/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.java,
+	jce/gnu/javax/crypto/jce/mac/OMacTwofishImpl.java,
+	jce/gnu/javax/crypto/jce/mac/TMMH16Spi.java,
+	jce/gnu/javax/crypto/jce/mac/UHash32Spi.java,
+	jce/gnu/javax/crypto/jce/mac/UMac32Spi.java,
+	jce/gnu/javax/crypto/jce/params/BlockCipherParameters.java,
+	jce/gnu/javax/crypto/jce/params/DEREncodingException.java,
+	jce/gnu/javax/crypto/jce/params/DERReader.java,
+	jce/gnu/javax/crypto/jce/params/DERWriter.java,
+	jce/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java,
+	jce/gnu/javax/crypto/jce/prng/CSPRNGSpi.java,
+	jce/gnu/javax/crypto/jce/prng/FortunaImpl.java,
+	jce/gnu/javax/crypto/jce/prng/ICMRandomSpi.java,
+	jce/gnu/javax/crypto/jce/prng/UMacRandomSpi.java,
+	jce/gnu/javax/crypto/jce/sig/DHKeyFactory.java,
+	jce/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java,
+	jce/gnu/javax/crypto/jce/sig/DHParameters.java,
+	jce/gnu/javax/crypto/jce/sig/DHParametersGenerator.java,
+	jce/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.java,
+	jce/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java,
+	jce/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.java,
+	jce/gnu/javax/crypto/key/BaseKeyAgreementParty.java,
+	jce/gnu/javax/crypto/key/GnuPBEKey.java,
+	jce/gnu/javax/crypto/key/GnuSecretKey.java,
+	jce/gnu/javax/crypto/key/IKeyAgreementParty.java,
+	jce/gnu/javax/crypto/key/IncomingMessage.java,
+	jce/gnu/javax/crypto/key/KeyAgreementException.java,
+	jce/gnu/javax/crypto/key/KeyAgreementFactory.java,
+	jce/gnu/javax/crypto/key/OutgoingMessage.java,
+	jce/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.java,
+	jce/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.java,
+	jce/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.java,
+	jce/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.java,
+	jce/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.java,
+	jce/gnu/javax/crypto/key/dh/DiffieHellmanSender.java,
+	jce/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.java,
+	jce/gnu/javax/crypto/key/dh/ElGamalReceiver.java,
+	jce/gnu/javax/crypto/key/dh/ElGamalSender.java,
+	jce/gnu/javax/crypto/key/dh/GnuDHKey.java,
+	jce/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java,
+	jce/gnu/javax/crypto/key/dh/GnuDHPrivateKey.java,
+	jce/gnu/javax/crypto/key/dh/GnuDHPublicKey.java,
+	jce/gnu/javax/crypto/key/dh/RFC2631.java,
+	jce/gnu/javax/crypto/key/srp6/SRP6Host.java,
+	jce/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.java,
+	jce/gnu/javax/crypto/key/srp6/SRP6SaslClient.java,
+	jce/gnu/javax/crypto/key/srp6/SRP6SaslServer.java,
+	jce/gnu/javax/crypto/key/srp6/SRP6TLSClient.java,
+	jce/gnu/javax/crypto/key/srp6/SRP6TLSServer.java,
+	jce/gnu/javax/crypto/key/srp6/SRP6User.java,
+	jce/gnu/javax/crypto/key/srp6/SRPAlgorithm.java,
+	jce/gnu/javax/crypto/key/srp6/SRPKey.java,
+	jce/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java,
+	jce/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.java,
+	jce/gnu/javax/crypto/key/srp6/SRPPrivateKey.java,
+	jce/gnu/javax/crypto/key/srp6/SRPPublicKey.java,
+	jce/gnu/javax/crypto/keyring/AuthenticatedEntry.java,
+	jce/gnu/javax/crypto/keyring/BaseKeyring.java,
+	jce/gnu/javax/crypto/keyring/BinaryDataEntry.java,
+	jce/gnu/javax/crypto/keyring/CertPathEntry.java,
+	jce/gnu/javax/crypto/keyring/CertificateEntry.java,
+	jce/gnu/javax/crypto/keyring/CompressedEntry.java,
+	jce/gnu/javax/crypto/keyring/EncryptedEntry.java,
+	jce/gnu/javax/crypto/keyring/Entry.java,
+	jce/gnu/javax/crypto/keyring/EnvelopeEntry.java,
+	jce/gnu/javax/crypto/keyring/GnuPrivateKeyring.java,
+	jce/gnu/javax/crypto/keyring/GnuPublicKeyring.java,
+	jce/gnu/javax/crypto/keyring/IKeyring.java,
+	jce/gnu/javax/crypto/keyring/IPrivateKeyring.java,
+	jce/gnu/javax/crypto/keyring/IPublicKeyring.java,
+	jce/gnu/javax/crypto/keyring/MalformedKeyringException.java,
+	jce/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.java,
+	jce/gnu/javax/crypto/keyring/MeteredInputStream.java,
+	jce/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java,
+	jce/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java,
+	jce/gnu/javax/crypto/keyring/PasswordProtectedEntry.java,
+	jce/gnu/javax/crypto/keyring/PrimitiveEntry.java,
+	jce/gnu/javax/crypto/keyring/PrivateKeyEntry.java,
+	jce/gnu/javax/crypto/keyring/Properties.java,
+	jce/gnu/javax/crypto/keyring/PublicKeyEntry.java,
+	jce/gnu/javax/crypto/kwa/AESKeyWrap.java,
+	jce/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.java,
+	jce/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.java,
+	jce/gnu/javax/crypto/kwa/KeyUnwrappingException.java,
+	jce/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.java,
+	jce/gnu/javax/crypto/kwa/TripleDESKeyWrap.java,
+	jce/gnu/javax/crypto/mac/BaseMac.java,
+	jce/gnu/javax/crypto/mac/HMac.java,
+	jce/gnu/javax/crypto/mac/HMacFactory.java,
+	jce/gnu/javax/crypto/mac/IMac.java,
+	jce/gnu/javax/crypto/mac/MacFactory.java,
+	jce/gnu/javax/crypto/mac/MacInputStream.java,
+	jce/gnu/javax/crypto/mac/MacOutputStream.java,
+	jce/gnu/javax/crypto/mac/OMAC.java,
+	jce/gnu/javax/crypto/mac/TMMH16.java,
+	jce/gnu/javax/crypto/mac/UHash32.java,
+	jce/gnu/javax/crypto/mac/UMac32.java,
+	jce/gnu/javax/crypto/mode/BaseMode.java,
+	jce/gnu/javax/crypto/mode/CBC.java,
+	jce/gnu/javax/crypto/mode/CFB.java,
+	jce/gnu/javax/crypto/mode/CTR.java,
+	jce/gnu/javax/crypto/mode/EAX.java,
+	jce/gnu/javax/crypto/mode/ECB.java,
+	jce/gnu/javax/crypto/mode/IAuthenticatedMode.java,
+	jce/gnu/javax/crypto/mode/ICM.java,
+	jce/gnu/javax/crypto/mode/IMode.java,
+	jce/gnu/javax/crypto/mode/ModeFactory.java,
+	jce/gnu/javax/crypto/mode/OFB.java,
+	jce/gnu/javax/crypto/pad/BasePad.java,
+	jce/gnu/javax/crypto/pad/IPad.java,
+	jce/gnu/javax/crypto/pad/ISO10126.java,
+	jce/gnu/javax/crypto/pad/PKCS1_V1_5.java,
+	jce/gnu/javax/crypto/pad/PKCS7.java,
+	jce/gnu/javax/crypto/pad/PadFactory.java,
+	jce/gnu/javax/crypto/pad/SSL3.java,
+	jce/gnu/javax/crypto/pad/TBC.java,
+	jce/gnu/javax/crypto/pad/TLS1.java,
+	jce/gnu/javax/crypto/pad/WrongPaddingException.java,
+	jce/gnu/javax/crypto/prng/ARCFour.java,
+	jce/gnu/javax/crypto/prng/CSPRNG.java,
+	jce/gnu/javax/crypto/prng/Fortuna.java,
+	jce/gnu/javax/crypto/prng/ICMGenerator.java,
+	jce/gnu/javax/crypto/prng/IPBE.java,
+	jce/gnu/javax/crypto/prng/PBKDF2.java,
+	jce/gnu/javax/crypto/prng/PRNGFactory.java,
+	jce/gnu/javax/crypto/prng/UMacGenerator.java,
+	jce/gnu/javax/crypto/sasl/AuthInfo.java,
+	jce/gnu/javax/crypto/sasl/AuthInfoProviderFactory.java,
+	jce/gnu/javax/crypto/sasl/ClientFactory.java,
+	jce/gnu/javax/crypto/sasl/ClientMechanism.java,
+	jce/gnu/javax/crypto/sasl/ConfidentialityException.java,
+	jce/gnu/javax/crypto/sasl/IAuthInfoProvider.java,
+	jce/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.java,
+	jce/gnu/javax/crypto/sasl/IllegalMechanismStateException.java,
+	jce/gnu/javax/crypto/sasl/InputBuffer.java,
+	jce/gnu/javax/crypto/sasl/IntegrityException.java,
+	jce/gnu/javax/crypto/sasl/NoSuchMechanismException.java,
+	jce/gnu/javax/crypto/sasl/NoSuchUserException.java,
+	jce/gnu/javax/crypto/sasl/OutputBuffer.java,
+	jce/gnu/javax/crypto/sasl/SaslEncodingException.java,
+	jce/gnu/javax/crypto/sasl/SaslInputStream.java,
+	jce/gnu/javax/crypto/sasl/SaslOutputStream.java,
+	jce/gnu/javax/crypto/sasl/SaslUtil.java,
+	jce/gnu/javax/crypto/sasl/ServerFactory.java,
+	jce/gnu/javax/crypto/sasl/ServerMechanism.java,
+	jce/gnu/javax/crypto/sasl/UserAlreadyExistsException.java,
+	jce/gnu/javax/crypto/sasl/anonymous/AnonymousClient.java,
+	jce/gnu/javax/crypto/sasl/anonymous/AnonymousServer.java,
+	jce/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.java,
+	jce/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.java,
+	jce/gnu/javax/crypto/sasl/crammd5/CramMD5Client.java,
+	jce/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.java,
+	jce/gnu/javax/crypto/sasl/crammd5/CramMD5Server.java,
+	jce/gnu/javax/crypto/sasl/crammd5/CramMD5Util.java,
+	jce/gnu/javax/crypto/sasl/crammd5/PasswordFile.java,
+	jce/gnu/javax/crypto/sasl/plain/PasswordFile.java,
+	jce/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.java,
+	jce/gnu/javax/crypto/sasl/plain/PlainClient.java,
+	jce/gnu/javax/crypto/sasl/plain/PlainRegistry.java,
+	jce/gnu/javax/crypto/sasl/plain/PlainServer.java,
+	jce/gnu/javax/crypto/sasl/srp/CALG.java,
+	jce/gnu/javax/crypto/sasl/srp/ClientStore.java,
+	jce/gnu/javax/crypto/sasl/srp/IALG.java,
+	jce/gnu/javax/crypto/sasl/srp/KDF.java,
+	jce/gnu/javax/crypto/sasl/srp/PasswordFile.java,
+	jce/gnu/javax/crypto/sasl/srp/SRP.java,
+	jce/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.java,
+	jce/gnu/javax/crypto/sasl/srp/SRPClient.java,
+	jce/gnu/javax/crypto/sasl/srp/SRPRegistry.java,
+	jce/gnu/javax/crypto/sasl/srp/SRPServer.java,
+	jce/gnu/javax/crypto/sasl/srp/SecurityContext.java,
+	jce/gnu/javax/crypto/sasl/srp/ServerStore.java,
+	jce/gnu/javax/crypto/sasl/srp/StoreEntry.java,
+	jce/gnu/javax/security/auth/Password.java,
+	jce/gnu/javax/security/auth/callback/AbstractCallbackHandler.java,
+	jce/gnu/javax/security/auth/callback/CertificateCallback.java,
+	jce/gnu/javax/security/auth/callback/ConsoleCallbackHandler.java,
+	jce/gnu/javax/security/auth/callback/DefaultCallbackHandler.java,
+	jce/gnu/javax/security/auth/callback/GnuCallbacks.java,
+	jce/gnu/javax/security/auth/login/ConfigFileParser.java,
+	jce/gnu/javax/security/auth/login/ConfigFileTokenizer.java,
+	jce/gnu/javax/security/auth/login/GnuConfiguration.java,
+	lib/rt/gnu/java/security/provider/Gnu.java,
+	rt/gnu/java/io/Base64InputStream.java,
+	rt/gnu/java/security/provider/Gnu.java,
+	rt/java/util/Timer.java,
+	rt/javax/security/auth/callback/ChoiceCallback.java,
+	rt/javax/security/auth/callback/ConfirmationCallback.java,
+	rt/javax/security/auth/callback/LanguageCallback.java,
+	rt/javax/security/auth/callback/NameCallback.java,
+	rt/javax/security/auth/callback/TextInputCallback.java,
+	rt/javax/security/auth/callback/TextOutputCallback.java,
+	rt/javax/security/sasl/AuthenticationException.java,
+	rt/javax/security/sasl/Sasl.java,
+	rt/javax/security/sasl/SaslClient.java,
+	rt/javax/security/sasl/SaslClientFactory.java,
+	rt/javax/security/sasl/SaslException.java,
+	rt/javax/security/sasl/SaslServer.java,
+	rt/javax/security/sasl/SaslServerFactory.java: New files
+
+2007-06-21  Andrew Haley  <aph@redhat.com>
+
+	* Makefile (ICEDTEA_PATCHES): Add icedtea-debuginfo.patch.
+	patches/icedtea-debuginfo.patch: New file.
+
 2007-06-25  Kyle Galloway  <kgallowa@redhat.com>
 
 	* rt/java/awt/color/ICC_Profile.java(isRGBProfile): Add tags parameter to

--- a/Makefile.am	Thu Jun 21 16:06:05 2007 +0100
+++ b/Makefile.am	Tue Jun 26 16:11:37 2007 +0100
@@ -33,6 +33,7 @@
 	patches/icedtea-text-relocations.patch \
 	patches/icedtea-graphics.patch \
 	patches/icedtea-gcc.patch \
+	patches/icedtea-debuginfo.patch \
 	$(FAST_BUILD_PATCH) \
 	$(CCACHE_PATCH)
 
@@ -209,7 +210,21 @@
 	com/sun/jdi/VoidType.java \
 	com/sun/jdi/VoidValue.java \
 	com/sun/tools/jdi/LinkedHashMap.java \
-	java/util/Observer.java
+	java/util/Observer.java \
+	java/util/Timer.java \
+	javax/security/sasl/SaslException.java \
+	javax/security/sasl/AuthenticationException.java \
+	javax/security/auth/callback/NameCallback.java \
+	javax/security/sasl/Sasl.java \
+	javax/security/sasl/SaslServer.java \
+	javax/security/sasl/SaslClient.java \
+	javax/security/sasl/SaslClientFactory.java \
+	javax/security/sasl/SaslServerFactory.java \
+	javax/security/auth/callback/ChoiceCallback.java \
+	javax/security/auth/callback/ConfirmationCallback.java \
+	javax/security/auth/callback/LanguageCallback.java \
+	javax/security/auth/callback/TextInputCallback.java \
+	javax/security/auth/callback/TextOutputCallback.java
 
 if FOUND_ECJ
   JCOMPILER = $(ECJ) -nowarn
@@ -383,7 +398,7 @@
 rt-compile-classes: rt-classes
 	mkdir -p lib/rt
 	cd rt ; \
-	  $(JCOMPILER) -d ../lib/rt -bootclasspath '' -source 1.6 \
+	  $(JCOMPILER) -g -d ../lib/rt -bootclasspath '' -source 1.6 \
 	    -sourcepath $(OPENJDK_SRC_DIR)/j2se/src/share/classes:$(OPENJDK_SRC_DIR)/j2se/src/solaris/classes:../generated:../jce \
 	    @../rt-classes
 
@@ -417,7 +432,7 @@
 	    generated/sun/nio/ch; \
 	  mkdir -p $(abs_top_srcdir)/lib; \
 	  cd $(OPENJDK_SRC_DIR)/j2se/make/tools/CompileProperties; \
-	    $(JCOMPILER) -d ../../../../../lib -1.5 CompileProperties.java; \
+	    $(JCOMPILER) -g -d ../../../../../lib -1.5 CompileProperties.java; \
 	  mkdir -p $(abs_top_srcdir)/generated/sun/util/resources; \
 	  cd $(abs_top_srcdir)/lib ; \
 	    for FILE in `ls $(OPENJDK_SRC_DIR)/j2se/src/share/classes/sun/util/resources/*.properties`; do \
@@ -438,7 +453,7 @@
 jce-compile-classes: jce-classes rt-classes
 	mkdir -p lib/jce
 	cd jce ; \
-	  $(JCOMPILER) -d ../lib/jce -source 1.6 -bootclasspath '' \
+	  $(JCOMPILER) -g -d ../lib/jce -source 1.6 -bootclasspath '' \
 	    -classpath ../lib/rt @../jce-classes
 
 lib/jce/jce.jar: jce-compile-classes

--- a/Makefile.in	Thu Jun 21 16:06:05 2007 +0100
+++ b/Makefile.in	Tue Jun 26 16:11:37 2007 +0100
@@ -193,6 +193,7 @@
 	patches/icedtea-text-relocations.patch \
 	patches/icedtea-graphics.patch \
 	patches/icedtea-gcc.patch \
+	patches/icedtea-debuginfo.patch \
 	$(FAST_BUILD_PATCH) \
 	$(CCACHE_PATCH)
 
@@ -369,7 +370,21 @@
 	com/sun/jdi/VoidType.java \
 	com/sun/jdi/VoidValue.java \
 	com/sun/tools/jdi/LinkedHashMap.java \
-	java/util/Observer.java
+	java/util/Observer.java \
+	java/util/Timer.java \
+	javax/security/sasl/SaslException.java \
+	javax/security/sasl/AuthenticationException.java \
+	javax/security/auth/callback/NameCallback.java \
+	javax/security/sasl/Sasl.java \
+	javax/security/sasl/SaslServer.java \
+	javax/security/sasl/SaslClient.java \
+	javax/security/sasl/SaslClientFactory.java \
+	javax/security/sasl/SaslServerFactory.java \
+	javax/security/auth/callback/ChoiceCallback.java \
+	javax/security/auth/callback/ConfirmationCallback.java \
+	javax/security/auth/callback/LanguageCallback.java \
+	javax/security/auth/callback/TextInputCallback.java \
+	javax/security/auth/callback/TextOutputCallback.java
 
 @FOUND_ECJ_FALSE@@FOUND_JAVAC_TRUE@JCOMPILER = $(JAVAC)
 @FOUND_ECJ_TRUE@JCOMPILER = $(ECJ) -nowarn
@@ -809,7 +824,7 @@
 rt-compile-classes: rt-classes
 	mkdir -p lib/rt
 	cd rt ; \
-	  $(JCOMPILER) -d ../lib/rt -bootclasspath '' -source 1.6 \
+	  $(JCOMPILER) -g -d ../lib/rt -bootclasspath '' -source 1.6 \
 	    -sourcepath $(OPENJDK_SRC_DIR)/j2se/src/share/classes:$(OPENJDK_SRC_DIR)/j2se/src/solaris/classes:../generated:../jce \
 	    @../rt-classes
 
@@ -843,7 +858,7 @@
 	    generated/sun/nio/ch; \
 	  mkdir -p $(abs_top_srcdir)/lib; \
 	  cd $(OPENJDK_SRC_DIR)/j2se/make/tools/CompileProperties; \
-	    $(JCOMPILER) -d ../../../../../lib -1.5 CompileProperties.java; \
+	    $(JCOMPILER) -g -d ../../../../../lib -1.5 CompileProperties.java; \
 	  mkdir -p $(abs_top_srcdir)/generated/sun/util/resources; \
 	  cd $(abs_top_srcdir)/lib ; \
 	    for FILE in `ls $(OPENJDK_SRC_DIR)/j2se/src/share/classes/sun/util/resources/*.properties`; do \
@@ -864,7 +879,7 @@
 jce-compile-classes: jce-classes rt-classes
 	mkdir -p lib/jce
 	cd jce ; \
-	  $(JCOMPILER) -d ../lib/jce -source 1.6 -bootclasspath '' \
+	  $(JCOMPILER) -g -d ../lib/jce -source 1.6 -bootclasspath '' \
 	    -classpath ../lib/rt @../jce-classes
 
 lib/jce/jce.jar: jce-compile-classes

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jce/gnu/java/security/hash/BaseHash.java	Tue Jun 26 16:11:37 2007 +0100
@@ -0,0 +1,183 @@
+/* BaseHash.java -- 
+   Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+
+This file is a part of GNU Classpath.
+
+GNU Classpath 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 of the License, or (at
+your option) any later version.
+
+GNU Classpath 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 GNU Classpath; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+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.java.security.hash;
+
+/**
+ * A base abstract class to facilitate hash implementations.
+ */
+public abstract class BaseHash
+    implements IMessageDigest
+{
+  /** The canonical name prefix of the hash. */
+  protected String name;
+
+  /** The hash (output) size in bytes. */
+  protected int hashSize;
+
+  /** The hash (inner) block size in bytes. */
+  protected int blockSize;
+
+  /** Number of bytes processed so far. */
+  protected long count;
+
+  /** Temporary input buffer. */
+  protected byte[] buffer;
+
+  /**
+   * Trivial constructor for use by concrete subclasses.
+   * 
+   * @param name the canonical name prefix of this instance.
+   * @param hashSize the block size of the output in bytes.
+   * @param blockSize the block size of the internal transform.
+   */
+  protected BaseHash(String name, int hashSize, int blockSize)
+  {
+    super();
+
+    this.name = name;
+    this.hashSize = hashSize;
+    this.blockSize = blockSize;
+    this.buffer = new byte[blockSize];
+
+    resetContext();
+  }
+
+  public String name()
+  {
+    return name;
+  }
+
+  public int hashSize()
+  {
+    return hashSize;
+  }
+
+  public int blockSize()
+  {
+    return blockSize;
+  }
+
+  public void update(byte b)
+  {
+    // compute number of bytes still unhashed; ie. present in buffer
+    int i = (int) (count % blockSize);
+    count++;
+    buffer[i] = b;
+    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)
+  {
+    int n = (int) (count % blockSize);
+    count += len;
+    int partLen = blockSize - n;
+    int i = 0;
+
+    if (len >= partLen)
+      {
+        System.arraycopy(b, offset, buffer, n, partLen);
+        transform(buffer, 0);
+        for (i = partLen; i + blockSize - 1 < len; i += blockSize)
+          transform(b, offset + i);
+
+        n = 0;
+      }
+
+    if (i < len)
+      System.arraycopy(b, offset + i, buffer, n, len - i);
+  }
+
+  public byte[] digest()
+  {
+    byte[] tail = padBuffer(); // pad remaining bytes in buffer
+    update(tail, 0, tail.length); // last transform of a message
+    byte[] result = getResult(); // make a result out of context
+
+    reset(); // reset this instance for future re-use
+
+    return result;
+  }
+
+  public void reset()
+  { // reset this instance for future re-use
+    count = 0L;
+    for (int i = 0; i < blockSize;)
+      buffer[i++] = 0;
+
+    resetContext();
+  }
+
+  public abstract Object clone();
+
+  public abstract boolean selfTest();
+
+  /**
+   * Returns the byte array to use as padding before completing a hash
+   * operation.
+   * 
+   * @return the bytes to pad the remaining bytes in the buffer before
+   *         completing a hash operation.
+   */
+  protected abstract byte[] padBuffer();
+
+  /**
+   * Constructs the result from the contents of the current context.
+   * 
+   * @return the output of the completed hash operation.
+   */
+  protected abstract byte[] getResult();
+
+  /** Resets the instance for future re-use. */
+  protected abstract void resetContext();
+
+  /**
+   * The block digest transformation per se.
+   * 
+   * @param in the <i>blockSize</i> long block, as an array of bytes to digest.
+   * @param offset the index where the data to digest is located within the
+   *          input buffer.
+   */
+  protected abstract void transform(byte[] in, int offset);
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jce/gnu/java/security/hash/HashFactory.java	Tue Jun 26 16:11:37 2007 +0100
@@ -0,0 +1,135 @@
+/* HashFactory.java -- 
+   Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+
+This file is a part of GNU Classpath.
+
+GNU Classpath 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 of the License, or (at
+your option) any later version.
+
+GNU Classpath 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 GNU Classpath; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+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.java.security.hash;
+
+import gnu.java.security.Registry;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * A <i>Factory</i> to instantiate message digest algorithm instances.
+ */
+public class HashFactory
+{
+  /** Trivial constructor to enforce <i>Singleton</i> pattern. */
+  private HashFactory()
+  {
+    super();
+  }
+
+  /**
+   * Return an instance of a hash algorithm given its name.
+   * 
+   * @param name the name of the hash algorithm.
+   * @return an instance of the hash algorithm, or null if none found.
+   * @exception InternalError if the implementation does not pass its self-
+   *              test.
+   */
+  public static IMessageDigest getInstance(String name)
+  {
+    if (name == null)
+      return null;
+
+    name = name.trim();
+    IMessageDigest result = null;
+    if (name.equalsIgnoreCase(Registry.WHIRLPOOL_HASH))
+      result = new Whirlpool();
+    else if (name.equalsIgnoreCase(Registry.RIPEMD128_HASH)
+             || name.equalsIgnoreCase(Registry.RIPEMD_128_HASH))
+      result = new RipeMD128();
+    else if (name.equalsIgnoreCase(Registry.RIPEMD160_HASH)
+             || name.equalsIgnoreCase(Registry.RIPEMD_160_HASH))
+      result = new RipeMD160();
+    else if (name.equalsIgnoreCase(Registry.SHA160_HASH)
+             || name.equalsIgnoreCase(Registry.SHA_1_HASH)
+             || name.equalsIgnoreCase(Registry.SHA1_HASH)
+             || name.equalsIgnoreCase(Registry.SHA_HASH))
+      result = new Sha160();
+    else if (name.equalsIgnoreCase(Registry.SHA256_HASH))
+      result = new Sha256();
+    else if (name.equalsIgnoreCase(Registry.SHA384_HASH))
+      result = new Sha384();
+    else if (name.equalsIgnoreCase(Registry.SHA512_HASH))
+      result = new Sha512();
+    else if (name.equalsIgnoreCase(Registry.TIGER_HASH))
+      result = new Tiger();
+    else if (name.equalsIgnoreCase(Registry.HAVAL_HASH))
+      result = new Haval();
+    else if (name.equalsIgnoreCase(Registry.MD5_HASH))
+      result = new MD5();
+    else if (name.equalsIgnoreCase(Registry.MD4_HASH))
+      result = new MD4();
+    else if (name.equalsIgnoreCase(Registry.MD2_HASH))
+      result = new MD2();
+    else if (name.equalsIgnoreCase(Registry.HAVAL_HASH))
+      result = new Haval();
+
+    if (result != null && ! result.selfTest())
+      throw new InternalError(result.name());
+
+    return result;
+  }
+
+  /**
+   * Returns a {@link Set} of names of hash algorithms supported by this
+   * <i>Factory</i>.
+   * 
+   * @return a {@link Set} of hash names (Strings).
+   */
+  public static final Set getNames()
+  {
+    HashSet hs = new HashSet();
+    hs.add(Registry.WHIRLPOOL_HASH);
+    hs.add(Registry.RIPEMD128_HASH);
+    hs.add(Registry.RIPEMD160_HASH);
+    hs.add(Registry.SHA160_HASH);
+    hs.add(Registry.SHA256_HASH);
+    hs.add(Registry.SHA384_HASH);
+    hs.add(Registry.SHA512_HASH);
+    hs.add(Registry.TIGER_HASH);
+    hs.add(Registry.HAVAL_HASH);
+    hs.add(Registry.MD5_HASH);
+    hs.add(Registry.MD4_HASH);
+    hs.add(Registry.MD2_HASH);
+
+    return Collections.unmodifiableSet(hs);
+  }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jce/gnu/java/security/hash/Haval.java	Tue Jun 26 16:11:37 2007 +0100
@@ -0,0 +1,807 @@
+/* Haval.java -- 
+   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+
+This file is a part of GNU Classpath.
+
+GNU Classpath 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 of the License, or (at
+your option) any later version.
+
+GNU Classpath 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 GNU Classpath; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+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.java.security.hash;
+
+import gnu.java.security.Registry;
+import gnu.java.security.util.Util;
+
+/**
+ * The <i>HAVAL</i> message-digest algorithm is a variable output length, with
+ * variable number of rounds. By default, this implementation allows <i>HAVAL</i>
+ * to be used as a drop-in replacement for <i>MD5</i>.
+ * <p>
+ * References:
+ * <ol>
+ * <li>HAVAL - A One-Way Hashing Algorithm with Variable Length of Output<br>
+ * Advances in Cryptology - AUSCRYPT'92, Lecture Notes in Computer Science,<br>
+ * Springer-Verlag, 1993; <br>
+ * Y. Zheng, J. Pieprzyk and J. Seberry.</li>
+ * </ol>
+ */
+public class Haval
+    extends BaseHash
+{
+  public static final int HAVAL_VERSION = 1;
+
+  public static final int HAVAL_128_BIT = 16;
+
+  public static final int HAVAL_160_BIT = 20;
+
+  public static final int HAVAL_192_BIT = 24;
+
+  public static final int HAVAL_224_BIT = 28;
+
+  public static final int HAVAL_256_BIT = 32;
+
+  public static final int HAVAL_3_ROUND = 3;
+
+  public static final int HAVAL_4_ROUND = 4;
+
+  public static final int HAVAL_5_ROUND = 5;
+
+  private static final int BLOCK_SIZE = 128; // inner block size in bytes
+
+  private static final String DIGEST0 = "C68F39913F901F3DDF44C707357A7D70";
+
+  /** caches the result of the correctness test, once executed. */
+  private static Boolean valid;
+
+  /**
+   * Number of HAVAL rounds. Allowed values are integers in the range <code>3
+   * .. 5</code>.
+   * The default is <code>3</code>.
+   */
+  private int rounds = HAVAL_3_ROUND;
+
+  /** 128-bit interim result. */
+  private int h0, h1, h2, h3, h4, h5, h6, h7;
+
+  /**
+   * Calls the constructor with two argument using {@link #HAVAL_128_BIT} as the
+   * value for the output size (i.e. <code>128</code> bits, and
+   * {@link #HAVAL_3_ROUND} for the value of number of rounds.
+   */
+  public Haval()
+  {
+    this(HAVAL_128_BIT, HAVAL_3_ROUND);
+  }
+
+  /**
+   * Calls the constructor with two arguments using the designated output size,
+   * and {@link #HAVAL_3_ROUND} for the value of number of rounds.
+   * 
+   * @param size the output size in bytes of this instance.
+   * @throws IllegalArgumentException if the designated output size is invalid.
+   * @see #HAVAL_128_BIT
+   * @see #HAVAL_160_BIT
+   * @see #HAVAL_192_BIT
+   * @see #HAVAL_224_BIT
+   * @see #HAVAL_256_BIT
+   */
+  public Haval(int size)
+  {
+    this(size, HAVAL_3_ROUND);
+  }
+
+  /**
+   * Constructs a <code>Haval</code> instance with the designated output size
+   * (in bytes). Valid output <code>size</code> values are <code>16</code>,
+   * <code>20</code>, <code>24</code>, <code>28</code> and
+   * <code>32</code>. Valid values for <code>rounds</code> are in the range
+   * <code>3..5</code> inclusive.
+   * 
+   * @param size the output size in bytes of this instance.
+   * @param rounds the number of rounds to apply when transforming data.
+   * @throws IllegalArgumentException if the designated output size is invalid,
+   *           or if the number of rounds is invalid.
+   * @see #HAVAL_128_BIT
+   * @see #HAVAL_160_BIT
+   * @see #HAVAL_192_BIT
+   * @see #HAVAL_224_BIT
+   * @see #HAVAL_256_BIT
+   * @see #HAVAL_3_ROUND
+   * @see #HAVAL_4_ROUND
+   * @see #HAVAL_5_ROUND
+   */
+  public Haval(int size, int rounds)
+  {
+    super(Registry.HAVAL_HASH, size, BLOCK_SIZE);
+
+    if (size != HAVAL_128_BIT
+        && size != HAVAL_160_BIT
+        && size != HAVAL_192_BIT
+        && size != HAVAL_224_BIT
+        && size != HAVAL_256_BIT)
+      throw new IllegalArgumentException("Invalid HAVAL output size");
+
+    if (rounds != HAVAL_3_ROUND
+        && rounds != HAVAL_4_ROUND
+        && rounds != HAVAL_5_ROUND)
+      throw new IllegalArgumentException("Invalid HAVAL number of rounds");
+
+    this.rounds = rounds;
+  }
+
+  /**
+   * Private constructor for cloning purposes.
+   * 
+   * @param md the instance to clone.
+   */
+  private Haval(Haval md)
+  {
+    this(md.hashSize, md.rounds);
+
+    this.h0 = md.h0;
+    this.h1 = md.h1;
+    this.h2 = md.h2;
+    this.h3 = md.h3;
+    this.h4 = md.h4;
+    this.h5 = md.h5;
+    this.h6 = md.h6;
+    this.h7 = md.h7;
+    this.count = md.count;
+    this.buffer = (byte[]) md.buffer.clone();
+  }
+
+  public Object clone()
+  {
+    return new Haval(this);
+  }
+
+  protected synchronized void transform(byte[] in, int i)
+  {
+    int X0 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | (in[i++] & 0xFF) << 24;
+    int X1 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | (in[i++] & 0xFF) << 24;
+    int X2 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | (in[i++] & 0xFF) << 24;
+    int X3 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | (in[i++] & 0xFF) << 24;
+    int X4 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | (in[i++] & 0xFF) << 24;
+    int X5 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | (in[i++] & 0xFF) << 24;
+    int X6 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | (in[i++] & 0xFF) << 24;
+    int X7 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | (in[i++] & 0xFF) << 24;
+    int X8 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | (in[i++] & 0xFF) << 24;
+    int X9 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | (in[i++] & 0xFF) << 24;
+    int X10 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X11 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X12 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X13 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X14 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X15 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X16 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X17 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X18 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X19 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X20 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X21 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X22 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X23 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X24 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X25 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X26 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X27 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X28 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X29 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X30 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int X31 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | (in[i++] & 0xFF) << 24;
+    int t0 = h0, t1 = h1, t2 = h2, t3 = h3, t4 = h4, t5 = h5, t6 = h6, t7 = h7;
+    // Pass 1
+    t7 = FF1(t7, t6, t5, t4, t3, t2, t1, t0, X0);
+    t6 = FF1(t6, t5, t4, t3, t2, t1, t0, t7, X1);
+    t5 = FF1(t5, t4, t3, t2, t1, t0, t7, t6, X2);
+    t4 = FF1(t4, t3, t2, t1, t0, t7, t6, t5, X3);
+    t3 = FF1(t3, t2, t1, t0, t7, t6, t5, t4, X4);
+    t2 = FF1(t2, t1, t0, t7, t6, t5, t4, t3, X5);
+    t1 = FF1(t1, t0, t7, t6, t5, t4, t3, t2, X6);
+    t0 = FF1(t0, t7, t6, t5, t4, t3, t2, t1, X7);
+
+    t7 = FF1(t7, t6, t5, t4, t3, t2, t1, t0, X8);
+    t6 = FF1(t6, t5, t4, t3, t2, t1, t0, t7, X9);
+    t5 = FF1(t5, t4, t3, t2, t1, t0, t7, t6, X10);
+    t4 = FF1(t4, t3, t2, t1, t0, t7, t6, t5, X11);
+    t3 = FF1(t3, t2, t1, t0, t7, t6, t5, t4, X12);
+    t2 = FF1(t2, t1, t0, t7, t6, t5, t4, t3, X13);
+    t1 = FF1(t1, t0, t7, t6, t5, t4, t3, t2, X14);
+    t0 = FF1(t0, t7, t6, t5, t4, t3, t2, t1, X15);
+
+    t7 = FF1(t7, t6, t5, t4, t3, t2, t1, t0, X16);
+    t6 = FF1(t6, t5, t4, t3, t2, t1, t0, t7, X17);
+    t5 = FF1(t5, t4, t3, t2, t1, t0, t7, t6, X18);
+    t4 = FF1(t4, t3, t2, t1, t0, t7, t6, t5, X19);
+    t3 = FF1(t3, t2, t1, t0, t7, t6, t5, t4, X20);
+    t2 = FF1(t2, t1, t0, t7, t6, t5, t4, t3, X21);
+    t1 = FF1(t1, t0, t7, t6, t5, t4, t3, t2, X22);
+    t0 = FF1(t0, t7, t6, t5, t4, t3, t2, t1, X23);
+
+    t7 = FF1(t7, t6, t5, t4, t3, t2, t1, t0, X24);
+    t6 = FF1(t6, t5, t4, t3, t2, t1, t0, t7, X25);
+    t5 = FF1(t5, t4, t3, t2, t1, t0, t7, t6, X26);
+    t4 = FF1(t4, t3, t2, t1, t0, t7, t6, t5, X27);
+    t3 = FF1(t3, t2, t1, t0, t7, t6, t5, t4, X28);
+    t2 = FF1(t2, t1, t0, t7, t6, t5, t4, t3, X29);
+    t1 = FF1(t1, t0, t7, t6, t5, t4, t3, t2, X30);
+    t0 = FF1(t0, t7, t6, t5, t4, t3, t2, t1, X31);
+
+    // Pass 2
+    t7 = FF2(t7, t6, t5, t4, t3, t2, t1, t0, X5, 0x452821E6);
+    t6 = FF2(t6, t5, t4, t3, t2, t1, t0, t7, X14, 0x38D01377);
+    t5 = FF2(t5, t4, t3, t2, t1, t0, t7, t6, X26, 0xBE5466CF);
+    t4 = FF2(t4, t3, t2, t1, t0, t7, t6, t5, X18, 0x34E90C6C);
+    t3 = FF2(t3, t2, t1, t0, t7, t6, t5, t4, X11, 0xC0AC29B7);
+    t2 = FF2(t2, t1, t0, t7, t6, t5, t4, t3, X28, 0xC97C50DD);
+    t1 = FF2(t1, t0, t7, t6, t5, t4, t3, t2, X7, 0x3F84D5B5);
+    t0 = FF2(t0, t7, t6, t5, t4, t3, t2, t1, X16, 0xB5470917);
+
+    t7 = FF2(t7, t6, t5, t4, t3, t2, t1, t0, X0, 0x9216D5D9);
+    t6 = FF2(t6, t5, t4, t3, t2, t1, t0, t7, X23, 0x8979FB1B);
+    t5 = FF2(t5, t4, t3, t2, t1, t0, t7, t6, X20, 0xD1310BA6);
+    t4 = FF2(t4, t3, t2, t1, t0, t7, t6, t5, X22, 0x98DFB5AC);
+    t3 = FF2(t3, t2, t1, t0, t7, t6, t5, t4, X1, 0x2FFD72DB);
+    t2 = FF2(t2, t1, t0, t7, t6, t5, t4, t3, X10, 0xD01ADFB7);
+    t1 = FF2(t1, t0, t7, t6, t5, t4, t3, t2, X4, 0xB8E1AFED);
+    t0 = FF2(t0, t7, t6, t5, t4, t3, t2, t1, X8, 0x6A267E96);
+
+    t7 = FF2(t7, t6, t5, t4, t3, t2, t1, t0, X30, 0xBA7C9045);
+    t6 = FF2(t6, t5, t4, t3, t2, t1, t0, t7, X3, 0xF12C7F99);
+    t5 = FF2(t5, t4, t3, t2, t1, t0, t7, t6, X21, 0x24A19947);
+    t4 = FF2(t4, t3, t2, t1, t0, t7, t6, t5, X9, 0xB3916CF7);
+    t3 = FF2(t3, t2, t1, t0, t7, t6, t5, t4, X17, 0x0801F2E2);
+    t2 = FF2(t2, t1, t0, t7, t6, t5, t4, t3, X24, 0x858EFC16);
+    t1 = FF2(t1, t0, t7, t6, t5, t4, t3, t2, X29, 0x636920D8);
+    t0 = FF2(t0, t7, t6, t5, t4, t3, t2, t1, X6, 0x71574E69);
+
+    t7 = FF2(t7, t6, t5, t4, t3, t2, t1, t0, X19, 0xA458FEA3);
+    t6 = FF2(t6, t5, t4, t3, t2, t1, t0, t7, X12, 0xF4933D7E);
+    t5 = FF2(t5, t4, t3, t2, t1, t0, t7, t6, X15, 0x0D95748F);
+    t4 = FF2(t4, t3, t2, t1, t0, t7, t6, t5, X13, 0x728EB658);
+    t3 = FF2(t3, t2, t1, t0, t7, t6, t5, t4, X2, 0x718BCD58);
+    t2 = FF2(t2, t1, t0, t7, t6, t5, t4, t3, X25, 0x82154AEE);
+    t1 = FF2(t1, t0, t7, t6, t5, t4, t3, t2, X31, 0x7B54A41D);
+    t0 = FF2(t0, t7, t6, t5, t4, t3, t2, t1, X27, 0xC25A59B5);
+
+    // Pass 3
+    t7 = FF3(t7, t6, t5, t4, t3, t2, t1, t0, X19, 0x9C30D539);
+    t6 = FF3(t6, t5, t4, t3, t2, t1, t0, t7, X9, 0x2AF26013);
+    t5 = FF3(t5, t4, t3, t2, t1, t0, t7, t6, X4, 0xC5D1B023);
+    t4 = FF3(t4, t3, t2, t1, t0, t7, t6, t5, X20, 0x286085F0);
+    t3 = FF3(t3, t2, t1, t0, t7, t6, t5, t4, X28, 0xCA417918);
+    t2 = FF3(t2, t1, t0, t7, t6, t5, t4, t3, X17, 0xB8DB38EF);
+    t1 = FF3(t1, t0, t7, t6, t5, t4, t3, t2, X8, 0x8E79DCB0);
+    t0 = FF3(t0, t7, t6, t5, t4, t3, t2, t1, X22, 0x603A180E);
+
+    t7 = FF3(t7, t6, t5, t4, t3, t2, t1, t0, X29, 0x6C9E0E8B);
+    t6 = FF3(t6, t5, t4, t3, t2, t1, t0, t7, X14, 0xB01E8A3E);
+    t5 = FF3(t5, t4, t3, t2, t1, t0, t7, t6, X25, 0xD71577C1);
+    t4 = FF3(t4, t3, t2, t1, t0, t7, t6, t5, X12, 0xBD314B27);
+    t3 = FF3(t3, t2, t1, t0, t7, t6, t5, t4, X24, 0x78AF2FDA);
+    t2 = FF3(t2, t1, t0, t7, t6, t5, t4, t3, X30, 0x55605C60);
+    t1 = FF3(t1, t0, t7, t6, t5, t4, t3, t2, X16, 0xE65525F3);
+    t0 = FF3(t0, t7, t6, t5, t4, t3, t2, t1, X26, 0xAA55AB94);
+
+    t7 = FF3(t7, t6, t5, t4, t3, t2, t1, t0, X31, 0x57489862);
+    t6 = FF3(t6, t5, t4, t3, t2, t1, t0, t7, X15, 0x63E81440);
+    t5 = FF3(t5, t4, t3, t2, t1, t0, t7, t6, X7, 0x55CA396A);
+    t4 = FF3(t4, t3, t2, t1, t0, t7, t6, t5, X3, 0x2AAB10B6);
+    t3 = FF3(t3, t2, t1, t0, t7, t6, t5, t4, X1, 0xB4CC5C34);
+    t2 = FF3(t2, t1, t0, t7, t6, t5, t4, t3, X0, 0x1141E8CE);
+    t1 = FF3(t1, t0, t7, t6, t5, t4, t3, t2, X18, 0xA15486AF);
+    t0 = FF3(t0, t7, t6, t5, t4, t3, t2, t1, X27, 0x7C72E993);
+
+    t7 = FF3(t7, t6, t5, t4, t3, t2, t1, t0, X13, 0xB3EE1411);
+    t6 = FF3(t6, t5, t4, t3, t2, t1, t0, t7, X6, 0x636FBC2A);
+    t5 = FF3(t5, t4, t3, t2, t1, t0, t7, t6, X21, 0x2BA9C55D);
+    t4 = FF3(t4, t3, t2, t1, t0, t7, t6, t5, X10, 0x741831F6);
+    t3 = FF3(t3, t2, t1, t0, t7, t6, t5, t4, X23, 0xCE5C3E16);
+    t2 = FF3(t2, t1, t0, t7, t6, t5, t4, t3, X11, 0x9B87931E);
+    t1 = FF3(t1, t0, t7, t6, t5, t4, t3, t2, X5, 0xAFD6BA33);
+    t0 = FF3(t0, t7, t6, t5, t4, t3, t2, t1, X2, 0x6C24CF5C);
+
+    if (rounds >= 4)
+      {
+        t7 = FF4(t7, t6, t5, t4, t3, t2, t1, t0, X24, 0x7A325381);
+        t6 = FF4(t6, t5, t4, t3, t2, t1, t0, t7, X4, 0x28958677);
+        t5 = FF4(t5, t4, t3, t2, t1, t0, t7, t6, X0, 0x3B8F4898);
+        t4 = FF4(t4, t3, t2, t1, t0, t7, t6, t5, X14, 0x6B4BB9AF);
+        t3 = FF4(t3, t2, t1, t0, t7, t6, t5, t4, X2, 0xC4BFE81B);
+        t2 = FF4(t2, t1, t0, t7, t6, t5, t4, t3, X7, 0x66282193);
+        t1 = FF4(t1, t0, t7, t6, t5, t4, t3, t2, X28, 0x61D809CC);
+        t0 = FF4(t0, t7, t6, t5, t4, t3, t2, t1, X23, 0xFB21A991);
+        t7 = FF4(t7, t6, t5, t4, t3, t2, t1, t0, X26, 0x487CAC60);
+        t6 = FF4(t6, t5, t4, t3, t2, t1, t0, t7, X6, 0x5DEC8032);
+        t5 = FF4(t5, t4, t3, t2, t1, t0, t7, t6, X30, 0xEF845D5D);
+        t4 = FF4(t4, t3, t2, t1, t0, t7, t6, t5, X20, 0xE98575B1);
+        t3 = FF4(t3, t2, t1, t0, t7, t6, t5, t4, X18, 0xDC262302);
+        t2 = FF4(t2, t1, t0, t7, t6, t5, t4, t3, X25, 0xEB651B88);
+        t1 = FF4(t1, t0, t7, t6, t5, t4, t3, t2, X19, 0x23893E81);
+        t0 = FF4(t0, t7, t6, t5, t4, t3, t2, t1, X3, 0xD396ACC5);
+
+        t7 = FF4(t7, t6, t5, t4, t3, t2, t1, t0, X22, 0x0F6D6FF3);
+        t6 = FF4(t6, t5, t4, t3, t2, t1, t0, t7, X11, 0x83F44239);
+        t5 = FF4(t5, t4, t3, t2, t1, t0, t7, t6, X31, 0x2E0B4482);
+        t4 = FF4(t4, t3, t2, t1, t0, t7, t6, t5, X21, 0xA4842004);
+        t3 = FF4(t3, t2, t1, t0, t7, t6, t5, t4, X8, 0x69C8F04A);
+        t2 = FF4(t2, t1, t0, t7, t6, t5, t4, t3, X27, 0x9E1F9B5E);
+        t1 = FF4(t1, t0, t7, t6, t5, t4, t3, t2, X12, 0x21C66842);
+        t0 = FF4(t0, t7, t6, t5, t4, t3, t2, t1, X9, 0xF6E96C9A);
+        t7 = FF4(t7, t6, t5, t4, t3, t2, t1, t0, X1, 0x670C9C61);
+        t6 = FF4(t6, t5, t4, t3, t2, t1, t0, t7, X29, 0xABD388F0);
+        t5 = FF4(t5, t4, t3, t2, t1, t0, t7, t6, X5, 0x6A51A0D2);
+        t4 = FF4(t4, t3, t2, t1, t0, t7, t6, t5, X15, 0xD8542F68);
+        t3 = FF4(t3, t2, t1, t0, t7, t6, t5, t4, X17, 0x960FA728);
+        t2 = FF4(t2, t1, t0, t7, t6, t5, t4, t3, X10, 0xAB5133A3);
+        t1 = FF4(t1, t0, t7, t6, t5, t4, t3, t2, X16, 0x6EEF0B6C);
+        t0 = FF4(t0, t7, t6, t5, t4, t3, t2, t1, X13, 0x137A3BE4);
+
+        if (rounds == 5)
+          {
+            t7 = FF5(t7, t6, t5, t4, t3, t2, t1, t0, X27, 0xBA3BF050);
+            t6 = FF5(t6, t5, t4, t3, t2, t1, t0, t7, X3, 0x7EFB2A98);
+            t5 = FF5(t5, t4, t3, t2, t1, t0, t7, t6, X21, 0xA1F1651D);
+            t4 = FF5(t4, t3, t2, t1, t0, t7, t6, t5, X26, 0x39AF0176);
+            t3 = FF5(t3, t2, t1, t0, t7, t6, t5, t4, X17, 0x66CA593E);
+            t2 = FF5(t2, t1, t0, t7, t6, t5, t4, t3, X11, 0x82430E88);
+            t1 = FF5(t1, t0, t7, t6, t5, t4, t3, t2, X20, 0x8CEE8619);
+            t0 = FF5(t0, t7, t6, t5, t4, t3, t2, t1, X29, 0x456F9FB4);
+
+            t7 = FF5(t7, t6, t5, t4, t3, t2, t1, t0, X19, 0x7D84A5C3);
+            t6 = FF5(t6, t5, t4, t3, t2, t1, t0, t7, X0, 0x3B8B5EBE);
+            t5 = FF5(t5, t4, t3, t2, t1, t0, t7, t6, X12, 0xE06F75D8);
+            t4 = FF5(t4, t3, t2, t1, t0, t7, t6, t5, X7, 0x85C12073);
+            t3 = FF5(t3, t2, t1, t0, t7, t6, t5, t4, X13, 0x401A449F);
+            t2 = FF5(t2, t1, t0, t7, t6, t5, t4, t3, X8, 0x56C16AA6);
+            t1 = FF5(t1, t0, t7, t6, t5, t4, t3, t2, X31, 0x4ED3AA62);
+            t0 = FF5(t0, t7, t6, t5, t4, t3, t2, t1, X10, 0x363F7706);
+
+            t7 = FF5(t7, t6, t5, t4, t3, t2, t1, t0, X5, 0x1BFEDF72);
+            t6 = FF5(t6, t5, t4, t3, t2, t1, t0, t7, X9, 0x429B023D);
+            t5 = FF5(t5, t4, t3, t2, t1, t0, t7, t6, X14, 0x37D0D724);
+            t4 = FF5(t4, t3, t2, t1, t0, t7, t6, t5, X30, 0xD00A1248);
+            t3 = FF5(t3, t2, t1, t0, t7, t6, t5, t4, X18, 0xDB0FEAD3);
+            t2 = FF5(t2, t1, t0, t7, t6, t5, t4, t3, X6, 0x49F1C09B);
+            t1 = FF5(t1, t0, t7, t6, t5, t4, t3, t2, X28, 0x075372C9);
+            t0 = FF5(t0, t7, t6, t5, t4, t3, t2, t1, X24, 0x80991B7B);
+
+            t7 = FF5(t7, t6, t5, t4, t3, t2, t1, t0, X2, 0x25D479D8);
+            t6 = FF5(t6, t5, t4, t3, t2, t1, t0, t7, X23, 0xF6E8DEF7);
+            t5 = FF5(t5, t4, t3, t2, t1, t0, t7, t6, X16, 0xE3FE501A);
+            t4 = FF5(t4, t3, t2, t1, t0, t7, t6, t5, X22, 0xB6794C3B);
+            t3 = FF5(t3, t2, t1, t0, t7, t6, t5, t4, X4, 0x976CE0BD);
+            t2 = FF5(t2, t1, t0, t7, t6, t5, t4, t3, X1, 0x04C006BA);
+            t1 = FF5(t1, t0, t7, t6, t5, t4, t3, t2, X25, 0xC1A94FB6);
+            t0 = FF5(t0, t7, t6, t5, t4, t3, t2, t1, X15, 0x409F60C4);
+          }
+      }
+    h7 += t7;
+    h6 += t6;
+    h5 += t5;
+    h4 += t4;
+    h3 += t3;
+    h2 += t2;
+    h1 += t1;
+    h0 += t0;
+  }
+
+  protected byte[] padBuffer()
+  {
+    // pad out to 118 mod 128. other 10 bytes have special use.
+    int n = (int)(count % BLOCK_SIZE);
+    int padding = (n < 118) ? (118 - n) : (246 - n);
+    byte[] result = new byte[padding + 10];
+    result[0] = (byte) 0x01;
+    // save the version number (LSB 3), the number of rounds (3 bits in the
+    // middle), the fingerprint length (MSB 2 bits and next byte) and the
+    // number of bits in the unpadded message.
+    int bl = hashSize * 8;
+    int sigByte = (bl & 0x03) << 6;
+    sigByte |= (rounds & 0x07) << 3;
+    sigByte |= HAVAL_VERSION & 0x07;
+    result[padding++] = (byte) sigByte;
+    result[padding++] = (byte)(bl >>> 2);
+    // save number of bits, casting the long to an array of 8 bytes
+    long bits = count << 3;
+    result[padding++] = (byte) bits;
+    result[padding++] = (byte)(bits >>> 8);
+    result[padding++] = (byte)(bits >>> 16);
+    result[padding++] = (byte)(bits >>> 24);
+    result[padding++] = (byte)(bits >>> 32);
+    result[padding++] = (byte)(bits >>> 40);
+    result[padding++] = (byte)(bits >>> 48);
+    result[padding  ] = (byte)(bits >>> 56);
+    return result;
+  }
+
+  protected byte[] getResult()
+  {
+    tailorDigestBits(); // tailor context for the designated output size
+    // cast enough top context values into an array of hashSize bytes
+    byte[] result = new byte[hashSize];
+    if (hashSize >= HAVAL_256_BIT)
+      {
+        result[31] = (byte)(h7 >>> 24);
+        result[30] = (byte)(h7 >>> 16);
+        result[29] = (byte)(h7 >>> 8);
+        result[28] = (byte) h7;
+      }
+    if (hashSize >= HAVAL_224_BIT)
+      {
+        result[27] = (byte)(h6 >>> 24);
+        result[26] = (byte)(h6 >>> 16);
+        result[25] = (byte)(h6 >>> 8);
+        result[24] = (byte) h6;
+      }
+    if (hashSize >= HAVAL_192_BIT)
+      {
+        result[23] = (byte)(h5 >>> 24);
+        result[22] = (byte)(h5 >>> 16);
+        result[21] = (byte)(h5 >>> 8);
+        result[20] = (byte) h5;
+      }
+    if (hashSize >= HAVAL_160_BIT)
+      {
+        result[19] = (byte)(h4 >>> 24);
+        result[18] = (byte)(h4 >>> 16);
+        result[17] = (byte)(h4 >>> 8);
+        result[16] = (byte) h4;
+      }
+    result[15] = (byte)(h3 >>> 24);
+    result[14] = (byte)(h3 >>> 16);
+    result[13] = (byte)(h3 >>> 8);
+    result[12] = (byte) h3;
+    result[11] = (byte)(h2 >>> 24);
+    result[10] = (byte)(h2 >>> 16);
+    result[ 9] = (byte)(h2 >>> 8);
+    result[ 8] = (byte) h2;
+    result[ 7] = (byte)(h1 >>> 24);
+    result[ 6] = (byte)(h1 >>> 16);
+    result[ 5] = (byte)(h1 >>> 8);
+    result[ 4] = (byte) h1;
+    result[ 3] = (byte)(h0 >>> 24);
+    result[ 2] = (byte)(h0 >>> 16);
+    result[ 1] = (byte)(h0 >>> 8);
+    result[ 0] = (byte) h0;
+    return result;
+  }
+
+  protected void resetContext()
+  {
+    h0 = 0x243F6A88;
+    h1 = 0x85A308D3;
+    h2 = 0x13198A2E;
+    h3 = 0x03707344;
+    h4 = 0xA4093822;
+    h5 = 0x299F31D0;
+    h6 = 0x082EFA98;
+    h7 = 0xEC4E6C89;
+  }
+
+  public boolean selfTest()
+  {
+    if (valid == null)
+      {
+        String d = Util.toString(new Haval().digest());
+        valid = Boolean.valueOf(DIGEST0.equals(d));
+      }
+    return valid.booleanValue();
+  }
+
+  /** Tailors the last output. */
+  private void tailorDigestBits()
+  {
+    int t;
+    switch (hashSize)
+      {
+      case HAVAL_128_BIT:
+        t = (h7 & 0x000000FF)
+          | (h6 & 0xFF000000)
+          | (h5 & 0x00FF0000)
+          | (h4 & 0x0000FF00);
+        h0 += t >>> 8 | t << 24;
+        t = (h7 & 0x0000FF00)
+          | (h6 & 0x000000FF)
+          | (h5 & 0xFF000000)
+          | (h4 & 0x00FF0000);
+        h1 += t >>> 16 | t << 16;
+        t = (h7 & 0x00FF0000)
+          | (h6 & 0x0000FF00)
+          | (h5 & 0x000000FF)
+          | (h4 & 0xFF000000);
+        h2 += t >>> 24 | t << 8;
+        t = (h7 & 0xFF000000)
+          | (h6 & 0x00FF0000)
+          | (h5 & 0x0000FF00)
+          | (h4 & 0x000000FF);
+        h3 += t;
+        break;
+      case HAVAL_160_BIT:
+        t = (h7 & 0x3F) | (h6 & (0x7F << 25)) | (h5 & (0x3F << 19));
+        h0 += t >>> 19 | t << 13;
+        t = (h7 & (0x3F << 6)) | (h6 & 0x3F) | (h5 & (0x7F << 25));
+        h1 += t >>> 25 | t << 7;
+        t = (h7 & (0x7F << 12)) | (h6 & (0x3F << 6)) | (h5 & 0x3F);
+        h2 += t;
+        t = (h7 & (0x3F << 19)) | (h6 & (0x7F << 12)) | (h5 & (0x3F << 6));
+        h3 += (t >>> 6);
+        t = (h7 & (0x7F << 25)) | (h6 & (0x3F << 19)) | (h5 & (0x7F << 12));
+        h4 += (t >>> 12);
+        break;
+      case HAVAL_192_BIT:
+        t = (h7 & 0x1F) | (h6 & (0x3F << 26));
+        h0 += t >>> 26 | t << 6;
+        t = (h7 & (0x1F << 5)) | (h6 & 0x1F);
+        h1 += t;
+        t = (h7 & (0x3F << 10)) | (h6 & (0x1F << 5));
+        h2 += (t >>> 5);
+        t = (h7 & (0x1F << 16)) | (h6 & (0x3F << 10));
+        h3 += (t >>> 10);
+        t = (h7 & (0x1F << 21)) | (h6 & (0x1F << 16));
+        h4 += (t >>> 16);
+        t = (h7 & (0x3F << 26)) | (h6 & (0x1F << 21));
+        h5 += (t >>> 21);
+        break;
+      case HAVAL_224_BIT:
+        h0 += ((h7 >>> 27) & 0x1F);
+        h1 += ((h7 >>> 22) & 0x1F);
+        h2 += ((h7 >>> 18) & 0x0F);
+        h3 += ((h7 >>> 13) & 0x1F);
+        h4 += ((h7 >>>  9) & 0x0F);
+        h5 += ((h7 >>>  4) & 0x1F);
+        h6 +=  (h7         & 0x0F);
+      }
+  }
+
+  /**
+   * Permutations phi_{i,j}, i=3,4,5, j=1,...,i.
+   *
+   * rounds = 3:   6 5 4 3 2 1 0
+   *               | | | | | | | (replaced by)
+   *  phi_{3,1}:   1 0 3 5 6 2 4
+   *  phi_{3,2}:   4 2 1 0 5 3 6
+   *  phi_{3,3}:   6 1 2 3 4 5 0
+   *
+   * rounds = 4:   6 5 4 3 2 1 0
+   *               | | | | | | | (replaced by)
+   *  phi_{4,1}:   2 6 1 4 5 3 0
+   *  phi_{4,2}:   3 5 2 0 1 6 4
+   *  phi_{4,3}:   1 4 3 6 0 2 5
+   *  phi_{4,4}:   6 4 0 5 2 1 3
+   *
+   * rounds = 5:   6 5 4 3 2 1 0
+   *               | | | | | | | (replaced by)
+   *  phi_{5,1}:   3 4 1 0 5 2 6
+   *  phi_{5,2}:   6 2 1 0 3 4 5
+   *  phi_{5,3}:   2 6 0 4 3 1 5
+   *  phi_{5,4}:   1 5 3 2 0 4 6
+   *  phi_{5,5}:   2 5 0 6 4 3 1
+   */
+  private int FF1(int x7, int x6, int x5, int x4, int x3, int x2, int x1,
+                  int x0, int w)
+  {
+    int t;
+    switch (rounds)
+      {
+      case 3:
+        t = f1(x1, x0, x3, x5, x6, x2, x4);
+        break;
+      case 4:
+        t = f1(x2, x6, x1, x4, x5, x3, x0);
+        break;
+      default:
+        t = f1(x3, x4, x1, x0, x5, x2, x6);
+      }
+    return (t >>> 7 | t << 25) + (x7 >>> 11 | x7 << 21) + w;
+  }
+
+  private int FF2(int x7, int x6, int x5, int x4, int x3, int x2, int x1,
+                  int x0, int w, int c)
+  {
+    int t;
+    switch (rounds)
+      {
+      case 3:
+        t = f2(x4, x2, x1, x0, x5, x3, x6);
+        break;
+      case 4:
+        t = f2(x3, x5, x2, x0, x1, x6, x4);
+        break;
+      default:
+        t = f2(x6, x2, x1, x0, x3, x4, x5);
+      }
+    return (t >>> 7 | t << 25) + (x7 >>> 11 | x7 << 21) + w + c;
+  }
+
+  private int FF3(int x7, int x6, int x5, int x4, int x3, int x2, int x1,
+                  int x0, int w, int c)
+  {
+    int t;
+    switch (rounds)
+      {
+      case 3:
+        t = f3(x6, x1, x2, x3, x4, x5, x0);
+        break;
+      case 4:
+        t = f3(x1, x4, x3, x6, x0, x2, x5);
+        break;
+      default:
+        t = f3(x2, x6, x0, x4, x3, x1, x5);
+      }
+    return (t >>> 7 | t << 25) + (x7 >>> 11 | x7 << 21) + w + c;
+  }
+
+  private int FF4(int x7, int x6, int x5, int x4, int x3, int x2, int x1,
+                  int x0, int w, int c)
+  {
+    int t;
+    switch (rounds)
+      {
+      case 4:
+        t = f4(x6, x4, x0, x5, x2, x1, x3);
+        break;
+      default:
+        t = f4(x1, x5, x3, x2, x0, x4, x6);
+      }
+    return (t >>> 7 | t << 25) + (x7 >>> 11 | x7 << 21) + w + c;
+  }
+
+  private int FF5(int x7, int x6, int x5, int x4, int x3, int x2, int x1,
+                  int x0, int w, int c)
+  {
+    int t = f5(x2, x5, x0, x6, x4, x3, x1);
+    return (t >>> 7 | t << 25) + (x7 >>> 11 | x7 << 21) + w + c;
+  }
+
+  private int f1(int x6, int x5, int x4, int x3, int x2, int x1, int x0)
+  {
+    return x1 & (x0 ^ x4) ^ x2 & x5 ^ x3 & x6 ^ x0;
+  }
+
+  private int f2(int x6, int x5, int x4, int x3, int x2, int x1, int x0)
+  {
+    return x2 & (x1 & ~x3 ^ x4 & x5 ^ x6 ^ x0) ^ x4 & (x1 ^ x5) ^ x3 & x5 ^ x0;
+  }
+
+  private int f3(int x6, int x5, int x4, int x3, int x2, int x1, int x0)
+  {
+    return x3 & (x1 & x2 ^ x6 ^ x0) ^ x1 & x4 ^ x2 & x5 ^ x0;
+  }
+
+  private int f4(int x6, int x5, int x4, int x3, int x2, int x1, int x0)
+  {
+    return x4 & (x5 & ~x2 ^ x3 & ~x6 ^ x1 ^ x6 ^ x0) ^ x3
+           & (x1 & x2 ^ x5 ^ x6) ^ x2 & x6 ^ x0;
+  }
+
+  private int f5(int x6, int x5, int x4, int x3, int x2, int x1, int x0)
+  {
+    return x0 & (x1 & x2 & x3 ^ ~x5) ^ x1 & x4 ^ x2 & x5 ^ x3 & x6;
+  }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jce/gnu/java/security/hash/IMessageDigest.java	Tue Jun 26 16:11:37 2007 +0100
@@ -0,0 +1,127 @@
+/* IMessageDigest.java -- 
+   Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+
+This file is a part of GNU Classpath.
+
+GNU Classpath 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 of the License, or (at
+your option) any later version.
+
+GNU Classpath 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 GNU Classpath; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+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.java.security.hash;
+
+/**
+ * The basic visible methods of any hash algorithm.
+ * <p>
+ * A hash (or message digest) algorithm produces its output by iterating a basic
+ * compression function on blocks of data.
+ */
+public interface IMessageDigest
+    extends Cloneable
+{
+  /**
+   * Returns the canonical name of this algorithm.
+   * 
+   * @return the canonical name of this instance.
+   */
+  String name();
+
+  /**
+   * Returns the output length in bytes of this message digest algorithm.
+   * 
+   * @return the output length in bytes of this message digest algorithm.
+   */
+  int hashSize();
+
+  /**
+   * Returns the algorithm's (inner) block size in bytes.
+   * 
+   * @return the algorithm's inner block size in bytes.
+   */
+  int blockSize();
+
+  /**
+   * Continues a message digest operation using the input byte.
+   * 
+   * @param b the input byte to digest.
+   */
+  void update(byte b);
+
+  /**
+   * 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.
+   * 
+   * @param in the input block.
+   */
+  void update(byte[] in);
+
+  /**
+   * 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.
+   * 
+   * @param in the input block.
+   * @param offset start of meaningful bytes in input block.
+   * @param length number of bytes, in input block, to consider.
+   */
+  void update(byte[] in, int offset, int length);
+
+  /**
+   * Completes the message digest by performing final operations such as padding
+   * and resetting the instance.
+   * 
+   * @return the array of bytes representing the hash value.
+   */
+  byte[] digest();
+
+  /**
+   * Resets the current context of this instance clearing any eventually cached
+   * intermediary values.
+   */
+  void reset();
+
+  /**
+   * A basic test. Ensures that the digest of a pre-determined message is equal
+   * to a known pre-computed value.
+   * 
+   * @return <code>true</code> if the implementation passes a basic self-test.
+   *         Returns <code>false</code> otherwise.
+   */
+  boolean selfTest();
+
+  /**
+   * Returns a clone copy of this instance.
+   * 
+   * @return a clone copy of this instance.
+   */
+  Object clone();
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jce/gnu/java/security/hash/MD2.java	Tue Jun 26 16:11:37 2007 +0100
@@ -0,0 +1,256 @@
+/* MD2.java -- 
+   Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+
+This file is a part of GNU Classpath.
+
+GNU Classpath 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 of the License, or (at
+your option) any later version.
+
+GNU Classpath 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 GNU Classpath; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+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.java.security.hash;
+
+import gnu.java.security.Registry;
+import gnu.java.security.util.Util;
+
+/**
+ * An implementation of the MD2 message digest algorithm.
+ * <p>
+ * MD2 is not widely used. Unless it is needed for compatibility with
+ * existing systems, it is not recommended for use in new applications.
+ * <p>
+ * References:
+ * <ol>
+ *    <li>The <a href="http://www.ietf.org/rfc/rfc1319.txt">MD2</a>
+ *    Message-Digest Algorithm.<br>
+ *    B. Kaliski.</li>
+ *    <li>The <a href="http://www.rfc-editor.org/errata.html">RFC ERRATA PAGE</a>
+ *    under section RFC 1319.</li>
+ * </ol>
+ */
+public class MD2
+    extends BaseHash
+{
+  /** An MD2 message digest is always 128-bits long, or 16 bytes. */
+  private static final int DIGEST_LENGTH = 16;
+
+  /** The MD2 algorithm operates on 128-bit blocks, or 16 bytes. */
+  private static final int BLOCK_LENGTH = 16;
+
+  /** 256 byte "random" permutation of the digits of pi. */
+  private static final byte[] PI = {
+        41,   46,   67,  -55,  -94,  -40,  124,   1,
+        61,   54,   84,  -95,  -20,  -16,    6,  19,
+        98,  -89,    5,  -13,  -64,  -57,  115, -116,
+      -104, -109,   43,  -39,  -68,   76, -126,  -54,
+        30, -101,   87,   60,   -3,  -44,  -32,   22,
+       103,   66,  111,   24, -118,   23,  -27,   18,
+       -66,   78,  -60,  -42,  -38,  -98,  -34,   73,
+       -96,   -5,  -11, -114,  -69,   47,  -18,  122,
+       -87,  104,  121, -111,   21,  -78,    7,   63,
+      -108,  -62,   16, -119,   11,   34,   95,   33,
+      -128,  127,   93, -102,   90, -112,   50,   39,
+        53,   62,  -52,  -25,  -65,   -9, -105,    3,
+        -1,   25,   48,  -77,   72,  -91,  -75,  -47,
+       -41,   94, -110,   42,  -84,   86,  -86,  -58,
+        79,  -72,   56,  -46, -106,  -92,  125,  -74,
+       118,   -4,  107,  -30, -100,  116,    4,  -15,
+        69,  -99,  112,   89,  100,  113, -121,   32,
+      -122,   91,  -49,  101,  -26,   45,  -88,    2,
+        27,   96,   37,  -83,  -82,  -80,  -71,  -10,
+        28,   70,   97,  105,   52,   64,  126,   15,
+        85,   71,  -93,   35,  -35,   81,  -81,   58,
+       -61,   92,   -7,  -50,  -70,  -59,  -22,   38,
+        44,   83,   13,  110, -123,   40, -124,    9,
+       -45,  -33,  -51,  -12,   65, -127,   77,   82,
+       106,  -36,   55,  -56,  108,  -63,  -85,   -6,
+        36,  -31,  123,    8,   12,  -67,  -79,   74,
+       120, -120, -107, -117,  -29,   99,  -24,  109,
+       -23,  -53,  -43,   -2,   59,    0,   29,   57,
+       -14,  -17,  -73,   14,  102,   88,  -48,  -28,
+       -90,  119,  114,   -8,  -21,  117,   75,   10,
+        49,   68,   80,  -76, -113,  -19,   31,   26,
+       -37, -103, -115,   51, - 97,   17, -125,   20 };
+
+  /** The output of this message digest when no data has been input. */
+  private static final String DIGEST0 = "8350E5A3E24C153DF2275C9F80692773";
+
+  /** caches the result of the correctness test, once executed. */
+  private static Boolean valid;
+
+  /** The checksum computed so far. */
+  private byte[] checksum;
+
+  /**
+   * Work array needed by encrypt method. First <code>BLOCK_LENGTH</code> bytes
+   * are also used to store the running digest.
+   */
+  private byte[] work;
+
+  /** Creates a new MD2 digest ready for use. */
+  public MD2()
+  {
+    super(Registry.MD2_HASH, DIGEST_LENGTH, BLOCK_LENGTH);
+  }
+
+  /**
+   * Private constructor used for cloning.
+   *
+   * @param md2 the instance to clone.
+   */
+  private MD2(MD2 md2)
+  {
+    this();
+
+    // superclass field
+    this.count = md2.count;
+    this.buffer = (byte[]) md2.buffer.clone();
+    // private field
+    this.checksum = (byte[]) md2.checksum.clone();
+    this.work = (byte[]) md2.work.clone();
+  }
+
+  public Object clone()
+  {
+    return new MD2(this);
+  }
+
+  protected byte[] getResult()
+  {
+    byte[] result = new byte[DIGEST_LENGTH];
+    // Encrypt checksum as last block.
+    encryptBlock(checksum, 0);
+    for (int i = 0; i < BLOCK_LENGTH; i++)
+      result[i] = work[i];
+
+    return result;
+  }
+
+  protected void resetContext()
+  {
+    checksum = new byte[BLOCK_LENGTH];
+    work = new byte[BLOCK_LENGTH * 3];
+  }
+
+  public boolean selfTest()
+  {
+    if (valid == null)
+      {
+        String d = Util.toString(new MD2().digest());
+        valid = Boolean.valueOf(DIGEST0.equals(d));
+      }
+    return valid.booleanValue();
+  }
+
+  /**
+   * Generates an array of padding bytes. The padding is defined as
+   * <code>i</code> bytes of value <code>i</code>, where <code>i</code> is the
+   * number of bytes to fill the last block of the message to
+   * <code>BLOCK_LENGTH</code> bytes (or <code>BLOCK_LENGTH</code> bytes when
+   * the last block was completely full).
+   *
+   * @return the bytes to pad the remaining bytes in the buffer before
+   * completing a hash operation.
+   */
+  protected byte[] padBuffer()
+  {
+    int length = BLOCK_LENGTH - (int) (count % BLOCK_LENGTH);
+    if (length == 0)
+      length = BLOCK_LENGTH;
+
+    byte[] pad = new byte[length];
+    for (int i = 0; i < length; i++)
+      pad[i] = (byte) length;
+
+    return pad;
+  }
+
+  /**
+   * Adds <code>BLOCK_LENGTH</code> bytes to the running digest.
+   *
+   * @param in the byte array to take the <code>BLOCK_LENGTH</code> bytes from.
+   * @param off the offset to start from in the given byte array.
+   */
+  protected void transform(byte[] in, int off)
+  {
+    updateCheckSumAndEncryptBlock(in, off);
+  }
+
+  /**
+   * Adds a new block (<code>BLOCK_LENGTH</code> bytes) to the running digest
+   * from the given byte array starting from the given offset.
+   */
+  private void encryptBlock(byte[] in, int off)
+  {
+    for (int i = 0; i < BLOCK_LENGTH; i++)
+      {
+        byte b = in[off + i];
+        work[BLOCK_LENGTH + i] = b;
+        work[BLOCK_LENGTH * 2 + i] = (byte)(work[i] ^ b);
+      }
+    byte t = 0;
+    for (int i = 0; i < 18; i++)
+      {
+        for (int j = 0; j < 3 * BLOCK_LENGTH; j++)
+          {
+            t = (byte)(work[j] ^ PI[t & 0xFF]);
+            work[j] = t;
+          }
+        t = (byte)(t + i);
+      }
+  }
+
+  /**
+   * Optimized method that combines a checksum update and encrypt of a block.
+   */
+  private void updateCheckSumAndEncryptBlock(byte[] in, int off)
+  {
+    byte l = checksum[BLOCK_LENGTH - 1];
+    for (int i = 0; i < BLOCK_LENGTH; i++)
+      {
+        byte b = in[off + i];
+        work[BLOCK_LENGTH + i] = b;
+        work[BLOCK_LENGTH * 2 + i] = (byte)(work[i] ^ b);
+        l = (byte)(checksum[i] ^ PI[(b ^ l) & 0xFF]);
+        checksum[i] = l;
+      }
+    byte t = 0;
+    for (int i = 0; i < 18; i++)
+      {
+        for (int j = 0; j < 3 * BLOCK_LENGTH; j++)
+          {
+            t = (byte)(work[j] ^ PI[t & 0xFF]);
+            work[j] = t;
+          }
+        t = (byte)(t + i);
+      }
+  }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jce/gnu/java/security/hash/MD4.java	Tue Jun 26 16:11:37 2007 +0100
@@ -0,0 +1,337 @@
+/* MD4.java -- 
+   Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+
+This file is a part of GNU Classpath.
+
+GNU Classpath 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 of the License, or (at
+your option) any later version.
+
+GNU Classpath 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 GNU Classpath; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+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.java.security.hash;
+
+import gnu.java.security.Registry;
+import gnu.java.security.util.Util;
+
+/**
+ * An implementation of Ron Rivest's MD4 message digest algorithm.
+ * <p>
+ * MD4 was the precursor to the stronger {@link gnu.java.security.hash.MD5}
+ * algorithm, and while not considered cryptograpically secure itself, MD4 is
+ * in use in various applications. It is slightly faster than MD5.
+ * <p>
+ * References:
+ * <ol>
+ *    <li>The <a href="http://www.ietf.org/rfc/rfc1320.txt">MD4</a>
+ *    Message-Digest Algorithm.<br>
+ *    R. Rivest.</li>
+ * </ol>
+ *
+ * @author Casey Marshall (rsdio@metastatic.org)
+ */
+public class MD4
+    extends BaseHash
+{
+  /** An MD4 message digest is always 128-bits long, or 16 bytes. */
+  private static final int DIGEST_LENGTH = 16;
+
+  /** The MD4 algorithm operates on 512-bit blocks, or 64 bytes. */
+  private static final int BLOCK_LENGTH = 64;
+
+  private static final int A = 0x67452301;
+
+  private static final int B = 0xefcdab89;
+
+  private static final int C = 0x98badcfe;
+
+  private static final int D = 0x10325476;
+
+  /** The output of this message digest when no data has been input. */
+  private static final String DIGEST0 = "31D6CFE0D16AE931B73C59D7E0C089C0";
+
+  /** caches the result of the correctness test, once executed. */
+  private static Boolean valid;
+
+  private int a, b, c, d;
+
+  /**
+   * Public constructor. Initializes the chaining variables, sets the byte
+   * count to <code>0</code>, and creates a new block of <code>512</code> bits.
+   */
+  public MD4()
+  {
+    super(Registry.MD4_HASH, DIGEST_LENGTH, BLOCK_LENGTH);
+  }
+
+  /**
+   * Trivial private constructor for cloning purposes.
+   *
+   * @param that the instance to clone.
+   */
+  private MD4(MD4 that)
+  {
+    this();
+
+    this.a = that.a;
+    this.b = that.b;
+    this.c = that.c;
+    this.d = that.d;
+    this.count = that.count;
+    this.buffer = (byte[]) that.buffer.clone();
+  }
+
+  public Object clone()
+  {
+    return new MD4(this);
+  }
+
+  protected byte[] getResult()
+  {
+    return new byte[] {
+        (byte) a, (byte)(a >>> 8), (byte)(a >>> 16), (byte)(a >>> 24),
+        (byte) b, (byte)(b >>> 8), (byte)(b >>> 16), (byte)(b >>> 24),
+        (byte) c, (byte)(c >>> 8), (byte)(c >>> 16), (byte)(c >>> 24),
+        (byte) d, (byte)(d >>> 8), (byte)(d >>> 16), (byte)(d >>> 24) };
+  }
+
+  protected void resetContext()
+  {
+    a = A;
+    b = B;
+    c = C;
+    d = D;
+  }
+
+  public boolean selfTest()
+  {
+    if (valid == null)
+      {
+        String d = Util.toString(new MD4().digest());
+        valid = Boolean.valueOf(DIGEST0.equals(d));
+      }
+    return valid.booleanValue();
+  }
+
+  protected byte[] padBuffer()
+  {
+    int n = (int)(count % BLOCK_LENGTH);
+    int padding = (n < 56) ? (56 - n) : (120 - n);
+    byte[] pad = new byte[padding + 8];
+    pad[0] = (byte) 0x80;
+    long bits = count << 3;
+    pad[padding++] = (byte) bits;
+    pad[padding++] = (byte)(bits >>> 8);
+    pad[padding++] = (byte)(bits >>> 16);
+    pad[padding++] = (byte)(bits >>> 24);
+    pad[padding++] = (byte)(bits >>> 32);
+    pad[padding++] = (byte)(bits >>> 40);
+    pad[padding++] = (byte)(bits >>> 48);
+    pad[padding  ] = (byte)(bits >>> 56);
+    return pad;
+  }
+
+  protected void transform(byte[] in, int i)
+  {
+    int X0 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | in[i++] << 24;
+    int X1 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | in[i++] << 24;
+    int X2 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | in[i++] << 24;
+    int X3 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | in[i++] << 24;
+    int X4 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | in[i++] << 24;
+    int X5 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | in[i++] << 24;
+    int X6 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | in[i++] << 24;
+    int X7 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | in[i++] << 24;
+    int X8 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | in[i++] << 24;
+    int X9 = (in[i++] & 0xFF)
+           | (in[i++] & 0xFF) << 8
+           | (in[i++] & 0xFF) << 16
+           | in[i++] << 24;
+    int X10 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | in[i++] << 24;
+    int X11 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | in[i++] << 24;
+    int X12 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | in[i++] << 24;
+    int X13 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | in[i++] << 24;
+    int X14 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | in[i++] << 24;
+    int X15 = (in[i++] & 0xFF)
+            | (in[i++] & 0xFF) << 8
+            | (in[i++] & 0xFF) << 16
+            | in[i] << 24;
+    int aa, bb, cc, dd;
+    aa = a;
+    bb = b;
+    cc = c;
+    dd = d;
+
+    aa += ((bb & cc) | ((~bb) & dd)) + X0;
+    aa = aa << 3 | aa >>> -3;
+    dd += ((aa & bb) | ((~aa) & cc)) + X1;
+    dd = dd << 7 | dd >>> -7;
+    cc += ((dd & aa) | ((~dd) & bb)) + X2;
+    cc = cc << 11 | cc >>> -11;
+    bb += ((cc & dd) | ((~cc) & aa)) + X3;
+    bb = bb << 19 | bb >>> -19;
+    aa += ((bb & cc) | ((~bb) & dd)) + X4;
+    aa = aa << 3 | aa >>> -3;
+    dd += ((aa & bb) | ((~aa) & cc)) + X5;
+    dd = dd << 7 | dd >>> -7;
+    cc += ((dd & aa) | ((~dd) & bb)) + X6;
+    cc = cc << 11 | cc >>> -11;
+    bb += ((cc & dd) | ((~cc) & aa)) + X7;
+    bb = bb << 19 | bb >>> -19;
+    aa += ((bb & cc) | ((~bb) & dd)) + X8;
+    aa = aa << 3 | aa >>> -3;
+    dd += ((aa & bb) | ((~aa) & cc)) + X9;
+    dd = dd << 7 | dd >>> -7;
+    cc += ((dd & aa) | ((~dd) & bb)) + X10;
+    cc = cc << 11 | cc >>> -11;
+    bb += ((cc & dd) | ((~cc) & aa)) + X11;
+    bb = bb << 19 | bb >>> -19;
+    aa += ((bb & cc) | ((~bb) & dd)) + X12;
+    aa = aa << 3 | aa >>> -3;
+    dd += ((aa & bb) | ((~aa) & cc)) + X13;
+    dd = dd << 7 | dd >>> -7;
+    cc += ((dd & aa) | ((~dd) & bb)) + X14;
+    cc = cc << 11 | cc >>> -11;
+    bb += ((cc & dd) | ((~cc) & aa)) + X15;
+    bb = bb << 19 | bb >>> -19;
+
+    aa += ((bb & (cc | dd)) | (cc & dd)) + X0 + 0x5a827999;
+    aa = aa << 3 | aa >>> -3;
+    dd += ((aa & (bb | cc)) | (bb & cc)) + X4 + 0x5a827999;
+    dd = dd << 5 | dd >>> -5;
+    cc += ((dd & (aa | bb)) | (aa & bb)) + X8 + 0x5a827999;
+    cc = cc << 9 | cc >>> -9;
+    bb += ((cc & (dd | aa)) | (dd & aa)) + X12 + 0x5a827999;
+    bb = bb << 13 | bb >>> -13;
+    aa += ((bb & (cc | dd)) | (cc & dd)) + X1 + 0x5a827999;
+    aa = aa << 3 | aa >>> -3;
+    dd += ((aa & (bb | cc)) | (bb & cc)) + X5 + 0x5a827999;
+    dd = dd << 5 | dd >>> -5;
+    cc += ((dd & (aa | bb)) | (aa & bb)) + X9 + 0x5a827999;
+    cc = cc << 9 | cc >>> -9;
+    bb += ((cc & (dd | aa)) | (dd & aa)) + X13 + 0x5a827999;
+    bb = bb << 13 | bb >>> -13;
+    aa += ((bb & (cc | dd)) | (cc & dd)) + X2 + 0x5a827999;
+    aa = aa << 3 | aa >>> -3;
+    dd += ((aa & (bb | cc)) | (bb & cc)) + X6 + 0x5a827999;
+    dd = dd << 5 | dd >>> -5;
+    cc += ((dd & (aa | bb)) | (aa & bb)) + X10 + 0x5a827999;
+    cc = cc << 9 | cc >>> -9;
+    bb += ((cc & (dd | aa)) | (dd & aa)) + X14 + 0x5a827999;
+    bb = bb << 13 | bb >>> -13;
+    aa += ((bb & (cc | dd)) | (cc & dd)) + X3 + 0x5a827999;
+    aa = aa << 3 | aa >>> -3;
+    dd += ((aa & (bb | cc)) | (bb & cc)) + X7 + 0x5a827999;
+    dd = dd << 5 | dd >>> -5;
+    cc += ((dd & (aa | bb)) | (aa & bb)) + X11 + 0x5a827999;
+    cc = cc << 9 | cc >>> -9;
+    bb += ((cc & (dd | aa)) | (dd & aa)) + X15 + 0x5a827999;
+    bb = bb << 13 | bb >>> -13;
+
+    aa += (bb ^ cc ^ dd) + X0 + 0x6ed9eba1;
+    aa = aa << 3 | aa >>> -3;
+    dd += (aa ^ bb ^ cc) + X8 + 0x6ed9eba1;
+    dd = dd << 9 | dd >>> -9;
+    cc += (dd ^ aa ^ bb) + X4 + 0x6ed9eba1;
+    cc = cc << 11 | cc >>> -11;
+    bb += (cc ^ dd ^ aa) + X12 + 0x6ed9eba1;
+    bb = bb << 15 | bb >>> -15;
+    aa += (bb ^ cc ^ dd) + X2 + 0x6ed9eba1;
+    aa = aa << 3 | aa >>> -3;
+    dd += (aa ^ bb ^ cc) + X10 + 0x6ed9eba1;
+    dd = dd << 9 | dd >>> -9;
+    cc += (dd ^ aa ^ bb) + X6 + 0x6ed9eba1;
+    cc = cc << 11 | cc >>> -11;
+    bb += (cc ^ dd ^ aa) + X14 + 0x6ed9eba1;
+    bb = bb << 15 | bb >>> -15;
+    aa += (bb ^ cc ^ dd) + X1 + 0x6ed9eba1;
+    aa = aa << 3 | aa >>> -3;
+    dd += (aa ^ bb ^ cc) + X9 + 0x6ed9eba1;
+    dd = dd << 9 | dd >>> -9;
+    cc += (dd ^ aa ^ bb) + X5 + 0x6ed9eba1;
+    cc = cc << 11 | cc >>> -11;
+    bb += (cc ^ dd ^ aa) + X13 + 0x6ed9eba1;
+    bb = bb << 15 | bb >>> -15;
+    aa += (bb ^ cc ^ dd) + X3 + 0x6ed9eba1;
+    aa = aa << 3 | aa >>> -3;
+    dd += (aa ^ bb ^ cc) + X11 + 0x6ed9eba1;
+    dd = dd << 9 | dd >>> -9;
+    cc += (dd ^ aa ^ bb) + X7 + 0x6ed9eba1;
+    cc = cc << 11 | cc >>> -11;
+    bb += (cc ^ dd ^ aa) + X15 + 0x6ed9eba1;
+    bb = bb << 15 | bb >>> -15;
+
+    a += aa;
+    b += bb;
+    c += cc;
+    d += dd;
+  }
+}