Author: simonetripodi
Date: Sat Jan 30 21:22:31 2010
New Revision: 904891
URL: http://svn.apache.org/viewvc?rev=904891&view=rev
Log:
no need to have abstract implementations, DERs are enough
Removed:
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/AbstractRsaSha1SigningKey.java
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/AbstractRsaSha1VerifyingKey.java
Modified:
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/DerRsaSha1SigningKey.java
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/DerRsaSha1VeryfingKey.java
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/PemRsaSha1SigningKey.java
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/PemRsaSha1VeryfingKey.java
Modified:
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/DerRsaSha1SigningKey.java
URL:
http://svn.apache.org/viewvc/labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/DerRsaSha1SigningKey.java?rev=904891&r1=904890&r2=904891&view=diff
==============================================================================
---
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/DerRsaSha1SigningKey.java
(original)
+++
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/DerRsaSha1SigningKey.java
Sat Jan 30 21:22:31 2010
@@ -17,15 +17,32 @@
package org.apache.labs.amber.signature.signers.rsa;
import java.net.URL;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.PKCS8EncodedKeySpec;
import org.apache.labs.amber.signature.signers.SignatureException;
+import org.apache.labs.amber.signature.signers.SignatureMethod;
/**
* Implementation of a DER RSA private key.
*
* @version $Id$
*/
-public final class DerRsaSha1SigningKey extends AbstractRsaSha1SigningKey {
+...@signaturemethod("RSA-SHA1")
+public class DerRsaSha1SigningKey extends AbstractRsaSha1Key {
+
+ /**
+ * The RSA algorithm name.
+ */
+ private static final String RSA = "RSA";
+
+ /**
+ * The RSA private key.
+ */
+ private RSAPrivateKey rsaPrivateKey;
/**
* Instantiate a new DER RSA private key reading the certificate from the
URL.
@@ -38,4 +55,31 @@
super(certificateLocation);
}
+ /**
+ * Return the RSA private key.
+ *
+ * @return the RSA private key.
+ */
+ public RSAPrivateKey getRsaPrivateKey() {
+ return this.rsaPrivateKey;
+ }
+
+ /**
+ * {...@inheritdoc}
+ */
+ @Override
+ protected void init(byte[] bufferedValue) throws SignatureException {
+ try {
+ KeyFactory keyFactory = KeyFactory.getInstance(RSA);
+ PKCS8EncodedKeySpec privSpec = new
PKCS8EncodedKeySpec(bufferedValue);
+ try {
+ this.rsaPrivateKey = (RSAPrivateKey)
keyFactory.generatePrivate(privSpec);
+ } catch (InvalidKeySpecException e) {
+ throw new SignatureException("An error occurred while reading
the private key ceritificate", e);
+ }
+ } catch (NoSuchAlgorithmException e) {
+ // TODO can this exception be ignored?
+ }
+ }
+
}
Modified:
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/DerRsaSha1VeryfingKey.java
URL:
http://svn.apache.org/viewvc/labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/DerRsaSha1VeryfingKey.java?rev=904891&r1=904890&r2=904891&view=diff
==============================================================================
---
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/DerRsaSha1VeryfingKey.java
(original)
+++
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/DerRsaSha1VeryfingKey.java
Sat Jan 30 21:22:31 2010
@@ -16,16 +16,33 @@
*/
package org.apache.labs.amber.signature.signers.rsa;
+import java.io.ByteArrayInputStream;
import java.net.URL;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.security.interfaces.RSAPublicKey;
import org.apache.labs.amber.signature.signers.SignatureException;
+import org.apache.labs.amber.signature.signers.SignatureMethod;
/**
* Implementation of a DER RSA public key.
*
* @version $Id$
*/
-public final class DerRsaSha1VeryfingKey extends AbstractRsaSha1VerifyingKey {
+...@signaturemethod("RSA-SHA1")
+public class DerRsaSha1VeryfingKey extends AbstractRsaSha1Key {
+
+ /**
+ * The X509 string constant.
+ */
+ private static final String X509 = "X509";
+
+ /**
+ * The RSA public key.
+ */
+ private RSAPublicKey rsaPublicKey;
/**
* Instantiate a new DER RSA public key reading the certificate from the
URL.
@@ -38,4 +55,33 @@
super(certificateLocation);
}
+ /**
+ * Return the RSA public key.
+ *
+ * @return the RSA public key.
+ */
+ public RSAPublicKey getRsaPublicKey() {
+ return this.rsaPublicKey;
+ }
+
+ /**
+ * {...@inheritdoc}
+ */
+ @Override
+ protected void init(byte[] bufferedValue) throws SignatureException {
+ try {
+ CertificateFactory certificateFactory =
CertificateFactory.getInstance(X509);
+
+ ByteArrayInputStream input = new
ByteArrayInputStream(bufferedValue);
+ try {
+ X509Certificate certificate = (X509Certificate)
certificateFactory.generateCertificate(input);
+ this.rsaPublicKey = (RSAPublicKey) certificate.getPublicKey();
+ } catch (CertificateException e) {
+ throw new SignatureException("An error occurred while reading
the public ceritificate", e);
+ }
+ } catch (CertificateException e) {
+ // TODO can this exception be ignored?
+ }
+ }
+
}
Modified:
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/PemRsaSha1SigningKey.java
URL:
http://svn.apache.org/viewvc/labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/PemRsaSha1SigningKey.java?rev=904891&r1=904890&r2=904891&view=diff
==============================================================================
---
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/PemRsaSha1SigningKey.java
(original)
+++
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/PemRsaSha1SigningKey.java
Sat Jan 30 21:22:31 2010
@@ -26,7 +26,7 @@
*
* @version $Id$
*/
-public final class PemRsaSha1SigningKey extends AbstractRsaSha1SigningKey {
+public final class PemRsaSha1SigningKey extends DerRsaSha1SigningKey {
/**
* Instantiate a new PEM RSA private key reading the certificate from the
URL.
Modified:
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/PemRsaSha1VeryfingKey.java
URL:
http://svn.apache.org/viewvc/labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/PemRsaSha1VeryfingKey.java?rev=904891&r1=904890&r2=904891&view=diff
==============================================================================
---
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/PemRsaSha1VeryfingKey.java
(original)
+++
labs/amber/signature-api/src/main/java/org/apache/labs/amber/signature/signers/rsa/PemRsaSha1VeryfingKey.java
Sat Jan 30 21:22:31 2010
@@ -26,7 +26,7 @@
*
* @version $Id$
*/
-public final class PemRsaSha1VeryfingKey extends AbstractRsaSha1VerifyingKey {
+public final class PemRsaSha1VeryfingKey extends DerRsaSha1VeryfingKey {
/**
* Instantiate a new PEM RSA public key reading the certificate from the
URL.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
