Mercurial > cpython-lru_cache-weakref
view Modules/cryptmodule.c @ 60174:255a401c19b0
(partially)
Merged revisions 79534,79537,79539,79558,79606 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79534 | florent.xicluna | 2010-03-31 23:21:54 +0200 (mer, 31 mar 2010) | 2 lines
Fix test for xml.etree when using a non-ascii path. And use check_warnings instead of catch_warnings.
........
r79537 | florent.xicluna | 2010-03-31 23:40:32 +0200 (mer, 31 mar 2010) | 2 lines
Fix typo
........
r79539 | florent.xicluna | 2010-04-01 00:01:03 +0200 (jeu, 01 avr 2010) | 2 lines
Replace catch_warnings with check_warnings when it makes sense. Use assertRaises context manager to simplify some tests.
........
r79558 | florent.xicluna | 2010-04-01 20:17:09 +0200 (jeu, 01 avr 2010) | 2 lines
#7092: Fix some -3 warnings, and fix Lib/platform.py when the path contains a double-quote.
........
r79606 | florent.xicluna | 2010-04-02 19:26:42 +0200 (ven, 02 avr 2010) | 2 lines
Backport some robotparser test and skip the test if the external resource is not available.
........
| author | Florent Xicluna <florent.xicluna@gmail.com> |
|---|---|
| date | Fri, 02 Apr 2010 18:52:12 +0000 |
| parents | 94f64f11fdd0 |
| children | cab14be0ada1 |
line wrap: on
line source
/* cryptmodule.c - by Steve Majewski */ #include "Python.h" #include <sys/types.h> #ifdef __VMS #include <openssl/des.h> #endif /* Module crypt */ static PyObject *crypt_crypt(PyObject *self, PyObject *args) { char *word, *salt; #ifndef __VMS extern char * crypt(const char *, const char *); #endif if (!PyArg_ParseTuple(args, "ss:crypt", &word, &salt)) { return NULL; } /* On some platforms (AtheOS) crypt returns NULL for an invalid salt. Return None in that case. XXX Maybe raise an exception? */ return Py_BuildValue("s", crypt(word, salt)); } PyDoc_STRVAR(crypt_crypt__doc__, "crypt(word, salt) -> string\n\ word will usually be a user's password. salt is a 2-character string\n\ which will be used to select one of 4096 variations of DES. The characters\n\ in salt must be either \".\", \"/\", or an alphanumeric character. Returns\n\ the hashed password as a string, which will be composed of characters from\n\ the same alphabet as the salt."); static PyMethodDef crypt_methods[] = { {"crypt", crypt_crypt, METH_VARARGS, crypt_crypt__doc__}, {NULL, NULL} /* sentinel */ }; static struct PyModuleDef cryptmodule = { PyModuleDef_HEAD_INIT, "crypt", NULL, -1, crypt_methods, NULL, NULL, NULL, NULL }; PyMODINIT_FUNC PyInit_crypt(void) { return PyModule_Create(&cryptmodule); }
