--- old/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java 2013-06-28 11:33:00.567455933 -0400
+++ new/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java 2013-06-28 11:33:00.367462157 -0400
@@ -2,21 +2,23 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package com.sun.org.apache.xml.internal.security.algorithms.implementations;
@@ -37,21 +39,17 @@
import com.sun.org.apache.xml.internal.security.utils.Base64;
import com.sun.org.apache.xml.internal.security.utils.Constants;
-/**
- *
- * @author $Author: mullan $
- */
public class SignatureDSA extends SignatureAlgorithmSpi {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
+ /** {@link org.apache.commons.logging} logging facility */
+ private static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(SignatureDSA.class.getName());
- /** Field _URI */
- public static final String _URI = Constants.SignatureSpecNS + "dsa-sha1";
+ /** Field URI */
+ public static final String URI = Constants.SignatureSpecNS + "dsa-sha1";
/** Field algorithm */
- private java.security.Signature _signatureAlgorithm = null;
+ private java.security.Signature signatureAlgorithm = null;
/**
* Method engineGetURI
@@ -59,7 +57,7 @@
* @inheritDoc
*/
protected String engineGetURI() {
- return SignatureDSA._URI;
+ return SignatureDSA.URI;
}
/**
@@ -68,17 +66,17 @@
* @throws XMLSignatureException
*/
public SignatureDSA() throws XMLSignatureException {
-
- String algorithmID = JCEMapper.translateURItoJCEID(SignatureDSA._URI);
- if (log.isLoggable(java.util.logging.Level.FINE))
+ String algorithmID = JCEMapper.translateURItoJCEID(SignatureDSA.URI);
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
log.log(java.util.logging.Level.FINE, "Created SignatureDSA using " + algorithmID);
+ }
String provider = JCEMapper.getProviderId();
try {
if (provider == null) {
- this._signatureAlgorithm = Signature.getInstance(algorithmID);
+ this.signatureAlgorithm = Signature.getInstance(algorithmID);
} else {
- this._signatureAlgorithm =
+ this.signatureAlgorithm =
Signature.getInstance(algorithmID, provider);
}
} catch (java.security.NoSuchAlgorithmException ex) {
@@ -95,9 +93,8 @@
*/
protected void engineSetParameter(AlgorithmParameterSpec params)
throws XMLSignatureException {
-
try {
- this._signatureAlgorithm.setParameter(params);
+ this.signatureAlgorithm.setParameter(params);
} catch (InvalidAlgorithmParameterException ex) {
throw new XMLSignatureException("empty", ex);
}
@@ -107,15 +104,15 @@
* @inheritDoc
*/
protected boolean engineVerify(byte[] signature)
- throws XMLSignatureException {
-
+ throws XMLSignatureException {
try {
- if (log.isLoggable(java.util.logging.Level.FINE))
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
log.log(java.util.logging.Level.FINE, "Called DSA.verify() on " + Base64.encode(signature));
+ }
byte[] jcebytes = SignatureDSA.convertXMLDSIGtoASN1(signature);
- return this._signatureAlgorithm.verify(jcebytes);
+ return this.signatureAlgorithm.verify(jcebytes);
} catch (SignatureException ex) {
throw new XMLSignatureException("empty", ex);
} catch (IOException ex) {
@@ -127,32 +124,29 @@
* @inheritDoc
*/
protected void engineInitVerify(Key publicKey) throws XMLSignatureException {
-
if (!(publicKey instanceof PublicKey)) {
String supplied = publicKey.getClass().getName();
String needed = PublicKey.class.getName();
Object exArgs[] = { supplied, needed };
- throw new XMLSignatureException
- ("algorithms.WrongKeyForThisOperation", exArgs);
+ throw new XMLSignatureException("algorithms.WrongKeyForThisOperation", exArgs);
}
try {
- this._signatureAlgorithm.initVerify((PublicKey) publicKey);
+ this.signatureAlgorithm.initVerify((PublicKey) publicKey);
} catch (InvalidKeyException ex) {
// reinstantiate Signature object to work around bug in JDK
// see: http://bugs.sun.com/view_bug.do?bug_id=4953555
- Signature sig = this._signatureAlgorithm;
+ Signature sig = this.signatureAlgorithm;
try {
- this._signatureAlgorithm = Signature.getInstance
- (_signatureAlgorithm.getAlgorithm());
+ this.signatureAlgorithm = Signature.getInstance(signatureAlgorithm.getAlgorithm());
} catch (Exception e) {
// this shouldn't occur, but if it does, restore previous
// Signature
if (log.isLoggable(java.util.logging.Level.FINE)) {
log.log(java.util.logging.Level.FINE, "Exception when reinstantiating Signature:" + e);
}
- this._signatureAlgorithm = sig;
+ this.signatureAlgorithm = sig;
}
throw new XMLSignatureException("empty", ex);
}
@@ -162,9 +156,8 @@
* @inheritDoc
*/
protected byte[] engineSign() throws XMLSignatureException {
-
try {
- byte jcebytes[] = this._signatureAlgorithm.sign();
+ byte jcebytes[] = this.signatureAlgorithm.sign();
return SignatureDSA.convertASN1toXMLDSIG(jcebytes);
} catch (IOException ex) {
@@ -178,20 +171,17 @@
* @inheritDoc
*/
protected void engineInitSign(Key privateKey, SecureRandom secureRandom)
- throws XMLSignatureException {
-
+ 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);
+ throw new XMLSignatureException("algorithms.WrongKeyForThisOperation", exArgs);
}
try {
- this._signatureAlgorithm.initSign((PrivateKey) privateKey,
- secureRandom);
+ this.signatureAlgorithm.initSign((PrivateKey) privateKey, secureRandom);
} catch (InvalidKeyException ex) {
throw new XMLSignatureException("empty", ex);
}
@@ -201,18 +191,16 @@
* @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);
+ throw new XMLSignatureException("algorithms.WrongKeyForThisOperation", exArgs);
}
try {
- this._signatureAlgorithm.initSign((PrivateKey) privateKey);
+ this.signatureAlgorithm.initSign((PrivateKey) privateKey);
} catch (InvalidKeyException ex) {
throw new XMLSignatureException("empty", ex);
}
@@ -223,7 +211,7 @@
*/
protected void engineUpdate(byte[] input) throws XMLSignatureException {
try {
- this._signatureAlgorithm.update(input);
+ this.signatureAlgorithm.update(input);
} catch (SignatureException ex) {
throw new XMLSignatureException("empty", ex);
}
@@ -234,7 +222,7 @@
*/
protected void engineUpdate(byte input) throws XMLSignatureException {
try {
- this._signatureAlgorithm.update(input);
+ this.signatureAlgorithm.update(input);
} catch (SignatureException ex) {
throw new XMLSignatureException("empty", ex);
}
@@ -243,10 +231,9 @@
/**
* @inheritDoc
*/
- protected void engineUpdate(byte buf[], int offset, int len)
- throws XMLSignatureException {
+ protected void engineUpdate(byte buf[], int offset, int len) throws XMLSignatureException {
try {
- this._signatureAlgorithm.update(buf, offset, len);
+ this.signatureAlgorithm.update(buf, offset, len);
} catch (SignatureException ex) {
throw new XMLSignatureException("empty", ex);
}
@@ -258,7 +245,7 @@
* @inheritDoc
*/
protected String engineGetJCEAlgorithmString() {
- return this._signatureAlgorithm.getAlgorithm();
+ return this.signatureAlgorithm.getAlgorithm();
}
/**
@@ -267,7 +254,7 @@
* @inheritDoc
*/
protected String engineGetJCEProviderName() {
- return this._signatureAlgorithm.getProvider().getName();
+ return this.signatureAlgorithm.getProvider().getName();
}
/**
@@ -282,8 +269,7 @@
* @throws IOException
* @see 6.4.1 DSA
*/
- private static byte[] convertASN1toXMLDSIG(byte asn1Bytes[])
- throws IOException {
+ private static byte[] convertASN1toXMLDSIG(byte asn1Bytes[]) throws IOException {
byte rLength = asn1Bytes[3];
int i;
@@ -294,21 +280,20 @@
int j;
for (j = sLength;
- (j > 0) && (asn1Bytes[(6 + rLength + sLength) - j] == 0); j--);
+ (j > 0) && (asn1Bytes[(6 + rLength + sLength) - j] == 0); j--);
if ((asn1Bytes[0] != 48) || (asn1Bytes[1] != asn1Bytes.length - 2)
- || (asn1Bytes[2] != 2) || (i > 20)
- || (asn1Bytes[4 + rLength] != 2) || (j > 20)) {
+ || (asn1Bytes[2] != 2) || (i > 20)
+ || (asn1Bytes[4 + rLength] != 2) || (j > 20)) {
throw new IOException("Invalid ASN.1 format of DSA signature");
- }
+ }
byte xmldsigBytes[] = new byte[40];
- System.arraycopy(asn1Bytes, (4 + rLength) - i, xmldsigBytes, 20 - i,
- i);
+ System.arraycopy(asn1Bytes, (4 + rLength) - i, xmldsigBytes, 20 - i, i);
System.arraycopy(asn1Bytes, (6 + rLength + sLength) - j, xmldsigBytes,
- 40 - j, j);
+ 40 - j, j);
- return xmldsigBytes;
+ return xmldsigBytes;
}
/**
@@ -323,8 +308,7 @@
* @throws IOException
* @see 6.4.1 DSA
*/
- private static byte[] convertXMLDSIGtoASN1(byte xmldsigBytes[])
- throws IOException {
+ private static byte[] convertXMLDSIGtoASN1(byte xmldsigBytes[]) throws IOException {
if (xmldsigBytes.length != 40) {
throw new IOException("Invalid XMLDSIG format of DSA signature");
@@ -337,7 +321,7 @@
int j = i;
if (xmldsigBytes[20 - i] < 0) {
- j += 1;
+ j += 1;
}
int k;
@@ -373,10 +357,8 @@
* @param HMACOutputLength
* @throws XMLSignatureException
*/
- protected void engineSetHMACOutputLength(int HMACOutputLength)
- throws XMLSignatureException {
- throw new XMLSignatureException(
- "algorithms.HMACOutputLengthOnlyForHMAC");
+ protected void engineSetHMACOutputLength(int HMACOutputLength) throws XMLSignatureException {
+ throw new XMLSignatureException("algorithms.HMACOutputLengthOnlyForHMAC");
}
/**
@@ -387,9 +369,8 @@
* @throws XMLSignatureException
*/
protected void engineInitSign(
- Key signingKey, AlgorithmParameterSpec algorithmParameterSpec)
- throws XMLSignatureException {
- throw new XMLSignatureException(
- "algorithms.CannotUseAlgorithmParameterSpecOnDSA");
+ Key signingKey, AlgorithmParameterSpec algorithmParameterSpec
+ ) throws XMLSignatureException {
+ throw new XMLSignatureException("algorithms.CannotUseAlgorithmParameterSpecOnDSA");
}
}