[multiple changes]
2004-09-21 Andreas Tobler <a.tobler@schweiz.ch> Import the big Crypto/Jessie/Security merge from Classpath. * Makefile.am: Add imported files. * Makefile.in: Regenerate. 2004-08-14 Casey Marshall <csm@gnu.org> The Big Crypto Merge of 2004. * javax/security/auth/x500/X500Principal.java: Replaced with GNU Crypto's version. Files imported from GNU Crypto. * javax/crypto/BadPaddingException.java * javax/crypto/Cipher.java * javax/crypto/CipherInputStream.java * javax/crypto/CipherOutputStream.java * javax/crypto/CipherSpi.java * javax/crypto/EncryptedPrivateKeyInfo.java * javax/crypto/ExemptionMechanism.java * javax/crypto/ExemptionMechanismException.java * javax/crypto/ExemptionMechanismSpi.java * javax/crypto/IllegalBlockSizeException.java * javax/crypto/KeyAgreement.java * javax/crypto/KeyAgreementSpi.java * javax/crypto/KeyGenerator.java * javax/crypto/KeyGeneratorSpi.java * javax/crypto/Mac.java * javax/crypto/MacSpi.java * javax/crypto/Makefile.am * javax/crypto/NoSuchPaddingException.java * javax/crypto/NullCipher.java * javax/crypto/NullCipherImpl.java * javax/crypto/SealedObject.java * javax/crypto/SecretKey.java * javax/crypto/SecretKeyFactory.java * javax/crypto/SecretKeyFactorySpi.java * javax/crypto/ShortBufferException.java * javax/crypto/interfaces/DHKey.java * javax/crypto/interfaces/DHPrivateKey.java * javax/crypto/interfaces/DHPublicKey.java * javax/crypto/interfaces/PBEKey.java * javax/crypto/spec/DESKeySpec.java * javax/crypto/spec/DESedeKeySpec.java * javax/crypto/spec/DHGenParameterSpec.java * javax/crypto/spec/DHParameterSpec.java * javax/crypto/spec/DHPrivateKeySpec.java * javax/crypto/spec/DHPublicKeySpec.java * javax/crypto/spec/IvParameterSpec.java * javax/crypto/spec/PBEKeySpec.java * javax/crypto/spec/PBEParameterSpec.java * javax/crypto/spec/RC2ParameterSpec.java * javax/crypto/spec/RC5ParameterSpec.java * javax/crypto/spec/SecretKeySpec.java * javax/security/auth/AuthPermission.java * javax/security/auth/DestroyFailedException.java * javax/security/auth/Destroyable.java * javax/security/auth/Policy.java * javax/security/auth/PrivateCredentialPermission.java * javax/security/auth/RefreshFailedException.java * javax/security/auth/Refreshable.java * javax/security/auth/Subject.java * javax/security/auth/SubjectDomainCombiner.java * javax/security/auth/callback/Callback.java * javax/security/auth/callback/CallbackHandler.java * javax/security/auth/callback/ChoiceCallback.java * javax/security/auth/callback/ConfirmationCallback.java * javax/security/auth/callback/LanguageCallback.java * javax/security/auth/callback/NameCallback.java * javax/security/auth/callback/PasswordCallback.java * javax/security/auth/callback/TextInputCallback.java * javax/security/auth/callback/TextOutputCallback.java * javax/security/auth/callback/UnsupportedCallbackException.java * javax/security/auth/login/AccountExpiredException.java * javax/security/auth/login/AppConfigurationEntry.java * javax/security/auth/login/Configuration.java * javax/security/auth/login/CredentialExpiredException.java * javax/security/auth/login/FailedLoginException.java * javax/security/auth/login/LoginContext.java * javax/security/auth/login/LoginException.java * javax/security/auth/login/NullConfiguration.java * javax/security/auth/x500/X500PrivateCredential.java * javax/security/sasl/AuthenticationException.java * javax/security/sasl/AuthorizeCallback.java * javax/security/sasl/RealmCallback.java * javax/security/sasl/RealmChoiceCallback.java * javax/security/sasl/Sasl.java * javax/security/sasl/SaslClient.java * javax/security/sasl/SaslClientFactory.java * javax/security/sasl/SaslException.java * javax/security/sasl/SaslServer.java * javax/security/sasl/SaslServerFactory.java * org/ietf/jgss/ChannelBinding.java * org/ietf/jgss/GSSContext.java * org/ietf/jgss/GSSCredential.java * org/ietf/jgss/GSSException.java * org/ietf/jgss/GSSManager.java * org/ietf/jgss/GSSName.java * org/ietf/jgss/MessageProp.java * org/ietf/jgss/Oid.java * org/ietf/jgss/MessagesBundle.properties Files imported from Jessie <http://www.nongnu.org/jessie/> * javax/net/ServerSocketFactory.java * javax/net/SocketFactory.java * javax/net/VanillaServerSocketFactory.java * javax/net/VanillaSocketFactory.java * javax/net/ssl/HandshakeCompletedEvent.java * javax/net/ssl/HandshakeCompletedListener.java * javax/net/ssl/HostnameVerifier.java * javax/net/ssl/HttpsURLConnection.java * javax/net/ssl/KeyManager.java * javax/net/ssl/KeyManagerFactory.java * javax/net/ssl/KeyManagerFactorySpi.java * javax/net/ssl/ManagerFactoryParameters.java * javax/net/ssl/SSLContext.java * javax/net/ssl/SSLContextSpi.java * javax/net/ssl/SSLException.java * javax/net/ssl/SSLHandshakeException.java * javax/net/ssl/SSLKeyException.java * javax/net/ssl/SSLPeerUnverifiedException.java * javax/net/ssl/SSLPermission.java * javax/net/ssl/SSLProtocolException.java * javax/net/ssl/SSLServerSocket.java * javax/net/ssl/SSLServerSocketFactory.java * javax/net/ssl/SSLSession.java * javax/net/ssl/SSLSessionBindingEvent.java * javax/net/ssl/SSLSessionBindingListener.java * javax/net/ssl/SSLSessionContext.java * javax/net/ssl/SSLSocket.java * javax/net/ssl/SSLSocketFactory.java * javax/net/ssl/TrivialHostnameVerifier.java * javax/net/ssl/TrustManager.java * javax/net/ssl/TrustManagerFactory.java * javax/net/ssl/TrustManagerFactorySpi.java * javax/net/ssl/X509KeyManager.java * javax/net/ssl/X509TrustManager.java * javax/security/cert/Certificate.java * javax/security/cert/CertificateEncodingException.java * javax/security/cert/CertificateException.java * javax/security/cert/CertificateExpiredException.java * javax/security/cert/CertificateNotYetValidException.java * javax/security/cert/CertificateParsingException.java * javax/security/cert/X509CertBridge.java * javax/security/cert/X509Certificate.java 2004-08-20 Casey Marshall <csm@gnu.org> * java/security/cert/X509CRLSelector.java: New file. * java/security/cert/X509CertSelector.java: New file. From-SVN: r87795
This commit is contained in:
Andreas Tobler
Andreas Tobler
parent
c93320c457
commit
6f5ce93bab
134 changed files with 25334 additions and 274 deletions
284
libjava/javax/crypto/EncryptedPrivateKeyInfo.java
Normal file
284
libjava/javax/crypto/EncryptedPrivateKeyInfo.java
Normal file
|
|
@ -0,0 +1,284 @@
|
|||
/* EncryptedPrivateKeyInfo.java -- As in PKCS #8.
|
||||
Copyright (C) 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 javax.crypto;
|
||||
|
||||
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;
|
||||
|
||||
/**
|
||||
* An implementation of the <code>EncryptedPrivateKeyInfo</code> ASN.1
|
||||
* type as specified in <a
|
||||
* href="http://www.rsasecurity.com/rsalabs/pkcs/pkcs-8/">PKCS #8 -
|
||||
* Private-Key Information Syntax Standard</a>.
|
||||
*
|
||||
* <p>The ASN.1 type <code>EncryptedPrivateKeyInfo</code> is:
|
||||
*
|
||||
* <blockquote>
|
||||
* <pre>EncryptedPrivateKeyInfo ::= SEQUENCE {
|
||||
* encryptionAlgorithm EncryptionAlgorithmIdentifier,
|
||||
* encryptedData EncryptedData }
|
||||
*
|
||||
* EncryptionAlgorithmIdentifier ::= AlgorithmIdentifier
|
||||
*
|
||||
* EncrytpedData ::= OCTET STRING
|
||||
*
|
||||
* AlgorithmIdentifier ::= SEQUENCE {
|
||||
* algorithm OBJECT IDENTIFIER,
|
||||
* parameters ANY DEFINED BY algorithm OPTIONAL }</pre>
|
||||
* </blockquote>
|
||||
*
|
||||
* @author Casey Marshall (csm@gnu.org)
|
||||
* @since 1.4
|
||||
* @see java.security.spec.PKCS8EncodedKeySpec
|
||||
*/
|
||||
public class EncryptedPrivateKeyInfo
|
||||
{
|
||||
|
||||
// Fields.
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
/** The encrypted data. */
|
||||
private byte[] encryptedData;
|
||||
|
||||
/** The encoded, encrypted key. */
|
||||
private byte[] encoded;
|
||||
|
||||
/** The OID of the encryption algorithm. */
|
||||
private OID algOid;
|
||||
|
||||
/** The encryption algorithm's parameters. */
|
||||
private AlgorithmParameters params;
|
||||
|
||||
/** The encoded ASN.1 algorithm parameters. */
|
||||
private byte[] encodedParams;
|
||||
|
||||
// Constructors.
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Create a new <code>EncryptedPrivateKeyInfo</code> object from raw
|
||||
* encrypted data and the parameters used for encryption.
|
||||
*
|
||||
* <p>The <code>encryptedData</code> array is cloned.
|
||||
*
|
||||
* @param params The encryption algorithm parameters.
|
||||
* @param encryptedData The encrypted key data.
|
||||
* @throws java.lang.IllegalArgumentException If the
|
||||
* <code>encryptedData</code> array is empty (zero-length).
|
||||
* @throws java.security.NoSuchAlgorithmException If the algorithm
|
||||
* specified in the parameters is not supported.
|
||||
* @throws java.lang.NullPointerException If <code>encryptedData</code>
|
||||
* is null.
|
||||
*/
|
||||
public EncryptedPrivateKeyInfo(AlgorithmParameters params,
|
||||
byte[] encryptedData)
|
||||
throws IllegalArgumentException, NoSuchAlgorithmException
|
||||
{
|
||||
if (encryptedData.length == 0)
|
||||
{
|
||||
throw new IllegalArgumentException("0-length encryptedData");
|
||||
}
|
||||
this.params = params;
|
||||
algOid = new OID(params.getAlgorithm());
|
||||
this.encryptedData = (byte[]) encryptedData.clone();
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new <code>EncryptedPrivateKeyInfo</code> from an encoded
|
||||
* representation, parsing the ASN.1 sequence.
|
||||
*
|
||||
* @param encoded The encoded info.
|
||||
* @throws java.io.IOException If parsing the encoded data fails.
|
||||
* @throws java.lang.NullPointerException If <code>encoded</code> is
|
||||
* null.
|
||||
*/
|
||||
public EncryptedPrivateKeyInfo(byte[] encoded)
|
||||
throws IOException
|
||||
{
|
||||
this.encoded = (byte[]) encoded.clone();
|
||||
decode();
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new <code>EncryptedPrivateKeyInfo</code> from the cipher
|
||||
* name and the encrytpedData.
|
||||
*
|
||||
* <p>The <code>encryptedData</code> array is cloned.
|
||||
*
|
||||
* @param algName The name of the algorithm (as an object identifier).
|
||||
* @param encryptedData The encrypted key data.
|
||||
* @throws java.lang.IllegalArgumentException If the
|
||||
* <code>encryptedData</code> array is empty (zero-length).
|
||||
* @throws java.security.NoSuchAlgorithmException If algName is not
|
||||
* the name of a supported algorithm.
|
||||
* @throws java.lang.NullPointerException If <code>encryptedData</code>
|
||||
* is null.
|
||||
*/
|
||||
public EncryptedPrivateKeyInfo(String algName, byte[] encryptedData)
|
||||
throws IllegalArgumentException, NoSuchAlgorithmException,
|
||||
NullPointerException
|
||||
{
|
||||
if (encryptedData.length == 0)
|
||||
{
|
||||
throw new IllegalArgumentException("0-length encryptedData");
|
||||
}
|
||||
this.algOid = new OID(algName);
|
||||
this.encryptedData = (byte[]) encryptedData.clone();
|
||||
}
|
||||
|
||||
// Instance methods.
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Return the name of the cipher used to encrypt this key.
|
||||
*
|
||||
* @return The algorithm name.
|
||||
*/
|
||||
public String getAlgName()
|
||||
{
|
||||
return algOid.toString();
|
||||
}
|
||||
|
||||
public AlgorithmParameters getAlgParameters()
|
||||
{
|
||||
if (params == null && encodedParams != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
params = AlgorithmParameters.getInstance(getAlgName());
|
||||
params.init(encodedParams);
|
||||
}
|
||||
catch (NoSuchAlgorithmException ignore)
|
||||
{
|
||||
}
|
||||
catch (IOException ignore)
|
||||
{
|
||||
}
|
||||
}
|
||||
return params;
|
||||
}
|
||||
|
||||
public synchronized byte[] getEncoded() throws IOException
|
||||
{
|
||||
if (encoded == null) encode();
|
||||
return (byte[]) encoded.clone();
|
||||
}
|
||||
|
||||
public byte[] getEncryptedData()
|
||||
{
|
||||
return encryptedData;
|
||||
}
|
||||
|
||||
public PKCS8EncodedKeySpec getKeySpec(Cipher cipher)
|
||||
throws InvalidKeySpecException
|
||||
{
|
||||
try
|
||||
{
|
||||
return new PKCS8EncodedKeySpec(cipher.doFinal(encryptedData));
|
||||
}
|
||||
catch (Exception x)
|
||||
{
|
||||
throw new InvalidKeySpecException(x.toString());
|
||||
}
|
||||
}
|
||||
|
||||
// Own methods.
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
private void decode() throws IOException
|
||||
{
|
||||
DERReader der = new DERReader(encoded);
|
||||
DERValue val = der.read();
|
||||
if (val.getTag() != DER.SEQUENCE)
|
||||
throw new IOException("malformed EncryptedPrivateKeyInfo");
|
||||
val = der.read();
|
||||
if (val.getTag() != DER.SEQUENCE)
|
||||
throw new IOException("malformed AlgorithmIdentifier");
|
||||
int algpLen = val.getLength();
|
||||
DERValue oid = der.read();
|
||||
if (oid.getTag() != DER.OBJECT_IDENTIFIER)
|
||||
throw new IOException("malformed AlgorithmIdentifier");
|
||||
algOid = (OID) oid.getValue();
|
||||
if (algpLen == 0)
|
||||
{
|
||||
val = der.read();
|
||||
if (val.getTag() != 0)
|
||||
{
|
||||
encodedParams = val.getEncoded();
|
||||
der.read();
|
||||
}
|
||||
}
|
||||
else if (oid.getEncodedLength() < val.getLength())
|
||||
{
|
||||
val = der.read();
|
||||
encodedParams = val.getEncoded();
|
||||
}
|
||||
val = der.read();
|
||||
if (val.getTag() != DER.OCTET_STRING)
|
||||
throw new IOException("malformed AlgorithmIdentifier");
|
||||
encryptedData = (byte[]) val.getValue();
|
||||
}
|
||||
|
||||
private void encode() throws IOException
|
||||
{
|
||||
List algId = new ArrayList(2);
|
||||
algId.add(new DERValue(DER.OBJECT_IDENTIFIER, algOid));
|
||||
getAlgParameters();
|
||||
if (params != null)
|
||||
{
|
||||
algId.add(DERReader.read(params.getEncoded()));
|
||||
}
|
||||
List epki = new ArrayList(2);
|
||||
epki.add(new DERValue(DER.CONSTRUCTED|DER.SEQUENCE, algId));
|
||||
epki.add(new DERValue(DER.OCTET_STRING, encryptedData));
|
||||
encoded = new DERValue(DER.CONSTRUCTED|DER.SEQUENCE, epki).getEncoded();
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue