Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

revert part of r77938 which broke hashlib constructors #8167

This commit is contained in:
Benjamin Peterson 2010-03-18 21:27:29 +00:00
parent 903fc51649
commit c8f5540062
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/_hashopenssl.c
View File

@ -49,10 +49,6 @@
#define HASH_OBJ_CONSTRUCTOR 0 #define HASH_OBJ_CONSTRUCTOR 0
#endif #endif
/* Minimum OpenSSL version needed to support sha224 and higher. */
#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x00908000)
#define _OPENSSL_SUPPORTS_SHA2
#endif
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
@ -74,12 +70,10 @@ static PyTypeObject EVPtype;
DEFINE_CONSTS_FOR_NEW(md5) DEFINE_CONSTS_FOR_NEW(md5)
DEFINE_CONSTS_FOR_NEW(sha1) DEFINE_CONSTS_FOR_NEW(sha1)
#ifdef _OPENSSL_SUPPORTS_SHA2
DEFINE_CONSTS_FOR_NEW(sha224) DEFINE_CONSTS_FOR_NEW(sha224)
DEFINE_CONSTS_FOR_NEW(sha256) DEFINE_CONSTS_FOR_NEW(sha256)
DEFINE_CONSTS_FOR_NEW(sha384) DEFINE_CONSTS_FOR_NEW(sha384)
DEFINE_CONSTS_FOR_NEW(sha512) DEFINE_CONSTS_FOR_NEW(sha512)
#endif
static EVPobject * static EVPobject *
@ -543,12 +537,10 @@ EVP_new(PyObject *self, PyObject *args, PyObject *kwdict)
GEN_CONSTRUCTOR(md5) GEN_CONSTRUCTOR(md5)
GEN_CONSTRUCTOR(sha1) GEN_CONSTRUCTOR(sha1)
#ifdef _OPENSSL_SUPPORTS_SHA2
GEN_CONSTRUCTOR(sha224) GEN_CONSTRUCTOR(sha224)
GEN_CONSTRUCTOR(sha256) GEN_CONSTRUCTOR(sha256)
GEN_CONSTRUCTOR(sha384) GEN_CONSTRUCTOR(sha384)
GEN_CONSTRUCTOR(sha512) GEN_CONSTRUCTOR(sha512)
#endif
/* List of functions exported by this module */ /* List of functions exported by this module */
@ -556,12 +548,10 @@ static struct PyMethodDef EVP_functions[] = {
{"new", (PyCFunction)EVP_new, METH_VARARGS|METH_KEYWORDS, EVP_new__doc__}, {"new", (PyCFunction)EVP_new, METH_VARARGS|METH_KEYWORDS, EVP_new__doc__},
CONSTRUCTOR_METH_DEF(md5), CONSTRUCTOR_METH_DEF(md5),
CONSTRUCTOR_METH_DEF(sha1), CONSTRUCTOR_METH_DEF(sha1),
#ifdef _OPENSSL_SUPPORTS_SHA2
CONSTRUCTOR_METH_DEF(sha224), CONSTRUCTOR_METH_DEF(sha224),
CONSTRUCTOR_METH_DEF(sha256), CONSTRUCTOR_METH_DEF(sha256),
CONSTRUCTOR_METH_DEF(sha384), CONSTRUCTOR_METH_DEF(sha384),
CONSTRUCTOR_METH_DEF(sha512), CONSTRUCTOR_METH_DEF(sha512),
#endif
{NULL, NULL} /* Sentinel */ {NULL, NULL} /* Sentinel */
}; };
@ -609,11 +599,9 @@ PyInit__hashlib(void)
/* these constants are used by the convenience constructors */ /* these constants are used by the convenience constructors */
INIT_CONSTRUCTOR_CONSTANTS(md5); INIT_CONSTRUCTOR_CONSTANTS(md5);
INIT_CONSTRUCTOR_CONSTANTS(sha1); INIT_CONSTRUCTOR_CONSTANTS(sha1);
#ifdef _OPENSSL_SUPPORTS_SHA2
INIT_CONSTRUCTOR_CONSTANTS(sha224); INIT_CONSTRUCTOR_CONSTANTS(sha224);
INIT_CONSTRUCTOR_CONSTANTS(sha256); INIT_CONSTRUCTOR_CONSTANTS(sha256);
INIT_CONSTRUCTOR_CONSTANTS(sha384); INIT_CONSTRUCTOR_CONSTANTS(sha384);
INIT_CONSTRUCTOR_CONSTANTS(sha512); INIT_CONSTRUCTOR_CONSTANTS(sha512);
#endif
return m; return m;
} }