bpo-45434: Remove pystrhex.h header file (GH-28923)

Move Include/pystrhex.h to Include/internal/pycore_strhex.h.
The header file only contains private functions.

The following C extensions are now built with Py_BUILD_CORE_MODULE
macro defined to get access to the internal C API:

* _blake2
* _hashopenssl
* _md5
* _sha1
* _sha3
* _ssl
* binascii

10 files changed, 23 insertions, 19 deletions

diff --git a/Modules/Setup b/Modules/Setup
index 5e26472..ba8c154 100644
--- a/Modules/Setup
+++ b/Modules/Setup
@@ -212,19 +212,23 @@ _symtable symtablemodule.c
 # OPENSSL=/path/to/openssl/directory
 # _ssl _ssl.c \
 #     -I$(OPENSSL)/include -L$(OPENSSL)/lib \
-#     -lssl -lcrypto
+#     -lssl -lcrypto \
+#     -DPy_BUILD_CORE_BUILTIN
 #_hashlib _hashopenssl.c \
 #     -I$(OPENSSL)/include -L$(OPENSSL)/lib \
-#     -lcrypto
+#     -lcrypto \
+#     -DPy_BUILD_CORE_BUILTIN
 
 # To statically link OpenSSL:
 # _ssl _ssl.c \
 #     -I$(OPENSSL)/include -L$(OPENSSL)/lib \
 #     -l:libssl.a -Wl,--exclude-libs,libssl.a \
-#     -l:libcrypto.a -Wl,--exclude-libs,libcrypto.a
+#     -l:libcrypto.a -Wl,--exclude-libs,libcrypto.a \
+#     -DPy_BUILD_CORE_BUILTIN
 #_hashlib _hashopenssl.c \
 #     -I$(OPENSSL)/include -L$(OPENSSL)/lib \
-#     -l:libcrypto.a -Wl,--exclude-libs,libcrypto.a
+#     -l:libcrypto.a -Wl,--exclude-libs,libcrypto.a \
+#     -DPy_BUILD_CORE_BUILTIN
 
 # The crypt module is now disabled by default because it breaks builds
 # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
@@ -255,18 +259,18 @@ _symtable symtablemodule.c
 # The _md5 module implements the RSA Data Security, Inc. MD5
 # Message-Digest Algorithm, described in RFC 1321.
 
-#_md5 md5module.c
+#_md5 md5module.c -DPy_BUILD_CORE_BUILTIN
 
 
 # The _sha module implements the SHA checksum algorithms.
 # (NIST's Secure Hash Algorithms.)
-#_sha1 sha1module.c
+#_sha1 sha1module.c -DPy_BUILD_CORE_BUILTIN
 #_sha256 sha256module.c -DPy_BUILD_CORE_BUILTIN
 #_sha512 sha512module.c -DPy_BUILD_CORE_BUILTIN
-#_sha3 _sha3/sha3module.c
+#_sha3 _sha3/sha3module.c -DPy_BUILD_CORE_BUILTIN
 
 # _blake module
-#_blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c
+#_blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c -DPy_BUILD_CORE_BUILTIN
 
 # The _tkinter module.
 #
@@ -339,7 +343,7 @@ _symtable symtablemodule.c
 
 
 # Helper module for various ascii-encoders
-#binascii binascii.c
+#binascii binascii.c -DPy_BUILD_CORE_MODULE
 
 # Andrew Kuchling's zlib module.
 # This require zlib 1.1.3 (or later).
diff --git a/Modules/_blake2/blake2b_impl.c b/Modules/_blake2/blake2b_impl.c
index 8b0d60d..b16324e 100644
--- a/Modules/_blake2/blake2b_impl.c
+++ b/Modules/_blake2/blake2b_impl.c
@@ -14,7 +14,7 @@
  */
 
 #include "Python.h"
-#include "pystrhex.h"
+#include "pycore_strhex.h"       // _Py_strhex()
 
 #include "../hashlib.h"
 #include "blake2ns.h"
diff --git a/Modules/_blake2/blake2s_impl.c b/Modules/_blake2/blake2s_impl.c
index 7ab3917..6b31a36 100644
--- a/Modules/_blake2/blake2s_impl.c
+++ b/Modules/_blake2/blake2s_impl.c
@@ -14,7 +14,7 @@
  */
 
 #include "Python.h"
-#include "pystrhex.h"
+#include "pycore_strhex.h"        // _Py_strhex()
 
 #include "../hashlib.h"
 #include "blake2ns.h"
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
index b9e68c0..b4ba60b 100644
--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
@@ -22,7 +22,7 @@
 
 #include "Python.h"
 #include "hashlib.h"
-#include "pystrhex.h"
+#include "pycore_strhex.h"        // _Py_strhex()
 
 /* EVP is the preferred interface to hashing in OpenSSL */
 #include <openssl/evp.h>
diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c
index 3974e0b..a033c4e 100644
--- a/Modules/_sha3/sha3module.c
+++ b/Modules/_sha3/sha3module.c
@@ -16,7 +16,7 @@
  */
 
 #include "Python.h"
-#include "pystrhex.h"
+#include "pycore_strhex.h"        // _Py_strhex()
 #include "../hashlib.h"
 
 /* **************************************************************************
diff --git a/Modules/binascii.c b/Modules/binascii.c
index db960dc..ef20988 100644
--- a/Modules/binascii.c
+++ b/Modules/binascii.c
@@ -56,9 +56,9 @@
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
-#include "pystrhex.h"
+#include "pycore_strhex.h"        // _Py_strhex_bytes_with_sep()
 #ifdef USE_ZLIB_CRC32
-#include "zlib.h"
+#  include "zlib.h"
 #endif
 
 typedef struct binascii_state {
diff --git a/Modules/md5module.c b/Modules/md5module.c
index b50d2e5..4d03f6b 100644
--- a/Modules/md5module.c
+++ b/Modules/md5module.c
@@ -18,7 +18,7 @@
 
 #include "Python.h"
 #include "hashlib.h"
-#include "pystrhex.h"
+#include "pycore_strhex.h"        // _Py_strhex()
 
 /*[clinic input]
 module _md5
diff --git a/Modules/sha1module.c b/Modules/sha1module.c
index d186aa4..153bc12 100644
--- a/Modules/sha1module.c
+++ b/Modules/sha1module.c
@@ -18,7 +18,7 @@
 
 #include "Python.h"
 #include "hashlib.h"
-#include "pystrhex.h"
+#include "pycore_strhex.h"        // _Py_strhex()
 
 /*[clinic input]
 module _sha1
diff --git a/Modules/sha256module.c b/Modules/sha256module.c
index fac7073..5858071 100644
--- a/Modules/sha256module.c
+++ b/Modules/sha256module.c
@@ -18,9 +18,9 @@
 
 #include "Python.h"
 #include "pycore_bitutils.h"      // _Py_bswap32()
+#include "pycore_strhex.h"        // _Py_strhex()
 #include "structmember.h"         // PyMemberDef
 #include "hashlib.h"
-#include "pystrhex.h"
 
 /*[clinic input]
 module _sha256
diff --git a/Modules/sha512module.c b/Modules/sha512module.c
index 4ea2fc1..e50b69b 100644
--- a/Modules/sha512module.c
+++ b/Modules/sha512module.c
@@ -18,9 +18,9 @@
 
 #include "Python.h"
 #include "pycore_bitutils.h"      // _Py_bswap64()
+#include "pycore_strhex.h"        // _Py_strhex()
 #include "structmember.h"         // PyMemberDef
 #include "hashlib.h"
-#include "pystrhex.h"
 
 /*[clinic input]
 module _sha512