[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commit-cp] classpath gnu/java/security/x509X509Certificate...
|
From: |
Raif S. Naffah |
|
Subject: |
[commit-cp] classpath gnu/java/security/x509X509Certificate... |
|
Date: |
Sat, 17 Jun 2006 12:06:54 +0000 |
CVSROOT: /cvsroot/classpath
Module name: classpath
Changes by: Raif S. Naffah <raif> 06/06/17 12:06:53
Modified files:
gnu/java/security/x509: X509Certificate.java
gnu/javax/crypto/cipher: Twofish.java DES.java NullCipher.java
TripleDES.java Rijndael.java
Serpent.java Cast5.java Blowfish.java
Square.java Anubis.java Khazad.java
gnu/javax/crypto/keyring: PasswordProtectedEntry.java
PasswordEncryptedEntry.java
PasswordAuthenticatedEntry.java
EncryptedEntry.java
AuthenticatedEntry.java
gnu/java/security/util: Sequence.java
java/security/cert: X509CertSelector.java
gnu/javax/crypto/mode: EAX.java BaseMode.java
gnu/javax/crypto/jce/prng: ICMRandomSpi.java UMacRandomSpi.java
gnu/javax/crypto/sasl/srp: KDF.java
gnu/javax/crypto/jce: PBKDF2SecretKeyFactory.java
gnu/javax/crypto/jce/key: SecretKeyGeneratorImpl.java
gnu/javax/crypto/mac: UHash32.java UMac32.java
gnu/java/security/x509/ext: GeneralNames.java
gnu/java/security/jce/sig: EncodedKeyFactory.java
RSAKeyPairGeneratorSpi.java
DSSKeyPairGeneratorSpi.java
gnu/javax/crypto/jce/cipher: PBES2.java CipherAdapter.java
gnu/javax/crypto/prng: ICMGenerator.java UMacGenerator.java
gnu/javax/crypto/jce/sig: DHKeyPairGeneratorSpi.java
gnu/javax/security/auth/callback: ConsoleCallbackHandler.java
gnu/javax/crypto/assembly: ModeStage.java
Log message:
2006-06-17 Raif S. Naffah <address@hidden>
* gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java:
Use Integer.valueOf() instead of new Integer().
* gnu/java/security/jce/sig/EncodedKeyFactory.java: Likewise.
* gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java:
Likewise.
* gnu/java/security/util/Sequence.java: Likewise.
* gnu/java/security/x509/ext/GeneralNames.java: Likewise.
* gnu/java/security/x509/X509Certificate.java: Likewise.
* gnu/javax/crypto/assembly/ModeStage.java: Likewise.
* gnu/javax/crypto/cipher/Anubis.java: Likewise.
* gnu/javax/crypto/cipher/Blowfish.java: Likewise.
* gnu/javax/crypto/cipher/Cast5.java: Likewise.
* gnu/javax/crypto/cipher/DES.java: Likewise.
* gnu/javax/crypto/cipher/Khazad.java: Likewise.
* gnu/javax/crypto/cipher/NullCipher.java: Likewise.
* gnu/javax/crypto/cipher/Rijndael.java: Likewise.
* gnu/javax/crypto/cipher/Serpent.java: Likewise.
* gnu/javax/crypto/cipher/Square.java: Likewise.
* gnu/javax/crypto/cipher/TripleDES.java: Likewise.
* gnu/javax/crypto/cipher/Twofish.java: Likewise.
* gnu/javax/crypto/jce/cipher/CipherAdapter.java: Likewise.
* gnu/javax/crypto/jce/cipher/PBES2.java: Likewise.
* gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java:
Likewise.
* gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java: Likewise.
* gnu/javax/crypto/jce/prng/ICMRandomSpi.java: Likewise.
* gnu/javax/crypto/jce/prng/UMacRandomSpi.java: Likewise.
* gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java: Likewise.
* gnu/javax/crypto/keyring/AuthenticatedEntry.java: Likewise.
* gnu/javax/crypto/keyring/EncryptedEntry.java: Likewise.
* gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java:
Likewise.
* gnu/javax/crypto/keyring/PasswordEncryptedEntry.java:
Likewise.
* gnu/javax/crypto/keyring/PasswordProtectedEntry.java:
Likewise.
* gnu/javax/crypto/mac/UHash32.java: Likewise.
* gnu/javax/crypto/mac/UMac32.java: Likewise.
* gnu/javax/crypto/mode/BaseMode.java: Likewise.
* gnu/javax/crypto/mode/EAX.java: Likewise.
* gnu/javax/crypto/prng/ICMGenerator.java: Likewise.
* gnu/javax/crypto/prng/UMacGenerator.java: Likewise.
* gnu/javax/crypto/sasl/srp/KDF.java: Likewise.
* gnu/javax/security/auth/callback/ConsoleCallbackHandler.java:
Likewise.
* java/security/cert/X509CertSelector.java: Likewise.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/x509/X509Certificate.java?cvsroot=classpath&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Twofish.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/DES.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/NullCipher.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/TripleDES.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Rijndael.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Serpent.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Cast5.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Blowfish.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Square.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Anubis.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/cipher/Khazad.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/PasswordProtectedEntry.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/EncryptedEntry.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/keyring/AuthenticatedEntry.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/util/Sequence.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/java/security/cert/X509CertSelector.java?cvsroot=classpath&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mode/EAX.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mode/BaseMode.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/sasl/srp/KDF.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mac/UHash32.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/mac/UMac32.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/x509/ext/GeneralNames.java?cvsroot=classpath&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/EncodedKeyFactory.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/PBES2.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/prng/ICMGenerator.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/prng/UMacGenerator.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/security/auth/callback/ConsoleCallbackHandler.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/assembly/ModeStage.java?cvsroot=classpath&r1=1.2&r2=1.3
Patches:
Index: gnu/java/security/x509/X509Certificate.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/security/x509/X509Certificate.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gnu/java/security/x509/X509Certificate.java 23 Jan 2006 18:21:44 -0000
1.10
+++ gnu/java/security/x509/X509Certificate.java 17 Jun 2006 12:06:52 -0000
1.11
@@ -552,7 +552,7 @@
// Certificate ::= SEQUENCE {
DERValue cert = der.read();
logger.log (Component.X509, "start Certificate len == {0}",
- new Integer (cert.getLength()));
+ Integer.valueOf(cert.getLength()));
this.encoded = cert.getEncoded();
if (!cert.isConstructed())
@@ -568,7 +568,7 @@
}
tbsCertBytes = tbsCert.getEncoded();
logger.log (Component.X509, "start TBSCertificate len == {0}",
- new Integer (tbsCert.getLength()));
+ Integer.valueOf(tbsCert.getLength()));
// Version ::= INTEGER [0] { v1(0), v2(1), v3(2) }
DERValue val = der.read();
@@ -582,7 +582,7 @@
version = 1;
}
logger.log (Component.X509, "read version == {0}",
- new Integer (version));
+ Integer.valueOf(version));
// SerialNumber ::= INTEGER
serialNo = (BigInteger) val.getValue();
@@ -596,7 +596,7 @@
}
int certAlgLen = val.getLength();
logger.log (Component.X509, "start AlgorithmIdentifier len == {0}",
- new Integer (certAlgLen));
+ Integer.valueOf(certAlgLen));
val = der.read();
// algorithm OBJECT IDENTIFIER,
@@ -677,20 +677,20 @@
{
val = der.read();
logger.log (Component.X509, "start Extensions len == {0}",
- new Integer (val.getLength()));
+ Integer.valueOf(val.getLength()));
int len = 0;
while (len < val.getLength())
{
DERValue ext = der.read();
logger.log (Component.X509, "start extension len == {0}",
- new Integer (ext.getLength()));
+ Integer.valueOf(ext.getLength()));
Extension e = new Extension(ext.getEncoded());
extensions.put(e.getOid(), e);
der.skip(ext.getLength());
len += ext.getEncodedLength();
logger.log (Component.X509, "read extension {0} == {1}",
new Object[] { e.getOid (), e });
- logger.log (Component.X509, "count == {0}", new Integer (len));
+ logger.log (Component.X509, "count == {0}", Integer.valueOf(len));
}
val = der.read ();
@@ -703,7 +703,7 @@
}
int sigAlgLen = val.getLength();
logger.log (Component.X509, "start AlgorithmIdentifier len == {0}",
- new Integer (sigAlgLen));
+ Integer.valueOf(sigAlgLen));
val = der.read();
sigAlgId = (OID) val.getValue();
logger.log (Component.X509, "read algorithm id == {0}", sigAlgId);
Index: gnu/javax/crypto/cipher/Twofish.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Twofish.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/javax/crypto/cipher/Twofish.java 11 Jun 2006 12:14:43 -0000
1.3
+++ gnu/javax/crypto/cipher/Twofish.java 17 Jun 2006 12:06:52 -0000
1.4
@@ -481,7 +481,7 @@
public Iterator blockSizes()
{
ArrayList al = new ArrayList();
- al.add(new Integer(DEFAULT_BLOCK_SIZE));
+ al.add(Integer.valueOf(DEFAULT_BLOCK_SIZE));
return Collections.unmodifiableList(al).iterator();
}
@@ -489,10 +489,10 @@
public Iterator keySizes()
{
ArrayList al = new ArrayList();
- al.add(new Integer(8)); // 64-bit
- al.add(new Integer(16)); // 128-bit
- al.add(new Integer(24)); // 192-bit
- al.add(new Integer(32)); // 256-bit
+ al.add(Integer.valueOf(8)); // 64-bit
+ al.add(Integer.valueOf(16)); // 128-bit
+ al.add(Integer.valueOf(24)); // 192-bit
+ al.add(Integer.valueOf(32)); // 256-bit
return Collections.unmodifiableList(al).iterator();
}
Index: gnu/javax/crypto/cipher/DES.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/DES.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/cipher/DES.java 26 Jan 2006 02:25:08 -0000 1.1
+++ gnu/javax/crypto/cipher/DES.java 17 Jun 2006 12:06:52 -0000 1.2
@@ -725,12 +725,12 @@
public Iterator blockSizes()
{
- return Collections.singleton(new Integer(BLOCK_SIZE)).iterator();
+ return Collections.singleton(Integer.valueOf(BLOCK_SIZE)).iterator();
}
public Iterator keySizes()
{
- return Collections.singleton(new Integer(KEY_SIZE)).iterator();
+ return Collections.singleton(Integer.valueOf(KEY_SIZE)).iterator();
}
public Object makeKey(byte[] kb, int bs) throws InvalidKeyException
Index: gnu/javax/crypto/cipher/NullCipher.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/NullCipher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/cipher/NullCipher.java 26 Jan 2006 02:25:08 -0000
1.1
+++ gnu/javax/crypto/cipher/NullCipher.java 17 Jun 2006 12:06:52 -0000
1.2
@@ -88,10 +88,10 @@
public Iterator blockSizes()
{
ArrayList al = new ArrayList();
- al.add(new Integer(64 / 8));
- al.add(new Integer(128 / 8));
- al.add(new Integer(192 / 8));
- al.add(new Integer(256 / 8));
+ al.add(Integer.valueOf(64 / 8));
+ al.add(Integer.valueOf(128 / 8));
+ al.add(Integer.valueOf(192 / 8));
+ al.add(Integer.valueOf(256 / 8));
return Collections.unmodifiableList(al).iterator();
}
@@ -101,7 +101,7 @@
ArrayList al = new ArrayList();
for (int n = 8; n < 64; n++)
{
- al.add(new Integer(n));
+ al.add(Integer.valueOf(n));
}
return Collections.unmodifiableList(al).iterator();
Index: gnu/javax/crypto/cipher/TripleDES.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/TripleDES.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/cipher/TripleDES.java 26 Jan 2006 02:25:08 -0000
1.1
+++ gnu/javax/crypto/cipher/TripleDES.java 17 Jun 2006 12:06:52 -0000
1.2
@@ -141,12 +141,12 @@
public Iterator blockSizes()
{
- return Collections.singleton(new Integer(BLOCK_SIZE)).iterator();
+ return Collections.singleton(Integer.valueOf(BLOCK_SIZE)).iterator();
}
public Iterator keySizes()
{
- return Collections.singleton(new Integer(KEY_SIZE)).iterator();
+ return Collections.singleton(Integer.valueOf(KEY_SIZE)).iterator();
}
public Object makeKey(byte[] kb, int bs) throws InvalidKeyException
Index: gnu/javax/crypto/cipher/Rijndael.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Rijndael.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/javax/crypto/cipher/Rijndael.java 11 Jun 2006 12:14:43 -0000
1.3
+++ gnu/javax/crypto/cipher/Rijndael.java 17 Jun 2006 12:06:52 -0000
1.4
@@ -611,9 +611,9 @@
public Iterator blockSizes()
{
ArrayList al = new ArrayList();
- al.add(new Integer(128 / 8));
- al.add(new Integer(192 / 8));
- al.add(new Integer(256 / 8));
+ al.add(Integer.valueOf(128 / 8));
+ al.add(Integer.valueOf(192 / 8));
+ al.add(Integer.valueOf(256 / 8));
return Collections.unmodifiableList(al).iterator();
}
@@ -621,9 +621,9 @@
public Iterator keySizes()
{
ArrayList al = new ArrayList();
- al.add(new Integer(128 / 8));
- al.add(new Integer(192 / 8));
- al.add(new Integer(256 / 8));
+ al.add(Integer.valueOf(128 / 8));
+ al.add(Integer.valueOf(192 / 8));
+ al.add(Integer.valueOf(256 / 8));
return Collections.unmodifiableList(al).iterator();
}
Index: gnu/javax/crypto/cipher/Serpent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Serpent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/cipher/Serpent.java 21 Apr 2006 10:52:26 -0000
1.2
+++ gnu/javax/crypto/cipher/Serpent.java 17 Jun 2006 12:06:52 -0000
1.3
@@ -130,15 +130,15 @@
public Iterator blockSizes()
{
- return Collections.singleton(new Integer(DEFAULT_BLOCK_SIZE)).iterator();
+ return
Collections.singleton(Integer.valueOf(DEFAULT_BLOCK_SIZE)).iterator();
}
public Iterator keySizes()
{
ArrayList keySizes = new ArrayList();
- keySizes.add(new Integer(16));
- keySizes.add(new Integer(24));
- keySizes.add(new Integer(32));
+ keySizes.add(Integer.valueOf(16));
+ keySizes.add(Integer.valueOf(24));
+ keySizes.add(Integer.valueOf(32));
return Collections.unmodifiableList(keySizes).iterator();
}
Index: gnu/javax/crypto/cipher/Cast5.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Cast5.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/cipher/Cast5.java 21 Apr 2006 10:52:26 -0000 1.2
+++ gnu/javax/crypto/cipher/Cast5.java 17 Jun 2006 12:06:52 -0000 1.3
@@ -866,7 +866,7 @@
public Iterator blockSizes()
{
ArrayList al = new ArrayList();
- al.add(new Integer(DEFAULT_BLOCK_SIZE));
+ al.add(Integer.valueOf(DEFAULT_BLOCK_SIZE));
return Collections.unmodifiableList(al).iterator();
}
@@ -876,7 +876,7 @@
ArrayList al = new ArrayList();
for (int n = 5; n < 17; n++)
{
- al.add(new Integer(n));
+ al.add(Integer.valueOf(n));
}
return Collections.unmodifiableList(al).iterator();
Index: gnu/javax/crypto/cipher/Blowfish.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Blowfish.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/cipher/Blowfish.java 21 Apr 2006 10:52:26 -0000
1.2
+++ gnu/javax/crypto/cipher/Blowfish.java 17 Jun 2006 12:06:52 -0000
1.3
@@ -474,7 +474,7 @@
public Iterator blockSizes()
{
- return Collections.singleton(new Integer(DEFAULT_BLOCK_SIZE)).iterator();
+ return
Collections.singleton(Integer.valueOf(DEFAULT_BLOCK_SIZE)).iterator();
}
public Object makeKey(byte[] k, int bs)
Index: gnu/javax/crypto/cipher/Square.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Square.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/javax/crypto/cipher/Square.java 21 Apr 2006 10:52:26 -0000 1.3
+++ gnu/javax/crypto/cipher/Square.java 17 Jun 2006 12:06:52 -0000 1.4
@@ -411,7 +411,7 @@
public Iterator blockSizes()
{
ArrayList al = new ArrayList();
- al.add(new Integer(DEFAULT_BLOCK_SIZE));
+ al.add(Integer.valueOf(DEFAULT_BLOCK_SIZE));
return Collections.unmodifiableList(al).iterator();
}
@@ -419,7 +419,7 @@
public Iterator keySizes()
{
ArrayList al = new ArrayList();
- al.add(new Integer(DEFAULT_KEY_SIZE));
+ al.add(Integer.valueOf(DEFAULT_KEY_SIZE));
return Collections.unmodifiableList(al).iterator();
}
Index: gnu/javax/crypto/cipher/Anubis.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Anubis.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/javax/crypto/cipher/Anubis.java 11 Jun 2006 12:14:43 -0000 1.3
+++ gnu/javax/crypto/cipher/Anubis.java 17 Jun 2006 12:06:52 -0000 1.4
@@ -328,7 +328,7 @@
public Iterator blockSizes()
{
ArrayList al = new ArrayList();
- al.add(new Integer(DEFAULT_BLOCK_SIZE));
+ al.add(Integer.valueOf(DEFAULT_BLOCK_SIZE));
return Collections.unmodifiableList(al).iterator();
}
@@ -338,7 +338,7 @@
ArrayList al = new ArrayList();
for (int n = 4; n < 10; n++)
{
- al.add(new Integer(n * 32 / 8));
+ al.add(Integer.valueOf(n * 32 / 8));
}
return Collections.unmodifiableList(al).iterator();
Index: gnu/javax/crypto/cipher/Khazad.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/cipher/Khazad.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/javax/crypto/cipher/Khazad.java 11 Jun 2006 12:14:43 -0000 1.3
+++ gnu/javax/crypto/cipher/Khazad.java 17 Jun 2006 12:06:52 -0000 1.4
@@ -328,7 +328,7 @@
public Iterator blockSizes()
{
ArrayList al = new ArrayList();
- al.add(new Integer(DEFAULT_BLOCK_SIZE));
+ al.add(Integer.valueOf(DEFAULT_BLOCK_SIZE));
return Collections.unmodifiableList(al).iterator();
}
@@ -336,7 +336,7 @@
public Iterator keySizes()
{
ArrayList al = new ArrayList();
- al.add(new Integer(DEFAULT_KEY_SIZE));
+ al.add(Integer.valueOf(DEFAULT_KEY_SIZE));
return Collections.unmodifiableList(al).iterator();
}
Index: gnu/javax/crypto/keyring/PasswordProtectedEntry.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/javax/crypto/keyring/PasswordProtectedEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/keyring/PasswordProtectedEntry.java 26 Jan 2006
02:25:09 -0000 1.1
+++ gnu/javax/crypto/keyring/PasswordProtectedEntry.java 17 Jun 2006
12:06:52 -0000 1.2
@@ -50,7 +50,7 @@
/**
* The iteration count for password-based KDFs.
*/
- Integer ITERATION_COUNT = new Integer(1000);
+ Integer ITERATION_COUNT = Integer.valueOf(1000);
// Method.
// ------------------------------------------------------------------------
Index: gnu/javax/crypto/keyring/PasswordEncryptedEntry.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/javax/crypto/keyring/PasswordEncryptedEntry.java 11 Jun 2006
12:14:43 -0000 1.4
+++ gnu/javax/crypto/keyring/PasswordEncryptedEntry.java 17 Jun 2006
12:06:52 -0000 1.5
@@ -313,7 +313,7 @@
}
HashMap modeAttr = new HashMap();
modeAttr.put(IMode.KEY_MATERIAL, dk);
- modeAttr.put(IMode.STATE, new Integer(state));
+ modeAttr.put(IMode.STATE, Integer.valueOf(state));
modeAttr.put(IMode.IV, iv);
try
{
Index: gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java 11 Jun 2006
12:14:43 -0000 1.4
+++ gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java 17 Jun 2006
12:06:52 -0000 1.5
@@ -309,7 +309,7 @@
HashMap macAttr = new HashMap();
macAttr.put(IMac.MAC_KEY_MATERIAL, dk);
- macAttr.put(IMac.TRUNCATED_SIZE, new Integer(maclen));
+ macAttr.put(IMac.TRUNCATED_SIZE, Integer.valueOf(maclen));
try
{
mac.init(macAttr);
Index: gnu/javax/crypto/keyring/EncryptedEntry.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/javax/crypto/keyring/EncryptedEntry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/keyring/EncryptedEntry.java 4 Jun 2006 06:57:25
-0000 1.2
+++ gnu/javax/crypto/keyring/EncryptedEntry.java 17 Jun 2006 12:06:52
-0000 1.3
@@ -214,7 +214,7 @@
HashMap modeAttr = new HashMap();
modeAttr.put(IMode.KEY_MATERIAL, key);
- modeAttr.put(IMode.STATE, new Integer(state));
+ modeAttr.put(IMode.STATE, Integer.valueOf(state));
modeAttr.put(IMode.IV, iv);
try
{
Index: gnu/javax/crypto/keyring/AuthenticatedEntry.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/javax/crypto/keyring/AuthenticatedEntry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/keyring/AuthenticatedEntry.java 4 Jun 2006 06:57:25
-0000 1.2
+++ gnu/javax/crypto/keyring/AuthenticatedEntry.java 17 Jun 2006 12:06:52
-0000 1.3
@@ -210,7 +210,7 @@
HashMap macAttr = new HashMap();
macAttr.put(IMac.MAC_KEY_MATERIAL, key);
- macAttr.put(IMac.TRUNCATED_SIZE, new Integer(maclen));
+ macAttr.put(IMac.TRUNCATED_SIZE, Integer.valueOf(maclen));
mac.init(macAttr);
return mac;
}
Index: gnu/java/security/util/Sequence.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/util/Sequence.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/java/security/util/Sequence.java 26 Jan 2006 02:25:11 -0000
1.1
+++ gnu/java/security/util/Sequence.java 17 Jun 2006 12:06:52 -0000
1.2
@@ -105,11 +105,11 @@
{
if (start != end)
{
- sequence = new Integer[] { new Integer(start), new Integer(end) };
+ sequence = new Integer[] { Integer.valueOf(start),
Integer.valueOf(end) };
}
else
{
- sequence = new Integer[] { new Integer(start) };
+ sequence = new Integer[] { Integer.valueOf(start) };
}
}
else
@@ -117,9 +117,9 @@
LinkedList l = new LinkedList();
for (int i = start; i != end; i += span)
{
- l.add(new Integer(i));
+ l.add(Integer.valueOf(i));
}
- l.add(new Integer(end));
+ l.add(Integer.valueOf(end));
sequence = (Integer[]) l.toArray(new Integer[l.size()]);
}
}
Index: java/security/cert/X509CertSelector.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/java/security/cert/X509CertSelector.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- java/security/cert/X509CertSelector.java 20 Mar 2006 23:57:04 -0000
1.7
+++ java/security/cert/X509CertSelector.java 17 Jun 2006 12:06:52 -0000
1.8
@@ -695,7 +695,7 @@
if (altNames == null)
altNames = new LinkedList();
ArrayList l = new ArrayList(2);
- l.add(new Integer(id));
+ l.add(Integer.valueOf(id));
l.add(name);
altNames.add(l);
}
@@ -714,7 +714,7 @@
if (altNames == null)
altNames = new LinkedList();
ArrayList l = new ArrayList(2);
- l.add(new Integer(id));
+ l.add(Integer.valueOf(id));
l.add(name);
altNames.add(l);
}
Index: gnu/javax/crypto/mode/EAX.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/mode/EAX.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/mode/EAX.java 26 Jan 2006 02:25:09 -0000 1.1
+++ gnu/javax/crypto/mode/EAX.java 17 Jun 2006 12:06:52 -0000 1.2
@@ -200,12 +200,12 @@
Integer modeSize = (Integer) attrib.get(MODE_BLOCK_SIZE);
if (modeSize == null)
{
- modeSize = new Integer(cipherBlockSize);
+ modeSize = Integer.valueOf(cipherBlockSize);
}
HashMap ctrAttr = new HashMap();
ctrAttr.put(KEY_MATERIAL, key);
ctrAttr.put(IV, N);
- ctrAttr.put(STATE, new Integer(ENCRYPTION));
+ ctrAttr.put(STATE, Integer.valueOf(ENCRYPTION));
ctrAttr.put(MODE_BLOCK_SIZE, modeSize);
ctr.reset();
ctr.init(ctrAttr);
Index: gnu/javax/crypto/mode/BaseMode.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/mode/BaseMode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/mode/BaseMode.java 4 Jun 2006 06:57:26 -0000 1.2
+++ gnu/javax/crypto/mode/BaseMode.java 17 Jun 2006 12:06:52 -0000 1.3
@@ -178,7 +178,7 @@
public Iterator blockSizes()
{
ArrayList al = new ArrayList();
- al.add(new Integer(cipherBlockSize));
+ al.add(Integer.valueOf(cipherBlockSize));
return Collections.unmodifiableList(al).iterator();
}
@@ -320,10 +320,10 @@
Map map = new HashMap();
map.put(KEY_MATERIAL, k);
- map.put(CIPHER_BLOCK_SIZE, new Integer(cipherBlockSize));
- map.put(STATE, new Integer(ENCRYPTION));
+ map.put(CIPHER_BLOCK_SIZE, Integer.valueOf(cipherBlockSize));
+ map.put(STATE, Integer.valueOf(ENCRYPTION));
map.put(IV, iv);
- map.put(MODE_BLOCK_SIZE, new Integer(bs));
+ map.put(MODE_BLOCK_SIZE, Integer.valueOf(bs));
mode.reset();
mode.init(map);
@@ -333,7 +333,7 @@
}
mode.reset();
- map.put(STATE, new Integer(DECRYPTION));
+ map.put(STATE, Integer.valueOf(DECRYPTION));
mode.init(map);
for (i = 0; i < blockCount; i++)
{
Index: gnu/javax/crypto/jce/prng/ICMRandomSpi.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/jce/prng/ICMRandomSpi.java 11 Jun 2006 12:14:44 -0000
1.2
+++ gnu/javax/crypto/jce/prng/ICMRandomSpi.java 17 Jun 2006 12:06:52 -0000
1.3
@@ -107,7 +107,7 @@
{
ndxLen = rand.nextInt(limit + 1);
}
- attributes.put(ICMGenerator.SEGMENT_INDEX_LENGTH, new Integer(ndxLen));
+ attributes.put(ICMGenerator.SEGMENT_INDEX_LENGTH, Integer.valueOf(ndxLen));
byte[] index = new byte[ndxLen];
rand.nextBytes(index);
attributes.put(ICMGenerator.SEGMENT_INDEX, new BigInteger(1, index));
@@ -220,7 +220,7 @@
// use AES cipher with 128-bit block size
attributes.put(ICMGenerator.CIPHER, Registry.AES_CIPHER);
// use an index the size of quarter of an AES block
- attributes.put(ICMGenerator.SEGMENT_INDEX_LENGTH, new Integer(4));
+ attributes.put(ICMGenerator.SEGMENT_INDEX_LENGTH, Integer.valueOf(4));
// specify the key
byte[] key = new byte[16];
System.arraycopy(material, 0, key, 0, 16);
Index: gnu/javax/crypto/jce/prng/UMacRandomSpi.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/jce/prng/UMacRandomSpi.java 11 Jun 2006 12:14:44
-0000 1.2
+++ gnu/javax/crypto/jce/prng/UMacRandomSpi.java 17 Jun 2006 12:06:52
-0000 1.3
@@ -90,7 +90,7 @@
rand.nextBytes(key);
attributes.put(IBlockCipher.KEY_MATERIAL, key);
int index = rand.nextInt() & 0xFF;
- attributes.put(UMacGenerator.INDEX, new Integer(index));
+ attributes.put(UMacGenerator.INDEX, Integer.valueOf(index));
prng.setup(attributes);
}
@@ -184,7 +184,7 @@
System.arraycopy(material, 0, key, 0, 16);
attributes.put(IBlockCipher.KEY_MATERIAL, key);
// use a 1-byte index
- attributes.put(UMacGenerator.INDEX, new Integer(material[16] & 0xFF));
+ attributes.put(UMacGenerator.INDEX, Integer.valueOf(material[16] & 0xFF));
adaptee.init(attributes);
}
Index: gnu/javax/crypto/sasl/srp/KDF.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/sasl/srp/KDF.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/sasl/srp/KDF.java 3 Feb 2006 19:29:01 -0000 1.2
+++ gnu/javax/crypto/sasl/srp/KDF.java 17 Jun 2006 12:06:53 -0000 1.3
@@ -88,8 +88,8 @@
// }
final HashMap map = new HashMap();
map.put(UMacGenerator.CIPHER, Registry.AES_CIPHER);
- map.put(UMacGenerator.INDEX, new Integer(ndx));
- map.put(IBlockCipher.CIPHER_BLOCK_SIZE, new Integer(AES_BLOCK_SIZE));
+ map.put(UMacGenerator.INDEX, Integer.valueOf(ndx));
+ map.put(IBlockCipher.CIPHER_BLOCK_SIZE, Integer.valueOf(AES_BLOCK_SIZE));
final byte[] key = new byte[AES_KEY_SIZE];
System.arraycopy(keyMaterial, 0, key, 0, AES_KEY_SIZE);
map.put(IBlockCipher.KEY_MATERIAL, key);
Index: gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java 26 Jan 2006 02:25:08
-0000 1.1
+++ gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java 17 Jun 2006 12:06:53
-0000 1.2
@@ -97,7 +97,7 @@
{
ic = DEFAULT_ITERATION_COUNT;
}
- attr.put(IPBE.ITERATION_COUNT, new Integer(ic));
+ attr.put(IPBE.ITERATION_COUNT, Integer.valueOf(ic));
kdf.init(attr);
int len = ((PBEKeySpec) spec).getKeyLength();
if (len <= 0)
Index: gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java 26 Jan 2006
02:25:08 -0000 1.1
+++ gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java 17 Jun 2006
12:06:53 -0000 1.2
@@ -106,7 +106,7 @@
protected void engineInit (int keySize, SecureRandom random)
{
keySize >>>= 3; // Use bytes.
- if (!keySizes.contains (new Integer (keySize)))
+ if (! keySizes.contains(Integer.valueOf(keySize)))
throw new InvalidParameterException ("unsupported key size: " + keySize);
currentKeySize = keySize;
this.random = random;
Index: gnu/javax/crypto/mac/UHash32.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/mac/UHash32.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/mac/UHash32.java 26 Jan 2006 02:25:09 -0000 1.1
+++ gnu/javax/crypto/mac/UHash32.java 17 Jun 2006 12:06:53 -0000 1.2
@@ -261,13 +261,13 @@
IRandom kdf4 = new UMacGenerator();
Map map = new HashMap();
map.put(IBlockCipher.KEY_MATERIAL, K);
- map.put(UMacGenerator.INDEX, new Integer(0));
+ map.put(UMacGenerator.INDEX, Integer.valueOf(0));
kdf1.init(map);
- map.put(UMacGenerator.INDEX, new Integer(1));
+ map.put(UMacGenerator.INDEX, Integer.valueOf(1));
kdf2.init(map);
- map.put(UMacGenerator.INDEX, new Integer(2));
+ map.put(UMacGenerator.INDEX, Integer.valueOf(2));
kdf3.init(map);
- map.put(UMacGenerator.INDEX, new Integer(3));
+ map.put(UMacGenerator.INDEX, Integer.valueOf(3));
kdf4.init(map);
// need to generate all bytes for use later in a Toepliz construction
Index: gnu/javax/crypto/mac/UMac32.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/mac/UMac32.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/mac/UMac32.java 21 Apr 2006 10:52:26 -0000 1.2
+++ gnu/javax/crypto/mac/UMac32.java 17 Jun 2006 12:06:53 -0000 1.3
@@ -447,7 +447,7 @@
Map map = new HashMap();
map.put(IBlockCipher.KEY_MATERIAL, K);
// map.put(IBlockCipher.CIPHER_BLOCK_SIZE, new Integer(128/8));
- map.put(UMacGenerator.INDEX, new Integer(128));
+ map.put(UMacGenerator.INDEX, Integer.valueOf(128));
// map.put(UMacGenerator.CIPHER, Registry.AES_CIPHER);
kdf.init(map);
byte[] Kp = new byte[KEY_LEN];
Index: gnu/java/security/x509/ext/GeneralNames.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/security/x509/ext/GeneralNames.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/java/security/x509/ext/GeneralNames.java 4 Jun 2006 05:29:43
-0000 1.5
+++ gnu/java/security/x509/ext/GeneralNames.java 17 Jun 2006 12:06:53
-0000 1.6
@@ -90,7 +90,7 @@
int tagClass = name.getTagClass();
if (tagClass != DER.CONTEXT)
throw new IOException("malformed GeneralName: Tag class is " +
tagClass);
- namePair.add(new Integer(name.getTag()));
+ namePair.add(Integer.valueOf(name.getTag()));
DERValue val = null;
switch (name.getTag())
{
Index: gnu/java/security/jce/sig/EncodedKeyFactory.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/security/jce/sig/EncodedKeyFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gnu/java/security/jce/sig/EncodedKeyFactory.java 11 Jun 2006 12:14:44
-0000 1.6
+++ gnu/java/security/jce/sig/EncodedKeyFactory.java 17 Jun 2006 12:06:53
-0000 1.7
@@ -365,7 +365,7 @@
BigInteger p = spec.getP();
BigInteger g = spec.getG();
BigInteger y = spec.getY();
- Object[] params = new Object[] {new Integer(Registry.X509_ENCODING_ID),
+ Object[] params = new Object[] {Integer.valueOf(Registry.X509_ENCODING_ID),
null, p, g, y};
Object obj = invokeConstructor("gnu.javax.crypto.key.dh.GnuDHPublicKey",
params);
@@ -435,7 +435,7 @@
BigInteger p = spec.getP();
BigInteger g = spec.getG();
BigInteger x = spec.getX();
- Object[] params = new Object[] {new Integer(Registry.PKCS8_ENCODING_ID),
+ Object[] params = new Object[]
{Integer.valueOf(Registry.PKCS8_ENCODING_ID),
null, p, g, x};
Object obj = invokeConstructor("gnu.javax.crypto.key.dh.GnuDHPrivateKey",
params);
Index: gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java 9 Feb 2006
11:52:48 -0000 1.2
+++ gnu/java/security/jce/sig/RSAKeyPairGeneratorSpi.java 17 Jun 2006
12:06:53 -0000 1.3
@@ -78,14 +78,14 @@
public void initialize(int keysize, SecureRandom random)
{
HashMap attributes = new HashMap();
- attributes.put(RSAKeyPairGenerator.MODULUS_LENGTH, new Integer(keysize));
+ attributes.put(RSAKeyPairGenerator.MODULUS_LENGTH,
Integer.valueOf(keysize));
if (random != null)
{
attributes.put(RSAKeyPairGenerator.SOURCE_OF_RANDOMNESS, random);
}
attributes.put(RSAKeyPairGenerator.PREFERRED_ENCODING_FORMAT,
- new Integer(Registry.ASN1_ENCODING_ID));
+ Integer.valueOf(Registry.ASN1_ENCODING_ID));
adaptee.setup(attributes);
}
@@ -109,7 +109,7 @@
}
attributes.put(RSAKeyPairGenerator.PREFERRED_ENCODING_FORMAT,
- new Integer(Registry.ASN1_ENCODING_ID));
+ Integer.valueOf(Registry.ASN1_ENCODING_ID));
adaptee.setup(attributes);
}
}
Index: gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java 26 Mar 2006
22:57:46 -0000 1.4
+++ gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java 17 Jun 2006
12:06:53 -0000 1.5
@@ -104,7 +104,7 @@
}
attributes.put(DSSKeyPairGenerator.PREFERRED_ENCODING_FORMAT,
- new Integer(Registry.ASN1_ENCODING_ID));
+ Integer.valueOf(Registry.ASN1_ENCODING_ID));
try
{
adaptee.setup(attributes);
@@ -144,7 +144,7 @@
throws InvalidParameterException
{
HashMap attributes = new HashMap();
- attributes.put(DSSKeyPairGenerator.MODULUS_LENGTH, new Integer(modlen));
+ attributes.put(DSSKeyPairGenerator.MODULUS_LENGTH,
Integer.valueOf(modlen));
if (random != null)
attributes.put(DSSKeyPairGenerator.SOURCE_OF_RANDOMNESS, random);
@@ -152,7 +152,7 @@
Boolean.valueOf(!genParams));
attributes.put(DSSKeyPairGenerator.STRICT_DEFAULTS, Boolean.TRUE);
attributes.put(DSSKeyPairGenerator.PREFERRED_ENCODING_FORMAT,
- new Integer(Registry.ASN1_ENCODING_ID));
+ Integer.valueOf(Registry.ASN1_ENCODING_ID));
try
{
adaptee.setup(attributes);
Index: gnu/javax/crypto/jce/cipher/PBES2.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/jce/cipher/PBES2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/jce/cipher/PBES2.java 13 Apr 2006 21:07:02 -0000
1.2
+++ gnu/javax/crypto/jce/cipher/PBES2.java 17 Jun 2006 12:06:53 -0000
1.3
@@ -121,7 +121,7 @@
throw new IllegalArgumentException("no such KDF: PBKDF2-" + macName);
}
HashMap attrib = new HashMap();
- attrib.put(IPBE.ITERATION_COUNT, new Integer(key.getIterationCount()));
+ attrib.put(IPBE.ITERATION_COUNT, Integer.valueOf(key.getIterationCount()));
attrib.put(IPBE.PASSWORD, key.getPassword());
attrib.put(IPBE.SALT, key.getSalt());
try
Index: gnu/javax/crypto/jce/cipher/CipherAdapter.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/javax/crypto/jce/cipher/CipherAdapter.java 17 Jun 2006 03:56:18
-0000 1.4
+++ gnu/javax/crypto/jce/cipher/CipherAdapter.java 17 Jun 2006 12:06:53
-0000 1.5
@@ -132,7 +132,7 @@
attributes = new HashMap();
this.blockLen = blockLen;
mode = ModeFactory.getInstance("ECB", cipher, blockLen);
- attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE, new Integer(blockLen));
+ attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE, Integer.valueOf(blockLen));
}
/**
@@ -146,7 +146,7 @@
blockLen = cipher.defaultBlockSize();
attributes = new HashMap();
mode = ModeFactory.getInstance("ECB", cipher, blockLen);
- attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE, new Integer(blockLen));
+ attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE, Integer.valueOf(blockLen));
}
// Instance methods implementing javax.crypto.CipherSpi.
@@ -162,7 +162,7 @@
try
{
int bs = Integer.parseInt(modeName.substring(3));
- attributes.put(IMode.MODE_BLOCK_SIZE, new Integer(bs / 8));
+ attributes.put(IMode.MODE_BLOCK_SIZE, Integer.valueOf(bs / 8));
}
catch (NumberFormatException nfe)
{
@@ -274,10 +274,10 @@
switch (opmode)
{
case Cipher.ENCRYPT_MODE:
- attributes.put(IMode.STATE, new Integer(IMode.ENCRYPTION));
+ attributes.put(IMode.STATE, Integer.valueOf(IMode.ENCRYPTION));
break;
case Cipher.DECRYPT_MODE:
- attributes.put(IMode.STATE, new Integer(IMode.DECRYPTION));
+ attributes.put(IMode.STATE, Integer.valueOf(IMode.DECRYPTION));
break;
}
if (!key.getFormat().equalsIgnoreCase("RAW"))
@@ -332,10 +332,8 @@
}
else if (params instanceof BlockCipherParameterSpec)
{
- attributes.put(
- IBlockCipher.CIPHER_BLOCK_SIZE,
- new Integer(
- ((BlockCipherParameterSpec)
params).getBlockSize()));
+ attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE,
+ Integer.valueOf(((BlockCipherParameterSpec)
params).getBlockSize()));
attributes.put(IMode.IV, ((BlockCipherParameterSpec) params).getIV());
keyLen = ((BlockCipherParameterSpec) params).getKeySize();
blockLen = ((BlockCipherParameterSpec) params).getBlockSize();
@@ -344,7 +342,7 @@
{
attributes.put(IMode.IV, ((IvParameterSpec) params).getIV());
blockLen = cipher.defaultBlockSize();
- attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE, new Integer(blockLen));
+ attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE,
Integer.valueOf(blockLen));
keyLen = 0;
}
engineInitHandler(opmode, key, random);
Index: gnu/javax/crypto/prng/ICMGenerator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/crypto/prng/ICMGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/prng/ICMGenerator.java 13 Apr 2006 21:07:03 -0000
1.2
+++ gnu/javax/crypto/prng/ICMGenerator.java 17 Jun 2006 12:06:53 -0000
1.3
@@ -214,7 +214,7 @@
HashMap map = new HashMap();
if (cipherBlockSize != 0)
{ // only needed if new or changed
- map.put(IBlockCipher.CIPHER_BLOCK_SIZE, new Integer(cipherBlockSize));
+ map.put(IBlockCipher.CIPHER_BLOCK_SIZE,
Integer.valueOf(cipherBlockSize));
}
map.put(IBlockCipher.KEY_MATERIAL, key);
try
Index: gnu/javax/crypto/prng/UMacGenerator.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/javax/crypto/prng/UMacGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/javax/crypto/prng/UMacGenerator.java 26 Jan 2006 02:25:09 -0000
1.1
+++ gnu/javax/crypto/prng/UMacGenerator.java 17 Jun 2006 12:06:53 -0000
1.2
@@ -198,7 +198,7 @@
Map map = new HashMap();
if (cipherBlockSize != 0)
{ // only needed if new or changed
- map.put(IBlockCipher.CIPHER_BLOCK_SIZE, new Integer(cipherBlockSize));
+ map.put(IBlockCipher.CIPHER_BLOCK_SIZE,
Integer.valueOf(cipherBlockSize));
}
map.put(IBlockCipher.KEY_MATERIAL, key);
try
Index: gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java 22 Apr 2006 17:57:19
-0000 1.2
+++ gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java 17 Jun 2006 12:06:53
-0000 1.3
@@ -61,12 +61,12 @@
public void initialize(int keysize, SecureRandom random)
{
HashMap attributes = new HashMap();
- attributes.put(GnuDHKeyPairGenerator.PRIME_SIZE, new Integer(keysize));
+ attributes.put(GnuDHKeyPairGenerator.PRIME_SIZE, Integer.valueOf(keysize));
if (random != null)
attributes.put(GnuDHKeyPairGenerator.SOURCE_OF_RANDOMNESS, random);
attributes.put(GnuDHKeyPairGenerator.PREFERRED_ENCODING_FORMAT,
- new Integer(Registry.ASN1_ENCODING_ID));
+ Integer.valueOf(Registry.ASN1_ENCODING_ID));
adaptee.setup(attributes);
}
@@ -87,7 +87,7 @@
attributes.put(GnuDHKeyPairGenerator.SOURCE_OF_RANDOMNESS, random);
attributes.put(GnuDHKeyPairGenerator.PREFERRED_ENCODING_FORMAT,
- new Integer(Registry.ASN1_ENCODING_ID));
+ Integer.valueOf(Registry.ASN1_ENCODING_ID));
adaptee.setup(attributes);
}
}
Index: gnu/javax/security/auth/callback/ConsoleCallbackHandler.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/javax/security/auth/callback/ConsoleCallbackHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/security/auth/callback/ConsoleCallbackHandler.java 29 Apr
2006 07:19:44 -0000 1.2
+++ gnu/javax/security/auth/callback/ConsoleCallbackHandler.java 17 Jun
2006 12:06:53 -0000 1.3
@@ -137,7 +137,7 @@
{
if (choices[i].equals(replies[j]))
{
- indices.add(new Integer(i));
+ indices.add(Integer.valueOf(i));
}
}
if (indices.size() == 0)
Index: gnu/javax/crypto/assembly/ModeStage.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/javax/crypto/assembly/ModeStage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/javax/crypto/assembly/ModeStage.java 13 Apr 2006 21:07:02 -0000
1.2
+++ gnu/javax/crypto/assembly/ModeStage.java 17 Jun 2006 12:06:53 -0000
1.3
@@ -99,7 +99,7 @@
{
Direction flow = (Direction) attributes.get(DIRECTION);
attributes.put(IMode.STATE,
- new Integer(flow.equals(forward) ? IMode.ENCRYPTION
+ Integer.valueOf(flow.equals(forward) ? IMode.ENCRYPTION
: IMode.DECRYPTION));
delegate.init(attributes);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [commit-cp] classpath gnu/java/security/x509X509Certificate...,
Raif S. Naffah <=