You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2014/07/16 16:49:21 UTC
svn commit: r1611033 - in
/santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations:
IntegrityHmac.java SignatureBaseRSA.java SignatureDSA.java
SignatureECDSA.java
Author: coheigea
Date: Wed Jul 16 14:49:21 2014
New Revision: 1611033
URL: http://svn.apache.org/r1611033
Log:
Fixing some NPEs + consolidating some code
Modified:
santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java
santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java
santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java
santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java
Modified: santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java?rev=1611033&r1=1611032&r2=1611033&view=diff
==============================================================================
--- santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java (original)
+++ santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java Wed Jul 16 14:49:21 2014
@@ -135,7 +135,10 @@ public abstract class IntegrityHmac exte
*/
protected void engineInitVerify(Key secretKey) throws XMLSignatureException {
if (!(secretKey instanceof SecretKey)) {
- String supplied = secretKey.getClass().getName();
+ String supplied = null;
+ if (secretKey != null) {
+ supplied = secretKey.getClass().getName();
+ }
String needed = SecretKey.class.getName();
Object exArgs[] = { supplied, needed };
@@ -191,19 +194,7 @@ public abstract class IntegrityHmac exte
* @throws XMLSignatureException
*/
protected void engineInitSign(Key secretKey) throws XMLSignatureException {
- if (!(secretKey instanceof SecretKey)) {
- String supplied = secretKey.getClass().getName();
- String needed = SecretKey.class.getName();
- Object exArgs[] = { supplied, needed };
-
- throw new XMLSignatureException("algorithms.WrongKeyForThisOperation", exArgs);
- }
-
- try {
- this.macAlgorithm.init(secretKey);
- } catch (InvalidKeyException ex) {
- throw new XMLSignatureException("empty", ex);
- }
+ engineInitSign(secretKey, (AlgorithmParameterSpec)null);
}
/**
@@ -217,7 +208,10 @@ public abstract class IntegrityHmac exte
Key secretKey, AlgorithmParameterSpec algorithmParameterSpec
) throws XMLSignatureException {
if (!(secretKey instanceof SecretKey)) {
- String supplied = secretKey.getClass().getName();
+ String supplied = null;
+ if (secretKey != null) {
+ supplied = secretKey.getClass().getName();
+ }
String needed = SecretKey.class.getName();
Object exArgs[] = { supplied, needed };
@@ -225,7 +219,11 @@ public abstract class IntegrityHmac exte
}
try {
- this.macAlgorithm.init(secretKey, algorithmParameterSpec);
+ if (algorithmParameterSpec == null) {
+ this.macAlgorithm.init(secretKey);
+ } else {
+ this.macAlgorithm.init(secretKey, algorithmParameterSpec);
+ }
} catch (InvalidKeyException ex) {
throw new XMLSignatureException("empty", ex);
} catch (InvalidAlgorithmParameterException ex) {
Modified: santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java?rev=1611033&r1=1611032&r2=1611033&view=diff
==============================================================================
--- santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java (original)
+++ santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java Wed Jul 16 14:49:21 2014
@@ -97,7 +97,10 @@ public abstract class SignatureBaseRSA e
/** @inheritDoc */
protected void engineInitVerify(Key publicKey) throws XMLSignatureException {
if (!(publicKey instanceof PublicKey)) {
- String supplied = publicKey.getClass().getName();
+ String supplied = null;
+ if (publicKey != null) {
+ supplied = publicKey.getClass().getName();
+ }
String needed = PublicKey.class.getName();
Object exArgs[] = { supplied, needed };
@@ -137,7 +140,10 @@ public abstract class SignatureBaseRSA e
protected void engineInitSign(Key privateKey, SecureRandom secureRandom)
throws XMLSignatureException {
if (!(privateKey instanceof PrivateKey)) {
- String supplied = privateKey.getClass().getName();
+ String supplied = null;
+ if (privateKey != null) {
+ supplied = privateKey.getClass().getName();
+ }
String needed = PrivateKey.class.getName();
Object exArgs[] = { supplied, needed };
@@ -145,7 +151,11 @@ public abstract class SignatureBaseRSA e
}
try {
- this.signatureAlgorithm.initSign((PrivateKey) privateKey, secureRandom);
+ if (secureRandom == null) {
+ this.signatureAlgorithm.initSign((PrivateKey) privateKey);
+ } else {
+ this.signatureAlgorithm.initSign((PrivateKey) privateKey, secureRandom);
+ }
} catch (InvalidKeyException ex) {
throw new XMLSignatureException("empty", ex);
}
@@ -153,19 +163,7 @@ public abstract class SignatureBaseRSA e
/** @inheritDoc */
protected void engineInitSign(Key privateKey) throws XMLSignatureException {
- if (!(privateKey instanceof PrivateKey)) {
- String supplied = privateKey.getClass().getName();
- String needed = PrivateKey.class.getName();
- Object exArgs[] = { supplied, needed };
-
- throw new XMLSignatureException("algorithms.WrongKeyForThisOperation", exArgs);
- }
-
- try {
- this.signatureAlgorithm.initSign((PrivateKey) privateKey);
- } catch (InvalidKeyException ex) {
- throw new XMLSignatureException("empty", ex);
- }
+ engineInitSign(privateKey, (SecureRandom)null);
}
/** @inheritDoc */
Modified: santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java?rev=1611033&r1=1611032&r2=1611033&view=diff
==============================================================================
--- santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java (original)
+++ santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java Wed Jul 16 14:49:21 2014
@@ -124,7 +124,10 @@ public class SignatureDSA extends Signat
*/
protected void engineInitVerify(Key publicKey) throws XMLSignatureException {
if (!(publicKey instanceof PublicKey)) {
- String supplied = publicKey.getClass().getName();
+ String supplied = null;
+ if (publicKey != null) {
+ supplied = publicKey.getClass().getName();
+ }
String needed = PublicKey.class.getName();
Object exArgs[] = { supplied, needed };
@@ -173,7 +176,10 @@ public class SignatureDSA extends Signat
protected void engineInitSign(Key privateKey, SecureRandom secureRandom)
throws XMLSignatureException {
if (!(privateKey instanceof PrivateKey)) {
- String supplied = privateKey.getClass().getName();
+ String supplied = null;
+ if (privateKey != null) {
+ supplied = privateKey.getClass().getName();
+ }
String needed = PrivateKey.class.getName();
Object exArgs[] = { supplied, needed };
@@ -181,7 +187,11 @@ public class SignatureDSA extends Signat
}
try {
- this.signatureAlgorithm.initSign((PrivateKey) privateKey, secureRandom);
+ if (secureRandom == null) {
+ this.signatureAlgorithm.initSign((PrivateKey) privateKey);
+ } else {
+ this.signatureAlgorithm.initSign((PrivateKey) privateKey, secureRandom);
+ }
} catch (InvalidKeyException ex) {
throw new XMLSignatureException("empty", ex);
}
@@ -192,20 +202,7 @@ public class SignatureDSA extends Signat
* @inheritDoc
*/
protected void engineInitSign(Key privateKey) throws XMLSignatureException {
- if (!(privateKey instanceof PrivateKey)) {
- String supplied = privateKey.getClass().getName();
- String needed = PrivateKey.class.getName();
- Object exArgs[] = { supplied, needed };
-
- throw new XMLSignatureException("algorithms.WrongKeyForThisOperation", exArgs);
- }
-
- try {
- this.signatureAlgorithm.initSign((PrivateKey) privateKey);
- } catch (InvalidKeyException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- size = ((DSAKey)privateKey).getParams().getQ().bitLength();
+ engineInitSign(privateKey, (SecureRandom)null);
}
/**
Modified: santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java?rev=1611033&r1=1611032&r2=1611033&view=diff
==============================================================================
--- santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java (original)
+++ santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java Wed Jul 16 14:49:21 2014
@@ -237,7 +237,10 @@ public abstract class SignatureECDSA ext
protected void engineInitVerify(Key publicKey) throws XMLSignatureException {
if (!(publicKey instanceof PublicKey)) {
- String supplied = publicKey.getClass().getName();
+ String supplied = null;
+ if (publicKey != null) {
+ supplied = publicKey.getClass().getName();
+ }
String needed = PublicKey.class.getName();
Object exArgs[] = { supplied, needed };
@@ -281,7 +284,10 @@ public abstract class SignatureECDSA ext
protected void engineInitSign(Key privateKey, SecureRandom secureRandom)
throws XMLSignatureException {
if (!(privateKey instanceof PrivateKey)) {
- String supplied = privateKey.getClass().getName();
+ String supplied = null;
+ if (privateKey != null) {
+ supplied = privateKey.getClass().getName();
+ }
String needed = PrivateKey.class.getName();
Object exArgs[] = { supplied, needed };
@@ -289,7 +295,11 @@ public abstract class SignatureECDSA ext
}
try {
- this.signatureAlgorithm.initSign((PrivateKey) privateKey, secureRandom);
+ if (secureRandom == null) {
+ this.signatureAlgorithm.initSign((PrivateKey) privateKey);
+ } else {
+ this.signatureAlgorithm.initSign((PrivateKey) privateKey, secureRandom);
+ }
} catch (InvalidKeyException ex) {
throw new XMLSignatureException("empty", ex);
}
@@ -297,19 +307,7 @@ public abstract class SignatureECDSA ext
/** @inheritDoc */
protected void engineInitSign(Key privateKey) throws XMLSignatureException {
- if (!(privateKey instanceof PrivateKey)) {
- String supplied = privateKey.getClass().getName();
- String needed = PrivateKey.class.getName();
- Object exArgs[] = { supplied, needed };
-
- throw new XMLSignatureException("algorithms.WrongKeyForThisOperation", exArgs);
- }
-
- try {
- this.signatureAlgorithm.initSign((PrivateKey) privateKey);
- } catch (InvalidKeyException ex) {
- throw new XMLSignatureException("empty", ex);
- }
+ engineInitSign(privateKey, (SecureRandom)null);
}
/** @inheritDoc */