Author: kiwiwings
Date: Wed Feb 23 23:54:45 2022
New Revision: 1898356
URL: http://svn.apache.org/viewvc?rev=1898356&view=rev
Log:
javadoc and forbiddenApis fix
Modified:
poi/trunk/build.gradle
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
Modified: poi/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1898356&r1=1898355&r2=1898356&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Wed Feb 23 23:54:45 2022
@@ -194,7 +194,7 @@ subprojects {
failOnError = true
maxMemory = "1024M"
javadocTool = javaToolchains.javadocToolFor {
- languageVersion = JavaLanguageVersion.of(11)
+ languageVersion = JavaLanguageVersion.of(Math.max(11,jdkVersion))
}
doFirst {
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java?rev=1898356&r1=1898355&r2=1898356&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
Wed Feb 23 23:54:45 2022
@@ -38,6 +38,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
+import javax.security.auth.x500.X500Principal;
import javax.xml.XMLConstants;
import javax.xml.crypto.XMLStructure;
import javax.xml.crypto.dom.DOMStructure;
@@ -309,6 +310,7 @@ public class XAdESSignatureFacet impleme
protected static void setCertID
(CertIDType certId, SignatureConfig signatureConfig, boolean
issuerNameNoReverseOrder, X509Certificate certificate) {
X509IssuerSerialType issuerSerial = certId.addNewIssuerSerial();
+ X500Principal issuerPrincipal = certificate.getIssuerX500Principal();
String issuerName;
if (issuerNameNoReverseOrder) {
/*
@@ -319,10 +321,9 @@ public class XAdESSignatureFacet impleme
* XXX: not correct according to RFC 4514.
*/
// TODO: check if issuerName is different on getTBSCertificate
- // issuerName =
PrincipalUtil.getIssuerX509Principal(certificate).getName().replace(",", ", ");
- issuerName = certificate.getIssuerDN().getName().replace(",", ",
");
+ issuerName = issuerPrincipal.getName().replace(",", ", ");
} else {
- issuerName = certificate.getIssuerX500Principal().toString();
+ issuerName = issuerPrincipal.toString();
}
issuerSerial.setX509IssuerName(issuerName);
issuerSerial.setX509SerialNumber(certificate.getSerialNumber());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
