Skip to content

Commit 6d3ef57

Browse files
mallardducknikic
authored andcommitted
Fix bug #81491: Ensure HAVE_ARGON2LIB is set when compiling using libargon2
Closes GH-7538.
1 parent 9b3069f commit 6d3ef57

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ PHP NEWS
77
Doleček)
88
. Fixed bug #81380 (Observer may not be initialized properly). (krakjoe)
99

10+
- Standard:
11+
. Fixed bug #81491 (Incorrectly using libsodium for argon2 hashing).
12+
(Dan Pock)
13+
1014
- Streams:
1115
. Fixed bug #81475 (stream_isatty emits warning with attached stream wrapper).
1216
(cmb)

ext/standard/config.m4

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,8 @@ if test "$PHP_PASSWORD_ARGON2" != "no"; then
407407
PKG_CHECK_MODULES([ARGON2], [libargon2])
408408
PHP_EVAL_INCLINE($ARGON2_CFLAGS)
409409
PHP_EVAL_LIBLINE($ARGON2_LIBS)
410+
411+
AC_DEFINE(HAVE_ARGON2LIB, 1, [ ])
410412
fi
411413

412414
dnl

0 commit comments

Comments
 (0)