summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/pychrysa/analysis/content.c27
-rw-r--r--plugins/pychrysa/analysis/contents/Makefile.am3
-rw-r--r--plugins/pychrysa/analysis/contents/module.c3
-rw-r--r--plugins/pychrysa/analysis/contents/restricted.c227
-rw-r--r--plugins/pychrysa/analysis/contents/restricted.h42
5 files changed, 296 insertions, 6 deletions
diff --git a/plugins/pychrysa/analysis/content.c b/plugins/pychrysa/analysis/content.c
index bd25589..00265e3 100644
--- a/plugins/pychrysa/analysis/content.c
+++ b/plugins/pychrysa/analysis/content.c
@@ -29,6 +29,9 @@
#include <pygobject.h>
+#include <i18n.h>
+
+
#include <analysis/content.h>
#include <common/endianness.h>
@@ -154,7 +157,11 @@ static PyObject *py_binary_content_read_u8(PyObject *self, PyObject *args)
assert(addr != NULL);
status = g_binary_content_read_u8(content, addr, &val);
- if (!status) return NULL;
+ if (!status)
+ {
+ PyErr_SetString(PyExc_Exception, _("Invalid read access."));
+ return NULL;
+ }
result = PyBytes_FromStringAndSize((char *)&val, 1);
@@ -197,7 +204,11 @@ static PyObject *py_binary_content_read_u16(PyObject *self, PyObject *args)
assert(addr != NULL);
status = g_binary_content_read_u16(content, addr, endianness, &val);
- if (!status) return NULL;
+ if (!status)
+ {
+ PyErr_SetString(PyExc_Exception, _("Invalid read access."));
+ return NULL;
+ }
result = PyBytes_FromStringAndSize((char *)&val, 2);
@@ -239,7 +250,11 @@ static PyObject *py_binary_content_read_u32(PyObject *self, PyObject *args)
assert(addr != NULL);
status = g_binary_content_read_u32(content, addr, endianness, &val);
- if (!status) return NULL;
+ if (!status)
+ {
+ PyErr_SetString(PyExc_Exception, _("Invalid read access."));
+ return NULL;
+ }
result = PyBytes_FromStringAndSize((char *)&val, 4);
@@ -281,7 +296,11 @@ static PyObject *py_binary_content_read_u64(PyObject *self, PyObject *args)
assert(addr != NULL);
status = g_binary_content_read_u64(content, addr, endianness, &val);
- if (!status) return NULL;
+ if (!status)
+ {
+ PyErr_SetString(PyExc_Exception, _("Invalid read access."));
+ return NULL;
+ }
result = PyBytes_FromStringAndSize((char *)&val, 8);
diff --git a/plugins/pychrysa/analysis/contents/Makefile.am b/plugins/pychrysa/analysis/contents/Makefile.am
index ff835e3..3cd00a6 100644
--- a/plugins/pychrysa/analysis/contents/Makefile.am
+++ b/plugins/pychrysa/analysis/contents/Makefile.am
@@ -3,7 +3,8 @@ noinst_LTLIBRARIES = libpychrysaanalysiscontents.la
libpychrysaanalysiscontents_la_SOURCES = \
file.h file.c \
- module.h module.c
+ module.h module.c \
+ restricted.h restricted.c
libpychrysaanalysiscontents_la_LDFLAGS =
diff --git a/plugins/pychrysa/analysis/contents/module.c b/plugins/pychrysa/analysis/contents/module.c
index f97ba27..366a158 100644
--- a/plugins/pychrysa/analysis/contents/module.c
+++ b/plugins/pychrysa/analysis/contents/module.c
@@ -29,6 +29,7 @@
#include "file.h"
+#include "restricted.h"
@@ -80,8 +81,8 @@ bool add_analysis_contents_module_to_python_module(PyObject *super)
result &= register_python_binary_content(module);
-
result &= register_python_file_content(module);
+ result &= register_python_restricted_content(module);
loading_failed:
diff --git a/plugins/pychrysa/analysis/contents/restricted.c b/plugins/pychrysa/analysis/contents/restricted.c
new file mode 100644
index 0000000..0b8c7da
--- /dev/null
+++ b/plugins/pychrysa/analysis/contents/restricted.c
@@ -0,0 +1,227 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * restricted.c - prototypes pour l'équivalent Python du fichier "analysis/contents/restricted.c"
+ *
+ * Copyright (C) 2015 Cyrille Bagard
+ *
+ * This file is part of Chrysalide.
+ *
+ * OpenIDA 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.
+ *
+ * OpenIDA 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 "restricted.h"
+
+
+#include <pygobject.h>
+
+
+#include <i18n.h>
+
+
+#include <analysis/contents/restricted.h>
+
+
+#include "../content.h"
+#include "../../arch/vmpa.h"
+
+
+
+/* Crée un nouvel objet Python de type 'BinContent'. */
+static PyObject *py_restricted_content_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 'BinContent'. *
+* *
+* Retour : Instance Python mise en place. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+static PyObject *py_restricted_content_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+ PyObject *result; /* Instance à retourner */
+ PyObject *content_obj; /* Objet pour le contenu */
+ PyObject *range_obj; /* Objet pour la restriction */
+ int ret; /* Bilan de lecture des args. */
+ GBinContent *content; /* Instance GLib correspondante*/
+ mrange_t *range; /* Restriction à appliquer */
+ GBinContent *restricted; /* Création GLib à transmettre */
+
+ ret = PyArg_ParseTuple(args, "OO", &content_obj, &range_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;
+ }
+
+ ret = PyObject_IsInstance(range_obj, (PyObject *)get_python_mrange_type());
+ if (!ret)
+ {
+ PyErr_SetString(PyExc_TypeError, _("The second argument must be an instance of mrange."));
+ return NULL;
+ }
+
+ content = G_BIN_CONTENT(pygobject_get(content_obj));
+
+ range = get_internal_mrange(range_obj);
+
+ restricted = g_restricted_content_new(content, range);
+
+ result = pygobject_new(G_OBJECT(restricted));
+
+ return result;
+
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : - *
+* *
+* Description : Fournit un accès à une définition de type à diffuser. *
+* *
+* Retour : Définition d'objet pour Python. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+
+
+PyMethodDef py_restricted_content_methods[] = {
+ { NULL }
+};
+
+PyGetSetDef py_restricted_content_getseters[] = {
+ { NULL }
+};
+
+PyTypeObject py_restricted_content_type = {
+
+ PyVarObject_HEAD_INIT(NULL, 0)
+
+ .tp_name = "pychrysalide.analysis.contents.RestrictedContent",
+ .tp_basicsize = sizeof(PyGObject),
+
+ .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+
+ .tp_doc = "PyChrysalide binary restricted content",
+
+ /*
+ .tp_methods = py_restricted_content_methods,
+ .tp_getset = py_restricted_content_getseters,
+ .tp_new = (newfunc)py_restricted_content_new
+ */
+ .tp_new = (newfunc)py_restricted_content_new
+
+};
+
+
+
+PyTypeObject *get_python_restricted_content_type(void)
+{
+#if 0
+ static PyMethodDef py_restricted_content_methods[] = {
+ { NULL }
+ };
+
+ static PyGetSetDef py_restricted_content_getseters[] = {
+ { NULL }
+ };
+
+ static PyTypeObject py_restricted_content_type = {
+
+ PyVarObject_HEAD_INIT(NULL, 0)
+
+ .tp_name = "pychrysalide.analysis.contents.RestrictedContent",
+ .tp_basicsize = sizeof(PyGObject),
+
+ .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | 1 << 9,
+
+ .tp_doc = "PyChrysalide binary restricted content",
+
+ /*
+ .tp_methods = py_restricted_content_methods,
+ .tp_getset = py_restricted_content_getseters,
+ .tp_new = (newfunc)py_restricted_content_new
+ */
+
+ };
+#endif
+ return &py_restricted_content_type;
+
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : module = module dont la définition est à compléter. *
+* *
+* Description : Prend en charge l'objet 'pychrysalide.glibext.BinContent'. *
+* *
+* Retour : Bilan de l'opération. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+#include "../content.h"//////////////////////////////////////////
+bool register_python_restricted_content(PyObject *module)
+{
+ PyTypeObject *py_restricted_content_type; /* Type Python 'BinContent' */
+ int ret; /* Bilan d'un appel */
+ PyObject *dict; /* Dictionnaire du module */
+
+ py_restricted_content_type = get_python_restricted_content_type();
+
+ //py_restricted_content_type->tp_base = &PyGObject_Type;
+ //py_restricted_content_type->tp_basicsize = py_restricted_content_type->tp_base->tp_basicsize;
+
+ /*
+ if (PyType_Ready(py_restricted_content_type) != 0)
+ return false;
+ */
+
+ /*
+ Py_INCREF(py_restricted_content_type);
+ ret = PyModule_AddObject(module, "RestrictedContent", (PyObject *)py_restricted_content_type);
+ if (ret != 0) return false;
+ */
+
+ dict = PyModule_GetDict(module);
+ pygobject_register_class(dict, "RestrictedContent", G_TYPE_RESTRICTED_CONTENT, py_restricted_content_type,
+ Py_BuildValue("(O)", &PyGObject_Type/*py_restricted_content_type->tp_base*/,
+ get_python_binary_content_type()));
+
+ /*
+ if (PyType_Ready(py_restricted_content_type) != 0)
+ return false;
+ */
+
+
+ return true;
+
+}
diff --git a/plugins/pychrysa/analysis/contents/restricted.h b/plugins/pychrysa/analysis/contents/restricted.h
new file mode 100644
index 0000000..24f2697
--- /dev/null
+++ b/plugins/pychrysa/analysis/contents/restricted.h
@@ -0,0 +1,42 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * restricted.h - prototypes pour l'équivalent Python du fichier "analysis/contents/restricted.h"
+ *
+ * Copyright (C) 2015 Cyrille Bagard
+ *
+ * This file is part of Chrysalide.
+ *
+ * OpenIDA 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.
+ *
+ * OpenIDA 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_ANALYSIS_CONTENTS_RESTRICTED_H
+#define _PLUGINS_PYCHRYSA_ANALYSIS_CONTENTS_RESTRICTED_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+
+
+/* Fournit un accès à une définition de type à diffuser. */
+PyTypeObject *get_python_restricted_content_type(void);
+
+/* Prend en charge l'objet 'pychrysalide.glibext.BinContent'. */
+bool register_python_restricted_content(PyObject *);
+
+
+
+#endif /* _PLUGINS_PYCHRYSA_ANALYSIS_CONTENTS_RESTRICTED_H */
generated by cgit v0.11.2-87-g4458 at 2024-12-25 17:06:28 (GMT)