Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org> Imported GNU Classpath 0.92 * HACKING: Add more importing hints. Update automake version requirement. * configure.ac (gconf-peer): New enable AC argument. Add --disable-gconf-peer and --enable-default-preferences-peer to classpath configure when gconf is disabled. * scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and gnu/java/awt/dnd/peer/gtk to bc. Classify gnu/java/security/Configuration.java as generated source file. * gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java, gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java, gnu/java/lang/management/VMClassLoadingMXBeanImpl.java, gnu/java/lang/management/VMRuntimeMXBeanImpl.java, gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java, gnu/java/lang/management/VMThreadMXBeanImpl.java, gnu/java/lang/management/VMMemoryMXBeanImpl.java, gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub classes. * java/lang/management/VMManagementFactory.java: Likewise. * java/net/VMURLConnection.java: Likewise. * gnu/java/nio/VMChannel.java: Likewise. * java/lang/Thread.java (getState): Add stub implementation. * java/lang/Class.java (isEnum): Likewise. * java/lang/Class.h (isEnum): Likewise. * gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed. * javax/naming/spi/NamingManager.java: New override for StackWalker functionality. * configure, sources.am, Makefile.in, gcj/Makefile.in, include/Makefile.in, testsuite/Makefile.in: Regenerated. From-SVN: r116139
This commit is contained in:
parent
abab460491
commit
ac1ed908de
1294 changed files with 99479 additions and 35933 deletions
|
@ -44,53 +44,41 @@ import gnu.java.security.sig.ISignatureCodec;
|
|||
import java.io.ByteArrayOutputStream;
|
||||
|
||||
/**
|
||||
* <p>An object that implements the {@link gnu.crypto.sig.ISignatureCodec}
|
||||
* operations for the <i>Raw</i> format to use with RSA-PSS signatures.</p>
|
||||
* An object that implements the {@link ISignatureCodec} operations for the
|
||||
* <i>Raw</i> format to use with RSA-PSS signatures.
|
||||
*/
|
||||
public class RSAPSSSignatureRawCodec implements ISignatureCodec
|
||||
public class RSAPSSSignatureRawCodec
|
||||
implements ISignatureCodec
|
||||
{
|
||||
|
||||
// Constants and variables
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
// Constructor(s)
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
// implicit 0-arguments constructor
|
||||
|
||||
// Class methods
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
// gnu.crypto.keys.IKeyPairCodec interface implementation
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
public int getFormatID()
|
||||
{
|
||||
return RAW_FORMAT;
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Returns the encoded form of the designated RSA-PSS signature object
|
||||
* according to the <i>Raw</i> format supported by this library.</p>
|
||||
*
|
||||
* <p>The <i>Raw</i> format for an RSA-PSS signature, in this implementation,
|
||||
* is a byte sequence consisting of the following:</p>
|
||||
*
|
||||
* Returns the encoded form of the designated RSA-PSS signature object
|
||||
* according to the <i>Raw</i> format supported by this library.
|
||||
* <p>
|
||||
* The <i>Raw</i> format for an RSA-PSS signature, in this implementation, is
|
||||
* a byte sequence consisting of the following:
|
||||
* <ol>
|
||||
* <li>4-byte magic consisting of the value of the literal
|
||||
* {@link Registry#MAGIC_RAW_RSA_PSS_SIGNATURE},<li>
|
||||
* <li>1-byte version consisting of the constant: 0x01,</li>
|
||||
* <li>4-byte count of following bytes representing the RSA-PSS signature
|
||||
* bytes in internet order,</li>
|
||||
* <li>the RSA-PSS signature bytes in internet order.</li>
|
||||
* <li>4-byte magic consisting of the value of the literal
|
||||
* {@link Registry#MAGIC_RAW_RSA_PSS_SIGNATURE},
|
||||
* <li>
|
||||
* <li>1-byte version consisting of the constant: 0x01,</li>
|
||||
* <li>4-byte count of following bytes representing the RSA-PSS signature
|
||||
* bytes in internet order,</li>
|
||||
* <li>the RSA-PSS signature bytes in internet order.</li>
|
||||
* </ol>
|
||||
*
|
||||
*
|
||||
* @param signature the signature to encode, consisting of the output of the
|
||||
* <code>sign()</code> method of a {@link RSAPSSSignature} instance --a byte
|
||||
* array.
|
||||
* <code>sign()</code> method of a {@link RSAPSSSignature} instance
|
||||
* --a byte array.
|
||||
* @return the <i>Raw</i> format encoding of the designated signature.
|
||||
* @exception IllegalArgumentException if the designated signature is not an
|
||||
* RSA-PSS one.
|
||||
* RSA-PSS one.
|
||||
*/
|
||||
public byte[] encodeSignature(Object signature)
|
||||
{
|
||||
|
@ -101,28 +89,23 @@ public class RSAPSSSignatureRawCodec implements ISignatureCodec
|
|||
}
|
||||
catch (Exception x)
|
||||
{
|
||||
throw new IllegalArgumentException("key");
|
||||
throw new IllegalArgumentException("signature");
|
||||
}
|
||||
|
||||
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||
|
||||
// magic
|
||||
baos.write(Registry.MAGIC_RAW_RSA_PSS_SIGNATURE[0]);
|
||||
baos.write(Registry.MAGIC_RAW_RSA_PSS_SIGNATURE[1]);
|
||||
baos.write(Registry.MAGIC_RAW_RSA_PSS_SIGNATURE[2]);
|
||||
baos.write(Registry.MAGIC_RAW_RSA_PSS_SIGNATURE[3]);
|
||||
|
||||
// version
|
||||
baos.write(0x01);
|
||||
|
||||
// signature bytes
|
||||
int length = buffer.length;
|
||||
baos.write(length >>> 24);
|
||||
baos.write( length >>> 24);
|
||||
baos.write((length >>> 16) & 0xFF);
|
||||
baos.write((length >>> 8) & 0xFF);
|
||||
baos.write(length & 0xFF);
|
||||
baos.write(buffer, 0, length);
|
||||
|
||||
return baos.toByteArray();
|
||||
}
|
||||
|
||||
|
@ -133,25 +116,19 @@ public class RSAPSSSignatureRawCodec implements ISignatureCodec
|
|||
|| k[1] != Registry.MAGIC_RAW_RSA_PSS_SIGNATURE[1]
|
||||
|| k[2] != Registry.MAGIC_RAW_RSA_PSS_SIGNATURE[2]
|
||||
|| k[3] != Registry.MAGIC_RAW_RSA_PSS_SIGNATURE[3])
|
||||
{
|
||||
throw new IllegalArgumentException("magic");
|
||||
}
|
||||
|
||||
throw new IllegalArgumentException("magic");
|
||||
// version
|
||||
if (k[4] != 0x01)
|
||||
{
|
||||
throw new IllegalArgumentException("version");
|
||||
}
|
||||
|
||||
throw new IllegalArgumentException("version");
|
||||
int i = 5;
|
||||
int l;
|
||||
|
||||
// signature bytes
|
||||
l = k[i++] << 24 | (k[i++] & 0xFF) << 16 | (k[i++] & 0xFF) << 8
|
||||
| (k[i++] & 0xFF);
|
||||
l = k[i++] << 24
|
||||
| (k[i++] & 0xFF) << 16
|
||||
| (k[i++] & 0xFF) << 8
|
||||
| (k[i++] & 0xFF);
|
||||
byte[] result = new byte[l];
|
||||
System.arraycopy(k, i, result, 0, l);
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue