From bd5a522ce73b442dd07099c264bf251e6d8d6a63 Mon Sep 17 00:00:00 2001 From: Casey Marshall Date: Thu, 26 Jan 2006 02:25:07 +0000 Subject: 2006-01-25 Casey Marshall Merging GNU Crypto and Jessie. * NEWS: mention the merge in the 0.21 notes. * gnu/classpath/debug/Component.java (SSL_APPLICATION): removed. (SSL_RECORD_LAYER): new constants. * gnu/java/security/provider/Gnu.java (): add new algorithms to provider. * resource/java/security/classpath.security: add new providers. * gnu/javax/crypto/assembly/Assembly.java, gnu/javax/crypto/assembly/Cascade.java, gnu/javax/crypto/assembly/CascadeStage.java, gnu/javax/crypto/assembly/CascadeTransformer.java, gnu/javax/crypto/assembly/DeflateTransformer.java, gnu/javax/crypto/assembly/Direction.java, gnu/javax/crypto/assembly/LoopbackTransformer.java, gnu/javax/crypto/assembly/ModeStage.java, gnu/javax/crypto/assembly/Operation.java, gnu/javax/crypto/assembly/PaddingTransformer.java, gnu/javax/crypto/assembly/Stage.java, gnu/javax/crypto/assembly/Transformer.java, gnu/javax/crypto/assembly/TransformerException.java, gnu/javax/crypto/cipher/Anubis.java, gnu/javax/crypto/cipher/BaseCipher.java, gnu/javax/crypto/cipher/Blowfish.java, gnu/javax/crypto/cipher/Cast5.java, gnu/javax/crypto/cipher/CipherFactory.java, gnu/javax/crypto/cipher/DES.java, gnu/javax/crypto/cipher/IBlockCipher.java, gnu/javax/crypto/cipher/IBlockCipherSpi.java, gnu/javax/crypto/cipher/Khazad.java, gnu/javax/crypto/cipher/NullCipher.java, gnu/javax/crypto/cipher/Rijndael.java, gnu/javax/crypto/cipher/Serpent.java, gnu/javax/crypto/cipher/Square.java, gnu/javax/crypto/cipher/TripleDES.java, gnu/javax/crypto/cipher/Twofish.java, gnu/javax/crypto/cipher/WeakKeyException.java, gnu/javax/crypto/jce/GnuCrypto.java, gnu/javax/crypto/jce/GnuSasl.java, gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java, gnu/javax/crypto/jce/cipher/AESSpi.java, gnu/javax/crypto/jce/cipher/ARCFourSpi.java, gnu/javax/crypto/jce/cipher/AnubisSpi.java, gnu/javax/crypto/jce/cipher/BlowfishSpi.java, gnu/javax/crypto/jce/cipher/Cast5Spi.java, gnu/javax/crypto/jce/cipher/CipherAdapter.java, gnu/javax/crypto/jce/cipher/DESSpi.java, gnu/javax/crypto/jce/cipher/KhazadSpi.java, gnu/javax/crypto/jce/cipher/NullCipherSpi.java, gnu/javax/crypto/jce/cipher/PBES2.java, gnu/javax/crypto/jce/cipher/RijndaelSpi.java, gnu/javax/crypto/jce/cipher/SerpentSpi.java, gnu/javax/crypto/jce/cipher/SquareSpi.java, gnu/javax/crypto/jce/cipher/TripleDESSpi.java, gnu/javax/crypto/jce/cipher/TwofishSpi.java, gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.java, gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java, gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.java, gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java, gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.java, gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java, gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.java, gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.java, gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.java, gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.java, gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.java, gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.java, gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.java, gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.java, gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java, gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.java, gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.java, gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.java, gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.java, gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.java, gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.java, gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.java, gnu/javax/crypto/jce/keyring/GnuKeyring.java, gnu/javax/crypto/jce/mac/HMacHavalSpi.java, gnu/javax/crypto/jce/mac/HMacMD2Spi.java, gnu/javax/crypto/jce/mac/HMacMD4Spi.java, gnu/javax/crypto/jce/mac/HMacMD5Spi.java, gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java, gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java, gnu/javax/crypto/jce/mac/HMacSHA160Spi.java, gnu/javax/crypto/jce/mac/HMacSHA256Spi.java, gnu/javax/crypto/jce/mac/HMacSHA384Spi.java, gnu/javax/crypto/jce/mac/HMacSHA512Spi.java, gnu/javax/crypto/jce/mac/HMacTigerSpi.java, gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java, gnu/javax/crypto/jce/mac/MacAdapter.java, gnu/javax/crypto/jce/mac/OMacAnubisImpl.java, gnu/javax/crypto/jce/mac/OMacBlowfishImpl.java, gnu/javax/crypto/jce/mac/OMacCast5Impl.java, gnu/javax/crypto/jce/mac/OMacDESImpl.java, gnu/javax/crypto/jce/mac/OMacImpl.java, gnu/javax/crypto/jce/mac/OMacKhazadImpl.java, gnu/javax/crypto/jce/mac/OMacRijndaelImpl.java, gnu/javax/crypto/jce/mac/OMacSerpentImpl.java, gnu/javax/crypto/jce/mac/OMacSquareImpl.java, gnu/javax/crypto/jce/mac/OMacTripleDESImpl.java, gnu/javax/crypto/jce/mac/OMacTwofishImpl.java, gnu/javax/crypto/jce/mac/TMMH16Spi.java, gnu/javax/crypto/jce/mac/UHash32Spi.java, gnu/javax/crypto/jce/mac/UMac32Spi.java, gnu/javax/crypto/jce/params/BlockCipherParameters.java, gnu/javax/crypto/jce/params/DEREncodingException.java, gnu/javax/crypto/jce/params/DERReader.java, gnu/javax/crypto/jce/params/DERWriter.java, gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java, gnu/javax/crypto/jce/prng/CSPRNGSpi.java, gnu/javax/crypto/jce/prng/FortunaImpl.java, gnu/javax/crypto/jce/prng/ICMRandomSpi.java, gnu/javax/crypto/jce/prng/UMacRandomSpi.java, gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.java, gnu/javax/crypto/jce/spec/TMMHParameterSpec.java, gnu/javax/crypto/jce/spec/UMac32ParameterSpec.java, gnu/javax/crypto/key/BaseKeyAgreementParty.java, gnu/javax/crypto/key/GnuSecretKey.java, gnu/javax/crypto/key/IKeyAgreementParty.java, gnu/javax/crypto/key/IncomingMessage.java, gnu/javax/crypto/key/KeyAgreementException.java, gnu/javax/crypto/key/KeyAgreementFactory.java, gnu/javax/crypto/key/OutgoingMessage.java, gnu/javax/crypto/key/dh/DHKeyPairRawCodec.java, gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.java, gnu/javax/crypto/key/dh/DiffieHellmanReceiver.java, gnu/javax/crypto/key/dh/DiffieHellmanSender.java, gnu/javax/crypto/key/dh/ElGamalKeyAgreement.java, gnu/javax/crypto/key/dh/ElGamalReceiver.java, gnu/javax/crypto/key/dh/ElGamalSender.java, gnu/javax/crypto/key/dh/GnuDHKey.java, gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java, gnu/javax/crypto/key/dh/GnuDHPrivateKey.java, gnu/javax/crypto/key/dh/GnuDHPublicKey.java, gnu/javax/crypto/key/dh/RFC2631.java, gnu/javax/crypto/key/srp6/SRP6Host.java, gnu/javax/crypto/key/srp6/SRP6KeyAgreement.java, gnu/javax/crypto/key/srp6/SRP6SaslClient.java, gnu/javax/crypto/key/srp6/SRP6SaslServer.java, gnu/javax/crypto/key/srp6/SRP6TLSClient.java, gnu/javax/crypto/key/srp6/SRP6TLSServer.java, gnu/javax/crypto/key/srp6/SRP6User.java, gnu/javax/crypto/key/srp6/SRPAlgorithm.java, gnu/javax/crypto/key/srp6/SRPKey.java, gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java, gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.java, gnu/javax/crypto/key/srp6/SRPPrivateKey.java, gnu/javax/crypto/key/srp6/SRPPublicKey.java, gnu/javax/crypto/keyring/AuthenticatedEntry.java, gnu/javax/crypto/keyring/BaseKeyring.java, gnu/javax/crypto/keyring/BinaryDataEntry.java, gnu/javax/crypto/keyring/CertPathEntry.java, gnu/javax/crypto/keyring/CertificateEntry.java, gnu/javax/crypto/keyring/CompressedEntry.java, gnu/javax/crypto/keyring/EncryptedEntry.java, gnu/javax/crypto/keyring/Entry.java, gnu/javax/crypto/keyring/EnvelopeEntry.java, gnu/javax/crypto/keyring/GnuPrivateKeyring.java, gnu/javax/crypto/keyring/GnuPublicKeyring.java, gnu/javax/crypto/keyring/IKeyring.java, gnu/javax/crypto/keyring/IPrivateKeyring.java, gnu/javax/crypto/keyring/IPublicKeyring.java, gnu/javax/crypto/keyring/MalformedKeyringException.java, gnu/javax/crypto/keyring/MaskableEnvelopeEntry.java, gnu/javax/crypto/keyring/MeteredInputStream.java, gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java, gnu/javax/crypto/keyring/PasswordEncryptedEntry.java, gnu/javax/crypto/keyring/PasswordProtectedEntry.java, gnu/javax/crypto/keyring/PrimitiveEntry.java, gnu/javax/crypto/keyring/PrivateKeyEntry.java, gnu/javax/crypto/keyring/Properties.java, gnu/javax/crypto/keyring/PublicKeyEntry.java, gnu/javax/crypto/mac/BaseMac.java, gnu/javax/crypto/mac/HMac.java, gnu/javax/crypto/mac/HMacFactory.java, gnu/javax/crypto/mac/IMac.java, gnu/javax/crypto/mac/MacFactory.java, gnu/javax/crypto/mac/MacInputStream.java, gnu/javax/crypto/mac/MacOutputStream.java, gnu/javax/crypto/mac/OMAC.java, gnu/javax/crypto/mac/TMMH16.java, gnu/javax/crypto/mac/UHash32.java, gnu/javax/crypto/mac/UMac32.java, gnu/javax/crypto/mode/BaseMode.java, gnu/javax/crypto/mode/CBC.java, gnu/javax/crypto/mode/CFB.java, gnu/javax/crypto/mode/CTR.java, gnu/javax/crypto/mode/EAX.java, gnu/javax/crypto/mode/ECB.java, gnu/javax/crypto/mode/IAuthenticatedMode.java, gnu/javax/crypto/mode/ICM.java, gnu/javax/crypto/mode/IMode.java, gnu/javax/crypto/mode/ModeFactory.java, gnu/javax/crypto/mode/OFB.java, gnu/javax/crypto/pad/BasePad.java, gnu/javax/crypto/pad/IPad.java, gnu/javax/crypto/pad/PKCS1_V1_5.java, gnu/javax/crypto/pad/PKCS7.java, gnu/javax/crypto/pad/PadFactory.java, gnu/javax/crypto/pad/SSL3.java, gnu/javax/crypto/pad/TBC.java, gnu/javax/crypto/pad/TLS1.java, gnu/javax/crypto/pad/WrongPaddingException.java, gnu/javax/crypto/prng/ARCFour.java, gnu/javax/crypto/prng/CSPRNG.java, gnu/javax/crypto/prng/Fortuna.java, gnu/javax/crypto/prng/ICMGenerator.java, gnu/javax/crypto/prng/IPBE.java, gnu/javax/crypto/prng/PBKDF2.java, gnu/javax/crypto/prng/PRNGFactory.java, gnu/javax/crypto/prng/UMacGenerator.java, gnu/javax/crypto/sasl/AuthInfo.java, gnu/javax/crypto/sasl/AuthInfoProviderFactory.java, gnu/javax/crypto/sasl/ClientFactory.java, gnu/javax/crypto/sasl/ClientMechanism.java, gnu/javax/crypto/sasl/ConfidentialityException.java, gnu/javax/crypto/sasl/IAuthInfoProvider.java, gnu/javax/crypto/sasl/IAuthInfoProviderFactory.java, gnu/javax/crypto/sasl/IllegalMechanismStateException.java, gnu/javax/crypto/sasl/InputBuffer.java, gnu/javax/crypto/sasl/IntegrityException.java, gnu/javax/crypto/sasl/NoSuchMechanismException.java, gnu/javax/crypto/sasl/NoSuchUserException.java, gnu/javax/crypto/sasl/OutputBuffer.java, gnu/javax/crypto/sasl/SaslEncodingException.java, gnu/javax/crypto/sasl/SaslInputStream.java, gnu/javax/crypto/sasl/SaslOutputStream.java, gnu/javax/crypto/sasl/SaslUtil.java, gnu/javax/crypto/sasl/ServerFactory.java, gnu/javax/crypto/sasl/ServerMechanism.java, gnu/javax/crypto/sasl/UserAlreadyExistsException.java, gnu/javax/crypto/sasl/anonymous/AnonymousClient.java, gnu/javax/crypto/sasl/anonymous/AnonymousServer.java, gnu/javax/crypto/sasl/anonymous/AnonymousUtil.java, gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.java, gnu/javax/crypto/sasl/crammd5/CramMD5Client.java, gnu/javax/crypto/sasl/crammd5/CramMD5Registry.java, gnu/javax/crypto/sasl/crammd5/CramMD5Server.java, gnu/javax/crypto/sasl/crammd5/CramMD5Util.java, gnu/javax/crypto/sasl/crammd5/PasswordFile.java, gnu/javax/crypto/sasl/plain/PasswordFile.java, gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.java, gnu/javax/crypto/sasl/plain/PlainClient.java, gnu/javax/crypto/sasl/plain/PlainRegistry.java, gnu/javax/crypto/sasl/plain/PlainServer.java, gnu/javax/crypto/sasl/srp/CALG.java, gnu/javax/crypto/sasl/srp/ClientStore.java, gnu/javax/crypto/sasl/srp/IALG.java, gnu/javax/crypto/sasl/srp/KDF.java, gnu/javax/crypto/sasl/srp/PasswordFile.java, gnu/javax/crypto/sasl/srp/SRP.java, gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.java, gnu/javax/crypto/sasl/srp/SRPClient.java, gnu/javax/crypto/sasl/srp/SRPRegistry.java, gnu/javax/crypto/sasl/srp/SRPServer.java, gnu/javax/crypto/sasl/srp/SecurityContext.java, gnu/javax/crypto/sasl/srp/ServerStore.java, gnu/javax/crypto/sasl/srp/StoreEntry.java, gnu/javax/net/ssl/Base64.java, gnu/javax/net/ssl/EntropySource.java, gnu/javax/net/ssl/NullManagerParameters.java, gnu/javax/net/ssl/PrivateCredentials.java, gnu/javax/net/ssl/SRPManagerParameters.java, gnu/javax/net/ssl/SRPTrustManager.java, gnu/javax/net/ssl/StaticTrustAnchors.java, gnu/javax/net/ssl/provider/Alert.java, gnu/javax/net/ssl/provider/AlertException.java, gnu/javax/net/ssl/provider/Certificate.java, gnu/javax/net/ssl/provider/CertificateRequest.java, gnu/javax/net/ssl/provider/CertificateType.java, gnu/javax/net/ssl/provider/CertificateVerify.java, gnu/javax/net/ssl/provider/CipherSuite.java, gnu/javax/net/ssl/provider/ClientHello.java, gnu/javax/net/ssl/provider/ClientKeyExchange.java, gnu/javax/net/ssl/provider/CompressionMethod.java, gnu/javax/net/ssl/provider/Constructed.java, gnu/javax/net/ssl/provider/ContentType.java, gnu/javax/net/ssl/provider/Context.java, gnu/javax/net/ssl/provider/DiffieHellman.java, gnu/javax/net/ssl/provider/DigestInputStream.java, gnu/javax/net/ssl/provider/DigestOutputStream.java, gnu/javax/net/ssl/provider/Enumerated.java, gnu/javax/net/ssl/provider/Extension.java, gnu/javax/net/ssl/provider/Extensions.java, gnu/javax/net/ssl/provider/Finished.java, gnu/javax/net/ssl/provider/GNUSecurityParameters.java, gnu/javax/net/ssl/provider/Handshake.java, gnu/javax/net/ssl/provider/JCESecurityParameters.java, gnu/javax/net/ssl/provider/JDBCSessionContext.java, gnu/javax/net/ssl/provider/Jessie.java, gnu/javax/net/ssl/provider/JessieDHPrivateKey.java, gnu/javax/net/ssl/provider/JessieDHPublicKey.java, gnu/javax/net/ssl/provider/JessieRSAPrivateKey.java, gnu/javax/net/ssl/provider/JessieRSAPublicKey.java, gnu/javax/net/ssl/provider/KeyPool.java, gnu/javax/net/ssl/provider/MacException.java, gnu/javax/net/ssl/provider/OverflowException.java, gnu/javax/net/ssl/provider/PRNG.java, gnu/javax/net/ssl/provider/ProtocolVersion.java, gnu/javax/net/ssl/provider/Random.java, gnu/javax/net/ssl/provider/RecordInput.java, gnu/javax/net/ssl/provider/RecordInputStream.java, gnu/javax/net/ssl/provider/RecordOutputStream.java, gnu/javax/net/ssl/provider/RecordingInputStream.java, gnu/javax/net/ssl/provider/SRPTrustManagerFactory.java, gnu/javax/net/ssl/provider/SSLHMac.java, gnu/javax/net/ssl/provider/SSLRSASignature.java, gnu/javax/net/ssl/provider/SSLRandom.java, gnu/javax/net/ssl/provider/SSLServerSocket.java, gnu/javax/net/ssl/provider/SSLServerSocketFactory.java, gnu/javax/net/ssl/provider/SSLSocket.java, gnu/javax/net/ssl/provider/SSLSocketFactory.java, gnu/javax/net/ssl/provider/SSLSocketInputStream.java, gnu/javax/net/ssl/provider/SSLSocketOutputStream.java, gnu/javax/net/ssl/provider/SecurityParameters.java, gnu/javax/net/ssl/provider/ServerHello.java, gnu/javax/net/ssl/provider/ServerKeyExchange.java, gnu/javax/net/ssl/provider/Session.java, gnu/javax/net/ssl/provider/SessionContext.java, gnu/javax/net/ssl/provider/Signature.java, gnu/javax/net/ssl/provider/SynchronizedRandom.java, gnu/javax/net/ssl/provider/TLSHMac.java, gnu/javax/net/ssl/provider/TLSRandom.java, gnu/javax/net/ssl/provider/Util.java, gnu/javax/net/ssl/provider/X509KeyManagerFactory.java, gnu/javax/net/ssl/provider/X509TrustManagerFactory.java, gnu/javax/net/ssl/provider/XMLSessionContext.java, gnu/javax/security/auth/Password.java, gnu/javax/security/auth/callback/AWTCallbackHandler.java, gnu/javax/security/auth/callback/AbstractCallbackHandler.java, gnu/javax/security/auth/callback/ConsoleCallbackHandler.java, gnu/javax/security/auth/callback/DefaultCallbackHandler.java, gnu/javax/security/auth/callback/GnuCallbacks.java, gnu/javax/security/auth/callback/SwingCallbackHandler.java, gnu/java/security/Registry.java, gnu/java/security/Properties.java, gnu/java/security/hash/BaseHash.java, gnu/java/security/hash/HashFactory.java, gnu/java/security/hash/Haval.java, gnu/java/security/hash/IMessageDigest.java, gnu/java/security/hash/MD2.java, gnu/java/security/hash/MD4.java, gnu/java/security/hash/MD5.java, gnu/java/security/hash/RipeMD128.java, gnu/java/security/hash/RipeMD160.java, gnu/java/security/hash/Sha160.java, gnu/java/security/hash/Sha256.java, gnu/java/security/hash/Sha384.java, gnu/java/security/hash/Sha512.java, gnu/java/security/hash/Tiger.java, gnu/java/security/hash/Whirlpool.java, gnu/java/security/jce/hash/HavalSpi.java, gnu/java/security/jce/hash/MD2Spi.java, gnu/java/security/jce/hash/MD4Spi.java, gnu/java/security/jce/hash/MD5Spi.java, gnu/java/security/jce/hash/MessageDigestAdapter.java, gnu/java/security/jce/hash/RipeMD128Spi.java, gnu/java/security/jce/hash/RipeMD160Spi.java, gnu/java/security/jce/hash/Sha160Spi.java, gnu/java/security/jce/hash/Sha256Spi.java, gnu/java/security/jce/hash/Sha384Spi.java, gnu/java/security/jce/hash/Sha512Spi.java, gnu/java/security/jce/hash/TigerSpi.java, gnu/java/security/jce/hash/WhirlpoolSpi.java, gnu/java/security/jce/prng/HavalRandomSpi.java, gnu/java/security/jce/prng/MD2RandomSpi.java, gnu/java/security/jce/prng/MD4RandomSpi.java, gnu/java/security/jce/prng/MD5RandomSpi.java, gnu/java/security/jce/prng/RipeMD128RandomSpi.java, gnu/java/security/jce/prng/RipeMD160RandomSpi.java, gnu/java/security/jce/prng/SecureRandomAdapter.java, gnu/java/security/jce/prng/Sha160RandomSpi.java, gnu/java/security/jce/prng/Sha256RandomSpi.java, gnu/java/security/jce/prng/Sha384RandomSpi.java, gnu/java/security/jce/prng/Sha512RandomSpi.java, gnu/java/security/jce/prng/TigerRandomSpi.java, gnu/java/security/jce/prng/WhirlpoolRandomSpi.java, gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java, gnu/java/security/jce/sig/DSSRawSignatureSpi.java, gnu/java/security/jce/sig/KeyPairGeneratorAdapter.java, gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java, gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.java, gnu/java/security/jce/sig/SignatureAdapter.java, gnu/java/security/key/IKeyPairCodec.java, gnu/java/security/key/IKeyPairGenerator.java, gnu/java/security/key/KeyPairCodecFactory.java, gnu/java/security/key/KeyPairGeneratorFactory.java, gnu/java/security/key/dss/DSSKey.java, gnu/java/security/key/dss/DSSKeyPairGenerator.java, gnu/java/security/key/dss/DSSKeyPairRawCodec.java, gnu/java/security/key/dss/DSSPrivateKey.java, gnu/java/security/key/dss/DSSPublicKey.java, gnu/java/security/key/dss/FIPS186.java, gnu/java/security/key/rsa/GnuRSAKey.java, gnu/java/security/key/rsa/GnuRSAPrivateKey.java, gnu/java/security/key/rsa/GnuRSAPublicKey.java, gnu/java/security/key/rsa/RSAKeyPairGenerator.java, gnu/java/security/key/rsa/RSAKeyPairRawCodec.java, gnu/java/security/prng/BasePRNG.java, gnu/java/security/prng/EntropySource.java, gnu/java/security/prng/IRandom.java, gnu/java/security/prng/LimitReachedException.java, gnu/java/security/prng/MDGenerator.java, gnu/java/security/prng/PRNGFactory.java, gnu/java/security/prng/RandomEvent.java, gnu/java/security/prng/RandomEventListener.java, gnu/java/security/sig/BaseSignature.java, gnu/java/security/sig/ISignature.java, gnu/java/security/sig/ISignatureCodec.java, gnu/java/security/sig/SignatureFactory.java, gnu/java/security/sig/dss/DSSSignature.java, gnu/java/security/sig/dss/DSSSignatureRawCodec.java, gnu/java/security/sig/rsa/EME_PKCS1_V1_5.java, gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.java, gnu/java/security/sig/rsa/EMSA_PSS.java, gnu/java/security/sig/rsa/RSA.java, gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.java, gnu/java/security/sig/rsa/RSAPSSSignature.java, gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java, gnu/java/security/util/Base64.java, gnu/java/security/util/ExpirableObject.java, gnu/java/security/util/Prime2.java, gnu/java/security/util/Sequence.java, gnu/java/security/util/SimpleList.java, gnu/java/security/util/Util.java, resource/gnu/javax/security/auth/callback/MessagesBundle.properties: new files imported from GNU Crypto and Jessie. --- gnu/java/security/Properties.java | 374 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 374 insertions(+) create mode 100644 gnu/java/security/Properties.java (limited to 'gnu/java/security/Properties.java') diff --git a/gnu/java/security/Properties.java b/gnu/java/security/Properties.java new file mode 100644 index 000000000..813888c20 --- /dev/null +++ b/gnu/java/security/Properties.java @@ -0,0 +1,374 @@ +/* Properties.java -- run-time configuration properties. + Copyright (C) 2003, 2004, 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; + +import java.io.FileInputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.HashMap; +import java.util.PropertyPermission; + +/** + *

A global object containing build-specific properties that affect the + * behaviour of the generated binaries from this library.

+ */ +public final class Properties +{ + + // Debugging methods and variables + // ------------------------------------------------------------------------- + + private static final String NAME = "Properties"; + + private static final boolean DEBUG = false; + + // private static final int debuglevel = 9; + private static final PrintWriter err = new PrintWriter(System.out, true); + + private static void debug(final String s) + { + err.println(">>> " + NAME + ": " + s); + } + + // Constants and variables + // ------------------------------------------------------------------------- + + public static final String VERSION = "gnu.crypto.version"; + + public static final String PROPERTIES_FILE = "gnu.crypto.properties.file"; + + public static final String REPRODUCIBLE_PRNG = "gnu.crypto.with.reproducible.prng"; + + public static final String CHECK_WEAK_KEYS = "gnu.crypto.with.check.for.weak.keys"; + + public static final String DO_RSA_BLINDING = "gnu.crypto.with.rsa.blinding"; + + private static final String TRUE = Boolean.TRUE.toString(); + + private static final String FALSE = Boolean.FALSE.toString(); + + private static final HashMap props = new HashMap(); + + private static Properties singleton = null; + + private boolean reproducible = false; + + private boolean checkForWeakKeys = true; + + private boolean doRSABlinding = true; + + // Constructor(s) + // ------------------------------------------------------------------------- + + /** Trivial constructor to enforce Singleton pattern. */ + private Properties() + { + super(); + init(); + } + + // Class methods + // ------------------------------------------------------------------------- + + /** + *

Returns the string representation of the library global configuration + * property with the designated key.

+ * + * @param key the case-insensitive, non-null and non-empty name of a + * configuration property. + * @return the string representation of the designated property, or + * null if such property is not yet set, or key is + * empty. + */ + public static final synchronized String getProperty(String key) + { + if (key == null) + return null; + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkPermission(new PropertyPermission(key, "read")); + key = key.trim().toLowerCase(); + if ("".equals(key)) + return null; + return (String) props.get(key); + } + + /** + *

Sets the value of a designated library global configuration property, + * to a string representation of what should be a legal value.

+ * + * @param key the case-insensitive, non-null and non-empty name of a + * configuration property. + * @param value the non-null, non-empty string representation of a legal + * value of the configuration property named by key. + */ + public static final synchronized void setProperty(String key, String value) + { + if (key == null || value == null) + return; + key = key.trim().toLowerCase(); + if ("".equals(key)) + return; + if (key.equals(VERSION)) + return; + value = value.trim(); + if ("".equals(value)) + return; + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkPermission(new PropertyPermission(key, "write")); + if (key.equals(REPRODUCIBLE_PRNG) + && (value.equalsIgnoreCase(TRUE) || value.equalsIgnoreCase(FALSE))) + setReproducible(Boolean.valueOf(value).booleanValue()); + else if (key.equals(CHECK_WEAK_KEYS) + && (value.equalsIgnoreCase(TRUE) || value.equalsIgnoreCase(FALSE))) + setCheckForWeakKeys(Boolean.valueOf(value).booleanValue()); + else if (key.equals(DO_RSA_BLINDING) + && (value.equalsIgnoreCase(TRUE) || value.equalsIgnoreCase(FALSE))) + setDoRSABlinding(Boolean.valueOf(value).booleanValue()); + else + props.put(key, value); + } + + /** + *

A convenience method that returns, as a boolean, the library global + * configuration property indicating if the default Pseudo Random Number + * Generator produces, or not, the same bit stream when instantiated.

+ * + * @return true if the default PRNG produces the same bit stream + * with every VM instance. Returns false if the default PRNG is + * seeded with the time of day of its first invocation. + */ + public static final synchronized boolean isReproducible() + { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkPermission(new PropertyPermission(REPRODUCIBLE_PRNG, "read")); + return instance().reproducible; + } + + /** + *

A convenience method that returns, as a boolean, the library global + * configuration property indicating if the implementations of symmetric + * key block ciphers check, or not, for possible/potential weak and semi-weak + * keys that may be produced in the course of generating round encryption + * and/or decryption keys.

+ * + * @return true if the cipher implementations check for weak and + * semi-weak keys. Returns false if the cipher implementations + * do not check for weak or semi-weak keys. + */ + public static final synchronized boolean checkForWeakKeys() + { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkPermission(new PropertyPermission(CHECK_WEAK_KEYS, "read")); + return instance().checkForWeakKeys; + } + + /** + *

A convenience method that returns, as a boolean, the library global + * configuration property indicating if RSA decryption (RSADP primitive), + * does, or not, blinding against timing attacks.

+ * + * @return true if the RSA decryption primitive includes a + * blinding operation. Returns false if the RSA decryption + * primitive does not include the additional blinding operation. + */ + public static final synchronized boolean doRSABlinding() + { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkPermission(new PropertyPermission(DO_RSA_BLINDING, "read")); + return instance().doRSABlinding; + } + + /** + *

A convenience method to set the global property for reproducibility of + * the default PRNG bit stream output.

+ * + * @param value if true then the default PRNG bit stream output + * is the same with every invocation of the VM. + */ + public static final synchronized void setReproducible(final boolean value) + { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkPermission(new PropertyPermission(REPRODUCIBLE_PRNG, "write")); + instance().reproducible = value; + props.put(REPRODUCIBLE_PRNG, String.valueOf(value)); + } + + /** + *

A convenience method to set the global property for checking for weak + * and semi-weak cipher keys.

+ * + * @param value if true then the cipher implementations will + * invoke additional checks for weak and semi-weak key values that may get + * generated. + */ + public static final synchronized void setCheckForWeakKeys(final boolean value) + { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkPermission(new PropertyPermission(CHECK_WEAK_KEYS, "write")); + instance().checkForWeakKeys = value; + props.put(CHECK_WEAK_KEYS, String.valueOf(value)); + } + + /** + *

A convenience method to set the global property fo adding a blinding + * operation when executing the RSA decryption primitive.

+ * + * @param value if true then the code for performing the RSA + * decryption primitive will include a blinding operation. + */ + public static final synchronized void setDoRSABlinding(final boolean value) + { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkPermission(new PropertyPermission(DO_RSA_BLINDING, "write")); + instance().doRSABlinding = value; + props.put(DO_RSA_BLINDING, String.valueOf(value)); + } + + private static final synchronized Properties instance() + { + if (singleton == null) + singleton = new Properties(); + return singleton; + } + + // Instance methods + // ------------------------------------------------------------------------- + private void init() + { + // default values + props.put(REPRODUCIBLE_PRNG, (reproducible ? "true" : "false")); + props.put(CHECK_WEAK_KEYS, (checkForWeakKeys ? "true" : "false")); + props.put(DO_RSA_BLINDING, (doRSABlinding ? "true" : "false")); + + // 1. allow site-wide override by reading a properties file + String propFile = null; + try + { + propFile = (String) AccessController.doPrivileged(new PrivilegedAction() + { + public Object run() + { + return System.getProperty(PROPERTIES_FILE); + } + }); + } + catch (SecurityException se) + { + if (DEBUG) + debug("Reading property " + PROPERTIES_FILE + + " not allowed. Ignored."); + } + if (propFile != null) + { + try + { + final java.util.Properties temp = new java.util.Properties(); + final FileInputStream fin = new FileInputStream(propFile); + temp.load(fin); + temp.list(System.out); + props.putAll(temp); + } + catch (IOException ioe) + { + if (DEBUG) + debug("IO error reading " + propFile + ": " + ioe.getMessage()); + } + catch (SecurityException se) + { + if (DEBUG) + debug("Security error reading " + propFile + ": " + + se.getMessage()); + } + } + + // 2. allow vm-specific override by allowing -D options in launcher + handleBooleanProperty(REPRODUCIBLE_PRNG); + handleBooleanProperty(CHECK_WEAK_KEYS); + handleBooleanProperty(DO_RSA_BLINDING); + + // re-sync the 'known' properties + reproducible = new Boolean((String) props.get(REPRODUCIBLE_PRNG)).booleanValue(); + checkForWeakKeys = new Boolean((String) props.get(CHECK_WEAK_KEYS)).booleanValue(); + doRSABlinding = new Boolean((String) props.get(DO_RSA_BLINDING)).booleanValue(); + + // This does not change. + props.put(VERSION, Registry.VERSION_STRING); + } + + private void handleBooleanProperty(final String name) + { + String s = null; + try + { + s = System.getProperty(name); + } + catch (SecurityException x) + { + if (DEBUG) + debug("SecurityManager forbids reading system properties. Ignored"); + } + if (s != null) + { + s = s.trim().toLowerCase(); + // we have to test for explicit "true" or "false". anything else may + // hide valid value set previously + if (s.equals(TRUE) || s.equals(FALSE)) + { + if (DEBUG) + debug("Setting " + name + " to '" + s + "'"); + props.put(name, s); + } + else + { + if (DEBUG) + debug("Invalid value for -D" + name + ": " + s + ". Ignored"); + } + } + } +} -- cgit v1.2.1