summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/dalvik/link.c25
-rw-r--r--plugins/dalvik/operands/pool.c74
-rw-r--r--plugins/pychrysalide/analysis/content.c1
-rw-r--r--plugins/pychrysalide/arch/Makefile.am1
-rw-r--r--plugins/pychrysalide/arch/module.c3
-rw-r--r--plugins/pychrysalide/arch/targetableop.c178
-rw-r--r--plugins/pychrysalide/arch/targetableop.h42
7 files changed, 305 insertions, 19 deletions
diff --git a/plugins/dalvik/link.c b/plugins/dalvik/link.c
index 8eda3c9..8e34485 100644
--- a/plugins/dalvik/link.c
+++ b/plugins/dalvik/link.c
@@ -32,7 +32,7 @@
#include <i18n.h>
#include <analysis/db/items/comment.h>
-#include <arch/target.h>
+#include <arch/targetableop.h>
#include <common/extstr.h>
#include <plugins/dex/pool.h>
@@ -142,11 +142,10 @@ void handle_links_for_dalvik_string(GArchInstruction *instr, GArchProcessor *pro
void handle_dalvik_packed_switch_links(GArchInstruction *instr, GArchProcessor *proc, GProcContext *context, GExeFormat *format)
{
GArchOperand *op; /* Opérande numérique en place */
+ const mrange_t *range; /* Emplacement de l'instruction*/
bool defined; /* Adresse définie ? */
vmpa2t addr; /* Adresse de destination */
- virt_t virt; /* Adresse virtuelle */
GArchInstruction *switch_ins; /* Instruction de branchements */
- const mrange_t *range; /* Zone d'occupation */
const vmpa2t *start_addr; /* Adresse de référentiel */
const int32_t *keys; /* Conditions de sauts */
const int32_t *targets; /* Positions relatives liées */
@@ -171,23 +170,17 @@ void handle_dalvik_packed_switch_links(GArchInstruction *instr, GArchProcessor *
g_arch_instruction_unlock_operands(instr);
- defined = false;
-
- if (G_IS_TARGET_OPERAND(op))
+ if (G_IS_TARGETABLE_OPERAND(op))
{
- g_target_operand_get_addr(G_TARGET_OPERAND(op), &addr);
- defined = true;
- }
+ range = g_arch_instruction_get_range(instr);
- else if (G_IS_IMM_OPERAND(op))
- {
- if (g_imm_operand_to_virt_t(G_IMM_OPERAND(op), &virt))
- {
- init_vmpa(&addr, VMPA_NO_PHYSICAL, virt);
- defined = true;
- }
+ defined = g_targetable_operand_get_addr(G_TARGETABLE_OPERAND(op), get_mrange_addr(range),
+ G_BIN_FORMAT(format), proc, &addr);
}
+ else
+ defined = false;
+
g_object_unref(G_OBJECT(op));
if (defined)
diff --git a/plugins/dalvik/operands/pool.c b/plugins/dalvik/operands/pool.c
index 1fd264b..4e2183b 100644
--- a/plugins/dalvik/operands/pool.c
+++ b/plugins/dalvik/operands/pool.c
@@ -32,6 +32,7 @@
#include <arch/operand-int.h>
+#include <arch/targetableop-int.h>
#include <common/sort.h>
#include <plugins/dex/pool.h>
@@ -63,6 +64,9 @@ static void g_dalvik_pool_operand_class_init(GDalvikPoolOperandClass *);
/* Initialise une instance d'opérande de constante Dalvik. */
static void g_dalvik_pool_operand_init(GDalvikPoolOperand *);
+/* Procède à l'initialisation de l'interface de ciblage. */
+static void g_dalvik_pool_operand_targetable_interface_init(GTargetableOperandInterface *);
+
/* Supprime toutes les références externes. */
static void g_dalvik_pool_operand_dispose(GDalvikPoolOperand *);
@@ -88,8 +92,17 @@ static bool g_dalvik_pool_operand_serialize(const GDalvikPoolOperand *, GAsmStor
+/* ----------------------- INTERFACE DE CIBLAGE POUR OPERANDE ----------------------- */
+
+
+/* Obtient l'adresse de la cible visée par un opérande. */
+static bool g_dalvik_pool_operand_get_addr(const GDalvikPoolOperand *, const vmpa2t *, GBinFormat *, GArchProcessor *, vmpa2t *);
+
+
+
/* Indique le type défini par la GLib pour un un élément de table de constantes Dalvik. */
-G_DEFINE_TYPE(GDalvikPoolOperand, g_dalvik_pool_operand, G_TYPE_ARCH_OPERAND);
+G_DEFINE_TYPE_WITH_CODE(GDalvikPoolOperand, g_dalvik_pool_operand, G_TYPE_ARCH_OPERAND,
+ G_IMPLEMENT_INTERFACE(G_TYPE_TARGETABLE_OPERAND, g_dalvik_pool_operand_targetable_interface_init));
/******************************************************************************
@@ -146,6 +159,25 @@ static void g_dalvik_pool_operand_init(GDalvikPoolOperand *operand)
/******************************************************************************
* *
+* Paramètres : iface = interface GLib à initialiser. *
+* *
+* Description : Procède à l'initialisation de l'interface de ciblage. *
+* *
+* Retour : - *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+static void g_dalvik_pool_operand_targetable_interface_init(GTargetableOperandInterface *iface)
+{
+ iface->get_addr = (get_targetable_addr_fc)g_dalvik_pool_operand_get_addr;
+
+}
+
+
+/******************************************************************************
+* *
* Paramètres : binary = instance d'objet GLib à traiter. *
* *
* Description : Supprime toutes les références externes. *
@@ -350,7 +382,7 @@ static void g_dalvik_pool_operand_print(const GDalvikPoolOperand *operand, GBuff
g_object_unref(G_OBJECT(routine));
g_buffer_line_append_text(line, BLC_ASSEMBLY, "<", 1, RTT_HOOK, NULL);
- g_buffer_line_append_text(line, BLC_ASSEMBLY, tmp, strlen(tmp), RTT_VAR_NAME, NULL);
+ g_buffer_line_append_text(line, BLC_ASSEMBLY, tmp, strlen(tmp), RTT_VAR_NAME, G_OBJECT(operand));
g_buffer_line_append_text(line, BLC_ASSEMBLY, ">", 1, RTT_HOOK, NULL);
}
@@ -550,3 +582,41 @@ static bool g_dalvik_pool_operand_serialize(const GDalvikPoolOperand *operand, G
return result;
}
+
+
+
+/* ---------------------------------------------------------------------------------- */
+/* INTERFACE DE CIBLAGE POUR OPERANDE */
+/* ---------------------------------------------------------------------------------- */
+
+
+/******************************************************************************
+* *
+* Paramètres : operand = operande à consulter. *
+* src = localisation de l'instruction mère. *
+* format = format reconnu pour le binaire chargé. *
+* proc = architecture associée à ce même binaire. *
+* addr = localisation de la cible. [OUT] *
+* *
+* Description : Obtient l'adresse de la cible visée par un opérande. *
+* *
+* Retour : true si la cible est valide, false sinon. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+static bool g_dalvik_pool_operand_get_addr(const GDalvikPoolOperand *operand, const vmpa2t *src, GBinFormat *format, GArchProcessor *proc, vmpa2t *addr)
+{
+ bool result; /* Bilan à retourner */
+
+ result = false;
+
+ if (operand->type == DPT_METHOD)
+ {
+ result = false;
+ }
+
+ return result;
+
+}
diff --git a/plugins/pychrysalide/analysis/content.c b/plugins/pychrysalide/analysis/content.c
index 05f1c74..4be318d 100644
--- a/plugins/pychrysalide/analysis/content.c
+++ b/plugins/pychrysalide/analysis/content.c
@@ -454,7 +454,6 @@ PyTypeObject *get_python_binary_content_type(void)
"data", py_binary_content_get_all_bytes, NULL,
"Provide all the content bytes at once.", NULL
},
-
{ NULL }
};
diff --git a/plugins/pychrysalide/arch/Makefile.am b/plugins/pychrysalide/arch/Makefile.am
index eb4b127..da66457 100644
--- a/plugins/pychrysalide/arch/Makefile.am
+++ b/plugins/pychrysalide/arch/Makefile.am
@@ -9,6 +9,7 @@ libpychrysaarch_la_SOURCES = \
operand.h operand.c \
processor.h processor.c \
raw.h raw.c \
+ targetableop.h targetableop.c \
vmpa.h vmpa.c
libpychrysaarch_la_LIBADD =
diff --git a/plugins/pychrysalide/arch/module.c b/plugins/pychrysalide/arch/module.c
index 54b470c..9c10965 100644
--- a/plugins/pychrysalide/arch/module.c
+++ b/plugins/pychrysalide/arch/module.c
@@ -37,6 +37,7 @@
#include "operand.h"
#include "processor.h"
#include "raw.h"
+#include "targetableop.h"
#include "vmpa.h"
#include "../access.h"
#include "../helpers.h"
@@ -143,6 +144,8 @@ bool add_arch_module_to_python_module(PyObject *super)
result &= py_base_define_constants(Py_TYPE(module));
+ result &= register_python_targetable_operand(module);
+
result &= register_python_arch_instruction(module);
result &= register_python_arch_operand(module);
result &= register_python_arch_processor(module);
diff --git a/plugins/pychrysalide/arch/targetableop.c b/plugins/pychrysalide/arch/targetableop.c
new file mode 100644
index 0000000..8951492
--- /dev/null
+++ b/plugins/pychrysalide/arch/targetableop.c
@@ -0,0 +1,178 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * targetableop.c - prototypes pour l'équivalent Python du fichier "arch/targetableop.c"
+ *
+ * Copyright (C) 2018 Cyrille Bagard
+ *
+ * This file is part of Chrysalide.
+ *
+ * Chrysalide is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Chrysalide is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+#include "targetableop.h"
+
+
+#include <assert.h>
+#include <pygobject.h>
+
+
+#include <i18n.h>
+
+
+#include <arch/targetableop.h>
+
+
+#include "processor.h"
+#include "vmpa.h"
+#include "../format/format.h"
+
+
+
+/* Obtient l'adresse de la cible visée par un opérande. */
+static PyObject *py_targetable_operand_get_addr(PyObject *, PyObject *);
+
+
+
+/******************************************************************************
+* *
+* Paramètres : self = contenu binaire à manipuler. *
+* args = non utilisé ici. *
+* *
+* Description : Obtient l'adresse de la cible visée par un opérande. *
+* *
+* Retour : Localisation de la cible ou None. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+static PyObject *py_targetable_operand_get_addr(PyObject *self, PyObject *args)
+{
+ PyObject *result; /* Instance à retourner */
+ PyObject *src_obj; /* Objet pour une position */
+ PyObject *format_obj; /* Objet pour un format */
+ PyObject *proc_obj; /* Objet pour une architecture */
+ int ret; /* Bilan de lecture des args. */
+ vmpa2t *src; /* Version native d'adresse */
+ GBinFormat *format; /* Instance GLib du format */
+ GArchProcessor *proc; /* Instance GLib de l'archi. */
+ GTargetableOperand *operand; /* Instance à manipuler */
+ vmpa2t addr; /* Localisation à cibler */
+ bool defined; /* Cible définie ? */
+
+ ret = PyArg_ParseTuple(args, "O!",
+ get_python_vmpa_type(), &src_obj,
+ get_python_binary_format_type(), &format_obj,
+ get_python_arch_processor_type(), &proc_obj);
+ if (!ret) return NULL;
+
+ src = get_internal_vmpa(src_obj);
+ assert(src != NULL);
+
+ format = G_BIN_FORMAT(pygobject_get(format_obj));
+ proc = G_ARCH_PROCESSOR(pygobject_get(proc_obj));
+
+ operand = G_TARGETABLE_OPERAND(pygobject_get(self));
+ assert(operand != NULL);
+
+ defined = g_targetable_operand_get_addr(operand, src, format, proc, &addr);
+
+ if (defined)
+ result = build_from_internal_vmpa(&addr);
+ else
+ {
+ result = Py_None;
+ Py_INCREF(result);
+ }
+
+ return result;
+
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : - *
+* *
+* Description : Fournit un accès à une définition de type à diffuser. *
+* *
+* Retour : Définition d'objet pour Python. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+PyTypeObject *get_python_targetable_operand_type(void)
+{
+ static PyMethodDef py_targetable_operand_methods[] = {
+ {
+ "get_addr", py_targetable_operand_get_addr,
+ METH_VARARGS,
+ "get_addr($self, src, format, proc, /)\n--\n\nGet a target address from an operand."
+ },
+ { NULL }
+ };
+
+ static PyGetSetDef py_targetable_operand_getseters[] = {
+ { NULL }
+ };
+
+ static PyTypeObject py_targetable_operand_type = {
+
+ PyVarObject_HEAD_INIT(NULL, 0)
+
+ .tp_name = "pychrysalide.arch.TargetableOperand",
+ .tp_basicsize = sizeof(PyObject),
+
+ .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+
+ .tp_doc = "PyChrysalide targetable operand",
+
+ .tp_methods = py_targetable_operand_methods,
+ .tp_getset = py_targetable_operand_getseters
+
+ };
+
+ return &py_targetable_operand_type;
+
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : module = module dont la définition est à compléter. *
+* *
+* Description : Prend en charge l'objet 'pychrysalide.....TargetableOperand'.*
+* *
+* Retour : Bilan de l'opération. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+bool register_python_targetable_operand(PyObject *module)
+{
+ PyTypeObject *py_targetable_operand_type; /* Type 'TargetableOperand' */
+ PyObject *dict; /* Dictionnaire du module */
+
+ py_targetable_operand_type = get_python_targetable_operand_type();
+
+ dict = PyModule_GetDict(module);
+ pyg_register_interface(dict, "TargetableOperand", G_TYPE_TARGETABLE_OPERAND, py_targetable_operand_type);
+
+ return true;
+
+}
diff --git a/plugins/pychrysalide/arch/targetableop.h b/plugins/pychrysalide/arch/targetableop.h
new file mode 100644
index 0000000..d79bb87
--- /dev/null
+++ b/plugins/pychrysalide/arch/targetableop.h
@@ -0,0 +1,42 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * targetableop.h - prototypes pour l'équivalent Python du fichier "arch/targetableop.h"
+ *
+ * Copyright (C) 2018 Cyrille Bagard
+ *
+ * This file is part of Chrysalide.
+ *
+ * Chrysalide is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Chrysalide is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+#ifndef _PLUGINS_PYCHRYSALIDE_ARCH_TARGETABLEOP_H
+#define _PLUGINS_PYCHRYSALIDE_ARCH_TARGETABLEOP_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+
+
+/* Fournit un accès à une définition de type à diffuser. */
+PyTypeObject *get_python_targetable_operand_type(void);
+
+/* Prend en charge l'objet 'pychrysalide.arch.TargetableOperand'. */
+bool register_python_targetable_operand(PyObject *);
+
+
+
+#endif /* _PLUGINS_PYCHRYSALIDE_ARCH_TARGETABLEOP_H */