You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2021/11/14 13:15:14 UTC
svn commit: r1895034 - in /poi/trunk/poi-ooxml/src: main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java test/java/org/apache/poi/poifs/crypt/dsig/DummyKeystore.java test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
Author: kiwiwings
Date: Sun Nov 14 13:15:14 2021
New Revision: 1895034
URL: http://svn.apache.org/viewvc?rev=1895034&view=rev
Log:
Fix deprecate warnings on X509 api calls
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/DummyKeystore.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java?rev=1895034&r1=1895033&r2=1895034&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java Sun Nov 14 13:15:14 2021
@@ -214,7 +214,7 @@ public class XAdESXLSignatureFacet imple
}
CRLIdentifierType crlIdentifier = crlRef.addNewCRLIdentifier();
- String issuerName = crl.getIssuerDN().getName().replace(",", ", ");
+ String issuerName = crl.getIssuerX500Principal().getName().replace(",", ", ");
crlIdentifier.setIssuer(issuerName);
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("Z"), Locale.ROOT);
cal.setTime(crl.getThisUpdate());
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/DummyKeystore.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/DummyKeystore.java?rev=1895034&r1=1895033&r2=1895034&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/DummyKeystore.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/DummyKeystore.java Sun Nov 14 13:15:14 2021
@@ -172,7 +172,7 @@ public class DummyKeystore {
throw new IOException("Please add private key and certificate in the PEM file.");
}
- String alias = x509.getSubjectDN().getName();
+ String alias = x509.getSubjectX500Principal().getName();
keystore.setKeyEntry(alias, key, keyPass.toCharArray(), new Certificate[]{x509});
return new KeyCertPair(key, new Certificate[]{x509});
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java?rev=1895034&r1=1895033&r2=1895034&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java Sun Nov 14 13:15:14 2021
@@ -23,6 +23,7 @@
================================================================= */
package org.apache.poi.poifs.crypt.dsig;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -52,6 +53,7 @@ import java.util.List;
import java.util.function.BiFunction;
import java.util.function.Supplier;
+import javax.security.auth.x500.X500Principal;
import javax.xml.crypto.MarshalException;
import javax.xml.crypto.dsig.CanonicalizationMethod;
import javax.xml.crypto.dsig.XMLSignatureException;
@@ -807,14 +809,9 @@ class TestSignatureInfo {
assertNotNull(result);
- if (multi) {
- assertEquals(2, result.size());
- assertEquals("CN=Muj Klic", result.get(0).getSubjectDN().toString());
- assertEquals("CN=My Second key", result.get(1).getSubjectDN().toString());
- } else {
- assertEquals(1, result.size());
- assertEquals("CN=My Second key", result.get(0).getSubjectDN().toString());
- }
+ String[] act = result.stream().map(X509Certificate::getSubjectX500Principal).map(X500Principal::getName).toArray(String[]::new);
+ String[] exp = multi ? new String[]{ "CN=Muj Klic", "CN=My Second key" } : new String[]{ "CN=My Second key" };
+ assertArrayEquals(exp, act);
assertTrue(si.verifySignature());
pkg.revert();
@@ -859,7 +856,7 @@ class TestSignatureInfo {
final List<X509Certificate> certs = sic.getSigningCertificateChain();
assertEquals(1, certs.size());
- assertEquals("CN=Test", certs.get(0).getSubjectDN().getName());
+ assertEquals("CN=Test", certs.get(0).getSubjectX500Principal().getName());
assertEquals("SuperDuper-Reviewer", sic.getXadesRole());
assertEquals("Purpose for signing", sic.getSignatureDescription());
assertEquals("2018-06-10T09:00:54Z", sic.formatExecutionTime());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org