Some keys/x509 refactoring
git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-java/trunk@1877774 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java b/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java
index 0b5e91f..315c123 100644
--- a/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java
+++ b/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java
@@ -100,14 +100,7 @@
try (InputStream is = new ByteArrayInputStream(certbytes)) {
CertificateFactory certFact =
CertificateFactory.getInstance(XMLX509Certificate.JCA_CERT_ID);
- X509Certificate cert =
- (X509Certificate) certFact.generateCertificate(is);
-
- if (cert != null) {
- return cert;
- }
-
- return null;
+ return (X509Certificate) certFact.generateCertificate(is);
} catch (CertificateException | IOException ex) {
throw new XMLSecurityException(ex);
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Digest.java b/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Digest.java
index 6a682da..90cf3b2 100644
--- a/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Digest.java
+++ b/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Digest.java
@@ -113,17 +113,17 @@
public static byte[] getDigestBytesFromCert(X509Certificate cert, String algorithmURI) throws XMLSecurityException {
String jcaDigestAlgorithm = JCEMapper.translateURItoJCEID(algorithmURI);
if (jcaDigestAlgorithm == null) {
- Object[] exArgs = { algorithmURI };
- throw new XMLSecurityException("XMLX509Digest.UnknownDigestAlgorithm", exArgs);
+ Object[] exArgs = {algorithmURI};
+ throw new XMLSecurityException("XMLX509Digest.UnknownDigestAlgorithm", exArgs);
}
try {
- MessageDigest md = MessageDigest.getInstance(jcaDigestAlgorithm);
- return md.digest(cert.getEncoded());
- } catch (Exception e) {
- Object[] exArgs = { jcaDigestAlgorithm };
- throw new XMLSecurityException("XMLX509Digest.FailedDigest", exArgs);
- }
+ MessageDigest md = MessageDigest.getInstance(jcaDigestAlgorithm);
+ return md.digest(cert.getEncoded());
+ } catch (Exception e) {
+ Object[] exArgs = {jcaDigestAlgorithm};
+ throw new XMLSecurityException("XMLX509Digest.FailedDigest", exArgs);
+ }
}
diff --git a/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509CertificateTest.java b/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509CertificateTest.java
index 72c33e6..65fbfab 100644
--- a/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509CertificateTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509CertificateTest.java
@@ -20,7 +20,10 @@
import java.io.File;
import java.io.FileInputStream;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import org.apache.xml.security.test.dom.TestUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -28,6 +31,8 @@
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* Certificate parsing test.
*
@@ -54,4 +59,27 @@
// System.out.println(cert);
}
+ @org.junit.jupiter.api.Test
+ public void testEqualsAndHashCode() throws Exception {
+ File f = null;
+ if (BASEDIR != null && !"".equals(BASEDIR)) {
+ f = new File(BASEDIR + SEP +
+ "src/test/resources/ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/certs/lugh.crt");
+ } else {
+ f = new File(
+ "src/test/resources/ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/certs/lugh.crt");
+ }
+
+ FileInputStream fis = new FileInputStream(f);
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+ X509Certificate cert = (X509Certificate) cf.generateCertificate(fis);
+
+ XMLX509Certificate x509Cert1 = new XMLX509Certificate(TestUtils.newDocument(), cert);
+ XMLX509Certificate x509Cert2 = new XMLX509Certificate(TestUtils.newDocument(), cert);
+
+ assertEquals(x509Cert1, x509Cert2);
+ assertEquals(x509Cert1.hashCode(), x509Cert2.hashCode());
+ }
+
+
}
diff --git a/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509IssuerSerialTest.java b/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509IssuerSerialTest.java
index 67bc97a..36563fb 100644
--- a/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509IssuerSerialTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509IssuerSerialTest.java
@@ -50,4 +50,16 @@
assertEquals("CN=\\#abc123", is.getIssuerName());
// System.out.println(is.getIssuerName());
}
+
+ @org.junit.jupiter.api.Test
+ public void testEqualsHashcode() throws Exception {
+ XMLX509IssuerSerial is1 = new XMLX509IssuerSerial(doc, "1234", 0);
+ assertEquals("1234", is1.getIssuerName());
+
+ XMLX509IssuerSerial is2 = new XMLX509IssuerSerial(doc, "1234", 0);
+ assertEquals("1234", is2.getIssuerName());
+
+ assertEquals(is1, is2);
+ assertEquals(is1.hashCode(), is2.hashCode());
+ }
}
\ No newline at end of file
diff --git a/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SKITest.java b/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SKITest.java
index 4e16918..5dec9e9 100644
--- a/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SKITest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SKITest.java
@@ -30,8 +30,11 @@
import java.util.Collections;
import org.apache.xml.security.keys.content.x509.XMLX509SKI;
+import org.apache.xml.security.test.dom.TestUtils;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test bugfix 41892: XML Security 1.4.0 does not build with IBM's JDK
@@ -79,5 +82,15 @@
Collection<?> certs = cs.getCertificates(xcs);
assertFalse(certs.isEmpty());
+
+ XMLX509SKI xmlx509SKI = new XMLX509SKI(TestUtils.newDocument(), skid);
+ assertNotNull(xmlx509SKI.getSKIBytes());
+
+ XMLX509SKI xmlx509SKI2 = new XMLX509SKI(TestUtils.newDocument(), cert);
+ assertNotNull(xmlx509SKI2.getSKIBytes());
+
+ assertEquals(xmlx509SKI, xmlx509SKI2);
+ assertEquals(xmlx509SKI.hashCode(), xmlx509SKI2.hashCode());
+
}
}
diff --git a/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SubjectNameTest.java b/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SubjectNameTest.java
new file mode 100644
index 0000000..423d86c
--- /dev/null
+++ b/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SubjectNameTest.java
@@ -0,0 +1,66 @@
+/**
+ * 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 org.apache.xml.security.test.dom.keys.content.x509;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+
+import org.apache.xml.security.keys.content.x509.XMLX509SubjectName;
+import org.apache.xml.security.test.dom.TestUtils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+/**
+ * Certificate parsing test.
+ *
+ */
+public class XMLX509SubjectNameTest {
+
+ private static final String BASEDIR =
+ System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
+ private static final String SEP = System.getProperty("file.separator");
+
+ @org.junit.jupiter.api.Test
+ public void testEqualsAndHashCode() throws Exception {
+ File f = null;
+ if (BASEDIR != null && !"".equals(BASEDIR)) {
+ f = new File(BASEDIR + SEP +
+ "src/test/resources/ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/certs/lugh.crt");
+ } else {
+ f = new File(
+ "src/test/resources/ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/certs/lugh.crt");
+ }
+
+ FileInputStream fis = new FileInputStream(f);
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+ X509Certificate cert = (X509Certificate) cf.generateCertificate(fis);
+
+ XMLX509SubjectName x509SubjectName1 = new XMLX509SubjectName(TestUtils.newDocument(), cert);
+ assertNotNull(x509SubjectName1.getSubjectName());
+ XMLX509SubjectName x509SubjectName2 = new XMLX509SubjectName(TestUtils.newDocument(), cert);
+
+ assertEquals(x509SubjectName1, x509SubjectName2);
+ assertEquals(x509SubjectName1.hashCode(), x509SubjectName2.hashCode());
+ }
+
+
+}
