diff options
| author | Casey Marshall <csm@gnu.org> | 2006-01-26 02:25:07 +0000 |
|---|---|---|
| committer | Casey Marshall <csm@gnu.org> | 2006-01-26 02:25:07 +0000 |
| commit | bd5a522ce73b442dd07099c264bf251e6d8d6a63 (patch) | |
| tree | b1cdc8f04689d9ea082589d3a7e61fef847ac1fa /gnu/java/security/util/Util.java | |
| parent | bf20436907439f2c47dc22eea41b3d3d5808aa74 (diff) | |
| download | classpath-bd5a522ce73b442dd07099c264bf251e6d8d6a63.tar.gz | |
2006-01-25 Casey Marshall <csm@gnu.org>
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 (<init>): 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.
Diffstat (limited to 'gnu/java/security/util/Util.java')
| -rw-r--r-- | gnu/java/security/util/Util.java | 692 |
1 files changed, 692 insertions, 0 deletions
diff --git a/gnu/java/security/util/Util.java b/gnu/java/security/util/Util.java new file mode 100644 index 000000000..53f8e3c2c --- /dev/null +++ b/gnu/java/security/util/Util.java @@ -0,0 +1,692 @@ +/* Util.java -- various utility routines. + 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.util; + +import java.math.BigInteger; + +/** + * <p>A collection of utility methods used throughout this project.</p> + * + * @version $Revision: 1.1 $ + */ +public class Util +{ + + // Constants and variables + // ------------------------------------------------------------------------- + + // Hex charset + private static final char[] HEX_DIGITS = "0123456789ABCDEF".toCharArray(); + + // Base-64 charset + private static final String BASE64_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz./"; + + private static final char[] BASE64_CHARSET = BASE64_CHARS.toCharArray(); + + // Constructor(s) + // ------------------------------------------------------------------------- + + /** Trivial constructor to enforce Singleton pattern. */ + private Util() + { + super(); + } + + // Class methods + // ------------------------------------------------------------------------- + + /** + * <p>Returns a string of hexadecimal digits from a byte array. Each byte is + * converted to 2 hex symbols; zero(es) included.</p> + * + * <p>This method calls the method with same name and three arguments as:</p> + * + * <pre> + * toString(ba, 0, ba.length); + * </pre> + * + * @param ba the byte array to convert. + * @return a string of hexadecimal characters (two for each byte) + * representing the designated input byte array. + */ + public static String toString(byte[] ba) + { + return toString(ba, 0, ba.length); + } + + /** + * <p>Returns a string of hexadecimal digits from a byte array, starting at + * <code>offset</code> and consisting of <code>length</code> bytes. Each byte + * is converted to 2 hex symbols; zero(es) included.</p> + * + * @param ba the byte array to convert. + * @param offset the index from which to start considering the bytes to + * convert. + * @param length the count of bytes, starting from the designated offset to + * convert. + * @return a string of hexadecimal characters (two for each byte) + * representing the designated input byte sub-array. + */ + public static final String toString(byte[] ba, int offset, int length) + { + char[] buf = new char[length * 2]; + for (int i = 0, j = 0, k; i < length;) + { + k = ba[offset + i++]; + buf[j++] = HEX_DIGITS[(k >>> 4) & 0x0F]; + buf[j++] = HEX_DIGITS[k & 0x0F]; + } + return new String(buf); + } + + /** + * <p>Returns a string of hexadecimal digits from a byte array. Each byte is + * converted to 2 hex symbols; zero(es) included. The argument is + * treated as a large little-endian integer and is returned as a + * large big-endian integer.</p> + * + * <p>This method calls the method with same name and three arguments as:</p> + * + * <pre> + * toReversedString(ba, 0, ba.length); + * </pre> + * + * @param ba the byte array to convert. + * @return a string of hexadecimal characters (two for each byte) + * representing the designated input byte array. + */ + public static String toReversedString(byte[] ba) + { + return toReversedString(ba, 0, ba.length); + } + + /** + * <p>Returns a string of hexadecimal digits from a byte array, starting at + * <code>offset</code> and consisting of <code>length</code> bytes. Each byte + * is converted to 2 hex symbols; zero(es) included.</p> + * + * <p>The byte array is treated as a large little-endian integer, and + * is returned as a large big-endian integer.</p> + * + * @param ba the byte array to convert. + * @param offset the index from which to start considering the bytes to + * convert. + * @param length the count of bytes, starting from the designated offset to + * convert. + * @return a string of hexadecimal characters (two for each byte) + * representing the designated input byte sub-array. + */ + public static final String toReversedString(byte[] ba, int offset, int length) + { + char[] buf = new char[length * 2]; + for (int i = offset + length - 1, j = 0, k; i >= offset;) + { + k = ba[offset + i--]; + buf[j++] = HEX_DIGITS[(k >>> 4) & 0x0F]; + buf[j++] = HEX_DIGITS[k & 0x0F]; + } + return new String(buf); + } + + /** + * <p>Returns a byte array from a string of hexadecimal digits.</p> + * + * @param s a string of hexadecimal ASCII characters + * @return the decoded byte array from the input hexadecimal string. + */ + public static byte[] toBytesFromString(String s) + { + int limit = s.length(); + byte[] result = new byte[((limit + 1) / 2)]; + int i = 0, j = 0; + if ((limit % 2) == 1) + { + result[j++] = (byte) fromDigit(s.charAt(i++)); + } + while (i < limit) + { + result[j] = (byte) (fromDigit(s.charAt(i++)) << 4); + result[j++] |= (byte) fromDigit(s.charAt(i++)); + } + return result; + } + + /** + * <p>Returns a byte array from a string of hexadecimal digits, interpreting + * them as a large big-endian integer and returning it as a large + * little-endian integer.</p> + * + * @param s a string of hexadecimal ASCII characters + * @return the decoded byte array from the input hexadecimal string. + */ + public static byte[] toReversedBytesFromString(String s) + { + int limit = s.length(); + byte[] result = new byte[((limit + 1) / 2)]; + int i = 0; + if ((limit % 2) == 1) + { + result[i++] = (byte) fromDigit(s.charAt(--limit)); + } + while (limit > 0) + { + result[i] = (byte) fromDigit(s.charAt(--limit)); + result[i++] |= (byte) (fromDigit(s.charAt(--limit)) << 4); + } + return result; + } + + /** + * <p>Returns a number from <code>0</code> to <code>15</code> corresponding + * to the designated hexadecimal digit.</p> + * + * @param c a hexadecimal ASCII symbol. + */ + public static int fromDigit(char c) + { + if (c >= '0' && c <= '9') + { + return c - '0'; + } + else if (c >= 'A' && c <= 'F') + { + return c - 'A' + 10; + } + else if (c >= 'a' && c <= 'f') + { + return c - 'a' + 10; + } + else + throw new IllegalArgumentException("Invalid hexadecimal digit: " + c); + } + + /** + * <p>Returns a string of 8 hexadecimal digits (most significant digit first) + * corresponding to the unsigned integer <code>n</code>.</p> + * + * @param n the unsigned integer to convert. + * @return a hexadecimal string 8-character long. + */ + public static String toString(int n) + { + char[] buf = new char[8]; + for (int i = 7; i >= 0; i--) + { + buf[i] = HEX_DIGITS[n & 0x0F]; + n >>>= 4; + } + return new String(buf); + } + + /** + * <p>Returns a string of hexadecimal digits from an integer array. Each int + * is converted to 4 hex symbols.</p> + */ + public static String toString(int[] ia) + { + int length = ia.length; + char[] buf = new char[length * 8]; + for (int i = 0, j = 0, k; i < length; i++) + { + k = ia[i]; + buf[j++] = HEX_DIGITS[(k >>> 28) & 0x0F]; + buf[j++] = HEX_DIGITS[(k >>> 24) & 0x0F]; + buf[j++] = HEX_DIGITS[(k >>> 20) & 0x0F]; + buf[j++] = HEX_DIGITS[(k >>> 16) & 0x0F]; + buf[j++] = HEX_DIGITS[(k >>> 12) & 0x0F]; + buf[j++] = HEX_DIGITS[(k >>> 8) & 0x0F]; + buf[j++] = HEX_DIGITS[(k >>> 4) & 0x0F]; + buf[j++] = HEX_DIGITS[k & 0x0F]; + } + return new String(buf); + } + + /** + * <p>Returns a string of 16 hexadecimal digits (most significant digit first) + * corresponding to the unsigned long <code>n</code>.</p> + * + * @param n the unsigned long to convert. + * @return a hexadecimal string 16-character long. + */ + public static String toString(long n) + { + char[] b = new char[16]; + for (int i = 15; i >= 0; i--) + { + b[i] = HEX_DIGITS[(int) (n & 0x0FL)]; + n >>>= 4; + } + return new String(b); + } + + /** + * <p>Similar to the <code>toString()</code> method except that the Unicode + * escape character is inserted before every pair of bytes. Useful to + * externalise byte arrays that will be constructed later from such strings; + * eg. s-box values.</p> + * + * @throws ArrayIndexOutOfBoundsException if the length is odd. + */ + public static String toUnicodeString(byte[] ba) + { + return toUnicodeString(ba, 0, ba.length); + } + + /** + * <p>Similar to the <code>toString()</code> method except that the Unicode + * escape character is inserted before every pair of bytes. Useful to + * externalise byte arrays that will be constructed later from such strings; + * eg. s-box values.</p> + * + * @throws ArrayIndexOutOfBoundsException if the length is odd. + */ + public static final String toUnicodeString(byte[] ba, int offset, int length) + { + StringBuffer sb = new StringBuffer(); + int i = 0; + int j = 0; + int k; + sb.append('\n').append("\""); + while (i < length) + { + sb.append("\\u"); + + k = ba[offset + i++]; + sb.append(HEX_DIGITS[(k >>> 4) & 0x0F]); + sb.append(HEX_DIGITS[k & 0x0F]); + + k = ba[offset + i++]; + sb.append(HEX_DIGITS[(k >>> 4) & 0x0F]); + sb.append(HEX_DIGITS[k & 0x0F]); + + if ((++j % 8) == 0) + { + sb.append("\"+").append('\n').append("\""); + } + } + sb.append("\"").append('\n'); + return sb.toString(); + } + + /** + * <p>Similar to the <code>toString()</code> method except that the Unicode + * escape character is inserted before every pair of bytes. Useful to + * externalise integer arrays that will be constructed later from such + * strings; eg. s-box values.</p> + * + * @throws ArrayIndexOutOfBoundsException if the length is not a multiple of 4. + */ + public static String toUnicodeString(int[] ia) + { + StringBuffer sb = new StringBuffer(); + int i = 0; + int j = 0; + int k; + sb.append('\n').append("\""); + while (i < ia.length) + { + k = ia[i++]; + sb.append("\\u"); + sb.append(HEX_DIGITS[(k >>> 28) & 0x0F]); + sb.append(HEX_DIGITS[(k >>> 24) & 0x0F]); + sb.append(HEX_DIGITS[(k >>> 20) & 0x0F]); + sb.append(HEX_DIGITS[(k >>> 16) & 0x0F]); + sb.append("\\u"); + sb.append(HEX_DIGITS[(k >>> 12) & 0x0F]); + sb.append(HEX_DIGITS[(k >>> 8) & 0x0F]); + sb.append(HEX_DIGITS[(k >>> 4) & 0x0F]); + sb.append(HEX_DIGITS[k & 0x0F]); + + if ((++j % 4) == 0) + { + sb.append("\"+").append('\n').append("\""); + } + } + sb.append("\"").append('\n'); + return sb.toString(); + } + + public static byte[] toBytesFromUnicode(String s) + { + int limit = s.length() * 2; + byte[] result = new byte[limit]; + char c; + for (int i = 0; i < limit; i++) + { + c = s.charAt(i >>> 1); + result[i] = (byte) (((i & 1) == 0) ? c >>> 8 : c); + } + return result; + } + + /** + * <p>Dumps a byte array as a string, in a format that is easy to read for + * debugging. The string <code>m</code> is prepended to the start of each + * line.</p> + * + * <p>If <code>offset</code> and <code>length</code> are omitted, the whole + * array is used. If <code>m</code> is omitted, nothing is prepended to each + * line.</p> + * + * @param data the byte array to be dumped. + * @param offset the offset within <i>data</i> to start from. + * @param length the number of bytes to dump. + * @param m a string to be prepended to each line. + * @return a string containing the result. + */ + public static String dumpString(byte[] data, int offset, int length, String m) + { + if (data == null) + { + return m + "null\n"; + } + StringBuffer sb = new StringBuffer(length * 3); + if (length > 32) + { + sb.append(m).append("Hexadecimal dump of ").append(length).append( + " bytes...\n"); + } + // each line will list 32 bytes in 4 groups of 8 each + int end = offset + length; + String s; + int l = Integer.toString(length).length(); + if (l < 4) + { + l = 4; + } + for (; offset < end; offset += 32) + { + if (length > 32) + { + s = " " + offset; + sb.append(m).append(s.substring(s.length() - l)).append(": "); + } + int i = 0; + for (; i < 32 && offset + i + 7 < end; i += 8) + { + sb.append(toString(data, offset + i, 8)).append(' '); + } + if (i < 32) + { + for (; i < 32 && offset + i < end; i++) + { + sb.append(byteToString(data[offset + i])); + } + } + sb.append('\n'); + } + return sb.toString(); + } + + public static String dumpString(byte[] data) + { + return (data == null) ? "null\n" : dumpString(data, 0, data.length, ""); + } + + public static String dumpString(byte[] data, String m) + { + return (data == null) ? "null\n" : dumpString(data, 0, data.length, m); + } + + public static String dumpString(byte[] data, int offset, int length) + { + return dumpString(data, offset, length, ""); + } + + /** + * <p>Returns a string of 2 hexadecimal digits (most significant digit first) + * corresponding to the lowest 8 bits of <code>n</code>.</p> + * + * @param n the byte value to convert. + * @return a string of 2 hex characters representing the input. + */ + public static String byteToString(int n) + { + char[] buf = { HEX_DIGITS[(n >>> 4) & 0x0F], HEX_DIGITS[n & 0x0F] }; + return new String(buf); + } + + /** + * <p>Converts a designated byte array to a Base-64 representation, with the + * exceptions that (a) leading 0-byte(s) are ignored, and (b) the character + * '.' (dot) shall be used instead of "+' (plus).</p> + * + * <p>Used by SASL password file manipulation primitives.</p> + * + * @param buffer an arbitrary sequence of bytes to represent in Base-64. + * @return unpadded (without the '=' character(s)) Base-64 representation of + * the input. + */ + public static final String toBase64(byte[] buffer) + { + int len = buffer.length, pos = len % 3; + byte b0 = 0, b1 = 0, b2 = 0; + switch (pos) + { + case 1: + b2 = buffer[0]; + break; + case 2: + b1 = buffer[0]; + b2 = buffer[1]; + break; + } + StringBuffer sb = new StringBuffer(); + int c; + boolean notleading = false; + do + { + c = (b0 & 0xFC) >>> 2; + if (notleading || c != 0) + { + sb.append(BASE64_CHARSET[c]); + notleading = true; + } + c = ((b0 & 0x03) << 4) | ((b1 & 0xF0) >>> 4); + if (notleading || c != 0) + { + sb.append(BASE64_CHARSET[c]); + notleading = true; + } + c = ((b1 & 0x0F) << 2) | ((b2 & 0xC0) >>> 6); + if (notleading || c != 0) + { + sb.append(BASE64_CHARSET[c]); + notleading = true; + } + c = b2 & 0x3F; + if (notleading || c != 0) + { + sb.append(BASE64_CHARSET[c]); + notleading = true; + } + if (pos >= len) + { + break; + } + else + { + try + { + b0 = buffer[pos++]; + b1 = buffer[pos++]; + b2 = buffer[pos++]; + } + catch (ArrayIndexOutOfBoundsException x) + { + break; + } + } + } + while (true); + + if (notleading) + { + return sb.toString(); + } + return "0"; + } + + /** + * <p>The inverse function of the above.</p> + * + * <p>Converts a string representing the encoding of some bytes in Base-64 + * to their original form.</p> + * + * @param str the Base-64 encoded representation of some byte(s). + * @return the bytes represented by the <code>str</code>. + * @throws NumberFormatException if <code>str</code> is <code>null</code>, or + * <code>str</code> contains an illegal Base-64 character. + * @see #toBase64(byte[]) + */ + public static final byte[] fromBase64(String str) + { + int len = str.length(); + if (len == 0) + { + throw new NumberFormatException("Empty string"); + } + byte[] a = new byte[len + 1]; + int i, j; + for (i = 0; i < len; i++) + { + try + { + a[i] = (byte) BASE64_CHARS.indexOf(str.charAt(i)); + } + catch (ArrayIndexOutOfBoundsException x) + { + throw new NumberFormatException("Illegal character at #" + i); + } + } + i = len - 1; + j = len; + try + { + while (true) + { + a[j] = a[i]; + if (--i < 0) + { + break; + } + a[j] |= (a[i] & 0x03) << 6; + j--; + a[j] = (byte) ((a[i] & 0x3C) >>> 2); + if (--i < 0) + { + break; + } + a[j] |= (a[i] & 0x0F) << 4; + j--; + a[j] = (byte) ((a[i] & 0x30) >>> 4); + if (--i < 0) + { + break; + } + a[j] |= (a[i] << 2); + j--; + a[j] = 0; + if (--i < 0) + { + break; + } + } + } + catch (Exception ignored) + { + } + + try + { // ignore leading 0-bytes + while (a[j] == 0) + { + j++; + } + } + catch (Exception x) + { + return new byte[1]; // one 0-byte + } + byte[] result = new byte[len - j + 1]; + System.arraycopy(a, j, result, 0, len - j + 1); + return result; + } + + // BigInteger utilities ---------------------------------------------------- + + /** + * <p>Treats the input as the MSB representation of a number, and discards + * leading zero elements. For efficiency, the input is simply returned if no + * leading zeroes are found.</p> + * + * @param n the {@link BigInteger} to trim. + * @return the byte array representation of the designated {@link BigInteger} + * with no leading 0-bytes. + */ + public static final byte[] trim(BigInteger n) + { + byte[] in = n.toByteArray(); + if (in.length == 0 || in[0] != 0) + { + return in; + } + int len = in.length; + int i = 1; + while (in[i] == 0 && i < len) + { + ++i; + } + byte[] result = new byte[len - i]; + System.arraycopy(in, i, result, 0, len - i); + return result; + } + + /** + * <p>Returns a hexadecimal dump of the trimmed bytes of a {@link BigInteger}. + * </p> + * + * @param x the {@link BigInteger} to display. + * @return the string representation of the designated {@link BigInteger}. + */ + public static final String dump(BigInteger x) + { + return dumpString(trim(x)); + } +} |
