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:
Mark Wielaard
@@ -38,60 +38,44 @@ exception statement from your version. */
|
||||
|
||||
package gnu.java.security.sig.rsa;
|
||||
|
||||
import gnu.java.security.Configuration;
|
||||
import gnu.java.security.Registry;
|
||||
import gnu.java.security.hash.HashFactory;
|
||||
import gnu.java.security.hash.IMessageDigest;
|
||||
import gnu.java.security.sig.BaseSignature;
|
||||
import gnu.java.security.util.Util;
|
||||
|
||||
import java.io.PrintWriter;
|
||||
import java.math.BigInteger;
|
||||
import java.security.PrivateKey;
|
||||
import java.security.PublicKey;
|
||||
import java.security.interfaces.RSAPrivateKey;
|
||||
import java.security.interfaces.RSAPublicKey;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
/**
|
||||
* <p>The RSA-PSS signature scheme is a public-key encryption scheme combining
|
||||
* the RSA algorithm with the Probabilistic Signature Scheme (PSS) encoding
|
||||
* method.</p>
|
||||
*
|
||||
* <p>The inventors of RSA are Ronald L. Rivest, Adi Shamir, and Leonard Adleman,
|
||||
* The RSA-PSS signature scheme is a public-key encryption scheme combining the
|
||||
* RSA algorithm with the Probabilistic Signature Scheme (PSS) encoding method.
|
||||
* <p>
|
||||
* The inventors of RSA are Ronald L. Rivest, Adi Shamir, and Leonard Adleman,
|
||||
* while the inventors of the PSS encoding method are Mihir Bellare and Phillip
|
||||
* Rogaway. During efforts to adopt RSA-PSS into the P1363a standards effort,
|
||||
* certain adaptations to the original version of RSA-PSS were made by Mihir
|
||||
* Bellare and Phillip Rogaway and also by Burt Kaliski (the editor of IEEE
|
||||
* P1363a) to facilitate implementation and integration into existing protocols.</p>
|
||||
*
|
||||
* <p>References:</pr>
|
||||
* P1363a) to facilitate implementation and integration into existing protocols.
|
||||
* <p>
|
||||
* References:
|
||||
* <ol>
|
||||
* <li><a href="http://www.cosic.esat.kuleuven.ac.be/nessie/workshop/submissions/rsa-pss.zip">
|
||||
* RSA-PSS Signature Scheme with Appendix, part B.</a><br>
|
||||
* Primitive specification and supporting documentation.<br>
|
||||
* Jakob Jonsson and Burt Kaliski.</li>
|
||||
* <li><a
|
||||
* href="http://www.cosic.esat.kuleuven.ac.be/nessie/workshop/submissions/rsa-pss.zip">
|
||||
* RSA-PSS Signature Scheme with Appendix, part B.</a><br>
|
||||
* Primitive specification and supporting documentation.<br>
|
||||
* Jakob Jonsson and Burt Kaliski.</li>
|
||||
* </ol>
|
||||
*/
|
||||
public class RSAPSSSignature extends BaseSignature
|
||||
public class RSAPSSSignature
|
||||
extends BaseSignature
|
||||
{
|
||||
|
||||
// Debugging methods and variables
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
private static final String NAME = "rsa-pss";
|
||||
|
||||
private static final boolean DEBUG = false;
|
||||
|
||||
private static final int debuglevel = 1;
|
||||
|
||||
private static final PrintWriter err = new PrintWriter(System.out, true);
|
||||
|
||||
private static void debug(String s)
|
||||
{
|
||||
err.println(">>> " + NAME + ": " + s);
|
||||
}
|
||||
|
||||
// Constants and variables
|
||||
// -------------------------------------------------------------------------
|
||||
private static final Logger log = Logger.getLogger(RSAPSSSignature.class.getName());
|
||||
|
||||
/** The underlying EMSA-PSS instance for this object. */
|
||||
private EMSA_PSS pss;
|
||||
@@ -99,9 +83,6 @@ public class RSAPSSSignature extends BaseSignature
|
||||
/** The desired length in octets of the EMSA-PSS salt. */
|
||||
private int sLen;
|
||||
|
||||
// Constructor(s)
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Default 0-arguments constructor. Uses SHA-1 as the default hash and a
|
||||
* 0-octet <i>salt</i>.
|
||||
@@ -112,10 +93,9 @@ public class RSAPSSSignature extends BaseSignature
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Constructs an instance of this object using the designated message
|
||||
* digest algorithm as its underlying hash function, and having 0-octet
|
||||
* <i>salt</i>.</p>
|
||||
*
|
||||
* Constructs an instance of this object using the designated message digest
|
||||
* algorithm as its underlying hash function, and having 0-octet <i>salt</i>.
|
||||
*
|
||||
* @param mdName the canonical name of the underlying hash function.
|
||||
*/
|
||||
public RSAPSSSignature(String mdName)
|
||||
@@ -124,12 +104,12 @@ public class RSAPSSSignature extends BaseSignature
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>Constructs an instance of this object using the designated message
|
||||
* digest algorithm as its underlying hash function.</p>
|
||||
*
|
||||
* Constructs an instance of this object using the designated message digest
|
||||
* algorithm as its underlying hash function.
|
||||
*
|
||||
* @param mdName the canonical name of the underlying hash function.
|
||||
* @param sLen the desired length in octets of the salt to use for encoding /
|
||||
* decoding signatures.
|
||||
* decoding signatures.
|
||||
*/
|
||||
public RSAPSSSignature(String mdName, int sLen)
|
||||
{
|
||||
@@ -155,14 +135,6 @@ public class RSAPSSSignature extends BaseSignature
|
||||
this.pss = (EMSA_PSS) that.pss.clone();
|
||||
}
|
||||
|
||||
// Class methods
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
// Instance methods
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
// Implementation of abstract methods in superclass ------------------------
|
||||
|
||||
public Object clone()
|
||||
{
|
||||
return new RSAPSSSignature(this);
|
||||
@@ -171,79 +143,71 @@ public class RSAPSSSignature extends BaseSignature
|
||||
protected void setupForVerification(PublicKey k)
|
||||
throws IllegalArgumentException
|
||||
{
|
||||
if (!(k instanceof RSAPublicKey))
|
||||
{
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
if (! (k instanceof RSAPublicKey))
|
||||
throw new IllegalArgumentException();
|
||||
|
||||
publicKey = (RSAPublicKey) k;
|
||||
}
|
||||
|
||||
protected void setupForSigning(PrivateKey k) throws IllegalArgumentException
|
||||
{
|
||||
if (!(k instanceof RSAPrivateKey))
|
||||
{
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
if (! (k instanceof RSAPrivateKey))
|
||||
throw new IllegalArgumentException();
|
||||
|
||||
privateKey = (RSAPrivateKey) k;
|
||||
}
|
||||
|
||||
protected Object generateSignature() throws IllegalStateException
|
||||
{
|
||||
// 1. Apply the EMSA-PSS encoding operation to the message M to produce an
|
||||
// encoded message EM of length CEILING((modBits ? 1)/8) octets such
|
||||
// that the bit length of the integer OS2IP(EM) is at most modBits ? 1:
|
||||
// EM = EMSA-PSS-Encode(M,modBits ? 1).
|
||||
// Note that the octet length of EM will be one less than k if
|
||||
// modBits ? 1 is divisible by 8. If the encoding operation outputs
|
||||
// 'message too long' or 'encoding error,' then output 'message too
|
||||
// long' or 'encoding error' and stop.
|
||||
// encoded message EM of length CEILING((modBits ? 1)/8) octets such
|
||||
// that the bit length of the integer OS2IP(EM) is at most modBits ? 1:
|
||||
// EM = EMSA-PSS-Encode(M,modBits ? 1).
|
||||
// Note that the octet length of EM will be one less than k if
|
||||
// modBits ? 1 is divisible by 8. If the encoding operation outputs
|
||||
// 'message too long' or 'encoding error,' then output 'message too
|
||||
// long' or 'encoding error' and stop.
|
||||
int modBits = ((RSAPrivateKey) privateKey).getModulus().bitLength();
|
||||
byte[] salt = new byte[sLen];
|
||||
this.nextRandomBytes(salt);
|
||||
byte[] EM = pss.encode(md.digest(), modBits - 1, salt);
|
||||
if (DEBUG && debuglevel > 8)
|
||||
{
|
||||
debug("EM (sign): " + Util.toString(EM));
|
||||
}
|
||||
if (Configuration.DEBUG)
|
||||
log.fine("EM (sign): " + Util.toString(EM));
|
||||
// 2. Convert the encoded message EM to an integer message representative
|
||||
// m (see Section 1.2.2): m = OS2IP(EM).
|
||||
// m (see Section 1.2.2): m = OS2IP(EM).
|
||||
BigInteger m = new BigInteger(1, EM);
|
||||
// 3. Apply the RSASP signature primitive to the public key K and the
|
||||
// message representative m to produce an integer signature
|
||||
// representative s: s = RSASP(K,m).
|
||||
// message representative m to produce an integer signature
|
||||
// representative s: s = RSASP(K,m).
|
||||
BigInteger s = RSA.sign(privateKey, m);
|
||||
// 4. Convert the signature representative s to a signature S of length k
|
||||
// octets (see Section 1.2.1): S = I2OSP(s, k).
|
||||
// octets (see Section 1.2.1): S = I2OSP(s, k).
|
||||
// 5. Output the signature S.
|
||||
int k = (modBits + 7) / 8;
|
||||
// return encodeSignature(s, k);
|
||||
// return encodeSignature(s, k);
|
||||
return RSA.I2OSP(s, k);
|
||||
}
|
||||
|
||||
protected boolean verifySignature(Object sig) throws IllegalStateException
|
||||
{
|
||||
if (publicKey == null)
|
||||
{
|
||||
throw new IllegalStateException();
|
||||
}
|
||||
// byte[] S = decodeSignature(sig);
|
||||
throw new IllegalStateException();
|
||||
// byte[] S = decodeSignature(sig);
|
||||
byte[] S = (byte[]) sig;
|
||||
// 1. If the length of the signature S is not k octets, output 'signature
|
||||
// invalid' and stop.
|
||||
// invalid' and stop.
|
||||
int modBits = ((RSAPublicKey) publicKey).getModulus().bitLength();
|
||||
int k = (modBits + 7) / 8;
|
||||
if (S.length != k)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
// 2. Convert the signature S to an integer signature representative s:
|
||||
// s = OS2IP(S).
|
||||
// s = OS2IP(S).
|
||||
BigInteger s = new BigInteger(1, S);
|
||||
// 3. Apply the RSAVP verification primitive to the public key (n, e) and
|
||||
// the signature representative s to produce an integer message
|
||||
// representative m: m = RSAVP((n, e), s).
|
||||
// If RSAVP outputs 'signature representative out of range,' then
|
||||
// output 'signature invalid' and stop.
|
||||
// the signature representative s to produce an integer message
|
||||
// representative m: m = RSAVP((n, e), s).
|
||||
// If RSAVP outputs 'signature representative out of range,' then
|
||||
// output 'signature invalid' and stop.
|
||||
BigInteger m = null;
|
||||
try
|
||||
{
|
||||
@@ -254,22 +218,18 @@ public class RSAPSSSignature extends BaseSignature
|
||||
return false;
|
||||
}
|
||||
// 4. Convert the message representative m to an encoded message EM of
|
||||
// length emLen = CEILING((modBits - 1)/8) octets, where modBits is
|
||||
// equal to the bit length of the modulus: EM = I2OSP(m, emLen).
|
||||
// Note that emLen will be one less than k if modBits - 1 is divisible
|
||||
// by 8. If I2OSP outputs 'integer too large,' then output 'signature
|
||||
// invalid' and stop.
|
||||
// length emLen = CEILING((modBits - 1)/8) octets, where modBits is
|
||||
// equal to the bit length of the modulus: EM = I2OSP(m, emLen).
|
||||
// Note that emLen will be one less than k if modBits - 1 is divisible
|
||||
// by 8. If I2OSP outputs 'integer too large,' then output 'signature
|
||||
// invalid' and stop.
|
||||
int emBits = modBits - 1;
|
||||
int emLen = (emBits + 7) / 8;
|
||||
byte[] EM = m.toByteArray();
|
||||
if (DEBUG && debuglevel > 8)
|
||||
{
|
||||
debug("EM (verify): " + Util.toString(EM));
|
||||
}
|
||||
if (Configuration.DEBUG)
|
||||
log.fine("EM (verify): " + Util.toString(EM));
|
||||
if (EM.length > emLen)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
else if (EM.length < emLen)
|
||||
{
|
||||
byte[] newEM = new byte[emLen];
|
||||
@@ -277,9 +237,9 @@ public class RSAPSSSignature extends BaseSignature
|
||||
EM = newEM;
|
||||
}
|
||||
// 5. Apply the EMSA-PSS decoding operation to the message M and the
|
||||
// encoded message EM: Result = EMSA-PSS-Decode(M, EM, emBits). If
|
||||
// Result = 'consistent,' output 'signature verified.' Otherwise,
|
||||
// output 'signature invalid.'
|
||||
// encoded message EM: Result = EMSA-PSS-Decode(M, EM, emBits). If
|
||||
// Result = 'consistent,' output 'signature verified.' Otherwise,
|
||||
// output 'signature invalid.'
|
||||
byte[] mHash = md.digest();
|
||||
boolean result = false;
|
||||
try
|
||||
@@ -292,55 +252,4 @@ public class RSAPSSSignature extends BaseSignature
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
// Other instance methods --------------------------------------------------
|
||||
|
||||
/**
|
||||
* Converts the <i>signature representative</i> <code>s</code> to a signature
|
||||
* <code>S</code> of length <code>k</code> octets; i.e.
|
||||
* <code>S = I2OSP(s, k)</code>, where <code>k = CEILING(modBits/8)</code>.
|
||||
*
|
||||
* @param s the <i>signature representative</i>.
|
||||
* @param k the length of the output.
|
||||
* @return the signature as an octet sequence.
|
||||
* @exception IllegalArgumentException if the length in octets of meaningful
|
||||
* bytes of <code>s</code> is greater than <code>k</code>, implying that
|
||||
* <code>s</code> is not less than the RSA <i>modulus</i>.
|
||||
*/
|
||||
// private Object encodeSignature(BigInteger s, int k) {
|
||||
// if (DEBUG && debuglevel > 8) {
|
||||
// debug("s.bitLength(): "+String.valueOf(s.bitLength()));
|
||||
// debug("k: "+String.valueOf(k));
|
||||
// }
|
||||
// byte[] result = s.toByteArray();
|
||||
// if (DEBUG && debuglevel > 8) {
|
||||
// debug("s: "+Util.toString(result));
|
||||
// debug("s (bytes): "+String.valueOf(result.length));
|
||||
// }
|
||||
// if (result.length < k) {
|
||||
// byte[] newResult = new byte[k];
|
||||
// System.arraycopy(result, 0, newResult, k-result.length, result.length);
|
||||
// result = newResult;
|
||||
// } else if (result.length > k) { // leftmost extra bytes should all be 0
|
||||
// int limit = result.length - k;
|
||||
// for (int i = 0; i < limit; i++) {
|
||||
// if (result[i] != 0x00) {
|
||||
// throw new IllegalArgumentException("integer too large");
|
||||
// }
|
||||
// }
|
||||
// byte[] newResult = new byte[k];
|
||||
// System.arraycopy(result, limit, newResult, 0, k);
|
||||
// result = newResult;
|
||||
// }
|
||||
// return result;
|
||||
// }
|
||||
/**
|
||||
* Returns the output of a previously generated signature object as an octet
|
||||
* sequence.<p>
|
||||
*
|
||||
* @return the octet sequence <code>S</code>.
|
||||
*/
|
||||
// private byte[] decodeSignature(Object signature) {
|
||||
// return (byte[]) signature;
|
||||
// }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user