From 5c7411981584e487ac41794feb98a66df9fd6fcb Mon Sep 17 00:00:00 2001 From: gandalf Date: Fri, 23 Mar 2012 15:19:26 +0000 Subject: Merge GNU Classpath 0.99 into libjava. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185741 138bc75d-0d04-0410-961f-82ee72b054a4 --- .../gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java | 5 +++-- libjava/classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java | 5 +++-- .../classpath/gnu/javax/crypto/jce/params/BlockCipherParameters.java | 5 +++-- libjava/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java | 5 +++-- libjava/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) (limited to 'libjava/classpath/gnu/javax/crypto/jce') diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java index 97fdd5331eb..b9ce3789432 100644 --- a/libjava/classpath/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java +++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java @@ -1,5 +1,5 @@ /* KeyWrappingAlgorithmAdapter.java -- Base Adapter for Key Wrapping algorithms - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2010 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -76,7 +76,8 @@ import javax.crypto.spec.SecretKeySpec; abstract class KeyWrappingAlgorithmAdapter extends CipherSpi { - private static final Logger log = Logger.getLogger(KeyWrappingAlgorithmAdapter.class.getName()); + private static final Logger log = Configuration.DEBUG ? + Logger.getLogger(KeyWrappingAlgorithmAdapter.class.getName()) : null; /** JCE canonical name of a null-padder. */ private static final String NO_PADDING = "nopadding"; /** Concrete Key Wrapping Algorithm SPI. */ diff --git a/libjava/classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java b/libjava/classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java index c30da69a2bf..39d402a0072 100644 --- a/libjava/classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java +++ b/libjava/classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java @@ -1,5 +1,5 @@ /* GnuKeyring.java -- KeyStore adapter for a pair of private and public Keyrings - Copyright (C) 2003, 2006 Free Software Foundation, Inc. + Copyright (C) 2003, 2006, 2010 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -77,7 +77,8 @@ import javax.crypto.SecretKey; public class GnuKeyring extends KeyStoreSpi { - private static final Logger log = Logger.getLogger(GnuKeyring.class.getName()); + private static final Logger log = Configuration.DEBUG ? + Logger.getLogger(GnuKeyring.class.getName()) : null; private static final String NOT_LOADED = "not loaded"; /** TRUE if the keystore is loaded; FALSE otherwise. */ diff --git a/libjava/classpath/gnu/javax/crypto/jce/params/BlockCipherParameters.java b/libjava/classpath/gnu/javax/crypto/jce/params/BlockCipherParameters.java index fde83b1f305..a6dd247518e 100644 --- a/libjava/classpath/gnu/javax/crypto/jce/params/BlockCipherParameters.java +++ b/libjava/classpath/gnu/javax/crypto/jce/params/BlockCipherParameters.java @@ -1,5 +1,5 @@ /* BlockCipherParameters.java -- - Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2006, 2010 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -59,7 +59,8 @@ import javax.crypto.spec.IvParameterSpec; public class BlockCipherParameters extends AlgorithmParametersSpi { - private static final Logger log = Logger.getLogger(BlockCipherParameters.class.getName()); + private static final Logger log = Configuration.DEBUG ? + Logger.getLogger(BlockCipherParameters.class.getName()) : null; /** The underlying block cipher specification. */ protected BlockCipherParameterSpec cipherSpec; private static final String DEFAULT_FORMAT = "ASN.1"; diff --git a/libjava/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java b/libjava/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java index bbd5d476864..b4fcdf81f4c 100644 --- a/libjava/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java +++ b/libjava/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java @@ -1,5 +1,5 @@ /* ICMRandomSpi.java -- - Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2006, 2010 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -58,7 +58,8 @@ import java.util.logging.Logger; public class ICMRandomSpi extends SecureRandomSpi { - private static final Logger log = Logger.getLogger(ICMRandomSpi.class.getName()); + private static final Logger log = Configuration.DEBUG ? + Logger.getLogger(ICMRandomSpi.class.getName()) : null; /** Class-wide prng to generate random material for the underlying prng. */ private static final ICMGenerator prng; // blank final static diff --git a/libjava/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java b/libjava/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java index 910e65c7033..20a467ee3ec 100644 --- a/libjava/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java +++ b/libjava/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java @@ -1,5 +1,5 @@ /* UMacRandomSpi.java -- - Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2006, 2010 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -57,7 +57,8 @@ import java.util.logging.Logger; public class UMacRandomSpi extends SecureRandomSpi { - private static final Logger log = Logger.getLogger(UMacRandomSpi.class.getName()); + private static final Logger log = Configuration.DEBUG ? + Logger.getLogger(UMacRandomSpi.class.getName()) : null; /** Class-wide prng to generate random material for the underlying prng. */ private static final UMacGenerator prng; // blank final -- cgit v1.2.3