diff options
author | akuchling <akuchling@rivest.dlitz.net> | 2002-05-23 13:43:49 -0700 |
---|---|---|
committer | akuchling <akuchling@rivest.dlitz.net> | 2002-05-23 13:43:49 -0700 |
commit | 0979dc535bdb38cf710a4c100c4f8d022af561e5 (patch) | |
tree | 12f8a506a8269c741f80dc03fad56fdd2aa189fa /src/stream_template.c | |
parent | 92ce6294430fbc3c7a483d26a93d65a56a67f526 (diff) | |
download | pycrypto-0979dc535bdb38cf710a4c100c4f8d022af561e5.tar.gz |
[project @ akuchling-20020523204349-92d3d4376201e7ad]
[project @ 2002-05-23 13:43:49 by akuchling]
Fix some error messages
Remove endianness testing
Minor formatting tweaks
Diffstat (limited to 'src/stream_template.c')
-rw-r--r-- | src/stream_template.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/stream_template.c b/src/stream_template.c index 9e8017d..c849aa9 100644 --- a/src/stream_template.c +++ b/src/stream_template.c @@ -30,15 +30,7 @@ #define _MODULE_NAME _PASTE2(init,MODULE_NAME) #define _MODULE_STRING _XSTR(MODULE_NAME) -/* Endianness testing and definitions */ -#define TestEndianness(variable) {int i=1; variable=PCT_BIG_ENDIAN;\ - if (*((char*)&i)==1) variable=PCT_LITTLE_ENDIAN;} - -#define PCT_LITTLE_ENDIAN 1 -#define PCT_BIG_ENDIAN 0 - - -/* + /* * * Python interface * @@ -64,9 +56,10 @@ newALGobject(void) static void ALGdealloc(PyObject *self) -{ /* Overwrite the contents of the object, just in case... */ +{ int i; - + + /* Overwrite the contents of the object, just in case... */ for (i = 0; i < sizeof(ALGobject); i++) *((char *) self + i) = '\0'; PyObject_DEL(self); @@ -94,13 +87,15 @@ ALGnew(PyObject *self, PyObject *args, PyObject *kwdict) if (KEY_SIZE!=0 && keylen != KEY_SIZE) { - PyErr_SetString(PyExc_ValueError, "ALG key must be " + PyErr_SetString(PyExc_ValueError, + _MODULE_STRING " key must be " "KEY_SIZE bytes long"); return NULL; } if (KEY_SIZE== 0 && keylen == 0) { - PyErr_SetString(PyExc_ValueError, "ALG key cannot be " + PyErr_SetString(PyExc_ValueError, + _MODULE_STRING " key cannot be " "the null string (0 bytes long)"); return NULL; } @@ -133,7 +128,7 @@ ALG_Encrypt(ALGobject *self, PyObject *args) if (buffer == NULL) { PyErr_SetString(PyExc_MemoryError, "No memory available in " - "ALG encrypt"); + _MODULE_STRING " encrypt"); return NULL; } memcpy(buffer, str, len); @@ -163,7 +158,7 @@ ALG_Decrypt(ALGobject *self, PyObject *args) if (buffer == NULL) { PyErr_SetString(PyExc_MemoryError, "No memory available in " - "ALG decrypt"); + _MODULE_STRING " decrypt"); return NULL; } memcpy(buffer, str, len); @@ -201,7 +196,8 @@ ALGgetattr(PyObject *self, char *name) static struct PyMethodDef modulemethods[] = { - {"new", (PyCFunction) ALGnew, METH_VARARGS|METH_KEYWORDS, ALGnew__doc__}, + {"new", (PyCFunction) ALGnew, + METH_VARARGS|METH_KEYWORDS, ALGnew__doc__}, {NULL, NULL} /* sentinel */ }; |