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 2016/10/24 10:05:44 UTC
svn commit: r1766371 - in
/santuario/xml-security-java/trunk/src/main/java/org/apache:
jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
xml/security/signature/XMLSignature.java
Author: coheigea
Date: Mon Oct 24 10:05:44 2016
New Revision: 1766371
URL: http://svn.apache.org/viewvc?rev=1766371&view=rev
Log:
More try with resources
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java?rev=1766371&r1=1766370&r2=1766371&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java Mon Oct 24 10:05:44 2016
@@ -224,9 +224,10 @@ public abstract class DOMSignatureMethod
log.debug("JCA Algorithm: " + getJCAAlgorithm());
log.debug("Signature Bytes length: " + sig.length);
}
- si.canonicalize(context, new SignerOutputStream(signature));
- try {
+ try (SignerOutputStream outputStream = new SignerOutputStream(signature)) {
+ si.canonicalize(context, outputStream);
+
Type type = getAlgorithmType();
if (type == Type.DSA) {
int size = ((DSAKey)key).getParams().getQ().bitLength();
@@ -271,9 +272,9 @@ public abstract class DOMSignatureMethod
log.debug("JCA Algorithm: " + getJCAAlgorithm());
}
- si.canonicalize(context, new SignerOutputStream(signature));
-
- try {
+ try (SignerOutputStream outputStream = new SignerOutputStream(signature)) {
+ si.canonicalize(context, outputStream);
+
Type type = getAlgorithmType();
if (type == Type.DSA) {
int size = ((DSAKey)key).getParams().getQ().bitLength();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java?rev=1766371&r1=1766370&r2=1766371&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java Mon Oct 24 10:05:44 2016
@@ -614,35 +614,21 @@ public final class XMLSignature extends
);
}
- try {
- //Create a SignatureAlgorithm object
- SignedInfo si = this.getSignedInfo();
- SignatureAlgorithm sa = si.getSignatureAlgorithm();
- OutputStream so = null;
- try {
- // generate digest values for all References in this SignedInfo
- si.generateDigestValues();
-
- // initialize SignatureAlgorithm for signing
- sa.initSign(signingKey);
-
- so = new UnsyncBufferedOutputStream(new SignerOutputStream(sa));
- // get the canonicalized bytes from SignedInfo
- si.signInOctetStream(so);
- } catch (XMLSecurityException ex) {
- throw ex;
- } finally {
- if (so != null) {
- try {
- so.close();
- } catch (IOException ex) {
- if (log.isDebugEnabled()) {
- log.debug(ex.getMessage(), ex);
- }
- }
- }
- }
-
+ //Create a SignatureAlgorithm object
+ SignedInfo si = this.getSignedInfo();
+ SignatureAlgorithm sa = si.getSignatureAlgorithm();
+ try (SignerOutputStream output = new SignerOutputStream(sa);
+ OutputStream so = new UnsyncBufferedOutputStream(output)) {
+
+ // generate digest values for all References in this SignedInfo
+ si.generateDigestValues();
+
+ // initialize SignatureAlgorithm for signing
+ sa.initSign(signingKey);
+
+ // get the canonicalized bytes from SignedInfo
+ si.signInOctetStream(so);
+
// set them on the SignatureValue element
this.setSignatureValueElement(sa.sign());
} catch (XMLSignatureException ex) {
@@ -653,6 +639,8 @@ public final class XMLSignature extends
throw new XMLSignatureException(ex);
} catch (XMLSecurityException ex) {
throw new XMLSignatureException(ex);
+ } catch (IOException ex) {
+ throw new XMLSignatureException(ex);
}
}
@@ -731,13 +719,12 @@ public final class XMLSignature extends
log.debug("PublicKey = " + pk);
}
byte sigBytes[] = null;
- try {
+ try (SignerOutputStream so = new SignerOutputStream(sa);
+ OutputStream bos = new UnsyncBufferedOutputStream(so)) {
+
sa.initVerify(pk);
// Get the canonicalized (normalized) SignedInfo
- SignerOutputStream so = new SignerOutputStream(sa);
- OutputStream bos = new UnsyncBufferedOutputStream(so);
-
si.signInOctetStream(bos);
bos.close();
// retrieve the byte[] from the stored signature