Skip to content

Commit f6c2c28

Browse files
committed
correctly support Py_HASH_EXTERNAL for Unix platforms
1 parent 198fd9a commit f6c2c28

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

Doc/using/configure.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -954,13 +954,14 @@ Libraries options
954954
Security Options
955955
----------------
956956

957-
.. option:: --with-hash-algorithm=[fnv|siphash13|siphash24]
957+
.. option:: --with-hash-algorithm=[fnv|siphash13|siphash24|external]
958958

959959
Select hash algorithm for use in ``Python/pyhash.c``:
960960

961961
* ``siphash13`` (default);
962962
* ``siphash24``;
963-
* ``fnv``.
963+
* ``fnv``;
964+
* ``external``.
964965

965966
.. versionadded:: 3.4
966967

configure

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3966,12 +3966,15 @@ dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
39663966
AC_ARG_WITH(
39673967
[hash_algorithm],
39683968
[AS_HELP_STRING(
3969-
[--with-hash-algorithm=@<:@fnv|siphash13|siphash24@:>@],
3969+
[--with-hash-algorithm=@<:@fnv|siphash13|siphash24|external@:>@],
39703970
[select hash algorithm for use in Python/pyhash.c (default is SipHash13)]
39713971
)],
39723972
[
39733973
AC_MSG_RESULT([$withval])
39743974
case "$withval" in
3975+
external)
3976+
AC_DEFINE([Py_HASH_ALGORITHM], [0])
3977+
;;
39753978
siphash13)
39763979
AC_DEFINE([Py_HASH_ALGORITHM], [3])
39773980
;;

0 commit comments

Comments
 (0)