On 14:30 Sun 09 May , Ivan Maidanski wrote: > Hi! > > This is a very minor code refinement - I just guarded the code initializing > "log" variables (which are used only for debugging in the classes of the > entitled packages) with "if (Configuration.DEBUG)", so the Logger stuff is no > longer compiled in and called at the class initialization (unless the > debugging mode in on). > > Among other minor fixes - an added class type check of the object returned by > newInstance() in CSPRNG.getSystemInstance(). >
Committed, without the merging of the catch blocks in CSPRNG as this would hide additional exceptions. > ChangeLog entries: > * gnu/java/security/Properties.java: Initialize "log" private static > variable to null (don't unnecessarily call Logger.getLogger) in case > of Configuration.DEBUG is false (the variable is unused when the > debugging mode is off). > * gnu/java/security/hash/Whirlpool.java: Likewise. > * gnu/java/security/jce/sig/EncodedKeyFactory.java: Likewise. > * gnu/java/security/jce/sig/SignatureAdapter.java: Likewise. > * gnu/java/security/key/dss/DSSKeyPairGenerator.java: Likewise. > * gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java: Likewise. > * gnu/java/security/key/rsa/RSAKeyPairGenerator.java: Likewise. > * gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java: Likewise. > * gnu/java/security/key/rsa/RSAKeyPairX509Codec.java: Likewise. > * gnu/java/security/pkcs/PKCS7SignedData.java: Likewise. > * gnu/java/security/pkcs/SignerInfo.java: Likewise. > * gnu/java/security/provider/PKIXCertPathValidatorImpl.java: Likewise. > * gnu/java/security/sig/rsa/EMSA_PSS.java: Likewise. > * gnu/java/security/sig/rsa/RSAPSSSignature.java: Likewise. > * gnu/java/security/x509/X509CRL.java: Likewise. > * gnu/java/security/x509/X509CRLEntry.java: Likewise. > * gnu/java/security/x509/ext/Extension.java: Likewise. > * gnu/javax/crypto/cipher/Anubis.java: Likewise. > * gnu/javax/crypto/cipher/BaseCipher.java: Likewise. > * gnu/javax/crypto/cipher/Khazad.java: Likewise. > * gnu/javax/crypto/cipher/Rijndael.java: Likewise. > * gnu/javax/crypto/cipher/Twofish.java: Likewise. > * gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java: > Likewise. > * gnu/javax/crypto/jce/keyring/GnuKeyring.java: Likewise. > * gnu/javax/crypto/jce/params/BlockCipherParameters.java: Likewise. > * gnu/javax/crypto/jce/prng/ICMRandomSpi.java: Likewise. > * gnu/javax/crypto/jce/prng/UMacRandomSpi.java: Likewise. > * gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java: Likewise. > * gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java: Likewise. > * gnu/javax/crypto/keyring/Entry.java: Likewise. > * gnu/javax/crypto/keyring/EnvelopeEntry.java: Likewise. > * gnu/javax/crypto/keyring/GnuPublicKeyring.java: Likewise. > * gnu/javax/crypto/mac/OMAC.java: Likewise. > * gnu/javax/crypto/pad/BasePad.java: Likewise. > * gnu/javax/crypto/pad/PKCS1_V1_5.java: Likewise. > * gnu/javax/crypto/pad/PKCS7.java: Likewise. > * gnu/javax/crypto/pad/TBC.java: Likewise. > * gnu/javax/crypto/prng/CSPRNG.java: Likewise. > * gnu/javax/crypto/sasl/SaslInputStream.java: Likewise. > * gnu/javax/crypto/sasl/SaslOutputStream.java: Likewise. > * gnu/javax/crypto/sasl/srp/SRPClient.java: Likewise. > * gnu/javax/crypto/sasl/srp/SRPServer.java: Likewise. > * gnu/javax/security/auth/login/ConfigFileParser.java: Likewise. > * gnu/javax/security/auth/login/ConfigFileTokenizer.java: Likewise. > * gnu/javax/security/auth/login/GnuConfiguration.java: Likewise. > * java/math/BigInteger.java: Likewise. > * gnu/java/security/der/DERWriter.java (toUtf8): Don't unnecessarily > use FP arithmetic. > * gnu/java/security/pkcs/SignerInfo.java (SignerInfo): Log version > string only if Configuration.DEBUG. > * gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java (sha): Remove > unused private variable. > * gnu/javax/crypto/prng/CSPRNG.java (getSystemInstance): Collapse > all catches for forName/newInstance() into a single one; add a cast > to "EntropySource" to ignore instances of wrong type (before adding > newly-created instance to "l". > * gnu/javax/security/auth/login/ConfigFileParser.java (map): Make the > private variable final. > * gnu/javax/security/auth/login/ConfigFileTokenizer.java (br): > Likewise. > * gnu/javax/security/auth/login/ConfigFileTokenizer.java > (ConfigFileTokenizer): Remove redundant super() call and "initialised" > initialization to false. > > > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8