Skip to content

Commit b6daf74

Browse files
Fix python CI patches (#1524)
This is in light of upstream [PR 117234#][1] being merged. [1]: python/cpython#117234
1 parent 6284822 commit b6daf74

File tree

2 files changed

+0
-34
lines changed

2 files changed

+0
-34
lines changed

tests/ci/integration/python_patch/3.12/aws-lc-cpython.patch

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -106,23 +106,6 @@ index a8faa1d..8abe8fd 100644
106106

107107
# The _tkinter module.
108108
#
109-
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
110-
index af6d1b2..4b060b3 100644
111-
--- a/Modules/_hashopenssl.c
112-
+++ b/Modules/_hashopenssl.c
113-
@@ -130,8 +130,12 @@ static const py_hashentry_t py_hashes[] = {
114-
PY_HASH_ENTRY(Py_hash_shake_128, NULL, SN_shake128, NID_shake128),
115-
PY_HASH_ENTRY(Py_hash_shake_256, NULL, SN_shake256, NID_shake256),
116-
/* blake2 digest */
117-
+#if defined(NID_blake2s256)
118-
PY_HASH_ENTRY(Py_hash_blake2s, "blake2s256", SN_blake2s256, NID_blake2s256),
119-
+#endif
120-
+#if defined(NID_blake2b512)
121-
PY_HASH_ENTRY(Py_hash_blake2b, "blake2b512", SN_blake2b512, NID_blake2b512),
122-
+#endif
123-
PY_HASH_ENTRY(NULL, NULL, NULL, 0),
124-
};
125-
126109
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
127110
index 5f1425a..d546ce7 100644
128111
--- a/Modules/_ssl.c

tests/ci/integration/python_patch/main/aws-lc-cpython.patch

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -105,23 +105,6 @@ index cd1cf24..53bcc4c 100644
105105

106106
# The _tkinter module.
107107
#
108-
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
109-
index 0e230f3..390d6e0 100644
110-
--- a/Modules/_hashopenssl.c
111-
+++ b/Modules/_hashopenssl.c
112-
@@ -130,8 +130,12 @@ static const py_hashentry_t py_hashes[] = {
113-
PY_HASH_ENTRY(Py_hash_shake_128, NULL, SN_shake128, NID_shake128),
114-
PY_HASH_ENTRY(Py_hash_shake_256, NULL, SN_shake256, NID_shake256),
115-
/* blake2 digest */
116-
+#if defined(NID_blake2s256)
117-
PY_HASH_ENTRY(Py_hash_blake2s, "blake2s256", SN_blake2s256, NID_blake2s256),
118-
+#endif
119-
+#if defined(NID_blake2b512)
120-
PY_HASH_ENTRY(Py_hash_blake2b, "blake2b512", SN_blake2b512, NID_blake2b512),
121-
+#endif
122-
PY_HASH_ENTRY(NULL, NULL, NULL, 0),
123-
};
124-
125108
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
126109
index d00f407..7049f79 100644
127110
--- a/Modules/_ssl.c

0 commit comments

Comments
 (0)