@@ -2078,7 +2078,6 @@ hashlib_init_hmactype(PyObject *module)
2078
2078
return 0 ;
2079
2079
}
2080
2080
2081
- #if 0
2082
2081
static PyModuleDef_Slot hashlib_slots [] = {
2083
2082
/* OpenSSL 1.0.2 and LibreSSL */
2084
2083
{Py_mod_exec , hashlib_openssl_legacy_init },
@@ -2088,15 +2087,14 @@ static PyModuleDef_Slot hashlib_slots[] = {
2088
2087
{Py_mod_exec , hashlib_md_meth_names },
2089
2088
{0 , NULL }
2090
2089
};
2091
- #endif
2092
2090
2093
2091
static struct PyModuleDef _hashlibmodule = {
2094
2092
PyModuleDef_HEAD_INIT ,
2095
2093
.m_name = "_hashlib" ,
2096
2094
.m_doc = "OpenSSL interface for hashlib module" ,
2097
2095
.m_size = sizeof (_hashlibstate ),
2098
2096
.m_methods = EVP_functions ,
2099
- .m_slots = NULL ,
2097
+ .m_slots = hashlib_slots ,
2100
2098
.m_traverse = hashlib_traverse ,
2101
2099
.m_clear = hashlib_clear ,
2102
2100
.m_free = hashlib_free
@@ -2105,37 +2103,5 @@ static struct PyModuleDef _hashlibmodule = {
2105
2103
PyMODINIT_FUNC
2106
2104
PyInit__hashlib (void )
2107
2105
{
2108
- PyObject * m = PyState_FindModule (& _hashlibmodule );
2109
- if (m != NULL ) {
2110
- Py_INCREF (m );
2111
- return m ;
2112
- }
2113
-
2114
- m = PyModule_Create (& _hashlibmodule );
2115
- if (m == NULL ) {
2116
- return NULL ;
2117
- }
2118
-
2119
- if (hashlib_openssl_legacy_init (m ) < 0 ) {
2120
- Py_DECREF (m );
2121
- return NULL ;
2122
- }
2123
- if (hashlib_init_evptype (m ) < 0 ) {
2124
- Py_DECREF (m );
2125
- return NULL ;
2126
- }
2127
- if (hashlib_init_evpxoftype (m ) < 0 ) {
2128
- Py_DECREF (m );
2129
- return NULL ;
2130
- }
2131
- if (hashlib_init_hmactype (m ) < 0 ) {
2132
- Py_DECREF (m );
2133
- return NULL ;
2134
- }
2135
- if (hashlib_md_meth_names (m ) == -1 ) {
2136
- Py_DECREF (m );
2137
- return NULL ;
2138
- }
2139
-
2140
- return m ;
2106
+ return PyModuleDef_Init (& _hashlibmodule );
2141
2107
}
0 commit comments