Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-22 12:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-905_dev747368_bouncycastle'

Browse Source
This commit is contained in:
ghidra1 2021-05-19 13:37:08 -04:00
commit ca2881205f
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Ghidra/Features/FileFormats/Module.manifest
View File

@ -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

3
Ghidra/Features/FileFormats/build.gradle
View File

@ -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'

1
Ghidra/Features/FileFormats/certification.manifest
View File

@ -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

2
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/img4/Img4FileSystem.java
View File

@ -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;