Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the bouncycastle version to 1.77.0 #2171

Merged
merged 1 commit into from
Apr 7, 2024
Merged

Bump the bouncycastle version to 1.77.0 #2171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
</dependency>
<dependency>
<groupId>org.wso2.orbit.org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<artifactId>bcpkix-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>
Expand Down
2 changes: 1 addition & 1 deletion modules/transports/core/nhttp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
<!-- BouncyCastle Api which needs when validating Certificates. -->
<dependency>
<groupId>org.wso2.orbit.org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<artifactId>bcpkix-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.caching</groupId>
Expand Down
17 changes: 13 additions & 4 deletions ...ttp/src/main/java/org/apache/synapse/transport/certificatevalidation/crl/CRLVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,19 @@

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.bouncycastle.asn1.*;
import org.bouncycastle.asn1.x509.*;
import org.apache.synapse.transport.certificatevalidation.*;
import org.apache.synapse.transport.certificatevalidation.CertificateVerificationException;
import org.apache.synapse.transport.certificatevalidation.RevocationVerifier;
import org.apache.synapse.transport.certificatevalidation.RevocationStatus;
import org.bouncycastle.asn1.ASN1IA5String;
import org.bouncycastle.asn1.ASN1InputStream;
import org.bouncycastle.asn1.ASN1Primitive;
import org.bouncycastle.asn1.DEROctetString;
import org.bouncycastle.asn1.x509.CRLDistPoint;
import org.bouncycastle.asn1.x509.DistributionPoint;
import org.bouncycastle.asn1.x509.DistributionPointName;
import org.bouncycastle.asn1.x509.Extension;
import org.bouncycastle.asn1.x509.GeneralName;
import org.bouncycastle.asn1.x509.GeneralNames;

import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -164,7 +173,7 @@ private List<String> getCrlDistributionPoints(X509Certificate cert)
if (genName.getTagNo() == GeneralName.uniformResourceIdentifier) {
//DERIA5String contains an ascii string.
//A IA5String is a restricted character string type in the ASN.1 notation
String url = DERIA5String.getInstance(genName.getName()).getString().trim();
String url = ASN1IA5String.getInstance(genName.getName()).getString().trim();
crlUrls.add(url);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...p/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
import org.apache.synapse.transport.certificatevalidation.Constants;
import org.apache.synapse.transport.certificatevalidation.RevocationStatus;
import org.apache.synapse.transport.certificatevalidation.RevocationVerifier;
import org.bouncycastle.asn1.ASN1IA5String;
import org.bouncycastle.asn1.ASN1InputStream;
import org.bouncycastle.asn1.DERIA5String;
import org.bouncycastle.asn1.DEROctetString;
import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers;
import org.bouncycastle.asn1.ocsp.OCSPResponseStatus;
Expand Down Expand Up @@ -276,7 +276,7 @@ private List<String> getAIALocations(X509Certificate cert) throws CertificateVer

GeneralName gn = accessDescription.getAccessLocation();
if (gn.getTagNo() == GeneralName.uniformResourceIdentifier) {
DERIA5String str = DERIA5String.getInstance(gn.getName());
ASN1IA5String str = ASN1IA5String.getInstance(gn.getName());
String accessLocation = str.getString();
ocspUrlList.add(accessLocation);
}
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@
</dependency>
<dependency>
<groupId>org.wso2.orbit.org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<artifactId>bcpkix-jdk18on</artifactId>
<version>${org.bouncycastle.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -1471,7 +1471,7 @@
<com.jayway.jsonpath.version>2.9.0.wso2v1</com.jayway.jsonpath.version>
<qfj.version>1.5.3</qfj.version>
<quickfixj.version>2.3.1</quickfixj.version>
<org.bouncycastle.version>1.69.0.wso2v1</org.bouncycastle.version>
<org.bouncycastle.version>1.77.0.wso2v2</org.bouncycastle.version>
<imp.pkg.version.wso2.bouncycastle>[1.52.0,2.0.0)</imp.pkg.version.wso2.bouncycastle>
<httpcore.version>4.4.16</httpcore.version>
<httpcore.wso2.version>${httpcore.version}.wso2v1</httpcore.wso2.version>
Expand Down
Loading