src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509IssuerSerial.java

Print this page

        

*** 1,24 **** /* * reserved comment block * DO NOT REMOVE OR ALTER! */ ! /* ! * Copyright 1999-2004 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. ! * */ package com.sun.org.apache.xml.internal.security.keys.content.x509; import java.math.BigInteger; import java.security.cert.X509Certificate; --- 1,26 ---- /* * 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. */ package com.sun.org.apache.xml.internal.security.keys.content.x509; import java.math.BigInteger; import java.security.cert.X509Certificate;
*** 29,74 **** import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy; import com.sun.org.apache.xml.internal.security.utils.XMLUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; ! /** ! * ! * @author $Author: mullan $ ! */ ! public class XMLX509IssuerSerial extends SignatureElementProxy ! implements XMLX509DataContent { ! /** {@link java.util.logging} logging facility */ ! static java.util.logging.Logger log = ! java.util.logging.Logger.getLogger( ! XMLX509IssuerSerial.class.getName()); /** * Constructor XMLX509IssuerSerial * * @param element * @param baseURI * @throws XMLSecurityException */ ! public XMLX509IssuerSerial(Element element, String baseURI) ! throws XMLSecurityException { super(element, baseURI); } /** * Constructor XMLX509IssuerSerial * * @param doc * @param x509IssuerName * @param x509SerialNumber */ ! public XMLX509IssuerSerial(Document doc, String x509IssuerName, ! BigInteger x509SerialNumber) { ! super(doc); ! XMLUtils.addReturnToElement(this._constructionElement); addTextElement(x509IssuerName, Constants._TAG_X509ISSUERNAME); addTextElement(x509SerialNumber.toString(), Constants._TAG_X509SERIALNUMBER); } /** --- 31,67 ---- import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy; import com.sun.org.apache.xml.internal.security.utils.XMLUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; ! public class XMLX509IssuerSerial extends SignatureElementProxy implements XMLX509DataContent { ! /** {@link org.apache.commons.logging} logging facility */ ! private static java.util.logging.Logger log = ! java.util.logging.Logger.getLogger(XMLX509IssuerSerial.class.getName()); /** * Constructor XMLX509IssuerSerial * * @param element * @param baseURI * @throws XMLSecurityException */ ! public XMLX509IssuerSerial(Element element, String baseURI) throws XMLSecurityException { super(element, baseURI); } /** * Constructor XMLX509IssuerSerial * * @param doc * @param x509IssuerName * @param x509SerialNumber */ ! public XMLX509IssuerSerial(Document doc, String x509IssuerName, BigInteger x509SerialNumber) { super(doc); ! XMLUtils.addReturnToElement(this.constructionElement); addTextElement(x509IssuerName, Constants._TAG_X509ISSUERNAME); addTextElement(x509SerialNumber.toString(), Constants._TAG_X509SERIALNUMBER); } /**
*** 76,127 **** * * @param doc * @param x509IssuerName * @param x509SerialNumber */ ! public XMLX509IssuerSerial(Document doc, String x509IssuerName, ! String x509SerialNumber) { this(doc, x509IssuerName, new BigInteger(x509SerialNumber)); } /** * Constructor XMLX509IssuerSerial * * @param doc * @param x509IssuerName * @param x509SerialNumber */ ! public XMLX509IssuerSerial(Document doc, String x509IssuerName, ! int x509SerialNumber) { ! this(doc, x509IssuerName, ! new BigInteger(Integer.toString(x509SerialNumber))); } /** * Constructor XMLX509IssuerSerial * * @param doc * @param x509certificate */ public XMLX509IssuerSerial(Document doc, X509Certificate x509certificate) { ! ! this(doc, ! RFC2253Parser.normalize(x509certificate.getIssuerDN().getName()), ! x509certificate.getSerialNumber()); } /** * Method getSerialNumber * * @return the serial number */ public BigInteger getSerialNumber() { ! ! String text = this.getTextFromChildElement ! (Constants._TAG_X509SERIALNUMBER, Constants.SignatureSpecNS); ! if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "X509SerialNumber text: " + text); return new BigInteger(text); } /** --- 69,118 ---- * * @param doc * @param x509IssuerName * @param x509SerialNumber */ ! public XMLX509IssuerSerial(Document doc, String x509IssuerName, String x509SerialNumber) { this(doc, x509IssuerName, new BigInteger(x509SerialNumber)); } /** * Constructor XMLX509IssuerSerial * * @param doc * @param x509IssuerName * @param x509SerialNumber */ ! public XMLX509IssuerSerial(Document doc, String x509IssuerName, int x509SerialNumber) { ! this(doc, x509IssuerName, new BigInteger(Integer.toString(x509SerialNumber))); } /** * Constructor XMLX509IssuerSerial * * @param doc * @param x509certificate */ public XMLX509IssuerSerial(Document doc, X509Certificate x509certificate) { ! this( ! doc, ! x509certificate.getIssuerX500Principal().getName(), ! x509certificate.getSerialNumber() ! ); } /** * Method getSerialNumber * * @return the serial number */ public BigInteger getSerialNumber() { ! String text = ! this.getTextFromChildElement(Constants._TAG_X509SERIALNUMBER, Constants.SignatureSpecNS); ! if (log.isLoggable(java.util.logging.Level.FINE)) { log.log(java.util.logging.Level.FINE, "X509SerialNumber text: " + text); + } return new BigInteger(text); } /**
*** 137,169 **** * Method getIssuerName * * @return the issuer name */ public String getIssuerName() { ! ! return RFC2253Parser ! .normalize(this ! .getTextFromChildElement(Constants._TAG_X509ISSUERNAME, ! Constants.SignatureSpecNS)); } /** @inheritDoc */ public boolean equals(Object obj) { ! ! if (obj == null) { ! return false; ! } ! if (!this.getClass().getName().equals(obj.getClass().getName())) { return false; } XMLX509IssuerSerial other = (XMLX509IssuerSerial) obj; return this.getSerialNumber().equals(other.getSerialNumber()) && this.getIssuerName().equals(other.getIssuerName()); } /** @inheritDoc */ public String getBaseLocalName() { return Constants._TAG_X509ISSUERSERIAL; } } --- 128,161 ---- * Method getIssuerName * * @return the issuer name */ public String getIssuerName() { ! return RFC2253Parser.normalize( ! this.getTextFromChildElement(Constants._TAG_X509ISSUERNAME, Constants.SignatureSpecNS) ! ); } /** @inheritDoc */ public boolean equals(Object obj) { ! if (!(obj instanceof XMLX509IssuerSerial)) { return false; } XMLX509IssuerSerial other = (XMLX509IssuerSerial) obj; return this.getSerialNumber().equals(other.getSerialNumber()) && this.getIssuerName().equals(other.getIssuerName()); } + public int hashCode() { + int result = 17; + result = 31 * result + getSerialNumber().hashCode(); + result = 31 * result + getIssuerName().hashCode(); + return result; + } + /** @inheritDoc */ public String getBaseLocalName() { return Constants._TAG_X509ISSUERSERIAL; } }