--- old/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java 2013-06-28 11:34:50.392037368 -0400 +++ new/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java 2013-06-28 11:34:50.220042721 -0400 @@ -2,38 +2,40 @@ * 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 +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * http://www.apache.org/licenses/LICENSE-2.0 * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ /* * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. */ /* - * $Id: DOMKeyInfo.java,v 1.2 2008/07/24 15:20:32 mullan Exp $ + * $Id: DOMKeyInfo.java 1333869 2012-05-04 10:42:44Z coheigea $ */ package org.jcp.xml.dsig.internal.dom; import javax.xml.crypto.*; import javax.xml.crypto.dsig.*; -import javax.xml.crypto.dsig.dom.DOMSignContext; import javax.xml.crypto.dsig.keyinfo.KeyInfo; import javax.xml.crypto.dom.*; import java.security.Provider; import java.util.*; + import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -48,7 +50,7 @@ public final class DOMKeyInfo extends DOMStructure implements KeyInfo { private final String id; - private final List keyInfoTypes; + private final List keyInfoTypes; /** * Creates a DOMKeyInfo. @@ -62,21 +64,21 @@ * @throws ClassCastException if content contains any entries * that are not of type {@link XMLStructure} */ - public DOMKeyInfo(List content, String id) { + public DOMKeyInfo(List content, String id) { if (content == null) { throw new NullPointerException("content cannot be null"); } - List typesCopy = new ArrayList(content); - if (typesCopy.isEmpty()) { + this.keyInfoTypes = + Collections.unmodifiableList(new ArrayList(content)); + if (this.keyInfoTypes.isEmpty()) { throw new IllegalArgumentException("content cannot be empty"); } - for (int i = 0, size = typesCopy.size(); i < size; i++) { - if (!(typesCopy.get(i) instanceof XMLStructure)) { + for (int i = 0, size = this.keyInfoTypes.size(); i < size; i++) { + if (!(this.keyInfoTypes.get(i) instanceof XMLStructure)) { throw new ClassCastException ("content["+i+"] is not a valid KeyInfo type"); } } - this.keyInfoTypes = Collections.unmodifiableList(typesCopy); this.id = id; } @@ -86,7 +88,9 @@ * @param kiElem KeyInfo element */ public DOMKeyInfo(Element kiElem, XMLCryptoContext context, - Provider provider) throws MarshalException { + Provider provider) + throws MarshalException + { // get Id attribute, if specified Attr attr = kiElem.getAttributeNodeNS(null, "Id"); if (attr != null) { @@ -103,24 +107,24 @@ throw new MarshalException ("KeyInfo must contain at least one type"); } - List content = new ArrayList(length); + 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; + Element childElem = (Element)child; String localName = childElem.getLocalName(); if (localName.equals("X509Data")) { content.add(new DOMX509Data(childElem)); } else if (localName.equals("KeyName")) { content.add(new DOMKeyName(childElem)); } else if (localName.equals("KeyValue")) { - content.add(new DOMKeyValue(childElem)); + content.add(DOMKeyValue.unmarshal(childElem)); } else if (localName.equals("RetrievalMethod")) { - content.add - (new DOMRetrievalMethod(childElem, context, provider)); + content.add(new DOMRetrievalMethod(childElem, + context, provider)); } else if (localName.equals("PGPData")) { content.add(new DOMPGPData(childElem)); } else { //may be MgmtData, SPKIData or element from other namespace @@ -139,51 +143,58 @@ } public void marshal(XMLStructure parent, XMLCryptoContext context) - throws MarshalException { + throws MarshalException + { if (parent == null) { throw new NullPointerException("parent is null"); } + if (!(parent instanceof javax.xml.crypto.dom.DOMStructure)) { + throw new ClassCastException("parent must be of type DOMStructure"); + } - Node pNode = ((javax.xml.crypto.dom.DOMStructure) parent).getNode(); + Node pNode = ((javax.xml.crypto.dom.DOMStructure)parent).getNode(); String dsPrefix = DOMUtils.getSignaturePrefix(context); - Element kiElem = DOMUtils.createElement + Element kiElem = DOMUtils.createElement (DOMUtils.getOwnerDocument(pNode), "KeyInfo", XMLSignature.XMLNS, dsPrefix); if (dsPrefix == null || dsPrefix.length() == 0) { - kiElem.setAttributeNS - ("http://www.w3.org/2000/xmlns/", "xmlns", XMLSignature.XMLNS); + kiElem.setAttributeNS("http://www.w3.org/2000/xmlns/", + "xmlns", XMLSignature.XMLNS); } else { - kiElem.setAttributeNS - ("http://www.w3.org/2000/xmlns/", "xmlns:" + dsPrefix, - XMLSignature.XMLNS); + kiElem.setAttributeNS("http://www.w3.org/2000/xmlns/", + "xmlns:" + dsPrefix, XMLSignature.XMLNS); } - marshal(pNode, kiElem, null, dsPrefix, (DOMCryptoContext) context); + marshal(pNode, kiElem, null, dsPrefix, (DOMCryptoContext)context); } public void marshal(Node parent, String dsPrefix, - DOMCryptoContext context) throws MarshalException { + DOMCryptoContext context) + throws MarshalException + { marshal(parent, null, dsPrefix, context); } public void marshal(Node parent, Node nextSibling, String dsPrefix, - DOMCryptoContext context) throws MarshalException { + DOMCryptoContext context) + throws MarshalException + { Document ownerDoc = DOMUtils.getOwnerDocument(parent); - - Element kiElem = DOMUtils.createElement - (ownerDoc, "KeyInfo", XMLSignature.XMLNS, dsPrefix); + Element kiElem = DOMUtils.createElement(ownerDoc, "KeyInfo", + XMLSignature.XMLNS, dsPrefix); marshal(parent, kiElem, nextSibling, dsPrefix, context); } private void marshal(Node parent, Element kiElem, Node nextSibling, - String dsPrefix, DOMCryptoContext context) throws MarshalException { + String dsPrefix, DOMCryptoContext context) + throws MarshalException + { // create and append KeyInfoType elements - for (int i = 0, size = keyInfoTypes.size(); i < size; i++) { - XMLStructure kiType = (XMLStructure) keyInfoTypes.get(i); + for (XMLStructure kiType : keyInfoTypes) { if (kiType instanceof DOMStructure) { - ((DOMStructure) kiType).marshal(kiElem, dsPrefix, context); + ((DOMStructure)kiType).marshal(kiElem, dsPrefix, context); } else { DOMUtils.appendChild(kiElem, - ((javax.xml.crypto.dom.DOMStructure) kiType).getNode()); + ((javax.xml.crypto.dom.DOMStructure)kiType).getNode()); } } @@ -193,6 +204,7 @@ parent.insertBefore(kiElem, nextSibling); } + @Override public boolean equals(Object o) { if (this == o) { return true; @@ -201,11 +213,22 @@ if (!(o instanceof KeyInfo)) { return false; } - KeyInfo oki = (KeyInfo) o; + KeyInfo oki = (KeyInfo)o; - boolean idsEqual = (id == null ? oki.getId() == null : - id.equals(oki.getId())); + boolean idsEqual = (id == null ? oki.getId() == null + : id.equals(oki.getId())); return (keyInfoTypes.equals(oki.getContent()) && idsEqual); } + + @Override + public int hashCode() { + int result = 17; + if (id != null) { + result = 31 * result + id.hashCode(); + } + result = 31 * result + keyInfoTypes.hashCode(); + + return result; + } }