mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Ghidra_12.2'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-09-21 13:53:16 -04:00
parent 02dc099e51 4e44b743b4
commit c574a1a31a
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Framework/Generic/Module.manifest
View File

@@ -10,6 +10,6 @@ MODULE FILE LICENSE: lib/commons-lang3-3.20.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/commons-io-2.19.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/commons-text-1.10.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/gson-2.13.2.jar Apache License 2.0
MODULE FILE LICENSE: lib/bcpkix-jdk18on-1.84.jar Bouncy Castle License
MODULE FILE LICENSE: lib/bcprov-jdk18on-1.84.jar Bouncy Castle License
MODULE FILE LICENSE: lib/bcutil-jdk18on-1.84.jar Bouncy Castle License
MODULE FILE LICENSE: lib/bcpkix-jdk18on-1.86.jar Bouncy Castle License
MODULE FILE LICENSE: lib/bcprov-jdk18on-1.86.jar Bouncy Castle License
MODULE FILE LICENSE: lib/bcutil-jdk18on-1.86.jar Bouncy Castle License

6
Ghidra/Framework/Generic/build.gradle
View File

@@ -43,9 +43,9 @@ dependencies {
api "org.apache.commons:commons-text:1.10.0"
api "commons-io:commons-io:2.19.0"
api "com.google.code.gson:gson:2.13.2"
api "org.bouncycastle:bcpkix-jdk18on:1.84" // requires bcutil and bcprov
api "org.bouncycastle:bcprov-jdk18on:1.84"
api "org.bouncycastle:bcutil-jdk18on:1.84"
api "org.bouncycastle:bcpkix-jdk18on:1.86" // requires bcutil and bcprov
api "org.bouncycastle:bcprov-jdk18on:1.86"
api "org.bouncycastle:bcutil-jdk18on:1.86"
compileOnly "junit:junit:4.13.2"
compileOnly "org.hamcrest:hamcrest:2.2"

28
Ghidra/Framework/Generic/src/main/java/ghidra/net/PKIUtils.java
View File

@@ -511,18 +511,24 @@ public class PKIUtils {
try {
pemObject = reader.readPemObject();
}
catch (DecoderException e) {
// Base64 decoding failure is reported by BouncyCastle as an unchecked
// exception. The offending block has already been consumed through its end
// marker, so reading is able to continue with the block which follows it.
++blockNumber;
String msg = "Invalid PEM certificate data within " + pemFile.getName() + ": " +
e.getMessage();
if (unusableBlockConsumer == null) {
throw new CertificateException(msg);
catch (IOException e) {
if (e.getCause() instanceof DecoderException ||
e.getMessage().contains("malformed")) {
// Base64 decoding failure is reported by BouncyCastle as an IOException
// (although checking cause or message for malformed entry is needed).
// The offending block has already been consumed through its end
// marker, so reading is able to continue with the block which follows it.
++blockNumber;
String msg =
"Invalid PEM certificate data within " + pemFile.getName() + ": " +
e.getMessage();
if (unusableBlockConsumer == null) {
throw new CertificateException(msg);
}
unusableBlockConsumer.accept(msg + " (PEM block " + blockNumber + ")");
continue;
}
unusableBlockConsumer.accept(msg + " (PEM block " + blockNumber + ")");
continue;
throw e;
}
if (pemObject == null) {
break; // end of file