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 [8/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/stax/ext/AbstractOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.java Tue Dec 15 17:13:17 2015
@@ -149,7 +149,7 @@ public abstract class AbstractOutputProc
xmlSecStartElement.addAttribute(xmlSecAttribute);
final QName attributeName = xmlSecAttribute.getName();
- if (attributeName.getNamespaceURI() != null && !"".equals(attributeName.getNamespaceURI())
+ if (attributeName.getNamespaceURI() != null && !"".equals(attributeName.getNamespaceURI())
&& !declaredNamespaces.contains(xmlSecAttribute.getAttributeNamespace())) {
xmlSecStartElement.addNamespace(xmlSecAttribute.getAttributeNamespace());
}
@@ -260,7 +260,7 @@ public abstract class AbstractOutputProc
}
return securePart;
}
-
+
protected void outputDOMElement(Element element, OutputProcessorChain outputProcessorChain)
throws XMLStreamException, XMLSecurityException {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java Tue Dec 15 17:13:17 2015
@@ -90,7 +90,7 @@ public class InboundXMLSec {
public XMLStreamReader processInMessage(XMLStreamReader xmlStreamReader) throws XMLStreamException {
return processInMessage(xmlStreamReader, null, null);
}
-
+
/**
* Warning:
* configure your xmlStreamReader correctly. Otherwise you can create a security hole.
@@ -110,13 +110,13 @@ public class InboundXMLSec {
* @throws XMLStreamException thrown when a streaming error occurs
*/
public XMLStreamReader processInMessage(
- XMLStreamReader xmlStreamReader, List<SecurityEvent> requestSecurityEvents,
+ XMLStreamReader xmlStreamReader, List<SecurityEvent> requestSecurityEvents,
SecurityEventListener securityEventListener) throws XMLStreamException {
-
+
if (requestSecurityEvents == null) {
requestSecurityEvents = Collections.emptyList();
}
-
+
final InboundSecurityContextImpl inboundSecurityContext = new InboundSecurityContextImpl();
inboundSecurityContext.putList(SecurityEvent.class, requestSecurityEvents);
inboundSecurityContext.addSecurityEventListener(securityEventListener);
@@ -130,7 +130,7 @@ public class InboundXMLSec {
if (location != null) {
documentContext.setBaseURI(location.getSystemId());
}
-
+
InputProcessorChainImpl inputProcessorChain = new InputProcessorChainImpl(inboundSecurityContext, documentContext);
inputProcessorChain.addProcessor(new XMLEventReaderInputProcessor(securityProperties, xmlStreamReader));
@@ -142,9 +142,9 @@ public class InboundXMLSec {
inputProcessorChain.addProcessor(inputProcessor);
}
}
-
+
inputProcessorChain.addProcessor(new XMLSecurityInputProcessor(securityProperties));
-
+
if (log.isTraceEnabled()) {
LogInputProcessor logInputProcessor = new LogInputProcessor(securityProperties);
logInputProcessor.addAfterProcessor(XMLSecurityInputProcessor.class.getName());
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/OutboundXMLSec.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/OutboundXMLSec.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/OutboundXMLSec.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/OutboundXMLSec.java Tue Dec 15 17:13:17 2015
@@ -89,12 +89,12 @@ public class OutboundXMLSec {
SecurePart signEntireRequestPart = null;
SecurePart encryptEntireRequestPart = null;
-
+
for (XMLSecurityConstants.Action action : securityProperties.getActions()) {
if (XMLSecurityConstants.SIGNATURE.equals(action)) {
XMLSignatureOutputProcessor signatureOutputProcessor = new XMLSignatureOutputProcessor();
initializeOutputProcessor(outputProcessorChain, signatureOutputProcessor, action);
-
+
configureSignatureKeys(outboundSecurityContext);
List<SecurePart> signatureParts = securityProperties.getSignatureSecureParts();
for (int j = 0; j < signatureParts.size(); j++) {
@@ -119,7 +119,7 @@ public class OutboundXMLSec {
} else if (XMLSecurityConstants.ENCRYPT.equals(action)) {
XMLEncryptOutputProcessor encryptOutputProcessor = new XMLEncryptOutputProcessor();
initializeOutputProcessor(outputProcessorChain, encryptOutputProcessor, action);
-
+
configureEncryptionKeys(outboundSecurityContext);
List<SecurePart> encryptionParts = securityProperties.getEncryptionSecureParts();
for (int j = 0; j < encryptionParts.size(); j++) {
@@ -158,7 +158,7 @@ public class OutboundXMLSec {
XMLSecurityStreamWriter streamWriter = new XMLSecurityStreamWriter(outputProcessorChain);
streamWriter.setSignEntireRequestPart(signEntireRequestPart);
streamWriter.setEncryptEntireRequestPart(encryptEntireRequestPart);
-
+
return streamWriter;
}
@@ -167,7 +167,7 @@ public class OutboundXMLSec {
outputProcessor.setAction(action);
outputProcessor.init(outputProcessorChain);
}
-
+
private void configureSignatureKeys(final OutboundSecurityContextImpl outboundSecurityContext) throws XMLSecurityException {
Key key = securityProperties.getSignatureKey();
X509Certificate[] x509Certificates = securityProperties.getSignatureCerts();
@@ -198,10 +198,10 @@ public class OutboundXMLSec {
}
};
outboundSecurityContext.registerSecurityTokenProvider(securityTokenid, securityTokenProvider);
-
+
outboundSecurityContext.put(XMLSecurityConstants.PROP_USE_THIS_TOKEN_ID_FOR_SIGNATURE, securityTokenid);
}
-
+
private void configureEncryptionKeys(final OutboundSecurityContextImpl outboundSecurityContext) throws XMLSecurityException {
// Sort out transport keys / key wrapping keys first.
Key transportKey = securityProperties.getEncryptionTransportKey();
@@ -213,7 +213,7 @@ public class OutboundXMLSec {
final OutboundSecurityToken transportSecurityToken =
new GenericOutboundSecurityToken(IDGenerator.generateID(null), SecurityTokenConstants.DefaultToken, transportKey, transportCerts);
-
+
// Now sort out the session key
Key key = securityProperties.getEncryptionKey();
if (key == null) {
@@ -221,7 +221,7 @@ public class OutboundXMLSec {
throw new XMLSecurityException("stax.encryption.encryptionKeyMissing");
}
// If none is configured then generate one
- String keyAlgorithm =
+ String keyAlgorithm =
JCEAlgorithmMapper.getJCEKeyAlgorithmFromURI(securityProperties.getEncryptionSymAlgorithm());
KeyGenerator keyGen;
try {
@@ -232,7 +232,7 @@ public class OutboundXMLSec {
//the sun JCE provider expects the real key size for 3DES (112 or 168 bit)
//whereas bouncy castle expects the block size of 128 or 192 bits
if (keyAlgorithm.contains("AES")) {
- int keyLength =
+ int keyLength =
JCEAlgorithmMapper.getKeyLengthFromURI(securityProperties.getEncryptionSymAlgorithm());
keyGen.init(keyLength);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/UncheckedXMLSecurityException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/UncheckedXMLSecurityException.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/UncheckedXMLSecurityException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/UncheckedXMLSecurityException.java Tue Dec 15 17:13:17 2015
@@ -27,7 +27,7 @@ package org.apache.xml.security.stax.ext
public class UncheckedXMLSecurityException extends RuntimeException {
/**
- *
+ *
*/
private static final long serialVersionUID = 3440022764012033141L;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java Tue Dec 15 17:13:17 2015
@@ -44,7 +44,7 @@ import org.xml.sax.SAXException;
* @version $Revision: 1354898 $ $Date: 2012-06-28 11:19:02 +0100 (Thu, 28 Jun 2012) $
*/
public class XMLSec {
-
+
static {
try {
URL resource = ClassLoaderUtils.getResource("security-config.xml", XMLSec.class);
@@ -52,7 +52,7 @@ public class XMLSec {
throw new RuntimeException("security-config.xml not found in classpath");
}
Init.init(resource.toURI(), XMLSec.class);
-
+
try {
XMLSecurityConstants.setJaxbContext(
JAXBContext.newInstance(
@@ -60,10 +60,10 @@ public class XMLSec {
org.apache.xml.security.binding.xmlenc11.ObjectFactory.class,
org.apache.xml.security.binding.xmldsig.ObjectFactory.class,
org.apache.xml.security.binding.xmldsig11.ObjectFactory.class,
- org.apache.xml.security.binding.excc14n.ObjectFactory.class
+ org.apache.xml.security.binding.excc14n.ObjectFactory.class
)
);
-
+
Schema schema = XMLSecurityUtils.loadXMLSecuritySchemas();
XMLSecurityConstants.setJaxbSchemas(schema);
} catch (JAXBException e) {
@@ -77,7 +77,7 @@ public class XMLSec {
throw new RuntimeException(e.getMessage(), e);
}
}
-
+
public static void init() {
// Do nothing
}
@@ -132,9 +132,9 @@ public class XMLSec {
if (securityProperties.getActions() == null || securityProperties.getActions().isEmpty()) {
throw new XMLSecurityConfigurationException("stax.noOutputAction");
}
-
+
// Check for duplicate actions
- if (new HashSet<XMLSecurityConstants.Action>(securityProperties.getActions()).size()
+ if (new HashSet<XMLSecurityConstants.Action>(securityProperties.getActions()).size()
!= securityProperties.getActions().size()) {
throw new XMLSecurityConfigurationException("stax.duplicateActions");
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConfigurationException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConfigurationException.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConfigurationException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConfigurationException.java Tue Dec 15 17:13:17 2015
@@ -29,7 +29,7 @@ import org.apache.xml.security.exception
public class XMLSecurityConfigurationException extends XMLSecurityException {
/**
- *
+ *
*/
private static final long serialVersionUID = -214211575738383300L;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java Tue Dec 15 17:13:17 2015
@@ -39,7 +39,7 @@ import org.apache.xml.security.exception
* @version $Revision$ $Date$
*/
public class XMLSecurityConstants {
-
+
public static final DatatypeFactory datatypeFactory;
public static final XMLOutputFactory xmlOutputFactory;
public static final XMLOutputFactory xmlOutputFactoryNonRepairingNs;
@@ -70,11 +70,11 @@ public class XMLSecurityConstants {
protected XMLSecurityConstants() {
}
-
+
/**
* Generate bytes of the given length using the SHA1PRNG algorithm. The SecureRandom
* instance that backs this method is cached for efficiency.
- *
+ *
* @return a byte array of the given length
* @throws WSSecurityException
*/
@@ -99,7 +99,7 @@ public class XMLSecurityConstants {
public static Schema getJaxbSchemas() {
return XMLSecurityConstants.schema;
}
-
+
public static Unmarshaller getJaxbUnmarshaller(boolean disableSchemaValidation) throws JAXBException {
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
if (!disableSchemaValidation) {
@@ -128,7 +128,7 @@ public class XMLSecurityConstants {
public static final String NS_DSIG_MORE ="http://www.w3.org/2001/04/xmldsig-more#";
public static final String NS_DSIG11 = "http://www.w3.org/2009/xmldsig11#";
public static final String NS_WSSE11 = "http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd";
-
+
public static final String PREFIX_XENC = "xenc";
public static final String PREFIX_XENC11 = "xenc11";
public static final QName TAG_xenc_EncryptedKey = new QName(NS_XMLENC, "EncryptedKey", PREFIX_XENC);
@@ -211,7 +211,7 @@ public class XMLSecurityConstants {
public static final String NS_XMLDSIG_HMACSHA1 = NS_DSIG + "hmac-sha1";
public static final String NS_XMLDSIG_RSASHA1 = NS_DSIG + "rsa-sha1";
public static final String NS_XMLDSIG_MANIFEST = NS_DSIG + "Manifest";
-
+
public static final String NS_XMLDSIG_HMACSHA256 = NS_DSIG_MORE + "hmac-sha256";
public static final String NS_XMLDSIG_HMACSHA384 = NS_DSIG_MORE + "hmac-sha384";
public static final String NS_XMLDSIG_HMACSHA512 = NS_DSIG_MORE + "hmac-sha512";
@@ -235,7 +235,7 @@ public class XMLSecurityConstants {
public static final String NS_MGF1_SHA256 = NS_XMLENC11 + "mgf1sha256";
public static final String NS_MGF1_SHA384 = NS_XMLENC11 + "mgf1sha384";
public static final String NS_MGF1_SHA512 = NS_XMLENC11 + "mgf1sha512";
-
+
public static final String NS_XENC_SHA256 = NS_XMLENC + "sha256";
public static final String NS_XENC_SHA512 = NS_XMLENC + "sha512";
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.java Tue Dec 15 17:13:17 2015
@@ -98,7 +98,7 @@ public class XMLSecurityProperties {
this.signatureKeyIdentifier = xmlSecurityProperties.signatureKeyIdentifier;
this.useSingleCert = xmlSecurityProperties.useSingleCert;
this.signatureVerificationKey = xmlSecurityProperties.signatureVerificationKey;
- this.signaturePosition = xmlSecurityProperties.signaturePosition;
+ this.signaturePosition = xmlSecurityProperties.signaturePosition;
}
public SecurityTokenConstants.KeyIdentifier getSignatureKeyIdentifier() {
@@ -127,7 +127,7 @@ public class XMLSecurityProperties {
public void setSignaturePosition(int signaturePosition) {
this.signaturePosition = signaturePosition;
}
-
+
/**
* returns the KeyIdentifierType which will be used in the secured document
*
@@ -348,7 +348,7 @@ public class XMLSecurityProperties {
public void setActions(List<XMLSecurityConstants.Action> actions) {
this.actions = actions;
}
-
+
public void addAction(XMLSecurityConstants.Action action) {
if (actions == null) {
actions = new ArrayList<XMLSecurityConstants.Action>();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java Tue Dec 15 17:13:17 2015
@@ -65,7 +65,7 @@ import java.util.*;
* @version $Revision$ $Date$
*/
public class XMLSecurityUtils {
-
+
private static final int MAX_SYMMETRIC_KEY_SIZE = 1024;
protected XMLSecurityUtils() {
@@ -176,7 +176,7 @@ public class XMLSecurityUtils {
public static String getQNameAttribute(Map<QName, String> attributes, QName qName) {
return attributes.get(qName);
}
-
+
public static void createKeyValueTokenStructure(AbstractOutputProcessor abstractOutputProcessor,
OutputProcessorChain outputProcessorChain, X509Certificate[] x509Certificates)
throws XMLStreamException, XMLSecurityException {
@@ -184,21 +184,21 @@ public class XMLSecurityUtils {
if (x509Certificates == null || x509Certificates.length == 0) {
throw new XMLSecurityException("stax.signature.publicKeyOrCertificateMissing");
}
-
+
X509Certificate x509Certificate = x509Certificates[0];
PublicKey publicKey = x509Certificate.getPublicKey();
createKeyValueTokenStructure(abstractOutputProcessor, outputProcessorChain, publicKey);
}
-
+
public static void createKeyValueTokenStructure(AbstractOutputProcessor abstractOutputProcessor,
- OutputProcessorChain outputProcessorChain,
+ OutputProcessorChain outputProcessorChain,
PublicKey publicKey)
throws XMLStreamException, XMLSecurityException {
if (publicKey == null) {
throw new XMLSecurityException("stax.signature.publicKeyOrCertificateMissing");
}
-
+
String algorithm = publicKey.getAlgorithm();
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_KeyValue, true, null);
@@ -249,7 +249,7 @@ public class XMLSecurityUtils {
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_KeyValue);
}
-
+
public static void createX509SubjectKeyIdentifierStructure(AbstractOutputProcessor abstractOutputProcessor,
OutputProcessorChain outputProcessorChain,
X509Certificate[] x509Certificates)
@@ -257,33 +257,33 @@ public class XMLSecurityUtils {
if (x509Certificates == null || x509Certificates.length == 0) {
throw new XMLSecurityException("stax.signature.publicKeyOrCertificateMissing");
}
-
+
// SKI can only be used for a V3 certificate
int version = x509Certificates[0].getVersion();
if (version != 3) {
throw new XMLSecurityException("certificate.noSki.lowVersion",
new Object[]{version});
}
-
+
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509Data, true, null);
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509SKI, false, null);
byte[] data = XMLX509SKI.getSKIBytesFromCert(x509Certificates[0]);
abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(data));
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509SKI);
-
+
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509Data);
}
-
+
public static void createX509CertificateStructure(AbstractOutputProcessor abstractOutputProcessor,
OutputProcessorChain outputProcessorChain,
X509Certificate[] x509Certificates)
throws XMLSecurityException, XMLStreamException {
-
+
if (x509Certificates == null || x509Certificates.length == 0) {
throw new XMLSecurityException("stax.signature.publicKeyOrCertificateMissing");
}
-
+
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509Data, true, null);
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509Certificate, false, null);
@@ -295,26 +295,26 @@ public class XMLSecurityUtils {
}
abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(data));
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509Certificate);
-
+
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509Data);
}
-
+
public static void createX509SubjectNameStructure(AbstractOutputProcessor abstractOutputProcessor,
OutputProcessorChain outputProcessorChain,
X509Certificate[] x509Certificates)
throws XMLSecurityException, XMLStreamException {
-
+
if (x509Certificates == null || x509Certificates.length == 0) {
throw new XMLSecurityException("stax.signature.publicKeyOrCertificateMissing");
}
-
+
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509Data, true, null);
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509SubjectName, false, null);
String subjectName = x509Certificates[0].getSubjectX500Principal().getName();
abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, subjectName);
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509SubjectName);
-
+
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509Data);
}
@@ -325,7 +325,7 @@ public class XMLSecurityUtils {
if (x509Certificates == null || x509Certificates.length == 0) {
throw new XMLSecurityException("stax.signature.publicKeyOrCertificateMissing");
}
-
+
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509Data, true, null);
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509IssuerSerial, false, null);
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509IssuerName, false, null);
@@ -359,7 +359,7 @@ public class XMLSecurityUtils {
} else if (SecurityTokenConstants.EncryptedKeyToken.equals(tokenType)) {
tokenSecurityEvent = new EncryptedKeyTokenSecurityEvent();
} else {
- throw new XMLSecurityException("stax.unsupportedToken",
+ throw new XMLSecurityException("stax.unsupportedToken",
new Object[]{tokenType});
}
tokenSecurityEvent.setSecurityToken(inboundSecurityToken);
@@ -419,7 +419,7 @@ public class XMLSecurityUtils {
outputStream.write(buf, 0, read);
}
}
-
+
/**
* Convert the raw key bytes into a SecretKey object of type symEncAlgo.
*/
@@ -435,13 +435,13 @@ public class XMLSecurityUtils {
String keyAlgorithm = JCEMapper.getJCEKeyAlgorithmFromURI(symEncAlgo);
SecretKeySpec keySpec;
if (size > 0 && !symEncAlgo.endsWith("gcm") && !symEncAlgo.contains("hmac-")) {
- keySpec =
+ keySpec =
new SecretKeySpec(
rawKey, 0, rawKey.length > size ? size : rawKey.length, keyAlgorithm
);
} else if (rawKey.length > MAX_SYMMETRIC_KEY_SIZE) {
// Prevent a possible attack where a huge secret key is specified
- keySpec =
+ keySpec =
new SecretKeySpec(
rawKey, 0, MAX_SYMMETRIC_KEY_SIZE, keyAlgorithm
);
@@ -496,5 +496,5 @@ public class XMLSecurityUtils {
);
return schema;
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithmFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithmFactory.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithmFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithmFactory.java Tue Dec 15 17:13:17 2015
@@ -45,7 +45,7 @@ public class SignatureAlgorithmFactory {
public SignatureAlgorithm getSignatureAlgorithm(String algoURI) throws XMLSecurityException, NoSuchProviderException, NoSuchAlgorithmException {
String algorithmClass = JCEAlgorithmMapper.getAlgorithmClassFromURI(algoURI);
if (algorithmClass == null) {
- throw new XMLSecurityException("algorithms.NoSuchMap",
+ throw new XMLSecurityException("algorithms.NoSuchMap",
new Object[] {algoURI});
}
String jceName = JCEAlgorithmMapper.translateURItoJCEID(algoURI);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java Tue Dec 15 17:13:17 2015
@@ -88,7 +88,7 @@ public abstract class AbstractDecryptInp
references = null;
processedReferences = null;
}
-
+
public AbstractDecryptInputProcessor(KeyInfoType keyInfoType, ReferenceList referenceList,
XMLSecurityProperties securityProperties) throws XMLSecurityException {
super(securityProperties);
@@ -184,11 +184,11 @@ public abstract class AbstractDecryptInp
if (processedReferences.contains(referenceType)) {
throw new XMLSecurityException("signature.Verification.MultipleIDs");
}
-
+
processedReferences.add(referenceType);
}
tmpXmlEventList.clear();
-
+
//the following logic reads the encryptedData structure and doesn't pass them further
//through the chain
InputProcessorChain subInputProcessorChain = inputProcessorChain.createSubChain(this);
@@ -206,7 +206,7 @@ public abstract class AbstractDecryptInp
final String algorithmURI = encryptedDataType.getEncryptionMethod().getAlgorithm();
final int ivLength = JCEAlgorithmMapper.getIVLengthFromURI(algorithmURI) / 8;
Cipher symCipher = getCipher(algorithmURI);
-
+
if (encryptedDataType.getCipherData().getCipherReference() != null) {
handleCipherReference(inputProcessorChain, encryptedDataType, symCipher, inboundSecurityToken);
subInputProcessorChain.reset();
@@ -218,7 +218,7 @@ public abstract class AbstractDecryptInp
//create a new Thread for streaming decryption
DecryptionThread decryptionThread =
new DecryptionThread(subInputProcessorChain, isSecurityHeaderEvent);
- Key decryptionKey =
+ Key decryptionKey =
inboundSecurityToken.getSecretKey(algorithmURI, XMLSecurityConstants.Enc, encryptedDataType.getId());
decryptionKey = XMLSecurityUtils.prepareSecretKey(algorithmURI, decryptionKey.getEncoded());
decryptionThread.setSecretKey(decryptionKey);
@@ -378,7 +378,7 @@ public abstract class AbstractDecryptInp
String jceName = JCEAlgorithmMapper.translateURItoJCEID(algorithmURI);
String jceProvider = JCEAlgorithmMapper.getJCEProviderFromURI(algorithmURI);
if (jceName == null) {
- throw new XMLSecurityException("algorithms.NoSuchMap",
+ throw new XMLSecurityException("algorithms.NoSuchMap",
new Object[] {algorithmURI});
}
if (jceProvider != null) {
@@ -407,18 +407,18 @@ public abstract class AbstractDecryptInp
}
if (keyInfoType != null) {
- final EncryptedKeyType encryptedKeyType =
+ final EncryptedKeyType encryptedKeyType =
XMLSecurityUtils.getQNameType(keyInfoType.getContent(), XMLSecurityConstants.TAG_xenc_EncryptedKey);
if (encryptedKeyType != null) {
XMLEncryptedKeyInputHandler handler = new XMLEncryptedKeyInputHandler();
handler.handle(inputProcessorChain, encryptedKeyType, xmlSecStartElement, getSecurityProperties());
-
+
SecurityTokenProvider<? extends InboundSecurityToken> securityTokenProvider =
inputProcessorChain.getSecurityContext().getSecurityTokenProvider(encryptedKeyType.getId());
return securityTokenProvider.getSecurityToken();
}
}
-
+
//retrieve the securityToken which must be used for decryption
return SecurityTokenFactory.getInstance().getSecurityToken(
keyInfoType, SecurityTokenConstants.KeyUsage_Decryption,
@@ -445,7 +445,7 @@ public abstract class AbstractDecryptInp
xmlSecEvents.push(encryptedDataXMLSecEvent);
if (++count >= maximumAllowedEncryptedDataEvents) {
- throw new XMLSecurityException("stax.xmlStructureSizeExceeded",
+ throw new XMLSecurityException("stax.xmlStructureSizeExceeded",
new Object[] {maximumAllowedEncryptedDataEvents});
}
@@ -798,7 +798,7 @@ public abstract class AbstractDecryptInp
switch (xmlSecEvent.getEventType()) {
case XMLStreamConstants.END_ELEMENT:
- //this must be the CipherValue EndElement.
+ //this must be the CipherValue EndElement.
break exitLoop;
case XMLStreamConstants.CHARACTERS:
final char[] data = xmlSecEvent.asCharacters().getText();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureInputHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureInputHandler.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureInputHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureInputHandler.java Tue Dec 15 17:13:17 2015
@@ -271,7 +271,7 @@ public abstract class AbstractSignatureI
createSignatureAlgorithm(inboundSecurityToken, signatureType);
}
-
+
protected abstract InboundSecurityToken retrieveSecurityToken(SignatureType signatureType,
XMLSecurityProperties securityProperties,
InboundSecurityContext inboundSecurityContext) throws XMLSecurityException;
@@ -292,7 +292,7 @@ public abstract class AbstractSignatureI
algorithmURI, XMLSecurityConstants.Sym_Sig, signatureType.getId());
verifyKey = XMLSecurityUtils.prepareSecretKey(algorithmURI, verifyKey.getEncoded());
}
-
+
try {
SignatureAlgorithm signatureAlgorithm =
SignatureAlgorithmFactory.getInstance().getSignatureAlgorithm(
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java Tue Dec 15 17:13:17 2015
@@ -155,7 +155,7 @@ public abstract class AbstractSignatureR
ReferenceType referenceType = referenceTypes.get(i);
if (processedReferences.contains(referenceType)) {
- throw new XMLSecurityException("signature.Verification.MultipleIDs",
+ throw new XMLSecurityException("signature.Verification.MultipleIDs",
new Object[] {referenceType.getURI()});
}
InternalSignatureReferenceVerifier internalSignatureReferenceVerifier =
@@ -271,7 +271,7 @@ public abstract class AbstractSignatureR
String jceName = JCEAlgorithmMapper.translateURItoJCEID(digestMethodAlgorithm);
String jceProvider = JCEAlgorithmMapper.getJCEProviderFromURI(digestMethodAlgorithm);
if (jceName == null) {
- throw new XMLSecurityException("algorithms.NoSuchMap",
+ throw new XMLSecurityException("algorithms.NoSuchMap",
new Object[] {digestMethodAlgorithm});
}
@@ -375,7 +375,7 @@ public abstract class AbstractSignatureR
if (!MessageDigest.isEqual(referenceType.getDigestValue(), calculatedDigest)) {
throw new XMLSecurityException(
- "signature.Verification.InvalidDigestOrReference",
+ "signature.Verification.InvalidDigestOrReference",
new Object[] {referenceType.getURI()});
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLDecryptInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLDecryptInputProcessor.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLDecryptInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLDecryptInputProcessor.java Tue Dec 15 17:13:17 2015
@@ -39,11 +39,11 @@ import org.apache.xml.security.stax.secu
* @version $Revision: 1228829 $ $Date: 2012-01-08 11:44:13 +0000 (Sun, 08 Jan 2012) $
*/
public class XMLDecryptInputProcessor extends AbstractDecryptInputProcessor {
-
+
public XMLDecryptInputProcessor(XMLSecurityProperties securityProperties) throws XMLSecurityException {
super(securityProperties);
}
-
+
@Override
protected AbstractDecryptedEventReaderInputProcessor newDecryptedEventReaderInputProcessor(
boolean encryptedHeader, XMLSecStartElement xmlSecStartElement, EncryptedDataType currentEncryptedDataType,
@@ -114,7 +114,7 @@ public class XMLDecryptInputProcessor ex
//fire a SecurityEvent:
final DocumentContext documentContext = inputProcessorChain.getDocumentContext();
List<QName> elementPath = xmlSecStartElement.getElementPath();
-
+
EncryptedElementSecurityEvent encryptedElementSecurityEvent =
new EncryptedElementSecurityEvent(inboundSecurityToken, true, documentContext.getProtectionOrder());
encryptedElementSecurityEvent.setElementPath(elementPath);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java Tue Dec 15 17:13:17 2015
@@ -143,7 +143,7 @@ public class XMLEncryptedKeyInputHandler
inboundSecurityContext
);
this.wrappingSecurityToken.addWrappedToken(wrappedSecurityToken);
-
+
return this.wrappingSecurityToken;
}
@@ -161,7 +161,7 @@ public class XMLEncryptedKeyInputHandler
String jceName = JCEAlgorithmMapper.translateURItoJCEID(algorithmURI);
String jceProvider = JCEAlgorithmMapper.getJCEProviderFromURI(algorithmURI);
if (jceName == null) {
- throw new XMLSecurityException("algorithms.NoSuchMap",
+ throw new XMLSecurityException("algorithms.NoSuchMap",
new Object[] {algorithmURI});
}
@@ -193,7 +193,7 @@ public class XMLEncryptedKeyInputHandler
algorithmSuiteSecurityEvent.setAlgorithmUsage(XMLSecurityConstants.EncDig);
algorithmSuiteSecurityEvent.setCorrelationID(correlationID);
inboundSecurityContext.registerSecurityEvent(algorithmSuiteSecurityEvent);
-
+
jceDigestAlgorithm = JCEAlgorithmMapper.translateURItoJCEID(digestMethodType.getAlgorithm());
}
@@ -232,11 +232,11 @@ public class XMLEncryptedKeyInputHandler
throw new XMLSecurityException(e);
}
- byte[] sha1Bytes =
+ byte[] sha1Bytes =
generateDigest(encryptedKeyType.getCipherData().getCipherValue());
String sha1Identifier = Base64.encode(sha1Bytes);
super.setSha1Identifier(sha1Identifier);
-
+
try {
Key key = cipher.unwrap(encryptedKeyType.getCipherData().getCipherValue(),
jceName,
@@ -279,7 +279,7 @@ public class XMLEncryptedKeyInputHandler
handleReferenceList(inputProcessorChain, encryptedKeyType, securityProperties);
}
}
-
+
private byte[] generateDigest(byte[] inputBytes) throws XMLSecurityException {
try {
return MessageDigest.getInstance("SHA-1").digest(inputBytes);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureInputHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureInputHandler.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureInputHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureInputHandler.java Tue Dec 15 17:13:17 2015
@@ -61,9 +61,9 @@ public class XMLSignatureInputHandler ex
new XMLSignatureReferenceVerifyInputProcessor(
inputProcessorChain, signatureType, inboundSecurityToken, securityProperties));
}
-
+
public class XMLSignatureVerifier extends SignatureVerifier {
-
+
public XMLSignatureVerifier(SignatureType signatureType, InboundSecurityContext inboundSecurityContext,
XMLSecurityProperties securityProperties) throws XMLSecurityException {
super(signatureType, inboundSecurityContext, securityProperties);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureReferenceVerifyInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureReferenceVerifyInputProcessor.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureReferenceVerifyInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureReferenceVerifyInputProcessor.java Tue Dec 15 17:13:17 2015
@@ -44,7 +44,7 @@ public class XMLSignatureReferenceVerify
super(inputProcessorChain, signatureType, inboundSecurityToken, securityProperties);
this.addAfterProcessor(XMLSignatureReferenceVerifyInputProcessor.class.getName());
}
-
+
@Override
protected void processElementPath(
List<QName> elementPath, InputProcessorChain inputProcessorChain, XMLSecEvent xmlSecEvent,
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java Tue Dec 15 17:13:17 2015
@@ -97,12 +97,12 @@ public abstract class AbstractEncryptOut
if (securePart.isRequired()) {
for (int i = 0; encryptionPartDefs != null && i < encryptionPartDefs.size(); i++) {
EncryptionPartDef encryptionPartDef = encryptionPartDefs.get(i);
-
+
if (encryptionPartDef.getSecurePart() == securePart) {
continue loop;
}
}
- throw new XMLSecurityException("stax.encryption.securePartNotFound",
+ throw new XMLSecurityException("stax.encryption.securePartNotFound",
new Object[] {securePart.getName()});
}
}
@@ -152,14 +152,14 @@ public abstract class AbstractEncryptOut
//initialize the cipher
String jceAlgorithm = JCEAlgorithmMapper.translateURItoJCEID(encryptionSymAlgorithm);
if (jceAlgorithm == null) {
- throw new XMLSecurityException("algorithms.NoSuchMap",
+ throw new XMLSecurityException("algorithms.NoSuchMap",
new Object[] {encryptionSymAlgorithm});
}
Cipher symmetricCipher = Cipher.getInstance(jceAlgorithm);
int ivLen = JCEMapper.getIVLengthFromURI(encryptionSymAlgorithm) / 8;
byte[] iv = XMLSecurityConstants.generateBytes(ivLen);
- AlgorithmParameterSpec parameterSpec =
+ AlgorithmParameterSpec parameterSpec =
XMLCipherUtil.constructBlockCipherParameters(encryptionSymAlgorithm, iv, this.getClass());
symmetricCipher.init(Cipher.ENCRYPT_MODE, encryptionPartDef.getSymmetricKey(), parameterSpec);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java Tue Dec 15 17:13:17 2015
@@ -219,7 +219,7 @@ public abstract class AbstractSignatureE
OutputProcessorChain outputProcessorChain,
OutboundSecurityToken securityToken,
boolean useSingleCertificate) throws XMLStreamException, XMLSecurityException;
-
+
protected static class SignedInfoProcessor extends AbstractOutputProcessor {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java Tue Dec 15 17:13:17 2015
@@ -146,16 +146,16 @@ public abstract class AbstractSignatureO
while (securePartsMapIterator.hasNext()) {
Map.Entry<Object, SecurePart> securePartEntry = securePartsMapIterator.next();
final SecurePart securePart = securePartEntry.getValue();
-
+
if (securePart.isRequired()) {
for (int i = 0; i < signaturePartDefs.size(); i++) {
SignaturePartDef signaturePartDef = signaturePartDefs.get(i);
-
+
if (signaturePartDef.getSecurePart() == securePart) {
continue loop;
}
}
- throw new XMLSecurityException("stax.signature.securePartNotFound",
+ throw new XMLSecurityException("stax.signature.securePartNotFound",
new Object[] {securePart.getName()});
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java Tue Dec 15 17:13:17 2015
@@ -177,16 +177,16 @@ public class XMLEncryptOutputProcessor e
}
createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_xenc_EncryptionMethod);
-
+
createKeyInfoStructureForEncryptedKey(outputProcessorChain, keyWrappingToken);
-
+
createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_xenc_CipherData, false, null);
createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_xenc_CipherValue, false, null);
//encrypt the symmetric session key with the public key from the receiver:
String jceid = JCEAlgorithmMapper.translateURItoJCEID(encryptionKeyTransportAlgorithm);
if (jceid == null) {
- throw new XMLSecurityException("algorithms.NoSuchMap",
+ throw new XMLSecurityException("algorithms.NoSuchMap",
new Object[] {encryptionKeyTransportAlgorithm});
}
@@ -261,21 +261,21 @@ public class XMLEncryptOutputProcessor e
createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_KeyInfo);
}
-
+
protected void createKeyInfoStructureForEncryptedKey(
OutputProcessorChain outputProcessorChain,
OutboundSecurityToken securityToken
) throws XMLStreamException, XMLSecurityException {
- SecurityTokenConstants.KeyIdentifier keyIdentifier =
+ SecurityTokenConstants.KeyIdentifier keyIdentifier =
getSecurityProperties().getEncryptionKeyIdentifier();
X509Certificate[] x509Certificates = securityToken.getX509Certificates();
if (x509Certificates == null) {
- if (securityToken.getPublicKey() != null
+ if (securityToken.getPublicKey() != null
&& SecurityTokenConstants.KeyIdentifier_KeyValue.equals(keyIdentifier)) {
createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_KeyInfo, true, null);
-
- XMLSecurityUtils.createKeyValueTokenStructure(this, outputProcessorChain,
+
+ XMLSecurityUtils.createKeyValueTokenStructure(this, outputProcessorChain,
securityToken.getPublicKey());
createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_KeyInfo);
}
@@ -284,7 +284,7 @@ public class XMLEncryptOutputProcessor e
if (!SecurityTokenConstants.KeyIdentifier_NoKeyInfo.equals(keyIdentifier)) {
createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_KeyInfo, true, null);
-
+
if (keyIdentifier == null || SecurityTokenConstants.KeyIdentifier_IssuerSerial.equals(keyIdentifier)) {
XMLSecurityUtils.createX509IssuerSerialStructure(this, outputProcessorChain, x509Certificates);
} else if (SecurityTokenConstants.KeyIdentifier_KeyValue.equals(keyIdentifier)) {
@@ -296,10 +296,10 @@ public class XMLEncryptOutputProcessor e
} else if (SecurityTokenConstants.KeyIdentifier_X509SubjectName.equals(keyIdentifier)) {
XMLSecurityUtils.createX509SubjectNameStructure(this, outputProcessorChain, x509Certificates);
} else {
- throw new XMLSecurityException("stax.unsupportedToken",
+ throw new XMLSecurityException("stax.unsupportedToken",
new Object[] {keyIdentifier});
}
-
+
createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_KeyInfo);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java Tue Dec 15 17:13:17 2015
@@ -78,7 +78,7 @@ public class XMLSignatureEndingOutputPro
// @see SANTUARIO-405
// Enhances SANTUARIO-324
- // Output the signature at a specific position.
+ // Output the signature at a specific position.
// By default, this is just after the root element
int signaturePosition = getSecurityProperties().getSignaturePosition();
if (signaturePosition < 0) {
@@ -143,7 +143,7 @@ public class XMLSignatureEndingOutputPro
} else if (SecurityTokenConstants.KeyIdentifier_X509SubjectName.equals(keyIdentifier)) {
XMLSecurityUtils.createX509SubjectNameStructure(this, outputProcessorChain, x509Certificates);
} else {
- throw new XMLSecurityException("stax.unsupportedToken",
+ throw new XMLSecurityException("stax.unsupportedToken",
new Object[] {keyIdentifier});
}
} else if (securityToken.getPublicKey() != null) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java Tue Dec 15 17:13:17 2015
@@ -41,13 +41,13 @@ import org.apache.xml.security.stax.impl
* An OutputProcessor for XML Signature.
*/
public class XMLSignatureOutputProcessor extends AbstractSignatureOutputProcessor {
-
+
private static final transient Logger log = LoggerFactory.getLogger(XMLSignatureOutputProcessor.class);
public XMLSignatureOutputProcessor() throws XMLSecurityException {
super();
}
-
+
@Override
public void init(OutputProcessorChain outputProcessorChain) throws XMLSecurityException {
super.init(outputProcessorChain);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java Tue Dec 15 17:13:17 2015
@@ -141,7 +141,7 @@ public abstract class AbstractInboundSec
} else if (key instanceof SecretKey) {
algorithmSuiteSecurityEvent.setKeyLength(key.getEncoded().length * 8);
} else {
- throw new XMLSecurityException("java.security.UnknownKeyType",
+ throw new XMLSecurityException("java.security.UnknownKeyType",
new Object[] {key.getClass().getName()});
}
this.inboundSecurityContext.registerSecurityEvent(algorithmSuiteSecurityEvent);
@@ -175,7 +175,7 @@ public abstract class AbstractInboundSec
} else if (publicKey instanceof ECKey) {
algorithmSuiteSecurityEvent.setKeyLength(((ECKey) publicKey).getParams().getOrder().bitLength());
} else {
- throw new XMLSecurityException("java.security.UnknownKeyType",
+ throw new XMLSecurityException("java.security.UnknownKeyType",
new Object[] {publicKey.getClass().getName()});
}
inboundSecurityContext.registerSecurityEvent(algorithmSuiteSecurityEvent);
@@ -223,5 +223,5 @@ public abstract class AbstractInboundSec
public boolean isIncludedInMessage() {
return includedInMessage;
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractSecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractSecurityToken.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractSecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractSecurityToken.java Tue Dec 15 17:13:17 2015
@@ -44,10 +44,10 @@ public abstract class AbstractSecurityTo
private X509Certificate[] x509Certificates;
private boolean asymmetric = false;
private String sha1Identifier;
-
+
protected final Map<String, Key> keyTable = new Hashtable<String, Key>();
protected final List<SecurityTokenConstants.TokenUsage> tokenUsages = new ArrayList<SecurityTokenConstants.TokenUsage>();
-
+
public AbstractSecurityToken(String id) {
if (id == null || id.isEmpty()) {
throw new IllegalArgumentException("No id specified");
@@ -61,7 +61,7 @@ public abstract class AbstractSecurityTo
public String getId() {
return this.id;
}
-
+
protected void setAsymmetric(boolean asymmetric) {
this.asymmetric = asymmetric;
}
@@ -113,7 +113,7 @@ public abstract class AbstractSecurityTo
public X509Certificate[] getX509Certificates() throws XMLSecurityException {
return x509Certificates;
}
-
+
@Override
public void addTokenUsage(TokenUsage tokenUsage) throws XMLSecurityException {
tokenUsages.add(tokenUsage);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/GenericOutboundSecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/GenericOutboundSecurityToken.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/GenericOutboundSecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/GenericOutboundSecurityToken.java Tue Dec 15 17:13:17 2015
@@ -105,7 +105,7 @@ public class GenericOutboundSecurityToke
public void setTokenType(SecurityTokenConstants.TokenType tokenType) {
this.tokenType = tokenType;
}
-
+
@Override
public SecurityTokenConstants.TokenType getTokenType() {
return tokenType;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java Tue Dec 15 17:13:17 2015
@@ -60,7 +60,7 @@ public class SecurityTokenFactoryImpl ex
if (x509DataType != null) {
return getSecurityToken(x509DataType, securityProperties, inboundSecurityContext, keyUsage);
}
-
+
// KeyValue
final KeyValueType keyValueType
= XMLSecurityUtils.getQNameType(keyInfoType.getContent(), XMLSecurityConstants.TAG_dsig_KeyValue);
@@ -109,7 +109,7 @@ public class SecurityTokenFactoryImpl ex
throw new XMLSecurityException("stax.noKey", new Object[] {keyUsage});
}
- private static InboundSecurityToken getSecurityToken(KeyValueType keyValueType,
+ private static InboundSecurityToken getSecurityToken(KeyValueType keyValueType,
XMLSecurityProperties securityProperties,
InboundSecurityContext inboundSecurityContext,
SecurityTokenConstants.KeyUsage keyUsage)
@@ -118,7 +118,7 @@ public class SecurityTokenFactoryImpl ex
final RSAKeyValueType rsaKeyValueType =
XMLSecurityUtils.getQNameType(keyValueType.getContent(), XMLSecurityConstants.TAG_dsig_RSAKeyValue);
if (rsaKeyValueType != null) {
- RsaKeyValueSecurityToken token =
+ RsaKeyValueSecurityToken token =
new RsaKeyValueSecurityToken(rsaKeyValueType, inboundSecurityContext);
setTokenKey(securityProperties, keyUsage, token);
return token;
@@ -126,7 +126,7 @@ public class SecurityTokenFactoryImpl ex
final DSAKeyValueType dsaKeyValueType =
XMLSecurityUtils.getQNameType(keyValueType.getContent(), XMLSecurityConstants.TAG_dsig_DSAKeyValue);
if (dsaKeyValueType != null) {
- DsaKeyValueSecurityToken token =
+ DsaKeyValueSecurityToken token =
new DsaKeyValueSecurityToken(dsaKeyValueType, inboundSecurityContext);
setTokenKey(securityProperties, keyUsage, token);
return token;
@@ -134,7 +134,7 @@ public class SecurityTokenFactoryImpl ex
final ECKeyValueType ecKeyValueType =
XMLSecurityUtils.getQNameType(keyValueType.getContent(), XMLSecurityConstants.TAG_dsig11_ECKeyValue);
if (ecKeyValueType != null) {
- ECKeyValueSecurityToken token =
+ ECKeyValueSecurityToken token =
new ECKeyValueSecurityToken(ecKeyValueType, inboundSecurityContext);
setTokenKey(securityProperties, keyUsage, token);
return token;
@@ -204,7 +204,7 @@ public class SecurityTokenFactoryImpl ex
&& securityProperties.getSignatureVerificationKey() == null
|| SecurityTokenConstants.KeyUsage_Decryption.equals(keyUsage)
&& securityProperties.getDecryptionKey() == null) {
- throw new XMLSecurityException("stax.noKey", new Object[] {keyUsage});
+ throw new XMLSecurityException("stax.noKey", new Object[] {keyUsage});
}
X509SKISecurityToken token =
new X509SKISecurityToken(
@@ -250,7 +250,7 @@ public class SecurityTokenFactoryImpl ex
} else if (SecurityTokenConstants.KeyUsage_Decryption.equals(keyUsage)) {
key = securityProperties.getDecryptionKey();
}
- if (key instanceof PublicKey
+ if (key instanceof PublicKey
&& !SecurityTokenConstants.KeyValueToken.equals(token.getTokenType())) {
token.setPublicKey((PublicKey) key);
} else {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java Tue Dec 15 17:13:17 2015
@@ -240,7 +240,7 @@ public abstract class CanonicalizerBase
public void transform(final XMLSecEvent xmlSecEvent) throws XMLStreamException {
try {
OutputStream outputStream = getOutputStream();
-
+
switch (xmlSecEvent.getEventType()) {
case XMLStreamConstants.START_ELEMENT:
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/MultiInputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/MultiInputStream.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/MultiInputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/MultiInputStream.java Tue Dec 15 17:13:17 2015
@@ -69,7 +69,7 @@ public class MultiInputStream extends In
public long skip(long n) throws IOException {
throw new IOException("skip() not supported");
}
-
+
@Override
public int available() throws IOException {
if (inputStreamIndex < inputStreamCount) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/UnsynchronizedByteArrayInputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/UnsynchronizedByteArrayInputStream.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/UnsynchronizedByteArrayInputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/UnsynchronizedByteArrayInputStream.java Tue Dec 15 17:13:17 2015
@@ -22,7 +22,7 @@ import java.io.InputStream;
/**
* A specialized {@link InputStream } for reading the contents of a byte array.
- *
+ *
* @see UnsynchronizedByteArrayOutputStream
*/
public class UnsynchronizedByteArrayInputStream extends InputStream {
@@ -51,7 +51,7 @@ public class UnsynchronizedByteArrayInpu
/**
* Constructs a new {@code ByteArrayInputStream} on the byte array
* {@code buf}.
- *
+ *
* @param buf
* the byte array to stream over.
*/
@@ -65,7 +65,7 @@ public class UnsynchronizedByteArrayInpu
* Constructs a new {@code ByteArrayInputStream} on the byte array
* {@code buf} with the initial position set to {@code offset} and the
* number of bytes available set to {@code offset} + {@code length}.
- *
+ *
* @param buf
* the byte array to stream over.
* @param offset
@@ -84,7 +84,7 @@ public class UnsynchronizedByteArrayInpu
* Returns the number of bytes that are available before this stream will
* block. This method returns the number of bytes yet to be read from the
* source byte array.
- *
+ *
* @return the number of bytes available before blocking.
*/
@Override
@@ -94,7 +94,7 @@ public class UnsynchronizedByteArrayInpu
/**
* Closes this stream and frees resources associated with this stream.
- *
+ *
* @throws IOException
* if an I/O error occurs while closing this stream.
*/
@@ -107,7 +107,7 @@ public class UnsynchronizedByteArrayInpu
* Sets a mark position in this ByteArrayInputStream. The parameter
* {@code readlimit} is ignored. Sending {@code reset()} will reposition the
* stream back to the marked position.
- *
+ *
* @param readlimit
* ignored.
* @see #markSupported()
@@ -122,7 +122,7 @@ public class UnsynchronizedByteArrayInpu
* Indicates whether this stream supports the {@code mark()} and
* {@code reset()} methods. Returns {@code true} since this class supports
* these methods.
- *
+ *
* @return always {@code true}.
* @see #mark(int)
* @see #reset()
@@ -136,7 +136,7 @@ public class UnsynchronizedByteArrayInpu
* Reads a single byte from the source byte array and returns it as an
* integer in the range from 0 to 255. Returns -1 if the end of the source
* array has been reached.
- *
+ *
* @return the byte read or -1 if the end of this stream has been reached.
*/
@Override
@@ -148,7 +148,7 @@ public class UnsynchronizedByteArrayInpu
* Reads at most {@code len} bytes from this stream and stores
* them in byte array {@code b} starting at {@code offset}. This
* implementation reads bytes from the source byte array.
- *
+ *
* @param b
* the byte array in which to store the bytes read.
* @param offset
@@ -206,7 +206,7 @@ public class UnsynchronizedByteArrayInpu
* {@code read()}s will not return these bytes unless {@code reset()} is
* used. This implementation skips {@code count} number of bytes in the
* target stream. It does nothing and returns 0 if {@code n} is negative.
- *
+ *
* @param n
* the number of bytes to skip.
* @return the number of bytes actually skipped.
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/UnsynchronizedByteArrayOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/UnsynchronizedByteArrayOutputStream.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/UnsynchronizedByteArrayOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/UnsynchronizedByteArrayOutputStream.java Tue Dec 15 17:13:17 2015
@@ -46,7 +46,7 @@ public class UnsynchronizedByteArrayOutp
* Constructs a new {@code ByteArrayOutputStream} with a default size of
* {@code size} bytes. If more than {@code size} bytes are written to this
* instance, the underlying byte array will expand.
- *
+ *
* @param size
* initial size for the underlying byte array, must be
* non-negative.
@@ -83,7 +83,7 @@ public class UnsynchronizedByteArrayOutp
/**
* Returns the total number of bytes written to this stream so far.
- *
+ *
* @return the number of bytes written to this stream.
*/
public int size() {
@@ -94,7 +94,7 @@ public class UnsynchronizedByteArrayOutp
* Returns the contents of this ByteArrayOutputStream as a byte array. Any
* changes made to the receiver after returning will not be reflected in the
* byte array returned to the caller.
- *
+ *
* @return this stream's current contents as a byte array.
*/
public byte[] toByteArray() {
@@ -107,7 +107,7 @@ public class UnsynchronizedByteArrayOutp
* Returns the contents of this ByteArrayOutputStream as a string. Any
* changes made to the receiver after returning will not be reflected in the
* string returned to the caller.
- *
+ *
* @return this stream's current contents as a string.
*/
@@ -119,7 +119,7 @@ public class UnsynchronizedByteArrayOutp
/**
* Returns the contents of this ByteArrayOutputStream as a string converted
* according to the encoding declared in {@code enc}.
- *
+ *
* @param enc
* a string representing the encoding to use when translating
* this stream to a string.
@@ -134,7 +134,7 @@ public class UnsynchronizedByteArrayOutp
/**
* Writes {@code count} bytes from the byte array {@code buffer} starting at
* offset {@code index} to this stream.
- *
+ *
* @param buffer
* the buffer to be written.
* @param offset
@@ -168,7 +168,7 @@ public class UnsynchronizedByteArrayOutp
/**
* Writes the specified byte {@code oneByte} to the OutputStream. Only the
* low order byte of {@code oneByte} is written.
- *
+ *
* @param oneByte
* the byte to be written.
*/
@@ -183,7 +183,7 @@ public class UnsynchronizedByteArrayOutp
/**
* Takes the contents of this stream and writes it to the output stream
* {@code out}.
- *
+ *
* @param out
* an OutputStream on which to write the contents of this stream.
* @throws IOException
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/SecurityEvent.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/SecurityEvent.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/SecurityEvent.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/SecurityEvent.java Tue Dec 15 17:13:17 2015
@@ -25,7 +25,7 @@ import org.apache.xml.security.stax.secu
* @version $Revision: 1350961 $ $Date: 2012-06-16 17:51:00 +0100 (Sat, 16 Jun 2012) $
*/
public abstract class SecurityEvent {
-
+
private final Event securityEventType;
private String correlationID;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/InboundSecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/InboundSecurityToken.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/InboundSecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/InboundSecurityToken.java Tue Dec 15 17:13:17 2015
@@ -60,14 +60,14 @@ public interface InboundSecurityToken ex
PublicKey getPublicKey(String algorithmURI, XMLSecurityConstants.AlgorithmUsage algorithmUsage, String correlationID) throws XMLSecurityException;
void addWrappedToken(InboundSecurityToken securityToken);
-
+
/**
* Verifies the key if applicable
*
* @throws XMLSecurityException if the key couldn't be verified or the key isn't valid
*/
void verify() throws XMLSecurityException;
-
+
/**
* Returns the absolute path to the XMLElement
*
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/OutboundSecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/OutboundSecurityToken.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/OutboundSecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/OutboundSecurityToken.java Tue Dec 15 17:13:17 2015
@@ -44,9 +44,9 @@ public interface OutboundSecurityToken e
* @throws XMLSecurityException if the key can't be loaded
*/
Key getSecretKey(String algorithmURI) throws XMLSecurityException;
-
+
void addWrappedToken(OutboundSecurityToken securityToken);
-
+
Element getCustomTokenReference();
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityToken.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityToken.java Tue Dec 15 17:13:17 2015
@@ -74,7 +74,7 @@ public interface SecurityToken {
SecurityToken getKeyWrappingToken() throws XMLSecurityException;
List<? extends SecurityToken> getWrappedTokens() throws XMLSecurityException;
-
+
/**
* Returns the KeyIdentifier
*
@@ -85,7 +85,7 @@ public interface SecurityToken {
SecurityTokenConstants.TokenType getTokenType();
List<SecurityTokenConstants.TokenUsage> getTokenUsages();
-
+
void addTokenUsage(SecurityTokenConstants.TokenUsage tokenUsage) throws XMLSecurityException;
/**
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenFactory.java Tue Dec 15 17:13:17 2015
@@ -39,7 +39,7 @@ public abstract class SecurityTokenFacto
if (securityTokenFactory == null) {
String stf = ConfigurationProperties.getProperty("securityTokenFactory");
if (stf == null) {
- throw new XMLSecurityException("algorithm.ClassDoesNotExist",
+ throw new XMLSecurityException("algorithm.ClassDoesNotExist",
new Object[] {"null"});
}
Class<?> callingClass = ConfigurationProperties.getCallingClass();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/InvalidTransformException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/InvalidTransformException.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/InvalidTransformException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/InvalidTransformException.java Tue Dec 15 17:13:17 2015
@@ -27,7 +27,7 @@ import org.apache.xml.security.exception
public class InvalidTransformException extends XMLSecurityException {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;