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 2015/12/15 18:13:22 UTC
svn commit: r1720201 [6/24] - in /santuario/xml-security-java/trunk:
samples/javax/xml/crypto/dsig/samples/
samples/org/apache/xml/security/samples/
samples/org/apache/xml/security/samples/algorithms/
samples/org/apache/xml/security/samples/canonicaliz...
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java Tue Dec 15 17:13:17 2015
@@ -99,7 +99,7 @@ public class KeyInfo extends SignatureEl
private List<X509Data> x509Datas = null;
private List<EncryptedKey> encryptedKeys = null;
-
+
private static final List<StorageResolver> nullList;
static {
List<StorageResolver> list = new ArrayList<StorageResolver>(1);
@@ -109,12 +109,12 @@ public class KeyInfo extends SignatureEl
/** Field storageResolvers */
private List<StorageResolver> storageResolvers = nullList;
-
+
/**
* Stores the individual (per-KeyInfo) {@link KeyResolverSpi}s
*/
private List<KeyResolverSpi> internalKeyResolvers = new ArrayList<KeyResolverSpi>();
-
+
private boolean secureValidation;
/**
@@ -124,13 +124,13 @@ public class KeyInfo extends SignatureEl
public KeyInfo(Document doc) {
super(doc);
addReturnToSelf();
-
+
String prefix = ElementProxy.getDefaultPrefix(this.getBaseNamespace());
if (prefix != null && prefix.length() > 0) {
- getElement().setAttributeNS(Constants.NamespaceSpecNS, "xmlns:" + prefix,
+ getElement().setAttributeNS(Constants.NamespaceSpecNS, "xmlns:" + prefix,
this.getBaseNamespace());
}
-
+
}
/**
@@ -142,13 +142,13 @@ public class KeyInfo extends SignatureEl
*/
public KeyInfo(Element element, String baseURI) throws XMLSecurityException {
super(element, baseURI);
-
+
Attr attr = element.getAttributeNodeNS(null, "Id");
if (attr != null) {
element.setIdAttributeNode(attr, true);
}
}
-
+
/**
* Set whether secure processing is enabled or not. The default is false.
*/
@@ -284,7 +284,7 @@ public class KeyInfo extends SignatureEl
*
* @param uri
* @param transforms
- * @param Type
+ * @param Type
*/
public void addRetrievalMethod(String uri, Transforms transforms, String Type) {
this.add(new RetrievalMethod(getDocument(), uri, transforms, Type));
@@ -339,12 +339,12 @@ public class KeyInfo extends SignatureEl
XMLCipher cipher = XMLCipher.getInstance();
appendSelf(cipher.martial(encryptedKey));
}
-
+
/**
* Method addDEREncodedKeyValue
*
* @param pk
- * @throws XMLSecurityException
+ * @throws XMLSecurityException
*/
public void addDEREncodedKeyValue(PublicKey pk) throws XMLSecurityException {
this.add(new DEREncodedKeyValue(getDocument(), pk));
@@ -359,12 +359,12 @@ public class KeyInfo extends SignatureEl
appendSelf(derEncodedKeyValue);
addReturnToSelf();
}
-
+
/**
* Method addKeyInfoReference
*
* @param URI
- * @throws XMLSecurityException
+ * @throws XMLSecurityException
*/
public void addKeyInfoReference(String URI) throws XMLSecurityException {
this.add(new KeyInfoReference(getDocument(), URI));
@@ -451,7 +451,7 @@ public class KeyInfo extends SignatureEl
*/
public int lengthX509Data() {
if (x509Datas != null) {
- return x509Datas.size();
+ return x509Datas.size();
}
return this.length(Constants.SignatureSpecNS, Constants._TAG_X509DATA);
}
@@ -493,7 +493,7 @@ public class KeyInfo extends SignatureEl
}
childNode = childNode.getNextSibling();
}
-
+
return res;
}
@@ -505,14 +505,14 @@ public class KeyInfo extends SignatureEl
* @throws XMLSecurityException
*/
public KeyName itemKeyName(int i) throws XMLSecurityException {
- Element e =
+ Element e =
XMLUtils.selectDsNode(
getFirstChild(), Constants._TAG_KEYNAME, i);
if (e != null) {
return new KeyName(e, this.baseURI);
- }
- return null;
+ }
+ return null;
}
/**
@@ -523,14 +523,14 @@ public class KeyInfo extends SignatureEl
* @throws XMLSecurityException
*/
public KeyValue itemKeyValue(int i) throws XMLSecurityException {
- Element e =
+ Element e =
XMLUtils.selectDsNode(
getFirstChild(), Constants._TAG_KEYVALUE, i);
if (e != null) {
return new KeyValue(e, this.baseURI);
- }
- return null;
+ }
+ return null;
}
/**
@@ -541,14 +541,14 @@ public class KeyInfo extends SignatureEl
* @throws XMLSecurityException
*/
public MgmtData itemMgmtData(int i) throws XMLSecurityException {
- Element e =
+ Element e =
XMLUtils.selectDsNode(
getFirstChild(), Constants._TAG_MGMTDATA, i);
if (e != null) {
return new MgmtData(e, this.baseURI);
- }
- return null;
+ }
+ return null;
}
/**
@@ -559,14 +559,14 @@ public class KeyInfo extends SignatureEl
* @throws XMLSecurityException
*/
public PGPData itemPGPData(int i) throws XMLSecurityException {
- Element e =
+ Element e =
XMLUtils.selectDsNode(
getFirstChild(), Constants._TAG_PGPDATA, i);
if (e != null) {
return new PGPData(e, this.baseURI);
- }
- return null;
+ }
+ return null;
}
/**
@@ -577,13 +577,13 @@ public class KeyInfo extends SignatureEl
* @throws XMLSecurityException
*/
public RetrievalMethod itemRetrievalMethod(int i) throws XMLSecurityException {
- Element e =
+ Element e =
XMLUtils.selectDsNode(
getFirstChild(), Constants._TAG_RETRIEVALMETHOD, i);
if (e != null) {
return new RetrievalMethod(e, this.baseURI);
- }
+ }
return null;
}
@@ -595,34 +595,34 @@ public class KeyInfo extends SignatureEl
* @throws XMLSecurityException
*/
public SPKIData itemSPKIData(int i) throws XMLSecurityException {
- Element e =
+ Element e =
XMLUtils.selectDsNode(
getFirstChild(), Constants._TAG_SPKIDATA, i);
if (e != null) {
return new SPKIData(e, this.baseURI);
- }
- return null;
+ }
+ return null;
}
-
+
/**
* Method itemX509Data
- *
+ *
* @param i
* @return the asked X509Data element, null if the index is too big
* @throws XMLSecurityException
*/
public X509Data itemX509Data(int i) throws XMLSecurityException {
if (x509Datas != null) {
- return x509Datas.get(i);
+ return x509Datas.get(i);
}
- Element e =
+ Element e =
XMLUtils.selectDsNode(
getFirstChild(), Constants._TAG_X509DATA, i);
if (e != null) {
return new X509Data(e, this.baseURI);
- }
+ }
return null;
}
@@ -637,7 +637,7 @@ public class KeyInfo extends SignatureEl
if (encryptedKeys != null) {
return encryptedKeys.get(i);
}
- Element e =
+ Element e =
XMLUtils.selectXencNode(
getFirstChild(), EncryptionConstants._TAG_ENCRYPTEDKEY, i);
@@ -648,7 +648,7 @@ public class KeyInfo extends SignatureEl
}
return null;
}
-
+
/**
* Method itemDEREncodedKeyValue
*
@@ -657,14 +657,14 @@ public class KeyInfo extends SignatureEl
* @throws XMLSecurityException
*/
public DEREncodedKeyValue itemDEREncodedKeyValue(int i) throws XMLSecurityException {
- Element e =
+ Element e =
XMLUtils.selectDs11Node(
getFirstChild(), Constants._TAG_DERENCODEDKEYVALUE, i);
if (e != null) {
return new DEREncodedKeyValue(e, this.baseURI);
- }
- return null;
+ }
+ return null;
}
/**
@@ -675,14 +675,14 @@ public class KeyInfo extends SignatureEl
* @throws XMLSecurityException
*/
public KeyInfoReference itemKeyInfoReference(int i) throws XMLSecurityException {
- Element e =
+ Element e =
XMLUtils.selectDs11Node(
getFirstChild(), Constants._TAG_KEYINFOREFERENCE, i);
if (e != null) {
return new KeyInfoReference(e, this.baseURI);
- }
- return null;
+ }
+ return null;
}
/**
@@ -793,7 +793,7 @@ public class KeyInfo extends SignatureEl
public boolean containsX509Data() {
return this.lengthX509Data() > 0;
}
-
+
/**
* Method containsDEREncodedKeyValue
*
@@ -811,7 +811,7 @@ public class KeyInfo extends SignatureEl
public boolean containsKeyInfoReference() {
return this.lengthKeyInfoReference() > 0;
}
-
+
/**
* This method returns the public key.
*
@@ -861,7 +861,7 @@ public class KeyInfo extends SignatureEl
keyResolver.setSecureValidation(secureValidation);
Node currentChild = getFirstChild();
String uri = this.getBaseURI();
- while (currentChild != null) {
+ while (currentChild != null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
for (StorageResolver storage : storageResolvers) {
PublicKey pk =
@@ -871,11 +871,11 @@ public class KeyInfo extends SignatureEl
if (pk != null) {
return pk;
- }
- }
+ }
+ }
}
currentChild = currentChild.getNextSibling();
- }
+ }
}
return null;
}
@@ -894,18 +894,18 @@ public class KeyInfo extends SignatureEl
keyResolver.setSecureValidation(secureValidation);
Node currentChild = getFirstChild();
String uri = this.getBaseURI();
- while (currentChild != null) {
- if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
+ while (currentChild != null) {
+ if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
for (StorageResolver storage : storageResolvers) {
- PublicKey pk =
+ PublicKey pk =
keyResolver.engineLookupAndResolvePublicKey(
(Element) currentChild, uri, storage
);
if (pk != null) {
return pk;
- }
- }
+ }
+ }
}
currentChild = currentChild.getNextSibling();
}
@@ -944,7 +944,7 @@ public class KeyInfo extends SignatureEl
}
return cert;
- }
+ }
if (log.isDebugEnabled()) {
log.debug("I couldn't find a X509Certificate using the system-wide key resolvers");
}
@@ -964,7 +964,7 @@ public class KeyInfo extends SignatureEl
throws KeyResolverException {
if (log.isDebugEnabled()) {
log.debug(
- "Start getX509CertificateFromStaticResolvers() with " + KeyResolver.length()
+ "Start getX509CertificateFromStaticResolvers() with " + KeyResolver.length()
+ " resolvers"
);
}
@@ -985,18 +985,18 @@ public class KeyInfo extends SignatureEl
String uri, KeyResolverSpi keyResolver
) throws KeyResolverException {
Node currentChild = getFirstChild();
- while (currentChild != null) {
+ while (currentChild != null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
for (StorageResolver storage : storageResolvers) {
- X509Certificate cert =
+ X509Certificate cert =
keyResolver.engineLookupResolveX509Certificate(
(Element) currentChild, uri, storage
);
- if (cert != null) {
+ if (cert != null) {
return cert;
- }
- }
+ }
+ }
}
currentChild = currentChild.getNextSibling();
}
@@ -1013,7 +1013,7 @@ public class KeyInfo extends SignatureEl
throws KeyResolverException {
if (log.isDebugEnabled()) {
log.debug(
- "Start getX509CertificateFromInternalResolvers() with "
+ "Start getX509CertificateFromInternalResolvers() with "
+ this.lengthInternalKeyResolver() + " resolvers"
);
}
@@ -1026,7 +1026,7 @@ public class KeyInfo extends SignatureEl
X509Certificate cert = applyCurrentResolver(uri, keyResolver);
if (cert != null) {
return cert;
- }
+ }
}
return null;
@@ -1081,7 +1081,7 @@ public class KeyInfo extends SignatureEl
Node currentChild = getFirstChild();
String uri = this.getBaseURI();
- while (currentChild != null) {
+ while (currentChild != null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
for (StorageResolver storage : storageResolvers) {
SecretKey sk =
@@ -1091,8 +1091,8 @@ public class KeyInfo extends SignatureEl
if (sk != null) {
return sk;
- }
- }
+ }
+ }
}
currentChild = currentChild.getNextSibling();
}
@@ -1115,19 +1115,19 @@ public class KeyInfo extends SignatureEl
keyResolver.setSecureValidation(secureValidation);
Node currentChild = getFirstChild();
String uri = this.getBaseURI();
- while (currentChild != null) {
+ while (currentChild != null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
for (StorageResolver storage : storageResolvers) {
- SecretKey sk =
+ SecretKey sk =
keyResolver.engineLookupAndResolveSecretKey(
(Element) currentChild, uri, storage
);
if (sk != null) {
return sk;
- }
+ }
}
- }
+ }
currentChild = currentChild.getNextSibling();
}
}
@@ -1181,18 +1181,18 @@ public class KeyInfo extends SignatureEl
Node currentChild = getFirstChild();
String uri = this.getBaseURI();
- while (currentChild != null) {
+ while (currentChild != null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
// not using StorageResolvers at the moment
// since they cannot return private keys
- PrivateKey pk =
+ PrivateKey pk =
keyResolver.engineLookupAndResolvePrivateKey(
(Element) currentChild, uri, null
);
if (pk != null) {
return pk;
- }
+ }
}
currentChild = currentChild.getNextSibling();
}
@@ -1214,19 +1214,19 @@ public class KeyInfo extends SignatureEl
keyResolver.setSecureValidation(secureValidation);
Node currentChild = getFirstChild();
String uri = this.getBaseURI();
- while (currentChild != null) {
+ while (currentChild != null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
// not using StorageResolvers at the moment
// since they cannot return private keys
- PrivateKey pk =
+ PrivateKey pk =
keyResolver.engineLookupAndResolvePrivateKey(
(Element) currentChild, uri, null
);
if (pk != null) {
return pk;
- }
- }
+ }
+ }
currentChild = currentChild.getNextSibling();
}
}
@@ -1271,7 +1271,7 @@ public class KeyInfo extends SignatureEl
if (storageResolvers == nullList) {
// Replace the default null StorageResolver
storageResolvers = new ArrayList<StorageResolver>();
- }
+ }
this.storageResolvers.add(storageResolver);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyUtils.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyUtils.java Tue Dec 15 17:13:17 2015
@@ -72,7 +72,7 @@ public final class KeyUtils {
X509Data x = ki.itemX509Data(i);
os.println("X509Data(" + i + ")=\"" + (x.containsCertificate()
- ? "Certificate " : "") + (x.containsIssuerSerial()
+ ? "Certificate " : "") + (x.containsIssuerSerial()
? "IssuerSerial " : "") + "\"");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java Tue Dec 15 17:13:17 2015
@@ -32,7 +32,7 @@ import org.w3c.dom.Element;
/**
* Provides content model support for the <code>dsig11:DEREncodedKeyvalue</code> element.
- *
+ *
* @author Brent Putman (putmanb@georgetown.edu)
*/
public class DEREncodedKeyValue extends Signature11ElementProxy implements KeyInfoContent {
@@ -68,7 +68,7 @@ public class DEREncodedKeyValue extends
* Constructor DEREncodedKeyValue
*
* @param doc
- * @param encodedKey
+ * @param encodedKey
*/
public DEREncodedKeyValue(Document doc, byte[] encodedKey) {
super(doc);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/KeyInfoReference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/KeyInfoReference.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/KeyInfoReference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/KeyInfoReference.java Tue Dec 15 17:13:17 2015
@@ -27,7 +27,7 @@ import org.w3c.dom.Element;
/**
* Provides content model support for the <code>dsig11:KeyInfoReference</code> element.
- *
+ *
* @author Brent Putman (putmanb@georgetown.edu)
*/
public class KeyInfoReference extends Signature11ElementProxy implements KeyInfoContent {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/KeyValue.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/KeyValue.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/KeyValue.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/KeyValue.java Tue Dec 15 17:13:17 2015
@@ -34,7 +34,7 @@ import org.w3c.dom.Element;
* validating the signature. Structured formats for defining DSA (REQUIRED)
* and RSA (RECOMMENDED) public keys are defined in Signature Algorithms
* (section 6.4). The KeyValue element may include externally defined public
- * keys values represented as PCDATA or element types from an external
+ * keys values represented as PCDATA or element types from an external
* namespace.
*
* @author $Author$
@@ -125,7 +125,7 @@ public class KeyValue extends SignatureE
* @throws XMLSecurityException
*/
public PublicKey getPublicKey() throws XMLSecurityException {
- Element rsa =
+ Element rsa =
XMLUtils.selectDsNode(
getFirstChild(), Constants._TAG_RSAKEYVALUE, 0);
@@ -134,7 +134,7 @@ public class KeyValue extends SignatureE
return kv.getPublicKey();
}
- Element dsa =
+ Element dsa =
XMLUtils.selectDsNode(
getFirstChild(), Constants._TAG_DSAKEYVALUE, 0);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/X509Data.java Tue Dec 15 17:13:17 2015
@@ -60,7 +60,7 @@ public class X509Data extends SignatureE
*/
public X509Data(Element element, String baseURI) throws XMLSecurityException {
super(element, baseURI);
-
+
Node sibling = getFirstChild();
while (sibling != null && sibling.getNodeType() != Node.ELEMENT_NODE) {
sibling = sibling.getNextSibling();
@@ -241,7 +241,7 @@ public class X509Data extends SignatureE
public void addDigest(byte[] x509CertificateDigestBytes, String algorithmURI) {
this.add(new XMLX509Digest(getDocument(), x509CertificateDigestBytes, algorithmURI));
}
-
+
/**
* Method add
*
@@ -324,7 +324,7 @@ public class X509Data extends SignatureE
public int lengthUnknownElement() {
int result = 0;
Node n = getFirstChild();
- while (n != null) {
+ while (n != null) {
if (n.getNodeType() == Node.ELEMENT_NODE
&& !n.getNamespaceURI().equals(Constants.SignatureSpecNS)) {
result++;
@@ -349,7 +349,7 @@ public class X509Data extends SignatureE
if (e != null) {
return new XMLX509IssuerSerial(e, this.baseURI);
- }
+ }
return null;
}
@@ -362,7 +362,7 @@ public class X509Data extends SignatureE
*/
public XMLX509SKI itemSKI(int i) throws XMLSecurityException {
- Element e =
+ Element e =
XMLUtils.selectDsNode(
getFirstChild(), Constants._TAG_X509SKI, i);
@@ -381,13 +381,13 @@ public class X509Data extends SignatureE
*/
public XMLX509SubjectName itemSubjectName(int i) throws XMLSecurityException {
- Element e =
+ Element e =
XMLUtils.selectDsNode(
getFirstChild(), Constants._TAG_X509SUBJECTNAME, i);
if (e != null) {
return new XMLX509SubjectName(e, this.baseURI);
- }
+ }
return null;
}
@@ -400,13 +400,13 @@ public class X509Data extends SignatureE
*/
public XMLX509Certificate itemCertificate(int i) throws XMLSecurityException {
- Element e =
+ Element e =
XMLUtils.selectDsNode(
getFirstChild(), Constants._TAG_X509CERTIFICATE, i);
if (e != null) {
return new XMLX509Certificate(e, this.baseURI);
- }
+ }
return null;
}
@@ -419,13 +419,13 @@ public class X509Data extends SignatureE
*/
public XMLX509CRL itemCRL(int i) throws XMLSecurityException {
- Element e =
+ Element e =
XMLUtils.selectDsNode(
getFirstChild(), Constants._TAG_X509CRL, i);
if (e != null) {
return new XMLX509CRL(e, this.baseURI);
- }
+ }
return null;
}
@@ -438,13 +438,13 @@ public class X509Data extends SignatureE
*/
public XMLX509Digest itemDigest(int i) throws XMLSecurityException {
- Element e =
+ Element e =
XMLUtils.selectDs11Node(
getFirstChild(), Constants._TAG_X509DIGEST, i);
if (e != null) {
return new XMLX509Digest(e, this.baseURI);
- }
+ }
return null;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java Tue Dec 15 17:13:17 2015
@@ -99,13 +99,13 @@ public class DSAKeyValue extends Signatu
new DSAPublicKeySpec(
this.getBigIntegerFromChildElement(
Constants._TAG_Y, Constants.SignatureSpecNS
- ),
+ ),
this.getBigIntegerFromChildElement(
Constants._TAG_P, Constants.SignatureSpecNS
- ),
+ ),
this.getBigIntegerFromChildElement(
Constants._TAG_Q, Constants.SignatureSpecNS
- ),
+ ),
this.getBigIntegerFromChildElement(
Constants._TAG_G, Constants.SignatureSpecNS
)
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java Tue Dec 15 17:13:17 2015
@@ -97,7 +97,7 @@ public class RSAKeyValue extends Signatu
new RSAPublicKeySpec(
this.getBigIntegerFromChildElement(
Constants._TAG_MODULUS, Constants.SignatureSpecNS
- ),
+ ),
this.getBigIntegerFromChildElement(
Constants._TAG_EXPONENT, Constants.SignatureSpecNS
)
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Digest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Digest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Digest.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Digest.java Tue Dec 15 17:13:17 2015
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
/**
* Provides content model support for the <code>dsig11:X509Digest</code> element.
- *
+ *
* @author Brent Putman (putmanb@georgetown.edu)
*/
public class XMLX509Digest extends Signature11ElementProxy implements XMLX509DataContent {
@@ -46,7 +46,7 @@ public class XMLX509Digest extends Signa
public XMLX509Digest(Element element, String baseURI) throws XMLSecurityException {
super(element, baseURI);
}
-
+
/**
* Constructor XMLX509Digest
*
@@ -73,7 +73,7 @@ public class XMLX509Digest extends Signa
this.addBase64Text(getDigestBytesFromCert(x509certificate, algorithmURI));
setLocalAttribute(Constants._ATT_ALGORITHM, algorithmURI);
}
-
+
/**
* Method getAlgorithmAttr
*
@@ -117,7 +117,7 @@ public class XMLX509Digest extends Signa
Object exArgs[] = { algorithmURI };
throw new XMLSecurityException("XMLX509Digest.UnknownDigestAlgorithm", exArgs);
}
-
+
try {
MessageDigest md = MessageDigest.getInstance(jcaDigestAlgorithm);
return md.digest(cert.getEncoded());
@@ -125,7 +125,7 @@ public class XMLX509Digest extends Signa
Object exArgs[] = { jcaDigestAlgorithm };
throw new XMLSecurityException("XMLX509Digest.FailedDigest", exArgs);
}
-
+
}
/** @inheritDoc */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java Tue Dec 15 17:13:17 2015
@@ -100,7 +100,7 @@ public class XMLX509IssuerSerial extends
* @return the serial number
*/
public BigInteger getSerialNumber() {
- String text =
+ String text =
this.getTextFromChildElement(Constants._TAG_X509SERIALNUMBER, Constants.SignatureSpecNS);
if (log.isDebugEnabled()) {
log.debug("X509SerialNumber text: " + text);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java Tue Dec 15 17:13:17 2015
@@ -113,9 +113,9 @@ public class XMLX509SKI extends Signatur
}
/*
- * Gets the DER-encoded OCTET string for the extension value
- * (extnValue) identified by the passed-in oid String. The oid
- * string is represented by a set of positive whole numbers
+ * Gets the DER-encoded OCTET string for the extension value
+ * (extnValue) identified by the passed-in oid String. The oid
+ * string is represented by a set of positive whole numbers
* separated by periods.
*/
byte[] extensionValue = cert.getExtensionValue(XMLX509SKI.SKI_OID);
@@ -124,7 +124,7 @@ public class XMLX509SKI extends Signatur
}
/**
- * Strip away first four bytes from the extensionValue
+ * Strip away first four bytes from the extensionValue
* The first two bytes are the tag and length of the extensionValue
* OCTET STRING, and the next two bytes are the tag and length of
* the ski OCTET STRING.
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/InvalidKeyResolverException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/InvalidKeyResolverException.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/InvalidKeyResolverException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/InvalidKeyResolverException.java Tue Dec 15 17:13:17 2015
@@ -23,7 +23,7 @@ import org.apache.xml.security.exception
public class InvalidKeyResolverException extends XMLSecurityException {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java Tue Dec 15 17:13:17 2015
@@ -57,10 +57,10 @@ public class KeyResolver {
/** Field resolverSpi */
private final KeyResolverSpi resolverSpi;
-
+
/**
* Constructor.
- *
+ *
* @param keyResolverSpi a KeyResolverSpi instance
*/
private KeyResolver(KeyResolverSpi keyResolverSpi) {
@@ -83,7 +83,7 @@ public class KeyResolver {
* @param baseURI
* @param storage
* @return The certificate represented by the element.
- *
+ *
* @throws KeyResolverException
*/
public static final X509Certificate getX509Certificate(
@@ -124,7 +124,7 @@ public class KeyResolver {
* @param baseURI
* @param storage
* @return the public key contained in the element
- *
+ *
* @throws KeyResolverException
*/
public static final PublicKey getPublicKey(
@@ -162,20 +162,20 @@ public class KeyResolver {
* This method is used for registering {@link KeyResolverSpi}s which are
* available to <I>all</I> {@link org.apache.xml.security.keys.KeyInfo} objects. This means that
* personalized {@link KeyResolverSpi}s should only be registered directly
- * to the {@link org.apache.xml.security.keys.KeyInfo} using
+ * to the {@link org.apache.xml.security.keys.KeyInfo} using
* {@link org.apache.xml.security.keys.KeyInfo#registerInternalKeyResolver}.
- * Please note that this method will create a new copy of the underlying array, as the
+ * Please note that this method will create a new copy of the underlying array, as the
* underlying collection is a CopyOnWriteArrayList.
*
* @param className
* @param globalResolver Whether the KeyResolverSpi is a global resolver or not
- * @throws InstantiationException
- * @throws IllegalAccessException
- * @throws ClassNotFoundException
+ * @throws InstantiationException
+ * @throws IllegalAccessException
+ * @throws ClassNotFoundException
* @throws SecurityException if a security manager is installed and the
* caller does not have permission to register the key resolver
*/
- public static void register(String className, boolean globalResolver)
+ public static void register(String className, boolean globalResolver)
throws ClassNotFoundException, IllegalAccessException, InstantiationException {
JavaUtils.checkRegisterPermission();
KeyResolverSpi keyResolverSpi =
@@ -188,9 +188,9 @@ public class KeyResolver {
* This method is used for registering {@link KeyResolverSpi}s which are
* available to <I>all</I> {@link org.apache.xml.security.keys.KeyInfo} objects. This means that
* personalized {@link KeyResolverSpi}s should only be registered directly
- * to the {@link org.apache.xml.security.keys.KeyInfo} using
+ * to the {@link org.apache.xml.security.keys.KeyInfo} using
* {@link org.apache.xml.security.keys.KeyInfo#registerInternalKeyResolver}.
- * Please note that this method will create a new copy of the underlying array, as the
+ * Please note that this method will create a new copy of the underlying array, as the
* underlying collection is a CopyOnWriteArrayList.
*
* @param className
@@ -219,14 +219,14 @@ public class KeyResolver {
IllegalArgumentException("Invalid KeyResolver class name").initCause(ex);
}
}
-
+
/**
* This method is used for registering {@link KeyResolverSpi}s which are
* available to <I>all</I> {@link org.apache.xml.security.keys.KeyInfo} objects. This means that
* personalized {@link KeyResolverSpi}s should only be registered directly
- * to the {@link org.apache.xml.security.keys.KeyInfo} using
+ * to the {@link org.apache.xml.security.keys.KeyInfo} using
* {@link org.apache.xml.security.keys.KeyInfo#registerInternalKeyResolver}.
- * Please note that this method will create a new copy of the underlying array, as the
+ * Please note that this method will create a new copy of the underlying array, as the
* underlying collection is a CopyOnWriteArrayList.
*
* @param keyResolverSpi a KeyResolverSpi instance to register
@@ -235,7 +235,7 @@ public class KeyResolver {
* caller does not have permission to register the key resolver
*/
public static void register(
- KeyResolverSpi keyResolverSpi,
+ KeyResolverSpi keyResolverSpi,
boolean start
) {
JavaUtils.checkRegisterPermission();
@@ -246,24 +246,24 @@ public class KeyResolver {
resolverVector.add(resolver);
}
}
-
+
/**
* This method is used for registering {@link KeyResolverSpi}s which are
* available to <I>all</I> {@link org.apache.xml.security.keys.KeyInfo} objects. This means that
* personalized {@link KeyResolverSpi}s should only be registered directly
- * to the {@link org.apache.xml.security.keys.KeyInfo} using
+ * to the {@link org.apache.xml.security.keys.KeyInfo} using
* {@link org.apache.xml.security.keys.KeyInfo#registerInternalKeyResolver}.
* The KeyResolverSpi instances are not registered as a global resolver.
- *
+ *
*
* @param classNames
- * @throws InstantiationException
- * @throws IllegalAccessException
- * @throws ClassNotFoundException
+ * @throws InstantiationException
+ * @throws IllegalAccessException
+ * @throws ClassNotFoundException
* @throws SecurityException if a security manager is installed and the
* caller does not have permission to register the key resolver
*/
- public static void registerClassNames(List<String> classNames)
+ public static void registerClassNames(List<String> classNames)
throws ClassNotFoundException, IllegalAccessException, InstantiationException {
JavaUtils.checkRegisterPermission();
List<KeyResolver> keyResolverList = new ArrayList<KeyResolver>(classNames.size());
@@ -275,12 +275,12 @@ public class KeyResolver {
}
resolverVector.addAll(keyResolverList);
}
-
+
/**
* This method registers the default resolvers.
*/
public static void registerDefaultResolvers() {
-
+
List<KeyResolver> keyResolverList = new ArrayList<KeyResolver>();
keyResolverList.add(new KeyResolver(new RSAKeyValueResolver()));
keyResolverList.add(new KeyResolver(new DSAKeyValueResolver()));
@@ -292,7 +292,7 @@ public class KeyResolver {
keyResolverList.add(new KeyResolver(new DEREncodedKeyValueResolver()));
keyResolverList.add(new KeyResolver(new KeyInfoReferenceResolver()));
keyResolverList.add(new KeyResolver(new X509DigestResolver()));
-
+
resolverVector.addAll(keyResolverList);
}
@@ -301,9 +301,9 @@ public class KeyResolver {
*
* @param element
* @param baseURI
- * @param storage
+ * @param storage
* @return resolved public key from the registered from the elements
- *
+ *
* @throws KeyResolverException
*/
public PublicKey resolvePublicKey(
@@ -319,7 +319,7 @@ public class KeyResolver {
* @param baseURI
* @param storage
* @return resolved X509certificate key from the registered from the elements
- *
+ *
* @throws KeyResolverException
*/
public X509Certificate resolveX509Certificate(
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverException.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverException.java Tue Dec 15 17:13:17 2015
@@ -23,7 +23,7 @@ import org.apache.xml.security.exception
public class KeyResolverException extends XMLSecurityException {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
@@ -34,7 +34,7 @@ public class KeyResolverException extend
public KeyResolverException() {
super();
}
-
+
public KeyResolverException(Exception ex) {
super(ex);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java Tue Dec 15 17:13:17 2015
@@ -46,21 +46,21 @@ import org.xml.sax.SAXException;
* </PRE>
*/
public abstract class KeyResolverSpi {
-
+
/** Field properties */
protected java.util.Map<String, String> properties = null;
protected boolean globalResolver = false;
-
+
protected boolean secureValidation;
-
+
/**
* Set whether secure validation is enabled or not. The default is false.
*/
public void setSecureValidation(boolean secureValidation) {
this.secureValidation = secureValidation;
}
-
+
/**
* This method returns whether the KeyResolverSpi is able to perform the requested action.
*
@@ -80,7 +80,7 @@ public abstract class KeyResolverSpi {
* @param baseURI
* @param storage
* @return resolved public key from the registered from the element.
- *
+ *
* @throws KeyResolverException
*/
public PublicKey engineResolvePublicKey(
@@ -96,7 +96,7 @@ public abstract class KeyResolverSpi {
* @param baseURI
* @param storage
* @return resolved public key from the registered from the element.
- *
+ *
* @throws KeyResolverException
*/
public PublicKey engineLookupAndResolvePublicKey(
@@ -110,10 +110,10 @@ public abstract class KeyResolverSpi {
}
private KeyResolverSpi cloneIfNeeded() throws KeyResolverException {
- KeyResolverSpi tmp = this;
+ KeyResolverSpi tmp = this;
if (globalResolver) {
try {
- tmp = getClass().newInstance();
+ tmp = getClass().newInstance();
} catch (InstantiationException e) {
throw new KeyResolverException(e, "");
} catch (IllegalAccessException e) {
@@ -222,7 +222,7 @@ public abstract class KeyResolverSpi {
* @param key
* @param value
*/
- public void engineSetProperty(String key, String value) {
+ public void engineSetProperty(String key, String value) {
if (properties == null) {
properties = new HashMap<String, String>();
}
@@ -256,17 +256,17 @@ public abstract class KeyResolverSpi {
return properties.get(propertyToTest) != null;
}
-
+
public void setGlobalResolver(boolean globalResolver) {
this.globalResolver = globalResolver;
}
-
+
/**
* Parses a byte array and returns the parsed Element.
*
* @param bytes
- * @return the Document Element after parsing bytes
+ * @return the Document Element after parsing bytes
* @throws KeyResolverException if something goes wrong
*/
protected static Element getDocFromBytes(byte[] bytes, boolean secureValidation) throws KeyResolverException {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java Tue Dec 15 17:13:17 2015
@@ -34,9 +34,9 @@ import org.apache.xml.security.utils.XML
import org.w3c.dom.Element;
/**
- * KeyResolverSpi implementation which resolves public keys from a
+ * KeyResolverSpi implementation which resolves public keys from a
* <code>dsig11:DEREncodedKeyValue</code> element.
- *
+ *
* @author Brent Putman (putmanb@georgetown.edu)
*/
public class DEREncodedKeyValueResolver extends KeyResolverSpi {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java Tue Dec 15 17:13:17 2015
@@ -30,7 +30,7 @@ import org.apache.xml.security.utils.XML
import org.w3c.dom.Element;
public class DSAKeyValueResolver extends KeyResolverSpi {
-
+
private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(DSAKeyValueResolver.class);
@@ -50,16 +50,16 @@ public class DSAKeyValueResolver extends
return null;
}
Element dsaKeyElement = null;
- boolean isKeyValue =
+ boolean isKeyValue =
XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_KEYVALUE);
- if (isKeyValue) {
+ if (isKeyValue) {
dsaKeyElement =
- XMLUtils.selectDsNode(element.getFirstChild(), Constants._TAG_DSAKEYVALUE, 0);
+ XMLUtils.selectDsNode(element.getFirstChild(), Constants._TAG_DSAKEYVALUE, 0);
} else if (XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_DSAKEYVALUE)) {
// this trick is needed to allow the RetrievalMethodResolver to eat a
// ds:DSAKeyValue directly (without KeyValue)
dsaKeyElement = element;
- }
+ }
if (dsaKeyElement == null) {
return null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java Tue Dec 15 17:13:17 2015
@@ -36,13 +36,13 @@ import org.apache.xml.security.utils.XML
import org.w3c.dom.Element;
/**
- * The <code>EncryptedKeyResolver</code> is not a generic resolver. It can
- * only be for specific instantiations, as the key being unwrapped will
- * always be of a particular type and will always have been wrapped by
+ * The <code>EncryptedKeyResolver</code> is not a generic resolver. It can
+ * only be for specific instantiations, as the key being unwrapped will
+ * always be of a particular type and will always have been wrapped by
* another key which needs to be recursively resolved.
*
* The <code>EncryptedKeyResolver</code> can therefore only be instantiated
- * with an algorithm. It can also be instantiated with a key (the KEK) or
+ * with an algorithm. It can also be instantiated with a key (the KEK) or
* will search the static KeyResolvers to find the appropriate key.
*
* @author Berin Lautenbach
@@ -116,7 +116,7 @@ public class EncryptedKeyResolver extend
}
SecretKey key = null;
- boolean isEncryptedKey =
+ boolean isEncryptedKey =
XMLUtils.elementIsInEncryptionSpace(element, EncryptionConstants._TAG_ENCRYPTEDKEY);
if (isEncryptedKey) {
if (log.isDebugEnabled()) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java Tue Dec 15 17:13:17 2015
@@ -43,9 +43,9 @@ import org.w3c.dom.Element;
import org.xml.sax.SAXException;
/**
- * KeyResolverSpi implementation which resolves public keys, private keys, secret keys, and X.509 certificates from a
+ * KeyResolverSpi implementation which resolves public keys, private keys, secret keys, and X.509 certificates from a
* <code>dsig11:KeyInfoReference</code> element.
- *
+ *
* @author Brent Putman (putmanb@georgetown.edu)
*/
public class KeyInfoReferenceResolver extends KeyResolverSpi {
@@ -164,7 +164,7 @@ public class KeyInfoReferenceResolver ex
/**
* Resolve the KeyInfoReference Element's URI attribute into a KeyInfo instance.
- *
+ *
* @param element
* @param baseURI
* @param storage
@@ -203,9 +203,9 @@ public class KeyInfoReferenceResolver ex
/**
* Validate the Element referred to by the KeyInfoReference.
- *
+ *
* @param referentElement
- *
+ *
* @throws XMLSecurityException
*/
private void validateReference(Element referentElement) throws XMLSecurityException {
@@ -230,12 +230,12 @@ public class KeyInfoReferenceResolver ex
/**
* Resolve the XML signature input represented by the specified URI.
- *
+ *
* @param uri
* @param baseURI
* @param secureValidation
- * @return the XML signature input represented by the specified URI.
- * @throws XMLSecurityException
+ * @return the XML signature input represented by the specified URI.
+ * @throws XMLSecurityException
*/
private XMLSignatureInput resolveInput(Attr uri, String baseURI, boolean secureValidation)
throws XMLSecurityException {
@@ -245,7 +245,7 @@ public class KeyInfoReferenceResolver ex
/**
* Resolve the Element effectively represented by the XML signature input source.
- *
+ *
* @param resource
* @return the Element effectively represented by the XML signature input source.
* @throws CanonicalizationException
@@ -254,8 +254,8 @@ public class KeyInfoReferenceResolver ex
* @throws SAXException
* @throws KeyResolverException
*/
- private Element obtainReferenceElement(XMLSignatureInput resource)
- throws CanonicalizationException, ParserConfigurationException,
+ private Element obtainReferenceElement(XMLSignatureInput resource)
+ throws CanonicalizationException, ParserConfigurationException,
IOException, SAXException, KeyResolverException {
Element e;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java Tue Dec 15 17:13:17 2015
@@ -56,7 +56,7 @@ public class PrivateKeyResolver extends
private char[] password;
/**
- * Constructor.
+ * Constructor.
*/
public PrivateKeyResolver(KeyStore keyStore, char[] password) {
this.keyStore = keyStore;
@@ -72,7 +72,7 @@ public class PrivateKeyResolver extends
* @return whether the KeyResolverSpi is able to perform the requested action.
*/
public boolean engineCanResolve(Element element, String baseURI, StorageResolver storage) {
- if (XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_X509DATA)
+ if (XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_X509DATA)
|| XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_KEYNAME)) {
return true;
}
@@ -262,7 +262,7 @@ public class PrivateKeyResolver extends
Certificate cert = keyStore.getCertificate(alias);
if (cert instanceof X509Certificate) {
- XMLX509IssuerSerial certSerial =
+ XMLX509IssuerSerial certSerial =
new XMLX509IssuerSerial(x509Serial.getDocument(), (X509Certificate) cert);
if (certSerial.equals(x509Serial)) {
@@ -298,7 +298,7 @@ public class PrivateKeyResolver extends
Certificate cert = keyStore.getCertificate(alias);
if (cert instanceof X509Certificate) {
- XMLX509SubjectName certSN =
+ XMLX509SubjectName certSN =
new XMLX509SubjectName(x509SubjectName.getDocument(), (X509Certificate) cert);
if (certSN.equals(x509SubjectName)) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java Tue Dec 15 17:13:17 2015
@@ -49,17 +49,17 @@ public class RSAKeyValueResolver extends
boolean isKeyValue = XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_KEYVALUE);
Element rsaKeyElement = null;
- if (isKeyValue) {
- rsaKeyElement =
+ if (isKeyValue) {
+ rsaKeyElement =
XMLUtils.selectDsNode(element.getFirstChild(), Constants._TAG_RSAKEYVALUE, 0);
} else if (XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_RSAKEYVALUE)) {
// this trick is needed to allow the RetrievalMethodResolver to eat a
// ds:RSAKeyValue directly (without KeyValue)
- rsaKeyElement = element;
+ rsaKeyElement = element;
}
if (rsaKeyElement == null) {
- return null;
+ return null;
}
try {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java Tue Dec 15 17:13:17 2015
@@ -76,14 +76,14 @@ public class RetrievalMethodResolver ext
public PublicKey engineLookupAndResolvePublicKey(
Element element, String baseURI, StorageResolver storage
) {
- if (!XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_RETRIEVALMETHOD)) {
+ if (!XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_RETRIEVALMETHOD)) {
return null;
}
try {
// Create a retrieval method over the given element
RetrievalMethod rm = new RetrievalMethod(element, baseURI);
- String type = rm.getType();
+ String type = rm.getType();
XMLSignatureInput resource = resolveInput(rm, baseURI, secureValidation);
if (RetrievalMethod.TYPE_RAWX509.equals(type)) {
// a raw certificate, direct parsing is done!
@@ -116,7 +116,7 @@ public class RetrievalMethodResolver ext
return null;
}
}
-
+
return resolveKey(e, baseURI, storage);
} catch (XMLSecurityException ex) {
if (log.isDebugEnabled()) {
@@ -138,7 +138,7 @@ public class RetrievalMethodResolver ext
if (log.isDebugEnabled()) {
log.debug("SAXException", e);
}
- }
+ }
return null;
}
@@ -151,18 +151,18 @@ public class RetrievalMethodResolver ext
*/
public X509Certificate engineLookupResolveX509Certificate(
Element element, String baseURI, StorageResolver storage) {
- if (!XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_RETRIEVALMETHOD)) {
+ if (!XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_RETRIEVALMETHOD)) {
return null;
}
try {
RetrievalMethod rm = new RetrievalMethod(element, baseURI);
- String type = rm.getType();
+ String type = rm.getType();
XMLSignatureInput resource = resolveInput(rm, baseURI, secureValidation);
if (RetrievalMethod.TYPE_RAWX509.equals(type)) {
return getRawCertificate(resource);
}
-
+
Element e = obtainReferenceElement(resource, secureValidation);
// Check to make sure that the reference is not to another RetrievalMethod
@@ -186,7 +186,7 @@ public class RetrievalMethodResolver ext
return null;
}
}
-
+
return resolveCertificate(e, baseURI, storage);
} catch (XMLSecurityException ex) {
if (log.isDebugEnabled()) {
@@ -208,17 +208,17 @@ public class RetrievalMethodResolver ext
if (log.isDebugEnabled()) {
log.debug("SAXException", e);
}
- }
+ }
return null;
}
-
+
/**
* Retrieves a x509Certificate from the given information
* @param e
* @param baseURI
* @param storage
* @return a x509Certificate from the given information
- * @throws KeyResolverException
+ * @throws KeyResolverException
*/
private static X509Certificate resolveCertificate(
Element e, String baseURI, StorageResolver storage
@@ -228,19 +228,19 @@ public class RetrievalMethodResolver ext
+ e.getLocalName() + " Element");
}
// An element has been provided
- if (e != null) {
+ if (e != null) {
return KeyResolver.getX509Certificate(e, baseURI, storage);
}
return null;
- }
-
+ }
+
/**
* Retrieves a PublicKey from the given information
* @param e
* @param baseURI
* @param storage
* @return a PublicKey from the given information
- * @throws KeyResolverException
+ * @throws KeyResolverException
*/
private static PublicKey resolveKey(
Element e, String baseURI, StorageResolver storage
@@ -250,14 +250,14 @@ public class RetrievalMethodResolver ext
+ e.getLocalName() + " Element");
}
// An element has been provided
- if (e != null) {
+ if (e != null) {
return KeyResolver.getPublicKey(e, baseURI, storage);
}
return null;
}
-
- private static Element obtainReferenceElement(XMLSignatureInput resource, boolean secureValidation)
- throws CanonicalizationException, ParserConfigurationException,
+
+ private static Element obtainReferenceElement(XMLSignatureInput resource, boolean secureValidation)
+ throws CanonicalizationException, ParserConfigurationException,
IOException, SAXException, KeyResolverException {
Element e;
if (resource.isElement()){
@@ -279,19 +279,19 @@ public class RetrievalMethodResolver ext
private static X509Certificate getRawCertificate(XMLSignatureInput resource)
throws CanonicalizationException, IOException, CertificateException {
- byte inputBytes[] = resource.getBytes();
+ byte inputBytes[] = resource.getBytes();
// if the resource stores a raw certificate, we have to handle it
- CertificateFactory certFact =
+ CertificateFactory certFact =
CertificateFactory.getInstance(XMLX509Certificate.JCA_CERT_ID);
- X509Certificate cert = (X509Certificate)
+ X509Certificate cert = (X509Certificate)
certFact.generateCertificate(new ByteArrayInputStream(inputBytes));
return cert;
}
/**
- * Resolves the input from the given retrieval method
+ * Resolves the input from the given retrieval method
* @return the input from the given retrieval method
- * @throws XMLSecurityException
+ * @throws XMLSecurityException
*/
private static XMLSignatureInput resolveInput(
RetrievalMethod rm, String baseURI, boolean secureValidation
@@ -306,7 +306,7 @@ public class RetrievalMethodResolver ext
log.debug("We have Transforms");
}
resource = transforms.performTransforms(resource);
- }
+ }
return resource;
}
@@ -322,7 +322,7 @@ public class RetrievalMethodResolver ext
) {
return null;
}
-
+
private static Element getDocumentElement(Set<Node> set) {
Iterator<Node> it = set.iterator();
Element e = null;
@@ -334,7 +334,7 @@ public class RetrievalMethodResolver ext
}
}
List<Node> parents = new ArrayList<Node>();
-
+
// Obtain all the parents of the elemnt
while (e != null) {
parents.add(e);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java Tue Dec 15 17:13:17 2015
@@ -44,7 +44,7 @@ public class SecretKeyResolver extends K
private char[] password;
/**
- * Constructor.
+ * Constructor.
*/
public SecretKeyResolver(KeyStore keyStore, char[] password) {
this.keyStore = keyStore;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java Tue Dec 15 17:13:17 2015
@@ -99,7 +99,7 @@ public class SingleKeyResolver extends K
log.debug("Can I resolve " + element.getTagName() + "?");
}
- if (publicKey != null
+ if (publicKey != null
&& XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_KEYNAME)) {
String name = element.getFirstChild().getNodeValue();
if (keyName.equals(name)) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java Tue Dec 15 17:13:17 2015
@@ -54,7 +54,7 @@ public class X509CertificateResolver ext
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
- X509Certificate cert =
+ X509Certificate cert =
this.engineLookupResolveX509Certificate(element, baseURI, storage);
if (cert != null) {
@@ -78,15 +78,15 @@ public class X509CertificateResolver ext
) throws KeyResolverException {
try {
- Element[] els =
+ Element[] els =
XMLUtils.selectDsNodes(element.getFirstChild(), Constants._TAG_X509CERTIFICATE);
- if (els == null || els.length == 0) {
+ if (els == null || els.length == 0) {
Element el =
XMLUtils.selectDsNode(element.getFirstChild(), Constants._TAG_X509DATA, 0);
if (el != null) {
return engineLookupResolveX509Certificate(el, baseURI, storage);
- }
- return null;
+ }
+ return null;
}
// populate Object array
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509DigestResolver.java Tue Dec 15 17:13:17 2015
@@ -37,9 +37,9 @@ import org.apache.xml.security.utils.XML
import org.w3c.dom.Element;
/**
- * KeyResolverSpi implementation which resolves public keys and X.509 certificates from a
+ * KeyResolverSpi implementation which resolves public keys and X.509 certificates from a
* <code>dsig11:X509Digest</code> element.
- *
+ *
* @author Brent Putman (putmanb@georgetown.edu)
*/
public class X509DigestResolver extends KeyResolverSpi {
@@ -105,14 +105,14 @@ public class X509DigestResolver extends
/**
* Resolves from the storage resolver the actual certificate represented by the digest.
- *
+ *
* @param element
* @param baseURI
* @param storage
* @return the certificate represented by the digest.
* @throws XMLSecurityException
*/
- private X509Certificate resolveCertificate(Element element, String baseURI, StorageResolver storage)
+ private X509Certificate resolveCertificate(Element element, String baseURI, StorageResolver storage)
throws XMLSecurityException {
XMLX509Digest x509Digests[] = null;
@@ -123,7 +123,7 @@ public class X509DigestResolver extends
return null;
}
- try {
+ try {
checkStorage(storage);
x509Digests = new XMLX509Digest[x509childNodes.length];
@@ -159,7 +159,7 @@ public class X509DigestResolver extends
/**
* Method checkSrorage
- *
+ *
* @param storage
* @throws KeyResolverException
*/
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java Tue Dec 15 17:13:17 2015
@@ -44,7 +44,7 @@ public class X509IssuerSerialResolver ex
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
- X509Certificate cert =
+ X509Certificate cert =
this.engineLookupResolveX509Certificate(element, baseURI, storage);
if (cert != null) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java Tue Dec 15 17:13:17 2015
@@ -52,7 +52,7 @@ public class X509SKIResolver extends Key
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
- X509Certificate cert =
+ X509Certificate cert =
this.engineLookupResolveX509Certificate(element, baseURI, storage);
if (cert != null) {
@@ -76,7 +76,7 @@ public class X509SKIResolver extends Key
) throws KeyResolverException {
if (log.isDebugEnabled()) {
log.debug("Can I resolve " + element.getTagName() + "?");
- }
+ }
if (!XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_X509DATA)) {
if (log.isDebugEnabled()) {
log.debug("I can't");
@@ -95,7 +95,7 @@ public class X509SKIResolver extends Key
}
return null;
}
- try {
+ try {
if (storage == null) {
Object exArgs[] = { Constants._TAG_X509SKI };
KeyResolverException ex =
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java Tue Dec 15 17:13:17 2015
@@ -52,7 +52,7 @@ public class X509SubjectNameResolver ext
Element element, String baseURI, StorageResolver storage
) throws KeyResolverException {
- X509Certificate cert =
+ X509Certificate cert =
this.engineLookupResolveX509Certificate(element, baseURI, storage);
if (cert != null) {
@@ -77,16 +77,16 @@ public class X509SubjectNameResolver ext
if (log.isDebugEnabled()) {
log.debug("Can I resolve " + element.getTagName() + "?");
}
- Element[] x509childNodes = null;
+ Element[] x509childNodes = null;
XMLX509SubjectName x509childObject[] = null;
- if (!XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_X509DATA)) {
- if (log.isDebugEnabled()) {
+ if (!XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_X509DATA)) {
+ if (log.isDebugEnabled()) {
log.debug("I can't");
}
return null;
}
- x509childNodes =
+ x509childNodes =
XMLUtils.selectDsNodes(element.getFirstChild(), Constants._TAG_X509SUBJECTNAME);
if (!(x509childNodes != null && x509childNodes.length > 0)) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolverException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolverException.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolverException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolverException.java Tue Dec 15 17:13:17 2015
@@ -24,7 +24,7 @@ import org.apache.xml.security.exception
public class StorageResolverException extends XMLSecurityException {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
@@ -35,7 +35,7 @@ public class StorageResolverException ex
public StorageResolverException() {
super();
}
-
+
public StorageResolverException(Exception ex) {
super(ex);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java Tue Dec 15 17:13:17 2015
@@ -38,7 +38,7 @@ import org.apache.xml.security.utils.Bas
/**
* This {@link StorageResolverSpi} makes all raw (binary) {@link X509Certificate}s
- * which reside as files in a single directory available to the
+ * which reside as files in a single directory available to the
* {@link org.apache.xml.security.keys.storage.StorageResolver}.
*/
public class CertsInFilesystemDirectoryResolver extends StorageResolverSpi {
@@ -58,7 +58,7 @@ public class CertsInFilesystemDirectoryR
* @param directoryName
* @throws StorageResolverException
*/
- public CertsInFilesystemDirectoryResolver(String directoryName)
+ public CertsInFilesystemDirectoryResolver(String directoryName)
throws StorageResolverException {
this.merlinsCertificatesDir = directoryName;
@@ -79,7 +79,7 @@ public class CertsInFilesystemDirectoryR
if (names != null) {
for (int i = 0; i < names.length; i++) {
String currentFileName = names[i];
-
+
if (currentFileName.endsWith(".crt")) {
al.add(names[i]);
}
@@ -137,7 +137,7 @@ public class CertsInFilesystemDirectoryR
if (log.isDebugEnabled()) {
log.debug("Could not add certificate from file " + filename, ex);
}
- }
+ }
}
if (added && log.isDebugEnabled()) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidDigestValueException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidDigestValueException.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidDigestValueException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidDigestValueException.java Tue Dec 15 17:13:17 2015
@@ -19,7 +19,7 @@
package org.apache.xml.security.signature;
/**
- * Raised when the computed hash value doesn't match the given <i>DigestValue</i>.
+ * Raised when the computed hash value doesn't match the given <i>DigestValue</i>.
* Additional human readable info is passed to the constructor -- this being the benefit
* of raising an exception or returning a value.
*
@@ -28,7 +28,7 @@ package org.apache.xml.security.signatur
public class InvalidDigestValueException extends XMLSignatureException {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidSignatureValueException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidSignatureValueException.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidSignatureValueException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidSignatureValueException.java Tue Dec 15 17:13:17 2015
@@ -27,7 +27,7 @@ package org.apache.xml.security.signatur
public class InvalidSignatureValueException extends XMLSignatureException {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;