gh-85283: Build md5 extension with limited C API

vstinner · vstinner · commit fcad07bb540e · 2023-10-17T12:29:27.000+02:00
* Replace _Py_strhex() with few lines of code.
* Replace _PyType_GetModuleState() with PyType_GetModuleState().
* Fix make check-c-globals
diff --git a/Doc/whatsnew/3.13.rst b/Doc/whatsnew/3.13.rst
@@ -932,8 +932,9 @@ Build Changes
 * Building CPython now requires a compiler with support for the C11 atomic
   library, GCC built-in atomic functions, or MSVC interlocked intrinsics.
 
-* The ``errno``, ``_ctypes_test``, ``_stat`` and ``_testimportmultiple`` C
-  extensions are now built with the :ref:`limited C API <limited-c-api>`.
+* The ``errno``, ``md5``, ``_ctypes_test``, ``_stat`` and
+  ``_testimportmultiple`` C extensions are now built with the :ref:`limited C
+  API <limited-c-api>`.
   (Contributed by Victor Stinner in :gh:`85283`.)
 
 
diff --git a/Misc/NEWS.d/next/Build/2023-10-17-01-56-11.gh-issue-85283.V156T2.rst b/Misc/NEWS.d/next/Build/2023-10-17-01-56-11.gh-issue-85283.V156T2.rst
@@ -1,3 +1,3 @@
-The ``errno``, ``_ctypes_test`` and ``_testimportmultiple`` C extensions are
-now built with the :ref:`limited C API <limited-c-api>`. Patch by Victor
-Stinner.
+The ``errno``, ``md5``, ``_ctypes_test`` and ``_testimportmultiple`` C
+extensions are now built with the :ref:`limited C API <limited-c-api>`. Patch
+by Victor Stinner.
diff --git a/Modules/clinic/md5module.c.h b/Modules/clinic/md5module.c.h
diff --git a/Modules/md5module.c b/Modules/md5module.c
@@ -15,14 +15,12 @@
 */
 
 /* MD5 objects */
-#ifndef Py_BUILD_CORE_BUILTIN
-#  define Py_BUILD_CORE_MODULE 1
-#endif
+
+// Need limited C API version 3.13 for Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
+#define Py_LIMITED_API 0x030d0000
 
 #include "Python.h"
 #include "hashlib.h"
-#include "pycore_strhex.h"        // _Py_strhex()
-#include "pycore_typeobject.h"    // _PyType_GetModuleState()
 
 /*[clinic input]
 module _md5
@@ -94,7 +92,7 @@ MD5_dealloc(MD5object *ptr)
     if (ptr->lock != NULL) {
         PyThread_free_lock(ptr->lock);
     }
-    PyTypeObject *tp = Py_TYPE(ptr);
+    PyTypeObject *tp = Py_TYPE((PyObject*)ptr);
     PyObject_GC_UnTrack(ptr);
     PyObject_GC_Del(ptr);
     Py_DECREF(tp);
@@ -115,7 +113,7 @@ static PyObject *
 MD5Type_copy_impl(MD5object *self, PyTypeObject *cls)
 /*[clinic end generated code: output=bf055e08244bf5ee input=d89087dcfb2a8620]*/
 {
-    MD5State *st = _PyType_GetModuleState(cls);
+    MD5State *st = PyType_GetModuleState(cls);
 
     MD5object *newobj;
     if ((newobj = newMD5object(st))==NULL)
@@ -158,7 +156,16 @@ MD5Type_hexdigest_impl(MD5object *self)
     ENTER_HASHLIB(self);
     Hacl_Streaming_MD5_legacy_finish(self->hash_state, digest);
     LEAVE_HASHLIB(self);
-    return _Py_strhex((const char*)digest, MD5_DIGESTSIZE);
+
+    const char *hexdigits = "0123456789abcdef";
+    char digest_hex[MD5_DIGESTSIZE * 2];
+    char *str = digest_hex;
+    for (size_t i=0; i < MD5_DIGESTSIZE; i++) {
+        unsigned char byte = digest[i];
+        *str++ = hexdigits[byte >> 4];
+        *str++ = hexdigits[byte & 0x0f];
+    }
+    return PyUnicode_FromStringAndSize(digest_hex, sizeof(digest_hex));
 }
 
 static void update(Hacl_Streaming_MD5_state *state, uint8_t *buf, Py_ssize_t len) {
diff --git a/Tools/c-analyzer/cpython/ignored.tsv b/Tools/c-analyzer/cpython/ignored.tsv
@@ -729,3 +729,4 @@ Modules/_io/_iomodule.c	-	_PyIO_Module	-
 Modules/_sqlite/module.c	-	_sqlite3module	-
 Python/optimizer_analysis.c	-	_Py_PartitionRootNode_Type	-
 Python/optimizer_analysis.c	-	_Py_UOpsAbstractInterpContext_Type	-
+Modules/clinic/md5module.c.h	_md5_md5	_keywords	-
