Skip to content

Commit 1ef4132

Browse files
author
Dmitry Radchuk
committed
Move all bouncycastle mappings to core, add conditional mappings
DEVSIX-8975
1 parent 3eb973b commit 1ef4132

File tree

17 files changed

+450
-85
lines changed

17 files changed

+450
-85
lines changed

barcodes/src/sharpenconfig/java/com/itextpdf/barcodes/SharpenConfigMapping.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ This file is part of the iText (R) project.
2626
import java.util.Collection;
2727
import java.util.Collections;
2828
import java.util.List;
29-
import sharpen.config.ExtendedMappingConfiguration;
29+
import sharpen.config.MappingConfiguration;
3030
import sharpen.config.MappingConfigurator;
3131
import sharpen.config.ModuleOption;
3232
import sharpen.config.ModulesConfigurator;
3333
import sharpen.config.OptionsConfigurator;
3434

35-
public class SharpenConfigMapping implements ExtendedMappingConfiguration {
35+
public class SharpenConfigMapping implements MappingConfiguration {
3636
@Override
3737
public int getMappingPriority() {
3838
return 15;

bouncy-castle-adapter/src/sharpenconfig/java/com/itextpdf/bouncycastle/SharpenConfigMapping.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ This file is part of the iText (R) project.
2626
import java.util.Collection;
2727
import java.util.Collections;
2828
import java.util.List;
29-
import sharpen.config.ExtendedMappingConfiguration;
29+
import sharpen.config.MappingConfiguration;
3030
import sharpen.config.MappingConfigurator;
3131
import sharpen.config.ModuleOption;
3232
import sharpen.config.ModulesConfigurator;
3333
import sharpen.config.OptionsConfigurator;
3434

35-
public class SharpenConfigMapping implements ExtendedMappingConfiguration {
35+
public class SharpenConfigMapping implements MappingConfiguration {
3636
@Override
3737
public int getMappingPriority() {
3838
return 15;
@@ -132,6 +132,11 @@ public void applyConfigModuleSettings(ModulesConfigurator configurator) {
132132

133133
}
134134

135+
@Override
136+
public void setConfigModuleSettings(ModulesConfigurator modulesConfigurator) {
137+
138+
}
139+
135140
@Override
136141
public Collection<ModuleOption> getAvailableModuleSettings() {
137142
return Collections.EMPTY_SET;
@@ -156,9 +161,4 @@ public Collection<String> getIgnoredResources() {
156161
public List<SimpleImmutableEntry<String, String>> getOverwrittenResources() {
157162
return Collections.EMPTY_LIST;
158163
}
159-
160-
@Override
161-
public void setConfigModuleSettings(ModulesConfigurator modulesConfigurator) {
162-
163-
}
164164
}

bouncy-castle-connector/src/sharpenconfig/java/com/itextpdf/bouncycastleconnector/SharpenConfigMapping.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ This file is part of the iText (R) project.
2626
import java.util.Collection;
2727
import java.util.Collections;
2828
import java.util.List;
29-
import sharpen.config.ExtendedMappingConfiguration;
29+
import sharpen.config.MappingConfiguration;
3030
import sharpen.config.MappingConfigurator;
3131
import sharpen.config.ModuleOption;
3232
import sharpen.config.ModulesConfigurator;
3333
import sharpen.config.OptionsConfigurator;
3434

35-
public class SharpenConfigMapping implements ExtendedMappingConfiguration {
35+
public class SharpenConfigMapping implements MappingConfiguration {
3636
@Override
3737
public int getMappingPriority() {
3838
return 16;

bouncy-castle-fips-adapter/src/sharpenconfig/java/com/itextpdf/bouncycastlefips/SharpenConfigMapping.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This file is part of the iText (R) project.
2222
*/
2323
package com.itextpdf.bouncycastlefips;
2424

25-
import sharpen.config.ExtendedMappingConfiguration;
25+
import sharpen.config.MappingConfiguration;
2626
import sharpen.config.MappingConfigurator;
2727
import sharpen.config.ModuleOption;
2828
import sharpen.config.ModulesConfigurator;
@@ -33,10 +33,10 @@ This file is part of the iText (R) project.
3333
import java.util.Collections;
3434
import java.util.List;
3535

36-
public class SharpenConfigMapping implements ExtendedMappingConfiguration {
36+
public class SharpenConfigMapping implements MappingConfiguration {
3737
@Override
3838
public int getMappingPriority() {
39-
return 15;
39+
return 12;
4040
}
4141

4242
@Override
@@ -125,6 +125,11 @@ public void applyConfigModuleSettings(ModulesConfigurator configurator) {
125125

126126
}
127127

128+
@Override
129+
public void setConfigModuleSettings(ModulesConfigurator modulesConfigurator) {
130+
131+
}
132+
128133
@Override
129134
public Collection<ModuleOption> getAvailableModuleSettings() {
130135
return Collections.EMPTY_SET;
@@ -149,9 +154,4 @@ public Collection<String> getIgnoredResources() {
149154
public List<SimpleImmutableEntry<String, String>> getOverwrittenResources() {
150155
return Collections.EMPTY_LIST;
151156
}
152-
153-
@Override
154-
public void setConfigModuleSettings(ModulesConfigurator modulesConfigurator) {
155-
156-
}
157157
}
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/*
2+
This file is part of the iText (R) project.
3+
Copyright (c) 1998-2025 Apryse Group NV
4+
Authors: Apryse Software.
5+
6+
This program is offered under a commercial and under the AGPL license.
7+
For commercial licensing, contact us at https://itextpdf.com/sales. For AGPL licensing, see below.
8+
9+
AGPL licensing:
10+
This program is free software: you can redistribute it and/or modify
11+
it under the terms of the GNU Affero General Public License as published by
12+
the Free Software Foundation, either version 3 of the License, or
13+
(at your option) any later version.
14+
15+
This program is distributed in the hope that it will be useful,
16+
but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18+
GNU Affero General Public License for more details.
19+
20+
You should have received a copy of the GNU Affero General Public License
21+
along with this program. If not, see <https://www.gnu.org/licenses/>.
22+
*/
23+
package com.itextpdf.commons;
24+
25+
import sharpen.config.MappingConfigurator;
26+
import sharpen.config.MemberKind;
27+
28+
public class BCWrappersConfigurationUtils {
29+
private BCWrappersConfigurationUtils() {}
30+
31+
public static void applyMappingConfiguration(MappingConfigurator configurator) {
32+
configurator.mapMethod("java.security.cert.X509Certificate.getSerialNumber", "GetSerialNumber");
33+
configurator.mapMethod("java.security.cert.X509Certificate.getThisUpdate", "GetThisUpdate");
34+
configurator.mapMethod("java.security.cert.X509Certificate.getNotBefore", "GetNotBefore");
35+
configurator.mapMethod("java.security.cert.X509CRL.getNextUpdate", "GetNextUpdate");
36+
configurator.mapMethod("java.security.cert.X509Certificate.getSubjectDN", "GetSubjectDN");
37+
configurator.mapMethod("java.security.cert.X509CRL.getThisUpdate", "GetThisUpdate");
38+
configurator.mapType("java.math.BigInteger", "iText.Commons.Bouncycastle.Math.IBigInteger");
39+
configurator.mapMemberToInvocationsChain("java.security.MessageDigest.getInstance(java.lang.String)",
40+
"iText.Bouncycastleconnector.BouncyCastleFactoryCreator.GetFactory().CreateIDigest",
41+
MemberKind.Method);
42+
configurator.mapType("java.security.MessageDigest", "iText.Commons.Digest.IMessageDigest");
43+
configurator.mapMethod("java.security.MessageDigest.digest(byte[])", "Digest");
44+
45+
configurator.mapType("java.security.NoSuchProviderException", "Org.BouncyCastle.Security.NoSuchProviderException");
46+
47+
configurator.mapType("org.bouncycastle.cert.ocsp.SingleResp", "Org.BouncyCastle.Asn1.Ocsp.SingleResponse");
48+
configurator.mapType("org.bouncycastle.cert.ocsp.CertificateID", "Org.BouncyCastle.Asn1.Ocsp.CertID");
49+
configurator.mapType("org.bouncycastle.cert.ocsp.CertificateStatus", "Org.BouncyCastle.Asn1.Ocsp.CertStatus");
50+
configurator.mapType("org.bouncycastle.cert.ocsp.BasicOCSPResp", "Org.BouncyCastle.Asn1.Ocsp.BasicOcspResponse");
51+
configurator.mapType("org.bouncycastle.cert.ocsp.OCSPReq", "Org.BouncyCastle.Asn1.Ocsp.OcspRequest");
52+
configurator.mapType("org.bouncycastle.asn1.pkcs.RSASSAPSSparams", "Org.BouncyCastle.Asn1.Pkcs.RsassaPssParameters");
53+
54+
configurator.mapProperty("org.bouncycastle.asn1.x509.AlgorithmIdentifier.getAlgorithm", "Algorithm");
55+
configurator.mapProperty("org.bouncycastle.asn1.x509.AlgorithmIdentifier.getParameters", "Parameters");
56+
}
57+
}

0 commit comments

Comments
 (0)