[kaffe] CVS kaffe (robilad): resynced with GNU Classpath: javax.crypto
Kaffe CVS
cvs-commits at kaffe.org
Sat Oct 23 12:35:12 PDT 2004
PatchSet 5342
Date: 2004/10/23 19:31:03
Author: robilad
Branch: HEAD
Tag: (none)
Log:
resynced with GNU Classpath: javax.crypto
2004-10-23 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/javax/crypto/BadPaddingException.java,
libraries/javalib/javax/crypto/CipherInputStream.java,
libraries/javalib/javax/crypto/CipherOutputStream.java,
libraries/javalib/javax/crypto/CipherSpi.java,
libraries/javalib/javax/crypto/EncryptedPrivateKeyInfo.java,
libraries/javalib/javax/crypto/ExemptionMechanism.java,
libraries/javalib/javax/crypto/ExemptionMechanismSpi.java,
libraries/javalib/javax/crypto/IllegalBlockSizeException.java,
libraries/javalib/javax/crypto/KeyAgreement.java,
libraries/javalib/javax/crypto/KeyAgreementSpi.java,
libraries/javalib/javax/crypto/KeyGenerator.java,
libraries/javalib/javax/crypto/KeyGeneratorSpi.java,
libraries/javalib/javax/crypto/Mac.java,
libraries/javalib/javax/crypto/NoSuchPaddingException.java,
libraries/javalib/javax/crypto/NullCipher.java,
libraries/javalib/javax/crypto/NullCipherImpl.java,
libraries/javalib/javax/crypto/SealedObject.java,
libraries/javalib/javax/crypto/SecretKeyFactorySpi.java,
libraries/javalib/javax/crypto/ShortBufferException.java,
libraries/javalib/javax/crypto/interfaces/DHKey.java,
libraries/javalib/javax/crypto/interfaces/DHPrivateKey.java,
libraries/javalib/javax/crypto/interfaces/DHPublicKey.java,
libraries/javalib/javax/crypto/interfaces/PBEKey.java,
libraries/javalib/javax/crypto/spec/DESKeySpec.java,
libraries/javalib/javax/crypto/spec/DESedeKeySpec.java,
libraries/javalib/javax/crypto/spec/DHGenParameterSpec.java,
libraries/javalib/javax/crypto/spec/DHParameterSpec.java,
libraries/javalib/javax/crypto/spec/DHPrivateKeySpec.java,
libraries/javalib/javax/crypto/spec/DHPublicKeySpec.java,
libraries/javalib/javax/crypto/spec/IvParameterSpec.java,
libraries/javalib/javax/crypto/spec/PBEKeySpec.java,
libraries/javalib/javax/crypto/spec/PBEParameterSpec.java,
libraries/javalib/javax/crypto/spec/RC2ParameterSpec.java,
libraries/javalib/javax/crypto/spec/RC5ParameterSpec.java,
libraries/javalib/javax/crypto/spec/SecretKeySpec.java:
Resynced with GNU Classpath.
2004-10-21 Michael Koch <konqueror at gmx.de>
* javax/crypto/Cipher.java,
javax/crypto/EncryptedPrivateKeyInfo.java,
javax/crypto/ExemptionMechanism.java,
javax/crypto/KeyAgreement.java,
javax/crypto/KeyGenerator.java,
javax/crypto/Mac.java,
javax/crypto/SecretKeyFactory.java,
javax/crypto/SecretKeyFactorySpi.java,
javax/crypto/spec/SecretKeySpec.java:
Import cleanup.
Members:
ChangeLog:1.2894->1.2895
libraries/javalib/javax/crypto/BadPaddingException.java:1.1->1.2
libraries/javalib/javax/crypto/CipherInputStream.java:1.1->1.2
libraries/javalib/javax/crypto/CipherOutputStream.java:1.1->1.2
libraries/javalib/javax/crypto/CipherSpi.java:1.1->1.2
libraries/javalib/javax/crypto/EncryptedPrivateKeyInfo.java:1.1->1.2
libraries/javalib/javax/crypto/ExemptionMechanism.java:1.1->1.2
libraries/javalib/javax/crypto/ExemptionMechanismSpi.java:1.1->1.2
libraries/javalib/javax/crypto/IllegalBlockSizeException.java:1.1->1.2
libraries/javalib/javax/crypto/KeyAgreement.java:1.1->1.2
libraries/javalib/javax/crypto/KeyAgreementSpi.java:1.1->1.2
libraries/javalib/javax/crypto/KeyGenerator.java:1.1->1.2
libraries/javalib/javax/crypto/KeyGeneratorSpi.java:1.1->1.2
libraries/javalib/javax/crypto/Mac.java:1.1->1.2
libraries/javalib/javax/crypto/NoSuchPaddingException.java:1.1->1.2
libraries/javalib/javax/crypto/NullCipher.java:1.1->1.2
libraries/javalib/javax/crypto/NullCipherImpl.java:1.1->1.2
libraries/javalib/javax/crypto/SealedObject.java:1.1->1.2
libraries/javalib/javax/crypto/SecretKeyFactorySpi.java:1.1->1.2
libraries/javalib/javax/crypto/ShortBufferException.java:1.1->1.2
libraries/javalib/javax/crypto/interfaces/DHKey.java:1.1->1.2
libraries/javalib/javax/crypto/interfaces/DHPrivateKey.java:1.1->1.2
libraries/javalib/javax/crypto/interfaces/DHPublicKey.java:1.1->1.2
libraries/javalib/javax/crypto/interfaces/PBEKey.java:1.1->1.2
libraries/javalib/javax/crypto/spec/DESKeySpec.java:1.1->1.2
libraries/javalib/javax/crypto/spec/DESedeKeySpec.java:1.1->1.2
libraries/javalib/javax/crypto/spec/DHGenParameterSpec.java:1.1->1.2
libraries/javalib/javax/crypto/spec/DHParameterSpec.java:1.1->1.2
libraries/javalib/javax/crypto/spec/DHPrivateKeySpec.java:1.1->1.2
libraries/javalib/javax/crypto/spec/DHPublicKeySpec.java:1.1->1.2
libraries/javalib/javax/crypto/spec/IvParameterSpec.java:1.1->1.2
libraries/javalib/javax/crypto/spec/PBEKeySpec.java:1.1->1.2
libraries/javalib/javax/crypto/spec/PBEParameterSpec.java:1.1->1.2
libraries/javalib/javax/crypto/spec/RC2ParameterSpec.java:1.1->1.2
libraries/javalib/javax/crypto/spec/RC5ParameterSpec.java:1.1->1.2
libraries/javalib/javax/crypto/spec/SecretKeySpec.java:1.1->1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2894 kaffe/ChangeLog:1.2895
--- kaffe/ChangeLog:1.2894 Sat Oct 23 18:18:12 2004
+++ kaffe/ChangeLog Sat Oct 23 19:31:03 2004
@@ -1,5 +1,57 @@
2004-10-23 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/javax/crypto/BadPaddingException.java,
+ libraries/javalib/javax/crypto/CipherInputStream.java,
+ libraries/javalib/javax/crypto/CipherOutputStream.java,
+ libraries/javalib/javax/crypto/CipherSpi.java,
+ libraries/javalib/javax/crypto/EncryptedPrivateKeyInfo.java,
+ libraries/javalib/javax/crypto/ExemptionMechanism.java,
+ libraries/javalib/javax/crypto/ExemptionMechanismSpi.java,
+ libraries/javalib/javax/crypto/IllegalBlockSizeException.java,
+ libraries/javalib/javax/crypto/KeyAgreement.java,
+ libraries/javalib/javax/crypto/KeyAgreementSpi.java,
+ libraries/javalib/javax/crypto/KeyGenerator.java,
+ libraries/javalib/javax/crypto/KeyGeneratorSpi.java,
+ libraries/javalib/javax/crypto/Mac.java,
+ libraries/javalib/javax/crypto/NoSuchPaddingException.java,
+ libraries/javalib/javax/crypto/NullCipher.java,
+ libraries/javalib/javax/crypto/NullCipherImpl.java,
+ libraries/javalib/javax/crypto/SealedObject.java,
+ libraries/javalib/javax/crypto/SecretKeyFactorySpi.java,
+ libraries/javalib/javax/crypto/ShortBufferException.java,
+ libraries/javalib/javax/crypto/interfaces/DHKey.java,
+ libraries/javalib/javax/crypto/interfaces/DHPrivateKey.java,
+ libraries/javalib/javax/crypto/interfaces/DHPublicKey.java,
+ libraries/javalib/javax/crypto/interfaces/PBEKey.java,
+ libraries/javalib/javax/crypto/spec/DESKeySpec.java,
+ libraries/javalib/javax/crypto/spec/DESedeKeySpec.java,
+ libraries/javalib/javax/crypto/spec/DHGenParameterSpec.java,
+ libraries/javalib/javax/crypto/spec/DHParameterSpec.java,
+ libraries/javalib/javax/crypto/spec/DHPrivateKeySpec.java,
+ libraries/javalib/javax/crypto/spec/DHPublicKeySpec.java,
+ libraries/javalib/javax/crypto/spec/IvParameterSpec.java,
+ libraries/javalib/javax/crypto/spec/PBEKeySpec.java,
+ libraries/javalib/javax/crypto/spec/PBEParameterSpec.java,
+ libraries/javalib/javax/crypto/spec/RC2ParameterSpec.java,
+ libraries/javalib/javax/crypto/spec/RC5ParameterSpec.java,
+ libraries/javalib/javax/crypto/spec/SecretKeySpec.java:
+ Resynced with GNU Classpath.
+
+ 2004-10-21 Michael Koch <konqueror at gmx.de>
+
+ * javax/crypto/Cipher.java,
+ javax/crypto/EncryptedPrivateKeyInfo.java,
+ javax/crypto/ExemptionMechanism.java,
+ javax/crypto/KeyAgreement.java,
+ javax/crypto/KeyGenerator.java,
+ javax/crypto/Mac.java,
+ javax/crypto/SecretKeyFactory.java,
+ javax/crypto/SecretKeyFactorySpi.java,
+ javax/crypto/spec/SecretKeySpec.java:
+ Import cleanup.
+
+2004-10-23 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/java/security/AlgorithmParametersSpi.java,
libraries/javalib/java/security/AllPermission.java,
libraries/javalib/java/security/BasicPermission.java,
Index: kaffe/libraries/javalib/javax/crypto/BadPaddingException.java
diff -u kaffe/libraries/javalib/javax/crypto/BadPaddingException.java:1.1 kaffe/libraries/javalib/javax/crypto/BadPaddingException.java:1.2
--- kaffe/libraries/javalib/javax/crypto/BadPaddingException.java:1.1 Wed Jul 21 01:42:09 2004
+++ kaffe/libraries/javalib/javax/crypto/BadPaddingException.java Sat Oct 23 19:31:06 2004
@@ -1,25 +1,22 @@
/* BadPaddingException -- Signals bad padding bytes on decryption.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is a part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto 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 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 Crypto is distributed in the hope that it will be useful, but
+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 Crypto; 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 @@
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;
@@ -48,7 +45,7 @@
* does not have the proper padding bytes that are expected by the padding
* mechanism.
*
- * @author Casey Marshall (rsdio at metastatic.org)
+ * @author Casey Marshall (csm at gnu.org)
*/
public class BadPaddingException extends GeneralSecurityException
{
Index: kaffe/libraries/javalib/javax/crypto/CipherInputStream.java
diff -u kaffe/libraries/javalib/javax/crypto/CipherInputStream.java:1.1 kaffe/libraries/javalib/javax/crypto/CipherInputStream.java:1.2
--- kaffe/libraries/javalib/javax/crypto/CipherInputStream.java:1.1 Wed Jul 21 01:42:10 2004
+++ kaffe/libraries/javalib/javax/crypto/CipherInputStream.java Sat Oct 23 19:31:06 2004
@@ -1,25 +1,22 @@
/* CipherInputStream.java -- Filters input through a cipher.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is a part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto 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 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 Crypto is distributed in the hope that it will be useful, but
+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 Crypto; 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 @@
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;
@@ -51,7 +48,7 @@
* argument must have been initialized before it is passed to the
* constructor.
*
- * @author Casey Marshall <rsdio at metastatic.org>
+ * @author Casey Marshall (csm at gnu.org)
*/
public class CipherInputStream extends FilterInputStream
{
Index: kaffe/libraries/javalib/javax/crypto/CipherOutputStream.java
diff -u kaffe/libraries/javalib/javax/crypto/CipherOutputStream.java:1.1 kaffe/libraries/javalib/javax/crypto/CipherOutputStream.java:1.2
--- kaffe/libraries/javalib/javax/crypto/CipherOutputStream.java:1.1 Wed Jul 21 01:42:10 2004
+++ kaffe/libraries/javalib/javax/crypto/CipherOutputStream.java Sat Oct 23 19:31:06 2004
@@ -1,25 +1,22 @@
/* CipherOutputStream.java -- Filters output through a cipher.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is a part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto 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 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 Crypto is distributed in the hope that it will be useful, but
+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 Crypto; 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 @@
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;
@@ -49,7 +46,7 @@
* A filtered output stream that transforms data written to it with a
* {@link Cipher} before sending it to the underlying output stream.
*
- * @author Casey Marshall (rsdio at metastatic.org)
+ * @author Casey Marshall (csm at gnu.org)
*/
public class CipherOutputStream extends FilterOutputStream
{
Index: kaffe/libraries/javalib/javax/crypto/CipherSpi.java
diff -u kaffe/libraries/javalib/javax/crypto/CipherSpi.java:1.1 kaffe/libraries/javalib/javax/crypto/CipherSpi.java:1.2
--- kaffe/libraries/javalib/javax/crypto/CipherSpi.java:1.1 Wed Jul 21 01:42:10 2004
+++ kaffe/libraries/javalib/javax/crypto/CipherSpi.java Sat Oct 23 19:31:06 2004
@@ -1,25 +1,22 @@
/* CipherSpi.java -- The cipher service provider interface.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is a part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto 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 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 Crypto is distributed in the hope that it will be useful, but
+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 Crypto; 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 @@
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;
@@ -119,7 +116,7 @@
* it. Otherwise throw a {@link java.security.NoSuchAlgorithmException}.</li>
* </ol>
*
- * @author Casey Marshall <rsdio at metastatic.org>
+ * @author Casey Marshall (csm at gnu.org)
* @since 1.4
*/
public abstract class CipherSpi
Index: kaffe/libraries/javalib/javax/crypto/EncryptedPrivateKeyInfo.java
diff -u kaffe/libraries/javalib/javax/crypto/EncryptedPrivateKeyInfo.java:1.1 kaffe/libraries/javalib/javax/crypto/EncryptedPrivateKeyInfo.java:1.2
--- kaffe/libraries/javalib/javax/crypto/EncryptedPrivateKeyInfo.java:1.1 Wed Jul 21 01:42:10 2004
+++ kaffe/libraries/javalib/javax/crypto/EncryptedPrivateKeyInfo.java Sat Oct 23 19:31:06 2004
@@ -1,25 +1,22 @@
/* EncryptedPrivateKeyInfo.java -- As in PKCS #8.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is a part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto 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 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 Crypto is distributed in the hope that it will be useful, but
+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 Crypto; 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,32 +26,30 @@
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;
-import gnu.crypto.der.DER;
-import gnu.crypto.der.DERReader;
-import gnu.crypto.der.DERValue;
-import gnu.crypto.der.OID;
+import gnu.java.security.OID;
+import gnu.java.security.der.DER;
+import gnu.java.security.der.DERReader;
+import gnu.java.security.der.DERValue;
import java.io.IOException;
-
-import java.util.ArrayList;
-import java.util.List;
-
import java.security.AlgorithmParameters;
import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.ArrayList;
+import java.util.List;
/**
* An implementation of the <code>EncryptedPrivateKeyInfo</code> ASN.1
@@ -78,7 +73,7 @@
* parameters ANY DEFINED BY algorithm OPTIONAL }</pre>
* </blockquote>
*
- * @author Casey Marshall (rsdio at metastatic.org)
+ * @author Casey Marshall (csm at gnu.org)
* @since 1.4
* @see java.security.spec.PKCS8EncodedKeySpec
*/
Index: kaffe/libraries/javalib/javax/crypto/ExemptionMechanism.java
diff -u kaffe/libraries/javalib/javax/crypto/ExemptionMechanism.java:1.1 kaffe/libraries/javalib/javax/crypto/ExemptionMechanism.java:1.2
--- kaffe/libraries/javalib/javax/crypto/ExemptionMechanism.java:1.1 Wed Jul 21 01:42:10 2004
+++ kaffe/libraries/javalib/javax/crypto/ExemptionMechanism.java Sat Oct 23 19:31:06 2004
@@ -1,25 +1,22 @@
/* ExemptionMechanism.java -- Generic crypto-weakening mechanism.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is a part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto 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 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 Crypto is distributed in the hope that it will be useful, but
+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 Crypto; 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,20 +26,21 @@
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;
-import java.lang.reflect.InvocationTargetException;
+import gnu.java.security.Engine;
+import java.lang.reflect.InvocationTargetException;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
@@ -62,7 +60,7 @@
* API-compatibility only; it is not actually used anywhere in this library
* and this library does not, in general, support crypto weakening.
*
- * @author Casey Marshall (rsdio at metastatic.org)
+ * @author Casey Marshall (csm at gnu.org)
* @since 1.4
*/
public class ExemptionMechanism
Index: kaffe/libraries/javalib/javax/crypto/ExemptionMechanismSpi.java
diff -u kaffe/libraries/javalib/javax/crypto/ExemptionMechanismSpi.java:1.1 kaffe/libraries/javalib/javax/crypto/ExemptionMechanismSpi.java:1.2
--- kaffe/libraries/javalib/javax/crypto/ExemptionMechanismSpi.java:1.1 Wed Jul 21 01:42:10 2004
+++ kaffe/libraries/javalib/javax/crypto/ExemptionMechanismSpi.java Sat Oct 23 19:31:06 2004
@@ -1,23 +1,22 @@
/* ExemptionMechanismSpi.java -- Exemption mechanism service provider interface.
Copyright (C) 2004 Free Software Foundation, Inc.
-GNU Crypto 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.
+This file is part of GNU Classpath.
-GNU Crypto is distributed in the hope that it will be useful, but
+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 Crypto; 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
@@ -27,14 +26,14 @@
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;
@@ -49,7 +48,7 @@
* The <i>Service Provider Interface</i> (<b>SPI</b>) for the {@link
* ExemptionMechanism} class.
*
- * @author Casey Marshall (rsdio at metastatic.org)
+ * @author Casey Marshall (csm at gnu.org)
* @since 1.4
*/
public abstract class ExemptionMechanismSpi
Index: kaffe/libraries/javalib/javax/crypto/IllegalBlockSizeException.java
diff -u kaffe/libraries/javalib/javax/crypto/IllegalBlockSizeException.java:1.1 kaffe/libraries/javalib/javax/crypto/IllegalBlockSizeException.java:1.2
--- kaffe/libraries/javalib/javax/crypto/IllegalBlockSizeException.java:1.1 Wed Jul 21 01:42:10 2004
+++ kaffe/libraries/javalib/javax/crypto/IllegalBlockSizeException.java Sat Oct 23 19:31:06 2004
@@ -1,25 +1,22 @@
/* IllegalBlockSizeException.java -- Signals illegal block sizes.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is a part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto 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 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 Crypto is distributed in the hope that it will be useful, but
+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 Crypto; 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 @@
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;
@@ -48,7 +45,7 @@
* decryption and the input is not a multiple of the cipher's block
* size.
*
- * @author Casey Marshall (rsdio at metastatic.org)
+ * @author Casey Marshall (csm at gnu.org)
*/
public class IllegalBlockSizeException extends GeneralSecurityException
{
Index: kaffe/libraries/javalib/javax/crypto/KeyAgreement.java
diff -u kaffe/libraries/javalib/javax/crypto/KeyAgreement.java:1.1 kaffe/libraries/javalib/javax/crypto/KeyAgreement.java:1.2
--- kaffe/libraries/javalib/javax/crypto/KeyAgreement.java:1.1 Wed Jul 21 01:42:10 2004
+++ kaffe/libraries/javalib/javax/crypto/KeyAgreement.java Sat Oct 23 19:31:06 2004
@@ -1,25 +1,22 @@
/* KeyAgreement.java -- Engine for key agreement methods.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is a part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto 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 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 Crypto is distributed in the hope that it will be useful, but
+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 Crypto; 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,20 +26,21 @@
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;
-import java.lang.reflect.InvocationTargetException;
+import gnu.java.security.Engine;
+import java.lang.reflect.InvocationTargetException;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.Key;
@@ -66,7 +64,7 @@
* href="http://www.rsasecurity.com/rsalabs/pkcs/pkcs-3/">PKCS #3 -
* Diffie Hellman Key Agreement Standard</a>.
*
- * @author Casey Marshall (rsdio at metastatic.org)
+ * @author Casey Marshall (csm at gnu.org)
* @since 1.4
* @see KeyGenerator
* @see SecretKey
Index: kaffe/libraries/javalib/javax/crypto/KeyAgreementSpi.java
diff -u kaffe/libraries/javalib/javax/crypto/KeyAgreementSpi.java:1.1 kaffe/libraries/javalib/javax/crypto/KeyAgreementSpi.java:1.2
--- kaffe/libraries/javalib/javax/crypto/KeyAgreementSpi.java:1.1 Wed Jul 21 01:42:10 2004
+++ kaffe/libraries/javalib/javax/crypto/KeyAgreementSpi.java Sat Oct 23 19:31:06 2004
@@ -1,25 +1,22 @@
/* KeyAgreementSpi.java -- The key agreement service provider interface.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is a part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto 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 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 Crypto is distributed in the hope that it will be useful, but
+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 Crypto; 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 @@
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;
@@ -58,7 +55,7 @@
* master {@link java.security.Provider} class (the service name for key
* agreement algorithms is <code>"KeyAgreement"</code>).
*
- * @author Casey Marshall (rsdio at metastatic.org)
+ * @author Casey Marshall (csm at gnu.org)
* @since 1.4
* @see KeyAgreement
* @see SecretKey
Index: kaffe/libraries/javalib/javax/crypto/KeyGenerator.java
diff -u kaffe/libraries/javalib/javax/crypto/KeyGenerator.java:1.1 kaffe/libraries/javalib/javax/crypto/KeyGenerator.java:1.2
--- kaffe/libraries/javalib/javax/crypto/KeyGenerator.java:1.1 Wed Jul 21 01:42:10 2004
+++ kaffe/libraries/javalib/javax/crypto/KeyGenerator.java Sat Oct 23 19:31:06 2004
@@ -1,25 +1,22 @@
/* KeyGenerator.java -- Interface to a symmetric key generator.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is a part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto 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 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 Crypto is distributed in the hope that it will be useful, but
+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 Crypto; 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,20 +26,21 @@
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;
-import java.lang.reflect.InvocationTargetException;
+import gnu.java.security.Engine;
+import java.lang.reflect.InvocationTargetException;
import java.security.InvalidAlgorithmParameterException;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
@@ -56,7 +54,7 @@
* returned may be simple wrappers around byte arrays, or, if the
* target cipher requires them, more complex objects.
*
- * @author Casey Marshall (rsdio at metastatic.org)
+ * @author Casey Marshall (csm at gnu.org)
* @since 1.4
* @see Cipher
* @see Mac
Index: kaffe/libraries/javalib/javax/crypto/KeyGeneratorSpi.java
*** Patch too long, truncated ***
More information about the kaffe
mailing list