Hi,
I have added a new file: gnu/java/security/Configuration.java.in. This
can be used to provide access to the properties in
gnu.classpath.Configuration without requiring the need to include it
explicitly aiding the separation of the crypto components into a
separate jar in the near future as discussed in the above PR.
Most of this patch is really a search and replace of
gnu.classpath.Configuration with gnu.java.security.Configuration within
crypto related packages:
gnu.javax.crypto, gnu.java.security, gnu.javax.security.
Please comment.
Thanks,
Vivek
Changelog:
2006-06-23 Vivek Lakshmanan <[EMAIL PROTECTED]>
* gnu/java/security/Configuration.java.in: New File.
* gnu/java/security/Properties.java: Change import from
gnu.classpath.Configuration to gnu.java.security.Configuration.
* 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/dss/DSSPrivateKey.java: Likewise.
* gnu/java/security/key/rsa/GnuRSAPrivateKey.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/util/Base64.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/keyring/GnuKeyring.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/GnuPrivateKeyring.java: Likewise.
* gnu/javax/crypto/keyring/GnuPublicKeyring.java: Likewise.
* gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java: Likewise.
* gnu/javax/crypto/keyring/PasswordEncryptedEntry.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
(getAppConfigurationEntry): Change reference to
gnu.classpath.Configuration.DEBUG to
gnu.java.security.Configuration.DEBUG.
(getConfigFromUserHome): Likewise.
(getInputStreamFromURL): Likewise.
(getUserHome): Likewise.
(init): Likewise.
(processSecurityProperties): Likewise.
(processSystemProperty): Likewise.
(processUserHome): Likewise.
* configure.ac: Add gnu/java/security/Configuration.java to
AC_CONFIG_FILES list.
* lib/Makefile.am: Remove gnu/java/security/Configuration.java when
required.
Index: configure.ac
===================================================================
RCS file: /sources/classpath/classpath/configure.ac,v
retrieving revision 1.163
diff -u -r1.163 configure.ac
--- configure.ac 17 Jun 2006 15:53:36 -0000 1.163
+++ configure.ac 23 Jun 2006 17:26:55 -0000
@@ -733,6 +733,7 @@
external/w3c_dom/Makefile
external/relaxngDatatype/Makefile
gnu/classpath/Configuration.java
+gnu/java/security/Configuration.java
include/Makefile
native/Makefile
native/fdlibm/Makefile
Index: gnu/java/security/Properties.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/Properties.java,v
retrieving revision 1.3
diff -u -r1.3 Properties.java
--- gnu/java/security/Properties.java 11 Jun 2006 12:14:44 -0000 1.3
+++ gnu/java/security/Properties.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import java.io.FileInputStream;
import java.io.IOException;
Index: gnu/java/security/hash/Whirlpool.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/hash/Whirlpool.java,v
retrieving revision 1.5
diff -u -r1.5 Whirlpool.java
--- gnu/java/security/hash/Whirlpool.java 18 Jun 2006 06:59:24 -0000 1.5
+++ gnu/java/security/hash/Whirlpool.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security.hash;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.util.Util;
Index: gnu/java/security/jce/sig/EncodedKeyFactory.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/jce/sig/EncodedKeyFactory.java,v
retrieving revision 1.8
diff -u -r1.8 EncodedKeyFactory.java
--- gnu/java/security/jce/sig/EncodedKeyFactory.java 19 Jun 2006 12:43:48 -0000 1.8
+++ gnu/java/security/jce/sig/EncodedKeyFactory.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security.jce.sig;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.key.dss.DSSPrivateKey;
import gnu.java.security.key.dss.DSSPublicKey;
Index: gnu/java/security/jce/sig/SignatureAdapter.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/jce/sig/SignatureAdapter.java,v
retrieving revision 1.5
diff -u -r1.5 SignatureAdapter.java
--- gnu/java/security/jce/sig/SignatureAdapter.java 19 Jun 2006 12:43:48 -0000 1.5
+++ gnu/java/security/jce/sig/SignatureAdapter.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security.jce.sig;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.sig.BaseSignature;
import gnu.java.security.sig.ISignature;
import gnu.java.security.sig.ISignatureCodec;
Index: gnu/java/security/key/dss/DSSKeyPairGenerator.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/key/dss/DSSKeyPairGenerator.java,v
retrieving revision 1.6
diff -u -r1.6 DSSKeyPairGenerator.java
--- gnu/java/security/key/dss/DSSKeyPairGenerator.java 20 Jun 2006 11:24:43 -0000 1.6
+++ gnu/java/security/key/dss/DSSKeyPairGenerator.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security.key.dss;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.hash.Sha160;
import gnu.java.security.key.IKeyPairGenerator;
Index: gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java,v
retrieving revision 1.7
diff -u -r1.7 DSSKeyPairPKCS8Codec.java
--- gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java 20 Jun 2006 11:24:43 -0000 1.7
+++ gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security.key.dss;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.OID;
import gnu.java.security.Registry;
import gnu.java.security.der.DER;
Index: gnu/java/security/key/dss/DSSPrivateKey.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/key/dss/DSSPrivateKey.java,v
retrieving revision 1.6
diff -u -r1.6 DSSPrivateKey.java
--- gnu/java/security/key/dss/DSSPrivateKey.java 20 Jun 2006 11:24:43 -0000 1.6
+++ gnu/java/security/key/dss/DSSPrivateKey.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security.key.dss;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.classpath.SystemProperties;
import gnu.java.security.Registry;
import gnu.java.security.key.IKeyPairCodec;
Index: gnu/java/security/key/rsa/GnuRSAPrivateKey.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/key/rsa/GnuRSAPrivateKey.java,v
retrieving revision 1.7
diff -u -r1.7 GnuRSAPrivateKey.java
--- gnu/java/security/key/rsa/GnuRSAPrivateKey.java 20 Jun 2006 11:24:41 -0000 1.7
+++ gnu/java/security/key/rsa/GnuRSAPrivateKey.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security.key.rsa;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.classpath.SystemProperties;
import gnu.java.security.Registry;
import gnu.java.security.key.IKeyPairCodec;
Index: gnu/java/security/key/rsa/RSAKeyPairGenerator.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/key/rsa/RSAKeyPairGenerator.java,v
retrieving revision 1.7
diff -u -r1.7 RSAKeyPairGenerator.java
--- gnu/java/security/key/rsa/RSAKeyPairGenerator.java 20 Jun 2006 11:24:41 -0000 1.7
+++ gnu/java/security/key/rsa/RSAKeyPairGenerator.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security.key.rsa;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.key.IKeyPairGenerator;
import gnu.java.security.util.PRNG;
Index: gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java,v
retrieving revision 1.6
diff -u -r1.6 RSAKeyPairPKCS8Codec.java
--- gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java 20 Jun 2006 11:24:41 -0000 1.6
+++ gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security.key.rsa;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.OID;
import gnu.java.security.Registry;
import gnu.java.security.der.DER;
Index: gnu/java/security/key/rsa/RSAKeyPairX509Codec.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java,v
retrieving revision 1.7
diff -u -r1.7 RSAKeyPairX509Codec.java
--- gnu/java/security/key/rsa/RSAKeyPairX509Codec.java 20 Jun 2006 11:24:41 -0000 1.7
+++ gnu/java/security/key/rsa/RSAKeyPairX509Codec.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security.key.rsa;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.OID;
import gnu.java.security.Registry;
import gnu.java.security.der.BitString;
Index: gnu/java/security/pkcs/PKCS7SignedData.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/pkcs/PKCS7SignedData.java,v
retrieving revision 1.5
diff -u -r1.5 PKCS7SignedData.java
--- gnu/java/security/pkcs/PKCS7SignedData.java 11 Jun 2006 12:14:44 -0000 1.5
+++ gnu/java/security/pkcs/PKCS7SignedData.java 23 Jun 2006 17:26:56 -0000
@@ -37,7 +37,7 @@
package gnu.java.security.pkcs;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.OID;
import gnu.java.security.ber.BER;
import gnu.java.security.ber.BEREncodingException;
Index: gnu/java/security/pkcs/SignerInfo.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/pkcs/SignerInfo.java,v
retrieving revision 1.6
diff -u -r1.6 SignerInfo.java
--- gnu/java/security/pkcs/SignerInfo.java 11 Jun 2006 12:14:44 -0000 1.6
+++ gnu/java/security/pkcs/SignerInfo.java 23 Jun 2006 17:26:56 -0000
@@ -37,7 +37,7 @@
package gnu.java.security.pkcs;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.OID;
import gnu.java.security.ber.BER;
import gnu.java.security.ber.BEREncodingException;
Index: gnu/java/security/provider/PKIXCertPathValidatorImpl.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/provider/PKIXCertPathValidatorImpl.java,v
retrieving revision 1.8
diff -u -r1.8 PKIXCertPathValidatorImpl.java
--- gnu/java/security/provider/PKIXCertPathValidatorImpl.java 11 Jun 2006 12:14:44 -0000 1.8
+++ gnu/java/security/provider/PKIXCertPathValidatorImpl.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security.provider;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.OID;
import gnu.java.security.Registry;
import gnu.java.security.key.dss.DSSPublicKey;
Index: gnu/java/security/sig/rsa/EMSA_PSS.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/sig/rsa/EMSA_PSS.java,v
retrieving revision 1.3
diff -u -r1.3 EMSA_PSS.java
--- gnu/java/security/sig/rsa/EMSA_PSS.java 11 Jun 2006 12:14:44 -0000 1.3
+++ gnu/java/security/sig/rsa/EMSA_PSS.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security.sig.rsa;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.hash.HashFactory;
import gnu.java.security.hash.IMessageDigest;
import gnu.java.security.util.Util;
Index: gnu/java/security/sig/rsa/RSAPSSSignature.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/sig/rsa/RSAPSSSignature.java,v
retrieving revision 1.4
diff -u -r1.4 RSAPSSSignature.java
--- gnu/java/security/sig/rsa/RSAPSSSignature.java 11 Jun 2006 12:14:44 -0000 1.4
+++ gnu/java/security/sig/rsa/RSAPSSSignature.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security.sig.rsa;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.hash.HashFactory;
import gnu.java.security.hash.IMessageDigest;
Index: gnu/java/security/util/Base64.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/util/Base64.java,v
retrieving revision 1.2
diff -u -r1.2 Base64.java
--- gnu/java/security/util/Base64.java 11 Jun 2006 12:14:44 -0000 1.2
+++ gnu/java/security/util/Base64.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security.util;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import java.io.UnsupportedEncodingException;
import java.util.logging.Logger;
Index: gnu/java/security/x509/X509CRL.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/x509/X509CRL.java,v
retrieving revision 1.8
diff -u -r1.8 X509CRL.java
--- gnu/java/security/x509/X509CRL.java 11 Jun 2006 12:14:44 -0000 1.8
+++ gnu/java/security/x509/X509CRL.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security.x509;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.OID;
import gnu.java.security.der.BitString;
import gnu.java.security.der.DER;
Index: gnu/java/security/x509/X509CRLEntry.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/x509/X509CRLEntry.java,v
retrieving revision 1.6
diff -u -r1.6 X509CRLEntry.java
--- gnu/java/security/x509/X509CRLEntry.java 11 Jun 2006 12:14:44 -0000 1.6
+++ gnu/java/security/x509/X509CRLEntry.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security.x509;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.OID;
import gnu.java.security.der.DERReader;
import gnu.java.security.der.DERValue;
Index: gnu/java/security/x509/ext/Extension.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/x509/ext/Extension.java,v
retrieving revision 1.6
diff -u -r1.6 Extension.java
--- gnu/java/security/x509/ext/Extension.java 11 Jun 2006 12:14:44 -0000 1.6
+++ gnu/java/security/x509/ext/Extension.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.java.security.x509.ext;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.OID;
import gnu.java.security.der.DER;
import gnu.java.security.der.DERReader;
Index: gnu/javax/crypto/cipher/Anubis.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/cipher/Anubis.java,v
retrieving revision 1.4
diff -u -r1.4 Anubis.java
--- gnu/javax/crypto/cipher/Anubis.java 17 Jun 2006 12:06:52 -0000 1.4
+++ gnu/javax/crypto/cipher/Anubis.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.cipher;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.util.Util;
Index: gnu/javax/crypto/cipher/BaseCipher.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/cipher/BaseCipher.java,v
retrieving revision 1.3
diff -u -r1.3 BaseCipher.java
--- gnu/javax/crypto/cipher/BaseCipher.java 11 Jun 2006 12:14:43 -0000 1.3
+++ gnu/javax/crypto/cipher/BaseCipher.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.cipher;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import java.security.InvalidKeyException;
import java.util.Arrays;
Index: gnu/javax/crypto/cipher/Khazad.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/cipher/Khazad.java,v
retrieving revision 1.4
diff -u -r1.4 Khazad.java
--- gnu/javax/crypto/cipher/Khazad.java 17 Jun 2006 12:06:52 -0000 1.4
+++ gnu/javax/crypto/cipher/Khazad.java 23 Jun 2006 17:26:56 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.cipher;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.util.Util;
Index: gnu/javax/crypto/cipher/Rijndael.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/cipher/Rijndael.java,v
retrieving revision 1.4
diff -u -r1.4 Rijndael.java
--- gnu/javax/crypto/cipher/Rijndael.java 17 Jun 2006 12:06:52 -0000 1.4
+++ gnu/javax/crypto/cipher/Rijndael.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.cipher;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.util.Util;
Index: gnu/javax/crypto/cipher/Twofish.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/cipher/Twofish.java,v
retrieving revision 1.4
diff -u -r1.4 Twofish.java
--- gnu/javax/crypto/cipher/Twofish.java 17 Jun 2006 12:06:52 -0000 1.4
+++ gnu/javax/crypto/cipher/Twofish.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.cipher;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.util.Util;
Index: gnu/javax/crypto/jce/keyring/GnuKeyring.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java,v
retrieving revision 1.4
diff -u -r1.4 GnuKeyring.java
--- gnu/javax/crypto/jce/keyring/GnuKeyring.java 11 Jun 2006 12:14:43 -0000 1.4
+++ gnu/javax/crypto/jce/keyring/GnuKeyring.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.jce.keyring;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.javax.crypto.keyring.GnuPrivateKeyring;
import gnu.javax.crypto.keyring.GnuPublicKeyring;
Index: gnu/javax/crypto/jce/prng/ICMRandomSpi.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java,v
retrieving revision 1.3
diff -u -r1.3 ICMRandomSpi.java
--- gnu/javax/crypto/jce/prng/ICMRandomSpi.java 17 Jun 2006 12:06:52 -0000 1.3
+++ gnu/javax/crypto/jce/prng/ICMRandomSpi.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.jce.prng;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.prng.LimitReachedException;
import gnu.javax.crypto.cipher.IBlockCipher;
Index: gnu/javax/crypto/jce/prng/UMacRandomSpi.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java,v
retrieving revision 1.3
diff -u -r1.3 UMacRandomSpi.java
--- gnu/javax/crypto/jce/prng/UMacRandomSpi.java 17 Jun 2006 12:06:52 -0000 1.3
+++ gnu/javax/crypto/jce/prng/UMacRandomSpi.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.jce.prng;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.prng.LimitReachedException;
import gnu.javax.crypto.cipher.IBlockCipher;
Index: gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java,v
retrieving revision 1.6
diff -u -r1.6 GnuDHKeyPairGenerator.java
--- gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java 11 Jun 2006 12:14:43 -0000 1.6
+++ gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.key.dh;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.hash.Sha160;
import gnu.java.security.key.IKeyPairGenerator;
Index: gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java,v
retrieving revision 1.4
diff -u -r1.4 SRPKeyPairGenerator.java
--- gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java 18 Jun 2006 02:43:56 -0000 1.4
+++ gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.key.srp6;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.key.IKeyPairGenerator;
import gnu.java.security.util.PRNG;
Index: gnu/javax/crypto/keyring/Entry.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/keyring/Entry.java,v
retrieving revision 1.3
diff -u -r1.3 Entry.java
--- gnu/javax/crypto/keyring/Entry.java 11 Jun 2006 12:14:43 -0000 1.3
+++ gnu/javax/crypto/keyring/Entry.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.keyring;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import java.io.DataInputStream;
import java.io.DataOutputStream;
Index: gnu/javax/crypto/keyring/EnvelopeEntry.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java,v
retrieving revision 1.3
diff -u -r1.3 EnvelopeEntry.java
--- gnu/javax/crypto/keyring/EnvelopeEntry.java 11 Jun 2006 12:14:43 -0000 1.3
+++ gnu/javax/crypto/keyring/EnvelopeEntry.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.keyring;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
Index: gnu/javax/crypto/keyring/GnuPrivateKeyring.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/keyring/GnuPrivateKeyring.java,v
retrieving revision 1.4
diff -u -r1.4 GnuPrivateKeyring.java
--- gnu/javax/crypto/keyring/GnuPrivateKeyring.java 11 Jun 2006 12:14:43 -0000 1.4
+++ gnu/javax/crypto/keyring/GnuPrivateKeyring.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.keyring;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import java.io.DataInputStream;
Index: gnu/javax/crypto/keyring/GnuPublicKeyring.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/keyring/GnuPublicKeyring.java,v
retrieving revision 1.4
diff -u -r1.4 GnuPublicKeyring.java
--- gnu/javax/crypto/keyring/GnuPublicKeyring.java 11 Jun 2006 12:14:43 -0000 1.4
+++ gnu/javax/crypto/keyring/GnuPublicKeyring.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.keyring;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import java.io.DataInputStream;
Index: gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java,v
retrieving revision 1.5
diff -u -r1.5 PasswordAuthenticatedEntry.java
--- gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java 17 Jun 2006 12:06:52 -0000 1.5
+++ gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.keyring;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.prng.IRandom;
import gnu.java.security.prng.LimitReachedException;
Index: gnu/javax/crypto/keyring/PasswordEncryptedEntry.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java,v
retrieving revision 1.5
diff -u -r1.5 PasswordEncryptedEntry.java
--- gnu/javax/crypto/keyring/PasswordEncryptedEntry.java 17 Jun 2006 12:06:52 -0000 1.5
+++ gnu/javax/crypto/keyring/PasswordEncryptedEntry.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.keyring;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.prng.IRandom;
import gnu.java.security.prng.LimitReachedException;
Index: gnu/javax/crypto/mac/OMAC.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/mac/OMAC.java,v
retrieving revision 1.3
diff -u -r1.3 OMAC.java
--- gnu/javax/crypto/mac/OMAC.java 11 Jun 2006 12:14:46 -0000 1.3
+++ gnu/javax/crypto/mac/OMAC.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.mac;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.util.Util;
import gnu.javax.crypto.cipher.CipherFactory;
Index: gnu/javax/crypto/pad/BasePad.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/pad/BasePad.java,v
retrieving revision 1.3
diff -u -r1.3 BasePad.java
--- gnu/javax/crypto/pad/BasePad.java 11 Jun 2006 12:14:44 -0000 1.3
+++ gnu/javax/crypto/pad/BasePad.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.pad;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import java.util.logging.Level;
import java.util.logging.Logger;
Index: gnu/javax/crypto/pad/PKCS1_V1_5.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/pad/PKCS1_V1_5.java,v
retrieving revision 1.4
diff -u -r1.4 PKCS1_V1_5.java
--- gnu/javax/crypto/pad/PKCS1_V1_5.java 11 Jun 2006 12:14:44 -0000 1.4
+++ gnu/javax/crypto/pad/PKCS1_V1_5.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.pad;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.sig.rsa.EME_PKCS1_V1_5;
import gnu.java.security.util.PRNG;
Index: gnu/javax/crypto/pad/PKCS7.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/pad/PKCS7.java,v
retrieving revision 1.3
diff -u -r1.3 PKCS7.java
--- gnu/javax/crypto/pad/PKCS7.java 11 Jun 2006 12:14:44 -0000 1.3
+++ gnu/javax/crypto/pad/PKCS7.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.pad;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.util.Util;
Index: gnu/javax/crypto/pad/TBC.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/pad/TBC.java,v
retrieving revision 1.3
diff -u -r1.3 TBC.java
--- gnu/javax/crypto/pad/TBC.java 11 Jun 2006 12:14:44 -0000 1.3
+++ gnu/javax/crypto/pad/TBC.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.pad;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.util.Util;
Index: gnu/javax/crypto/prng/CSPRNG.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/prng/CSPRNG.java,v
retrieving revision 1.4
diff -u -r1.4 CSPRNG.java
--- gnu/javax/crypto/prng/CSPRNG.java 11 Jun 2006 12:14:44 -0000 1.4
+++ gnu/javax/crypto/prng/CSPRNG.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.prng;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Properties;
import gnu.java.security.Registry;
import gnu.java.security.hash.HashFactory;
Index: gnu/javax/crypto/sasl/SaslInputStream.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/sasl/SaslInputStream.java,v
retrieving revision 1.2
diff -u -r1.2 SaslInputStream.java
--- gnu/javax/crypto/sasl/SaslInputStream.java 11 Jun 2006 12:14:44 -0000 1.2
+++ gnu/javax/crypto/sasl/SaslInputStream.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.sasl;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.util.Util;
import java.io.IOException;
Index: gnu/javax/crypto/sasl/SaslOutputStream.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/sasl/SaslOutputStream.java,v
retrieving revision 1.2
diff -u -r1.2 SaslOutputStream.java
--- gnu/javax/crypto/sasl/SaslOutputStream.java 11 Jun 2006 12:14:44 -0000 1.2
+++ gnu/javax/crypto/sasl/SaslOutputStream.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.sasl;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.util.Util;
import java.io.IOException;
Index: gnu/javax/crypto/sasl/srp/SRPClient.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/sasl/srp/SRPClient.java,v
retrieving revision 1.3
diff -u -r1.3 SRPClient.java
--- gnu/javax/crypto/sasl/srp/SRPClient.java 11 Jun 2006 12:14:44 -0000 1.3
+++ gnu/javax/crypto/sasl/srp/SRPClient.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.sasl.srp;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.hash.MD5;
import gnu.java.security.util.PRNG;
Index: gnu/javax/crypto/sasl/srp/SRPServer.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/sasl/srp/SRPServer.java,v
retrieving revision 1.4
diff -u -r1.4 SRPServer.java
--- gnu/javax/crypto/sasl/srp/SRPServer.java 11 Jun 2006 12:14:44 -0000 1.4
+++ gnu/javax/crypto/sasl/srp/SRPServer.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.crypto.sasl.srp;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.util.PRNG;
import gnu.java.security.util.Util;
Index: gnu/javax/security/auth/login/ConfigFileParser.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/security/auth/login/ConfigFileParser.java,v
retrieving revision 1.5
diff -u -r1.5 ConfigFileParser.java
--- gnu/javax/security/auth/login/ConfigFileParser.java 12 Jun 2006 03:59:34 -0000 1.5
+++ gnu/javax/security/auth/login/ConfigFileParser.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.security.auth.login;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import java.io.IOException;
import java.io.Reader;
Index: gnu/javax/security/auth/login/ConfigFileTokenizer.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java,v
retrieving revision 1.2
diff -u -r1.2 ConfigFileTokenizer.java
--- gnu/javax/security/auth/login/ConfigFileTokenizer.java 14 Jun 2006 09:53:36 -0000 1.2
+++ gnu/javax/security/auth/login/ConfigFileTokenizer.java 23 Jun 2006 17:26:57 -0000
@@ -38,7 +38,7 @@
package gnu.javax.security.auth.login;
-import gnu.classpath.Configuration;
+import gnu.java.security.Configuration;
import java.io.BufferedReader;
import java.io.IOException;
Index: gnu/javax/security/auth/login/GnuConfiguration.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/security/auth/login/GnuConfiguration.java,v
retrieving revision 1.2
diff -u -r1.2 GnuConfiguration.java
--- gnu/javax/security/auth/login/GnuConfiguration.java 11 Jun 2006 12:14:43 -0000 1.2
+++ gnu/javax/security/auth/login/GnuConfiguration.java 23 Jun 2006 17:26:57 -0000
@@ -175,7 +175,7 @@
if (loginModules == null || loginModules.size() == 0)
return null;
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine(appName + " -> " + loginModules.size() + " entry(ies)");
return (AppConfigurationEntry[]) loginModules.toArray(new AppConfigurationEntry[0]);
}
@@ -213,22 +213,22 @@
{
if (processSecurityProperties())
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("Using login configuration defined by Security property(ies)");
}
else if (processSystemProperty())
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("Using login configuration defined by System property");
}
else if (processUserHome())
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("Using login configuration defined in ${user.home}");
}
else
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("No login configuration file found");
}
}
@@ -258,7 +258,7 @@
s = s.trim();
if (s.length() != 0)
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("java.security.auth.login.config.url." + counter
+ " = " + s);
parseConfig(getInputStreamFromURL(s));
@@ -267,7 +267,7 @@
}
catch (Throwable t)
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("Exception while handling Security property at #"
+ counter + ". Continue: " + t);
}
@@ -298,7 +298,7 @@
}
catch (MalformedURLException x)
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("Failed opening as URL: " + s + ". Will try as File");
result = new FileInputStream(s);
}
@@ -323,7 +323,7 @@
s = s.trim();
if (s.length() != 0)
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("java.security.auth.login.config = " + s);
parseConfig(getInputStreamFromURL(s));
result = true;
@@ -332,7 +332,7 @@
}
catch (Throwable t)
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("Exception while handling System property. Continue: " + t);
}
return result;
@@ -363,7 +363,7 @@
if (jaasFile == null)
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("Login Configuration file, in " + userHome
+ ", does not exist or is inaccessible");
return result;
@@ -375,7 +375,7 @@
}
catch (Throwable t)
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("Exception (ignored) while handling ${user.home}: " + t);
}
return result;
@@ -413,7 +413,7 @@
String uh = System.getProperty("user.home");
if (uh == null || uh.trim().length() == 0)
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("User home path is not set or is empty");
return null;
}
@@ -421,19 +421,19 @@
File result = new File(uh);
if (! result.exists())
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("User home '" + uh + "' does not exist");
return null;
}
if (! result.isDirectory())
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("User home '" + uh + "' is not a directory");
return null;
}
if (! result.canRead())
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("User home '" + uh + "' is not readable");
return null;
}
@@ -445,19 +445,19 @@
File result = new File(userHome, fileName);
if (! result.exists())
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("File '" + fileName + "' does not exist in user's home");
return null;
}
if (! result.isFile())
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("File '" + fileName + "' in user's home is not a file");
return null;
}
if (! result.canRead())
{
- if (gnu.classpath.Configuration.DEBUG)
+ if (gnu.java.security.Configuration.DEBUG)
log.fine("File '" + fileName + "' in user's home is not readable");
return null;
}
Index: lib/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.119
diff -u -r1.119 Makefile.am
--- lib/Makefile.am 10 Jun 2006 11:10:16 -0000 1.119
+++ lib/Makefile.am 23 Jun 2006 17:27:00 -0000
@@ -190,4 +190,5 @@
$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../sun $(distdir)/../vm $(distdir)/../resource -name .cvsignore -print | xargs rm -f
$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../sun $(distdir)/../vm -name class-dependencies.conf -print | xargs rm -f
rm -f $(distdir)/../gnu/classpath/Configuration.java
+ rm -f $(distdir)/../gnu/java/security/Configuration.java
rm -f $(distdir)/../gnu/java/locale/LocaleData.java
Index: gnu/java/security/Configuration.java.in
===================================================================
RCS file: gnu/java/security/Configuration.java.in
diff -N gnu/java/security/Configuration.java.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnu/java/security/Configuration.java.in 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,56 @@
+/* Configuration.java --
+ Copyright (C) 2006 Free Software Foundation, Inc.
+
+This file is 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, 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; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, 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;
+
+/**
+ * This file defines compile-time constants that can be accessed by
+ * our crypto code. All crypto code should use and define such
+ * constants here instead of using the gnu.classpath.Configuration class.
+ */
+public interface Configuration
+{
+
+ /**
+ * The value of DEBUG is substituted according to whether the
+ * "--enable-debug" argument was passed to configure. Code
+ * which is made conditional based on the value of this flag - typically
+ * code that generates debugging output - will be removed by the optimizer
+ * in a non-debug build.
+ */
+ boolean DEBUG = @LIBDEBUG@;
+}
