diff options
Diffstat (limited to 'plugins/pychrysa/format')
| -rw-r--r-- | plugins/pychrysa/format/Makefile.am | 5 | ||||
| -rw-r--r-- | plugins/pychrysa/format/elf/Makefile.am | 15 | ||||
| -rw-r--r-- | plugins/pychrysa/format/elf/elf.c | 206 | ||||
| -rw-r--r-- | plugins/pychrysa/format/elf/elf.h | 42 | ||||
| -rw-r--r-- | plugins/pychrysa/format/elf/module.c | 84 | ||||
| -rw-r--r-- | plugins/pychrysa/format/elf/module.h | 39 | ||||
| -rw-r--r-- | plugins/pychrysa/format/module.c | 6 |
7 files changed, 6 insertions, 391 deletions
diff --git a/plugins/pychrysa/format/Makefile.am b/plugins/pychrysa/format/Makefile.am index bef87ca..71f0022 100644 --- a/plugins/pychrysa/format/Makefile.am +++ b/plugins/pychrysa/format/Makefile.am @@ -8,8 +8,7 @@ libpychrysaformat_la_SOURCES = \ symbol.h symbol.c libpychrysaformat_la_LIBADD = \ - dex/libpychrysaformatdex.la \ - elf/libpychrysaformatelf.la + dex/libpychrysaformatdex.la libpychrysaformat_la_LDFLAGS = @@ -19,4 +18,4 @@ AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJE AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) -SUBDIRS = dex elf +SUBDIRS = dex diff --git a/plugins/pychrysa/format/elf/Makefile.am b/plugins/pychrysa/format/elf/Makefile.am deleted file mode 100644 index b8f9074..0000000 --- a/plugins/pychrysa/format/elf/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ - -noinst_LTLIBRARIES = libpychrysaformatelf.la - -libpychrysaformatelf_la_SOURCES = \ - elf.h elf.c \ - module.h module.c - - -libpychrysaformatelf_la_LDFLAGS = - - -AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ - -I../../../../src - -AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/pychrysa/format/elf/elf.c b/plugins/pychrysa/format/elf/elf.c deleted file mode 100644 index 102c60d..0000000 --- a/plugins/pychrysa/format/elf/elf.c +++ /dev/null @@ -1,206 +0,0 @@ - -/* Chrysalide - Outil d'analyse de fichiers binaires - * elf.c - équivalent Python du fichier "format/elf/elf.c" - * - * Copyright (C) 2013-2017 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 "elf.h" - - -#include <pygobject.h> - - -#include <i18n.h> - - -#include <format/elf/elf.h> - - -#include "../executable.h" -#include "../../analysis/content.h" -#include "../../helpers.h" - - - -/* Crée un nouvel objet Python de type 'ElfFormat'. */ -static PyObject *py_elf_format_new(PyTypeObject *, PyObject *, PyObject *); - - - -/****************************************************************************** -* * -* Paramètres : type = type de l'objet à instancier. * -* args = arguments fournis à l'appel. * -* kwds = arguments de type key=val fournis. * -* * -* Description : Crée un nouvel objet Python de type 'ElfFormat'. * -* * -* Retour : Instance Python mise en place. * -* * -* Remarques : - * -* * -******************************************************************************/ - -static PyObject *py_elf_format_new(PyTypeObject *type, PyObject *args, PyObject *kwds) -{ - PyObject *result; /* Instance à retourner */ - PyObject *content_obj; /* Objet pour le contenu */ - PyObject *parent_obj; /* Objet pour le parent */ - PyObject *status_obj; /* Objet pour la progression */ - int ret; /* Bilan de lecture des args. */ - GBinContent *content; /* Instance GLib du contenu */ - GExeFormat *parent; /* Instance GLib du parent */ - GtkStatusStack *status; /* Instance GTK de suivi */ - GBinFormat *format; /* Création GLib à transmettre */ - - - ret = PyArg_ParseTuple(args, "OOO", &content_obj, &parent_obj, &status_obj); - if (!ret) return NULL; - - ret = PyObject_IsInstance(content_obj, (PyObject *)get_python_binary_content_type()); - if (!ret) - { - PyErr_SetString(PyExc_TypeError, _("The first argument must be an instance of BinContent.")); - return NULL; - } - - content = G_BIN_CONTENT(pygobject_get(content_obj)); - - if (parent_obj == Py_None) - parent = NULL; - - else - { - ret = PyObject_IsInstance(parent_obj, (PyObject *)get_python_executable_format_type()); - if (!ret) - { - PyErr_SetString(PyExc_TypeError, _("The second argument must be a container format or None.")); - return NULL; - } - - parent = G_EXE_FORMAT(pygobject_get(parent_obj)); - - } - - if (status_obj == Py_None) - status = NULL; - - else - { - ret = PyObject_IsInstance(status_obj, (PyObject *)get_python_binary_content_type()); - if (!ret) - { - PyErr_SetString(PyExc_TypeError, _("The third argument must be a status bar object or None.")); - return NULL; - } - - status = GTK_STATUS_STACK(pygobject_get(status_obj)); - - } - - format = g_elf_format_new(content, parent, status); - if (format == NULL) - { - PyErr_SetString(PyExc_RuntimeError, _("Unable to load the ELF format.")); - return NULL; - } - - result = pygobject_new(G_OBJECT(format)); - - g_object_unref(format); - - return (PyObject *)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_elf_format_type(void) -{ - static PyMethodDef py_elf_format_methods[] = { - { NULL } - }; - - static PyGetSetDef py_elf_format_getseters[] = { - { NULL } - }; - - static PyTypeObject py_elf_format_type = { - - PyVarObject_HEAD_INIT(NULL, 0) - - .tp_name = "pychrysalide.format.elf.ElfFormat", - .tp_basicsize = sizeof(PyGObject), - - .tp_flags = Py_TPFLAGS_DEFAULT, - - .tp_doc = "PyChrysalide Elf format", - - .tp_methods = py_elf_format_methods, - .tp_getset = py_elf_format_getseters, - .tp_new = (newfunc)py_elf_format_new - - }; - - return &py_elf_format_type; - -} - - -/****************************************************************************** -* * -* Paramètres : module = module dont la définition est à compléter. * -* * -* Description : Prend en charge l'objet 'pychrysalide.format.elf.ElfFormat'. * -* * -* Retour : Bilan de l'opération. * -* * -* Remarques : - * -* * -******************************************************************************/ - -bool register_python_elf_format(PyObject *module) -{ - PyTypeObject *py_elf_format_type; /* Type Python 'ElfFormat' */ - PyObject *dict; /* Dictionnaire du module */ - - py_elf_format_type = get_python_elf_format_type(); - - dict = PyModule_GetDict(module); - - if (!register_class_for_pygobject(dict, G_TYPE_ELF_FORMAT, - py_elf_format_type, get_python_executable_format_type())) - return false; - - return true; - -} diff --git a/plugins/pychrysa/format/elf/elf.h b/plugins/pychrysa/format/elf/elf.h deleted file mode 100644 index cf6a706..0000000 --- a/plugins/pychrysa/format/elf/elf.h +++ /dev/null @@ -1,42 +0,0 @@ - -/* Chrysalide - Outil d'analyse de fichiers binaires - * elf.h - prototypes pour l'équivalent Python du fichier "format/elf/elf.h" - * - * Copyright (C) 2013-2017 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_PYCHRYSA_FORMAT_ELF_ELF_H -#define _PLUGINS_PYCHRYSA_FORMAT_ELF_ELF_H - - -#include <Python.h> -#include <stdbool.h> - - - -/* Fournit un accès à une définition de type à diffuser. */ -PyTypeObject *get_python_elf_format_type(void); - -/* Prend en charge l'objet 'pychrysalide.format.elf.ElfFormat'. */ -bool register_python_elf_format(PyObject *); - - - -#endif /* _PLUGINS_PYCHRYSA_FORMAT_ELF_ELF_H */ diff --git a/plugins/pychrysa/format/elf/module.c b/plugins/pychrysa/format/elf/module.c deleted file mode 100644 index 421e4d2..0000000 --- a/plugins/pychrysa/format/elf/module.c +++ /dev/null @@ -1,84 +0,0 @@ - -/* Chrysalide - Outil d'analyse de fichiers binaires - * module.c - intégration du répertoire elf en tant que module - * - * Copyright (C) 2013-2017 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 "module.h" - - -#include "elf.h" - - - -/****************************************************************************** -* * -* Paramètres : module = module dont la définition est à compléter. * -* * -* Description : Ajoute le module 'format.elf' au module Python. * -* * -* Retour : - * -* * -* Remarques : - * -* * -******************************************************************************/ - -bool add_format_elf_module_to_python_module(PyObject *super) -{ - bool result; /* Bilan à retourner */ - PyObject *module; /* Sous-module mis en place */ - int ret; /* Bilan d'un appel */ - - static PyModuleDef py_chrysalide_elf_module = { - - .m_base = PyModuleDef_HEAD_INIT, - - .m_name = "pychrysalide.format.elf", - .m_doc = "Python module for Chrysalide.format.elf", - - .m_size = -1, - - }; - - result = false; - - module = PyModule_Create(&py_chrysalide_elf_module); - if (module == NULL) return false; - - ret = PyState_AddModule(super, &py_chrysalide_elf_module); - if (ret != 0) goto loading_failed; - - ret = _PyImport_FixupBuiltin(module, "pychrysalide.format.elf"); - if (ret != 0) goto loading_failed; - - Py_INCREF(module); - ret = PyModule_AddObject(super, "elf", module); - if (ret != 0) goto loading_failed; - - result = true; - - result &= register_python_elf_format(module); - - loading_failed: - - return result; - -} diff --git a/plugins/pychrysa/format/elf/module.h b/plugins/pychrysa/format/elf/module.h deleted file mode 100644 index 998674f..0000000 --- a/plugins/pychrysa/format/elf/module.h +++ /dev/null @@ -1,39 +0,0 @@ - -/* Chrysalide - Outil d'analyse de fichiers binaires - * module.h - prototypes pour l'intégration du répertoire elf en tant que module - * - * Copyright (C) 2013-2017 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_PYCHRYSA_FORMAT_ELF_MODULE_H -#define _PLUGINS_PYCHRYSA_FORMAT_ELF_MODULE_H - - -#include <Python.h> -#include <stdbool.h> - - - -/* Ajoute le module 'format.elf' au module Python. */ -bool add_format_elf_module_to_python_module(PyObject *); - - - -#endif /* _PLUGINS_PYCHRYSA_FORMAT_ELF_MODULE_H */ diff --git a/plugins/pychrysa/format/module.c b/plugins/pychrysa/format/module.c index 29170b1..d15fea8 100644 --- a/plugins/pychrysa/format/module.c +++ b/plugins/pychrysa/format/module.c @@ -32,7 +32,7 @@ #include "format.h" #include "symbol.h" #include "dex/module.h" -#include "elf/module.h" +#include "../access.h" @@ -88,7 +88,9 @@ bool add_format_module_to_python_module(PyObject *super) result &= register_python_binary_symbol(module); result &= add_format_dex_module_to_python_module(module); - result &= add_format_elf_module_to_python_module(module); + + if (result) + register_access_to_python_module("pychrysalide.format", module); loading_failed: |