mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2024-10-24 14:11:11 +00:00
Merge branch 'GP-0_ryanmkurtz_PR-4964_ekilmer_typos'
This commit is contained in:
commit
5b543c1847
|
@ -15,21 +15,15 @@
|
||||||
*/
|
*/
|
||||||
package agent.frida.model.methods;
|
package agent.frida.model.methods;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.*;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
import agent.frida.manager.FridaExport;
|
import agent.frida.manager.*;
|
||||||
import agent.frida.manager.FridaImport;
|
|
||||||
import agent.frida.manager.FridaSymbol;
|
|
||||||
import agent.frida.model.iface1.FridaModelTargetMethod;
|
import agent.frida.model.iface1.FridaModelTargetMethod;
|
||||||
import agent.frida.model.iface2.FridaModelTargetObject;
|
import agent.frida.model.iface2.FridaModelTargetObject;
|
||||||
import agent.frida.model.impl.FridaModelTargetObjectImpl;
|
import agent.frida.model.impl.FridaModelTargetObjectImpl;
|
||||||
import ghidra.dbg.target.TargetMethod;
|
import ghidra.dbg.target.TargetMethod;
|
||||||
import ghidra.dbg.target.schema.TargetAttributeType;
|
import ghidra.dbg.target.schema.*;
|
||||||
import ghidra.dbg.target.schema.TargetElementType;
|
|
||||||
import ghidra.dbg.target.schema.TargetObjectSchemaInfo;
|
|
||||||
|
|
||||||
@TargetObjectSchemaInfo(
|
@TargetObjectSchemaInfo(
|
||||||
name = "FunctionIntercept",
|
name = "FunctionIntercept",
|
||||||
|
@ -58,9 +52,9 @@ public class FridaModelTargetFunctionInterceptorImpl extends FridaModelTargetObj
|
||||||
HashMap<String, ParameterDescription<?>> map =
|
HashMap<String, ParameterDescription<?>> map =
|
||||||
new HashMap<String, ParameterDescription<?>>();
|
new HashMap<String, ParameterDescription<?>>();
|
||||||
ParameterDescription<String> onEnter = ParameterDescription.create(String.class, "OnEnter",
|
ParameterDescription<String> onEnter = ParameterDescription.create(String.class, "OnEnter",
|
||||||
false, "", "onEnter file", "JS file with onEnter implemenation");
|
false, "", "onEnter file", "JS file with onEnter implementation");
|
||||||
ParameterDescription<String> onLeave = ParameterDescription.create(String.class, "OnLeave",
|
ParameterDescription<String> onLeave = ParameterDescription.create(String.class, "OnLeave",
|
||||||
false, "", "onLeave file", "JS file with onLeave implemenation");
|
false, "", "onLeave file", "JS file with onLeave implementation");
|
||||||
ParameterDescription<String> name = ParameterDescription.create(String.class, "Name",
|
ParameterDescription<String> name = ParameterDescription.create(String.class, "Name",
|
||||||
false, "intercept", "name", "name for future unload");
|
false, "intercept", "name", "name for future unload");
|
||||||
ParameterDescription<String> script = ParameterDescription.create(String.class, "Script",
|
ParameterDescription<String> script = ParameterDescription.create(String.class, "Script",
|
||||||
|
|
|
@ -15,18 +15,14 @@
|
||||||
*/
|
*/
|
||||||
package agent.frida.model.methods;
|
package agent.frida.model.methods;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.*;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
import agent.frida.model.iface1.FridaModelTargetMethod;
|
import agent.frida.model.iface1.FridaModelTargetMethod;
|
||||||
import agent.frida.model.iface2.FridaModelTargetMemoryContainer;
|
import agent.frida.model.iface2.FridaModelTargetMemoryContainer;
|
||||||
import agent.frida.model.impl.FridaModelTargetObjectImpl;
|
import agent.frida.model.impl.FridaModelTargetObjectImpl;
|
||||||
import ghidra.dbg.target.TargetMethod;
|
import ghidra.dbg.target.TargetMethod;
|
||||||
import ghidra.dbg.target.schema.TargetAttributeType;
|
import ghidra.dbg.target.schema.*;
|
||||||
import ghidra.dbg.target.schema.TargetElementType;
|
|
||||||
import ghidra.dbg.target.schema.TargetObjectSchemaInfo;
|
|
||||||
|
|
||||||
@TargetObjectSchemaInfo(
|
@TargetObjectSchemaInfo(
|
||||||
name = "MemoryWatch",
|
name = "MemoryWatch",
|
||||||
|
@ -59,7 +55,7 @@ public class FridaModelTargetMemoryWatchImpl extends FridaModelTargetObjectImpl
|
||||||
ParameterDescription<Long> size = ParameterDescription.create(Long.class, "Size", true,
|
ParameterDescription<Long> size = ParameterDescription.create(Long.class, "Size", true,
|
||||||
1L, "Size", "size to scan");
|
1L, "Size", "size to scan");
|
||||||
ParameterDescription<String> onAccess = ParameterDescription.create(String.class, "OnAccess",
|
ParameterDescription<String> onAccess = ParameterDescription.create(String.class, "OnAccess",
|
||||||
true, "", "onAccess file", "JS file with onAccess implemenation");
|
true, "", "onAccess file", "JS file with onAccess implementation");
|
||||||
ParameterDescription<String> name = ParameterDescription.create(String.class, "Name",
|
ParameterDescription<String> name = ParameterDescription.create(String.class, "Name",
|
||||||
false, "watch", "name", "name for future unload");
|
false, "watch", "name", "name for future unload");
|
||||||
ParameterDescription<String> script = ParameterDescription.create(String.class, "Script",
|
ParameterDescription<String> script = ParameterDescription.create(String.class, "Script",
|
||||||
|
|
|
@ -15,18 +15,14 @@
|
||||||
*/
|
*/
|
||||||
package agent.frida.model.methods;
|
package agent.frida.model.methods;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.*;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
import agent.frida.model.iface1.FridaModelTargetMethod;
|
import agent.frida.model.iface1.FridaModelTargetMethod;
|
||||||
import agent.frida.model.iface2.FridaModelTargetObject;
|
import agent.frida.model.iface2.FridaModelTargetObject;
|
||||||
import agent.frida.model.impl.FridaModelTargetObjectImpl;
|
import agent.frida.model.impl.FridaModelTargetObjectImpl;
|
||||||
import ghidra.dbg.target.TargetMethod;
|
import ghidra.dbg.target.TargetMethod;
|
||||||
import ghidra.dbg.target.schema.TargetAttributeType;
|
import ghidra.dbg.target.schema.*;
|
||||||
import ghidra.dbg.target.schema.TargetElementType;
|
|
||||||
import ghidra.dbg.target.schema.TargetObjectSchemaInfo;
|
|
||||||
|
|
||||||
@TargetObjectSchemaInfo(
|
@TargetObjectSchemaInfo(
|
||||||
name = "ModuleIntercept",
|
name = "ModuleIntercept",
|
||||||
|
@ -57,9 +53,9 @@ public class FridaModelTargetModuleInterceptorImpl extends FridaModelTargetObjec
|
||||||
ParameterDescription<String> address = ParameterDescription.create(String.class, "Address",
|
ParameterDescription<String> address = ParameterDescription.create(String.class, "Address",
|
||||||
true, "", "Address", "function address");
|
true, "", "Address", "function address");
|
||||||
ParameterDescription<String> onEnter = ParameterDescription.create(String.class, "OnEnter",
|
ParameterDescription<String> onEnter = ParameterDescription.create(String.class, "OnEnter",
|
||||||
true, "", "onEnter file", "JS file with onEnter implemenation");
|
true, "", "onEnter file", "JS file with onEnter implementation");
|
||||||
ParameterDescription<String> onLeave = ParameterDescription.create(String.class, "OnLeave",
|
ParameterDescription<String> onLeave = ParameterDescription.create(String.class, "OnLeave",
|
||||||
true, "", "onLeave file", "JS file with onLeave implemenation");
|
true, "", "onLeave file", "JS file with onLeave implementation");
|
||||||
ParameterDescription<String> name = ParameterDescription.create(String.class, "Name",
|
ParameterDescription<String> name = ParameterDescription.create(String.class, "Name",
|
||||||
false, "intercept", "name", "name for future unload");
|
false, "intercept", "name", "name for future unload");
|
||||||
ParameterDescription<String> script = ParameterDescription.create(String.class, "Script",
|
ParameterDescription<String> script = ParameterDescription.create(String.class, "Script",
|
||||||
|
|
|
@ -15,9 +15,7 @@
|
||||||
*/
|
*/
|
||||||
package agent.frida.model.methods;
|
package agent.frida.model.methods;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.*;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
import agent.frida.manager.FridaThread;
|
import agent.frida.manager.FridaThread;
|
||||||
|
@ -26,9 +24,7 @@ import agent.frida.model.iface2.FridaModelTargetThreadContainer;
|
||||||
import agent.frida.model.impl.FridaModelTargetObjectImpl;
|
import agent.frida.model.impl.FridaModelTargetObjectImpl;
|
||||||
import agent.frida.model.impl.FridaModelTargetThreadImpl;
|
import agent.frida.model.impl.FridaModelTargetThreadImpl;
|
||||||
import ghidra.dbg.target.TargetMethod;
|
import ghidra.dbg.target.TargetMethod;
|
||||||
import ghidra.dbg.target.schema.TargetAttributeType;
|
import ghidra.dbg.target.schema.*;
|
||||||
import ghidra.dbg.target.schema.TargetElementType;
|
|
||||||
import ghidra.dbg.target.schema.TargetObjectSchemaInfo;
|
|
||||||
|
|
||||||
@TargetObjectSchemaInfo(
|
@TargetObjectSchemaInfo(
|
||||||
name = "ThreadStalk",
|
name = "ThreadStalk",
|
||||||
|
@ -92,7 +88,7 @@ public class FridaModelTargetThreadStalkImpl extends FridaModelTargetObjectImpl
|
||||||
ParameterDescription<Boolean> e_compile = ParameterDescription.create(Boolean.class, "EventCompile",
|
ParameterDescription<Boolean> e_compile = ParameterDescription.create(Boolean.class, "EventCompile",
|
||||||
true, false, "event=compile", "block compiled");
|
true, false, "event=compile", "block compiled");
|
||||||
ParameterDescription<String> onReceive = ParameterDescription.create(String.class, "OnReceive",
|
ParameterDescription<String> onReceive = ParameterDescription.create(String.class, "OnReceive",
|
||||||
false, "", "onRecv file", "JS file with onReceive implemenation");
|
false, "", "onRecv file", "JS file with onReceive implementation");
|
||||||
ParameterDescription<String> onCallSummary = ParameterDescription.create(String.class, "OnCallSummary",
|
ParameterDescription<String> onCallSummary = ParameterDescription.create(String.class, "OnCallSummary",
|
||||||
false, "", "onCall file", "JS file with onCallSummary implementation");
|
false, "", "onCall file", "JS file with onCallSummary implementation");
|
||||||
ParameterDescription<String> name = ParameterDescription.create(String.class, "Name",
|
ParameterDescription<String> name = ParameterDescription.create(String.class, "Name",
|
||||||
|
|
|
@ -18,7 +18,7 @@ package ghidra.app.util.xml;
|
||||||
import org.xml.sax.*;
|
import org.xml.sax.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An implemenation of the basic interface for SAX error handlers.
|
* An implementation of the basic interface for SAX error handlers.
|
||||||
* Per the documentation, this class is required to prevent the SAX
|
* Per the documentation, this class is required to prevent the SAX
|
||||||
* parser from squelching all parse exceptions.
|
* parser from squelching all parse exceptions.
|
||||||
*
|
*
|
||||||
|
|
|
@ -133,7 +133,7 @@ configurations {
|
||||||
pcodeTestImplementation.extendsFrom implementation
|
pcodeTestImplementation.extendsFrom implementation
|
||||||
testArtifacts.extendsFrom testRuntimeOnly
|
testArtifacts.extendsFrom testRuntimeOnly
|
||||||
integrationTestArtifacts.extendsFrom integrationTestRuntimeOnly
|
integrationTestArtifacts.extendsFrom integrationTestRuntimeOnly
|
||||||
screenShotsImplementation.extendsFrom integrationTestImplemenation
|
screenShotsImplementation.extendsFrom integrationTestImplementation
|
||||||
}
|
}
|
||||||
|
|
||||||
task testJar(type: Jar) {
|
task testJar(type: Jar) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user