
2005-02-16 Mark Wielaard <mark@klomp.org> * Makefile.am (ordinary_java_source_files): Add new files gnu/java/security/ber/BER.java, gnu/java/security/ber/BEREncodingException.java, gnu/java/security/ber/BERReader.java, gnu/java/security/ber/BERValue.java, gnu/java/security/pkcs/PKCS7SignedData.java and gnu/java/security/pkcs/SignerInfo.java. * Makefile.in: Regenerated. 2005-02-16 Casey Marshall <csm@gnu.org> * gnu/java/security/provider/GnuDSAPrivateKey.java (encodedKey): new field. (getFormat): return "PKCS#8". (getEncoded): implemented. (toString): check for 'null' values. * gnu/java/security/provider/GnuDSAPublicKey.java (encodedKey): new field. (getFormat): return "X.509". (getEncoded): implemented. (toString): check for 'null' values. 2005-02-16 Michael Koch <konqueror@gmx.de> * java/util/jar/JarFile.java: Imports reworked. 2005-02-16 Mark Wielaard <mark@klomp.org> * java/util/jar/JarFile.java (verify): Make package private. (signaturesRead): Likewise. (verified): Likewise. (entryCerts): Likewise. (DEBUG): Likewise. (debug): Likewise. (entries): Construct new JarEnumeration with reference to this. (JarEnumeration): Make static. (JarEnumeration.jarfile): New field. (JarEnumeration.nextElement): Use and synchronize on jarfile. Compare verified value to Boolean.TRUE or Boolean.False only when verify is true. (getEntry): Make synchronized. Compare value of verified to Boolean.TRUE. (getInputStream): Construct EntryInputStream with reference to this. (getManifest): Make synchronized. (EntryInputStream): Make static. (EntryInputStream.jarfile): New field. (EntryInputStream.EntryInputStream): Check if manifest exists, before getting attributes. (eof): Synchronize on jarfile. 2005-02-16 Casey Marshall <csm@gnu.org> * java/util/jar/JarFile.java (verify): return if the jar is signed with an unsupported algorithm. 2005-02-16 Mark Wielaard <mark@klomp.org> * java/util/jar/JarFile.java (EntryInputStream): Add actual InputStream as argument. (getInputStream): Construct a new EntryInputStream with the result of super.getInputStream(entry). 2005-02-16 Casey Marshall <csm@gnu.org> Signed JAR file support. * java/net/URLClassLoader.java (JarURLResource.getCertificates): re-read jar entry to ensure certificates are picked up. (findClass): fill in class `signers' field, too. * java/util/jar/JarFile.java (META_INF): new constant. (PKCS7_DSA_SUFFIX): new constant. (PKCS7_RSA_SUFFIX): new constant. (DIGEST_KEY_SUFFIX): new constant. (SF_SUFFIX): new constant. (MD2_OID): new constant. (MD4_OID): new constant. (MD5_OID): new constant. (SHA1_OID): new constant. (DSA_ENCRYPTION_OID): new constant. (RSA_ENCRYPTION_OID): new constant. (signaturesRead): new field. (verified): new field. (entryCerts): new field. (DEBUG): new constant. (debug): new method. (JarEnumeration.nextElement): fill in entry certificates, read signatures if they haven't been read. (getEntry): likewise. (getInputStream): verify stream if it hasn't been verified yet. (readSignatures): new method. (verify): new method. (verifyHashes): new method. (readManifestEntry): new method. (EntryInputStream): new class. * gnu/java/io/Base64InputStream.java (decode): new class method. * gnu/java/security/der/DERReader.java don't make class final. (in): made protected. (encBuf): likewise. (readLength): likewise. * gnu/java/security/ber/BER.java, * gnu/java/security/ber/BEREncodingException.java, * gnu/java/security/ber/BERReader.java, * gnu/java/security/ber/BERValue.java, * gnu/java/security/pkcs/PKCS7SignedData.java, * gnu/java/security/pkcs/SignerInfo.java: new files. From-SVN: r95124
150 lines
4.6 KiB
Java
150 lines
4.6 KiB
Java
/* GnuDSAPrivateKey.java --- Gnu DSA Private Key
|
|
Copyright (C) 1999,2003,2004 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; 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
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package gnu.java.security.provider;
|
|
|
|
import gnu.java.security.OID;
|
|
import gnu.java.security.der.DER;
|
|
import gnu.java.security.der.DERValue;
|
|
import gnu.java.security.der.DERWriter;
|
|
|
|
import java.io.ByteArrayOutputStream;
|
|
import java.io.IOException;
|
|
|
|
import java.math.BigInteger;
|
|
|
|
import java.security.interfaces.DSAPrivateKey;
|
|
import java.security.interfaces.DSAParams;
|
|
import java.security.spec.DSAParameterSpec;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
public class GnuDSAPrivateKey implements DSAPrivateKey
|
|
{
|
|
private byte[] encodedKey;
|
|
BigInteger x;
|
|
BigInteger p;
|
|
BigInteger q;
|
|
BigInteger g;
|
|
|
|
public GnuDSAPrivateKey(BigInteger x, BigInteger p, BigInteger q, BigInteger g )
|
|
{
|
|
this.x = x;
|
|
this.p = p;
|
|
this.q = q;
|
|
this.g = g;
|
|
}
|
|
|
|
public String getAlgorithm()
|
|
{
|
|
return "DSA";
|
|
}
|
|
|
|
public String getFormat()
|
|
{
|
|
return "PKCS#8";
|
|
}
|
|
|
|
/**
|
|
* Encodes this key as a <code>PrivateKeyInfo</code>, as described in
|
|
* PKCS #8. The ASN.1 specification for this structure is:
|
|
*
|
|
* <blockquote><pre>
|
|
* PrivateKeyInfo ::= SEQUENCE {
|
|
* version Version,
|
|
* privateKeyAlgorithm PrivateKeyAlgorithmIdentifier,
|
|
* privateKey PrivateKey,
|
|
* attributes [0] IMPLICIT Attributes OPTIONAL }
|
|
*
|
|
* Version ::= INTEGER
|
|
*
|
|
* PrivateKeyAlgorithmIdentifier ::= AlgorithmIdentifier
|
|
*
|
|
* PrivateKey ::= OCTET STRING
|
|
*
|
|
* Attributes ::= SET OF Attribute
|
|
* </pre></blockquote>
|
|
*
|
|
* <p>DSA private keys (in Classpath at least) have no attributes.
|
|
*/
|
|
public byte[] getEncoded()
|
|
{
|
|
if (encodedKey != null)
|
|
return (byte[]) encodedKey.clone();
|
|
try
|
|
{
|
|
ByteArrayOutputStream out = new ByteArrayOutputStream();
|
|
ArrayList pki = new ArrayList(3);
|
|
pki.add(new DERValue(DER.INTEGER, BigInteger.ZERO));
|
|
ArrayList algId = new ArrayList(2);
|
|
algId.add(new DERValue(DER.OBJECT_IDENTIFIER,
|
|
new OID("1.2.840.10040.4.1")));
|
|
ArrayList algParams = new ArrayList(3);
|
|
algParams.add(new DERValue(DER.INTEGER, p));
|
|
algParams.add(new DERValue(DER.INTEGER, q));
|
|
algParams.add(new DERValue(DER.INTEGER, g));
|
|
algId.add(new DERValue(DER.CONSTRUCTED|DER.SEQUENCE, algParams));
|
|
pki.add(new DERValue(DER.OCTET_STRING, x.toByteArray()));
|
|
DERWriter.write(out, new DERValue(DER.CONSTRUCTED|DER.SEQUENCE, pki));
|
|
return (byte[]) (encodedKey = out.toByteArray()).clone();
|
|
}
|
|
catch (IOException ioe)
|
|
{
|
|
return null;
|
|
}
|
|
}
|
|
|
|
public DSAParams getParams()
|
|
{
|
|
return (DSAParams)(new DSAParameterSpec(p,q,g));
|
|
}
|
|
|
|
public BigInteger getX()
|
|
{
|
|
return x;
|
|
}
|
|
|
|
public String toString()
|
|
{
|
|
return "GnuDSAPrivateKey: x="
|
|
+ (x != null ? x.toString(16) : "null") + " p="
|
|
+ (p != null ? p.toString(16) : "null") + " q="
|
|
+ (q != null ? q.toString(16) : "null") + " g="
|
|
+ (g != null ? g.toString(16) : "null");
|
|
}
|
|
}
|