diff --git a/Ghidra/Features/FileFormats/Module.manifest b/Ghidra/Features/FileFormats/Module.manifest index cc8ce9024f..ef87f38645 100644 --- a/Ghidra/Features/FileFormats/Module.manifest +++ b/Ghidra/Features/FileFormats/Module.manifest @@ -9,3 +9,4 @@ MODULE FILE LICENSE: lib/sevenzipjbinding-16.02-2.01.jar LGPL 2.1 MODULE FILE LICENSE: lib/sevenzipjbinding-all-platforms-16.02-2.01.jar LGPL 2.1 MODULE FILE LICENSE: lib/AXMLPrinter2.jar Apache License 2.0 MODULE FILE LICENSE: lib/util-1.4.0.jar BSD +MODULE FILE LICENSE: lib/bcprov-jdk15on-1.68.jar Bouncy Castle License diff --git a/Ghidra/Features/FileFormats/build.gradle b/Ghidra/Features/FileFormats/build.gradle index 1046713237..edb20b7c7f 100644 --- a/Ghidra/Features/FileFormats/build.gradle +++ b/Ghidra/Features/FileFormats/build.gradle @@ -23,9 +23,9 @@ apply plugin: 'eclipse' eclipse.project.name = 'Features FileFormats' dependencies { + api project(':Base') api project(':Recognizers') - api project(':Python') api ':dex-ir:2.0' api ':dex-reader:2.0' @@ -33,6 +33,7 @@ dependencies { api ':dex-translator:2.0' api 'org.ow2.asm:asm-debug-all:4.1' + api 'org.bouncycastle:bcprov-jdk15on:1.68' api 'org.smali:baksmali:1.4.0' // TODO: upgrade to 2.2.6 api 'org.smali:dexlib:1.4.0' diff --git a/Ghidra/Features/FileFormats/certification.manifest b/Ghidra/Features/FileFormats/certification.manifest index 1a4990d500..cd67f8608a 100644 --- a/Ghidra/Features/FileFormats/certification.manifest +++ b/Ghidra/Features/FileFormats/certification.manifest @@ -1,5 +1,6 @@ ##VERSION: 2.0 ##MODULE IP: Apache License 2.0 +##MODULE IP: Bouncy Castle License ##MODULE IP: BSD ##MODULE IP: Copyright Distribution Permitted ##MODULE IP: Creative Commons Attribution 2.5 diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/img4/Img4FileSystem.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/img4/Img4FileSystem.java index 9d6d146dac..7a0fdc5b76 100644 --- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/img4/Img4FileSystem.java +++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/img4/Img4FileSystem.java @@ -20,7 +20,7 @@ import java.util.*; import javax.swing.Icon; -import org.python.bouncycastle.asn1.*; +import org.bouncycastle.asn1.*; import ghidra.app.util.bin.ByteProvider; import ghidra.file.crypto.CryptoKey;