src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java
Print this page
*** 1,30 ****
/*
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
! /*
! * Copyright 2005 The Apache Software Foundation.
! *
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
! *
*/
/*
* Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
*/
/*
! * $Id: DOMX509Data.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
import java.io.ByteArrayInputStream;
import java.security.cert.*;
--- 1,32 ----
/*
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
! /**
! * Licensed to the Apache Software Foundation (ASF) under one
! * or more contributor license agreements. See the NOTICE file
! * distributed with this work for additional information
! * regarding copyright ownership. The ASF licenses this file
! * to you under the Apache License, Version 2.0 (the
! * "License"); you may not use this file except in compliance
! * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing,
! * software distributed under the License is distributed on an
! * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
! * KIND, either express or implied. See the License for the
! * specific language governing permissions and limitations
! * under the License.
*/
/*
* Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
*/
/*
! * $Id: DOMX509Data.java 1333415 2012-05-03 12:03:51Z coheigea $
*/
package org.jcp.xml.dsig.internal.dom;
import java.io.ByteArrayInputStream;
import java.security.cert.*;
*** 49,59 ****
* @author Sean Mullan
*/
//@@@ check for illegal combinations of data violating MUSTs in W3c spec
public final class DOMX509Data extends DOMStructure implements X509Data {
! private final List content;
private CertificateFactory cf;
/**
* Creates a DOMX509Data.
*
--- 51,61 ----
* @author Sean Mullan
*/
//@@@ check for illegal combinations of data violating MUSTs in W3c spec
public final class DOMX509Data extends DOMStructure implements X509Data {
! private final List<Object> content;
private CertificateFactory cf;
/**
* Creates a DOMX509Data.
*
*** 67,88 ****
* @throws NullPointerException if <code>content</code> is <code>null</code>
* @throws IllegalArgumentException if <code>content</code> is empty
* @throws ClassCastException if <code>content</code> contains any entries
* that are not of one of the valid types mentioned above
*/
! public DOMX509Data(List content) {
if (content == null) {
throw new NullPointerException("content cannot be null");
}
! List contentCopy = new ArrayList(content);
if (contentCopy.isEmpty()) {
throw new IllegalArgumentException("content cannot be empty");
}
for (int i = 0, size = contentCopy.size(); i < size; i++) {
Object x509Type = contentCopy.get(i);
if (x509Type instanceof String) {
! new X500Principal((String) x509Type);
} else if (!(x509Type instanceof byte[]) &&
!(x509Type instanceof X509Certificate) &&
!(x509Type instanceof X509CRL) &&
!(x509Type instanceof XMLStructure)) {
throw new ClassCastException
--- 69,90 ----
* @throws NullPointerException if <code>content</code> is <code>null</code>
* @throws IllegalArgumentException if <code>content</code> is empty
* @throws ClassCastException if <code>content</code> contains any entries
* that are not of one of the valid types mentioned above
*/
! public DOMX509Data(List<?> content) {
if (content == null) {
throw new NullPointerException("content cannot be null");
}
! List<Object> contentCopy = new ArrayList<Object>(content);
if (contentCopy.isEmpty()) {
throw new IllegalArgumentException("content cannot be empty");
}
for (int i = 0, size = contentCopy.size(); i < size; i++) {
Object x509Type = contentCopy.get(i);
if (x509Type instanceof String) {
! new X500Principal((String)x509Type);
} else if (!(x509Type instanceof byte[]) &&
!(x509Type instanceof X509Certificate) &&
!(x509Type instanceof X509CRL) &&
!(x509Type instanceof XMLStructure)) {
throw new ClassCastException
*** 100,118 ****
*/
public DOMX509Data(Element xdElem) throws MarshalException {
// get all children nodes
NodeList nl = xdElem.getChildNodes();
int length = nl.getLength();
! List content = new ArrayList(length);
for (int i = 0; i < length; i++) {
Node child = nl.item(i);
// ignore all non-Element nodes
if (child.getNodeType() != Node.ELEMENT_NODE) {
continue;
}
! Element childElem = (Element) child;
String localName = childElem.getLocalName();
if (localName.equals("X509Certificate")) {
content.add(unmarshalX509Certificate(childElem));
} else if (localName.equals("X509IssuerSerial")) {
content.add(new DOMX509IssuerSerial(childElem));
--- 102,120 ----
*/
public DOMX509Data(Element xdElem) throws MarshalException {
// get all children nodes
NodeList nl = xdElem.getChildNodes();
int length = nl.getLength();
! List<Object> content = new ArrayList<Object>(length);
for (int i = 0; i < length; i++) {
Node child = nl.item(i);
// ignore all non-Element nodes
if (child.getNodeType() != Node.ELEMENT_NODE) {
continue;
}
! Element childElem = (Element)child;
String localName = childElem.getLocalName();
if (localName.equals("X509Certificate")) {
content.add(unmarshalX509Certificate(childElem));
} else if (localName.equals("X509IssuerSerial")) {
content.add(new DOMX509IssuerSerial(childElem));
*** 136,237 ****
public List getContent() {
return content;
}
public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
! throws MarshalException {
Document ownerDoc = DOMUtils.getOwnerDocument(parent);
!
! Element xdElem = DOMUtils.createElement
! (ownerDoc, "X509Data", XMLSignature.XMLNS, dsPrefix);
// append children and preserve order
for (int i = 0, size = content.size(); i < size; i++) {
Object object = content.get(i);
if (object instanceof X509Certificate) {
! marshalCert((X509Certificate) object,xdElem,ownerDoc,dsPrefix);
} else if (object instanceof XMLStructure) {
if (object instanceof X509IssuerSerial) {
! ((DOMX509IssuerSerial) object).marshal
(xdElem, dsPrefix, context);
} else {
javax.xml.crypto.dom.DOMStructure domContent =
! (javax.xml.crypto.dom.DOMStructure) object;
DOMUtils.appendChild(xdElem, domContent.getNode());
}
} else if (object instanceof byte[]) {
! marshalSKI((byte[]) object, xdElem, ownerDoc, dsPrefix);
} else if (object instanceof String) {
! marshalSubjectName((String) object, xdElem, ownerDoc,dsPrefix);
} else if (object instanceof X509CRL) {
! marshalCRL((X509CRL) object, xdElem, ownerDoc, dsPrefix);
}
}
parent.appendChild(xdElem);
}
private void marshalSKI(byte[] skid, Node parent, Document doc,
! String dsPrefix) {
!
! Element skidElem = DOMUtils.createElement
! (doc, "X509SKI", XMLSignature.XMLNS, dsPrefix);
skidElem.appendChild(doc.createTextNode(Base64.encode(skid)));
parent.appendChild(skidElem);
}
private void marshalSubjectName(String name, Node parent, Document doc,
! String dsPrefix) {
!
! Element snElem = DOMUtils.createElement
! (doc, "X509SubjectName", XMLSignature.XMLNS, dsPrefix);
snElem.appendChild(doc.createTextNode(name));
parent.appendChild(snElem);
}
private void marshalCert(X509Certificate cert, Node parent, Document doc,
! String dsPrefix) throws MarshalException {
!
! Element certElem = DOMUtils.createElement
! (doc, "X509Certificate", XMLSignature.XMLNS, dsPrefix);
try {
certElem.appendChild(doc.createTextNode
(Base64.encode(cert.getEncoded())));
} catch (CertificateEncodingException e) {
throw new MarshalException("Error encoding X509Certificate", e);
}
parent.appendChild(certElem);
}
private void marshalCRL(X509CRL crl, Node parent, Document doc,
! String dsPrefix) throws MarshalException {
!
! Element crlElem = DOMUtils.createElement
! (doc, "X509CRL", XMLSignature.XMLNS, dsPrefix);
try {
crlElem.appendChild(doc.createTextNode
(Base64.encode(crl.getEncoded())));
} catch (CRLException e) {
throw new MarshalException("Error encoding X509CRL", e);
}
parent.appendChild(crlElem);
}
private X509Certificate unmarshalX509Certificate(Element elem)
! throws MarshalException {
try {
ByteArrayInputStream bs = unmarshalBase64Binary(elem);
! return (X509Certificate) cf.generateCertificate(bs);
} catch (CertificateException e) {
throw new MarshalException("Cannot create X509Certificate", e);
}
}
private X509CRL unmarshalX509CRL(Element elem) throws MarshalException {
try {
ByteArrayInputStream bs = unmarshalBase64Binary(elem);
! return (X509CRL) cf.generateCRL(bs);
} catch (CRLException e) {
throw new MarshalException("Cannot create X509CRL", e);
}
}
--- 138,242 ----
public List getContent() {
return content;
}
public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
! throws MarshalException
! {
Document ownerDoc = DOMUtils.getOwnerDocument(parent);
! Element xdElem = DOMUtils.createElement(ownerDoc, "X509Data",
! XMLSignature.XMLNS, dsPrefix);
// append children and preserve order
for (int i = 0, size = content.size(); i < size; i++) {
Object object = content.get(i);
if (object instanceof X509Certificate) {
! marshalCert((X509Certificate)object,xdElem,ownerDoc,dsPrefix);
} else if (object instanceof XMLStructure) {
if (object instanceof X509IssuerSerial) {
! ((DOMX509IssuerSerial)object).marshal
(xdElem, dsPrefix, context);
} else {
javax.xml.crypto.dom.DOMStructure domContent =
! (javax.xml.crypto.dom.DOMStructure)object;
DOMUtils.appendChild(xdElem, domContent.getNode());
}
} else if (object instanceof byte[]) {
! marshalSKI((byte[])object, xdElem, ownerDoc, dsPrefix);
} else if (object instanceof String) {
! marshalSubjectName((String)object, xdElem, ownerDoc,dsPrefix);
} else if (object instanceof X509CRL) {
! marshalCRL((X509CRL)object, xdElem, ownerDoc, dsPrefix);
}
}
parent.appendChild(xdElem);
}
private void marshalSKI(byte[] skid, Node parent, Document doc,
! String dsPrefix)
! {
! Element skidElem = DOMUtils.createElement(doc, "X509SKI",
! XMLSignature.XMLNS, dsPrefix);
skidElem.appendChild(doc.createTextNode(Base64.encode(skid)));
parent.appendChild(skidElem);
}
private void marshalSubjectName(String name, Node parent, Document doc,
! String dsPrefix)
! {
! Element snElem = DOMUtils.createElement(doc, "X509SubjectName",
! XMLSignature.XMLNS, dsPrefix);
snElem.appendChild(doc.createTextNode(name));
parent.appendChild(snElem);
}
private void marshalCert(X509Certificate cert, Node parent, Document doc,
! String dsPrefix)
! throws MarshalException
! {
! Element certElem = DOMUtils.createElement(doc, "X509Certificate",
! XMLSignature.XMLNS, dsPrefix);
try {
certElem.appendChild(doc.createTextNode
(Base64.encode(cert.getEncoded())));
} catch (CertificateEncodingException e) {
throw new MarshalException("Error encoding X509Certificate", e);
}
parent.appendChild(certElem);
}
private void marshalCRL(X509CRL crl, Node parent, Document doc,
! String dsPrefix)
! throws MarshalException
! {
! Element crlElem = DOMUtils.createElement(doc, "X509CRL",
! XMLSignature.XMLNS, dsPrefix);
try {
crlElem.appendChild(doc.createTextNode
(Base64.encode(crl.getEncoded())));
} catch (CRLException e) {
throw new MarshalException("Error encoding X509CRL", e);
}
parent.appendChild(crlElem);
}
private X509Certificate unmarshalX509Certificate(Element elem)
! throws MarshalException
! {
try {
ByteArrayInputStream bs = unmarshalBase64Binary(elem);
! return (X509Certificate)cf.generateCertificate(bs);
} catch (CertificateException e) {
throw new MarshalException("Cannot create X509Certificate", e);
}
}
private X509CRL unmarshalX509CRL(Element elem) throws MarshalException {
try {
ByteArrayInputStream bs = unmarshalBase64Binary(elem);
! return (X509CRL)cf.generateCRL(bs);
} catch (CRLException e) {
throw new MarshalException("Cannot create X509CRL", e);
}
}
*** 247,278 ****
} catch (Base64DecodingException bde) {
throw new MarshalException("Cannot decode Base64-encoded val", bde);
}
}
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof X509Data)) {
return false;
}
! X509Data oxd = (X509Data) o;
! List ocontent = oxd.getContent();
int size = content.size();
if (size != ocontent.size()) {
return false;
}
for (int i = 0; i < size; i++) {
Object x = content.get(i);
Object ox = ocontent.get(i);
if (x instanceof byte[]) {
if (!(ox instanceof byte[]) ||
! !Arrays.equals((byte[]) x, (byte[]) ox)) {
return false;
}
} else {
if (!(x.equals(ox))) {
return false;
--- 252,284 ----
} catch (Base64DecodingException bde) {
throw new MarshalException("Cannot decode Base64-encoded val", bde);
}
}
+ @Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof X509Data)) {
return false;
}
! X509Data oxd = (X509Data)o;
! @SuppressWarnings("unchecked") List<Object> ocontent = oxd.getContent();
int size = content.size();
if (size != ocontent.size()) {
return false;
}
for (int i = 0; i < size; i++) {
Object x = content.get(i);
Object ox = ocontent.get(i);
if (x instanceof byte[]) {
if (!(ox instanceof byte[]) ||
! !Arrays.equals((byte[])x, (byte[])ox)) {
return false;
}
} else {
if (!(x.equals(ox))) {
return false;
*** 280,285 ****
--- 286,299 ----
}
}
return true;
}
+
+ @Override
+ public int hashCode() {
+ int result = 17;
+ result = 31 * result + content.hashCode();
+
+ return result;
+ }
}