diff options
Diffstat (limited to 'libjava/javax/crypto')
| -rw-r--r-- | libjava/javax/crypto/Cipher.java | 1 | ||||
| -rw-r--r-- | libjava/javax/crypto/ExemptionMechanismException.java | 33 | ||||
| -rw-r--r-- | libjava/javax/crypto/SecretKey.java | 33 | ||||
| -rw-r--r-- | libjava/javax/crypto/SecretKeyFactory.java | 1 |
4 files changed, 30 insertions, 38 deletions
diff --git a/libjava/javax/crypto/Cipher.java b/libjava/javax/crypto/Cipher.java index d768d6a..af7f2f2 100644 --- a/libjava/javax/crypto/Cipher.java +++ b/libjava/javax/crypto/Cipher.java @@ -51,7 +51,6 @@ import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.security.spec.AlgorithmParameterSpec; -import java.util.Enumeration; import java.util.StringTokenizer; import gnu.java.security.Engine; diff --git a/libjava/javax/crypto/ExemptionMechanismException.java b/libjava/javax/crypto/ExemptionMechanismException.java index 42e1c5e..2c0665d 100644 --- a/libjava/javax/crypto/ExemptionMechanismException.java +++ b/libjava/javax/crypto/ExemptionMechanismException.java @@ -1,25 +1,22 @@ /* ExemptionMechanismException -- An error in an exemption mechanism. Copyright (C) 2004 Free Software Foundation, Inc. -This file is a part of GNU Classpath. +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 of the License, or (at -your option) any later version. +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; if not, write to the - - Free Software Foundation, Inc., - 59 Temple Place, Suite 330, - Boston, MA 02111-1307 - USA +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., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and @@ -29,14 +26,14 @@ 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. */ +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 javax.crypto; diff --git a/libjava/javax/crypto/SecretKey.java b/libjava/javax/crypto/SecretKey.java index 85529b9..ce7057e 100644 --- a/libjava/javax/crypto/SecretKey.java +++ b/libjava/javax/crypto/SecretKey.java @@ -1,25 +1,22 @@ /* SecretKey.java -- A key for symmetric cryptography. Copyright (C) 2004 Free Software Foundation, Inc. -This file is a part of GNU Classpath. +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 of the License, or (at -your option) any later version. +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; if not, write to the - - Free Software Foundation, Inc., - 59 Temple Place, Suite 330, - Boston, MA 02111-1307 - USA +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., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and @@ -29,14 +26,14 @@ 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. */ +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 javax.crypto; diff --git a/libjava/javax/crypto/SecretKeyFactory.java b/libjava/javax/crypto/SecretKeyFactory.java index 92f18ec..d12e1b5 100644 --- a/libjava/javax/crypto/SecretKeyFactory.java +++ b/libjava/javax/crypto/SecretKeyFactory.java @@ -44,7 +44,6 @@ import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; import java.security.Provider; -import java.security.SecureRandom; import java.security.Security; import java.security.spec.KeySpec; import java.security.spec.InvalidKeySpecException; |