DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix building nt_password_hash with gnutls

Browse source 
Even with

    CONFIG_TLS=gnutls
    CONFIG_CRYPTO=gnutls

in .config, nt_password_hash was linked with libcrypto instead of
libgcrypt, which caused linkage failure.

Signed-off-by: Andrey Utkin <andrey_utkin@gentoo.org>
This commit is contained in:
Andrey Utkin 2018-04-15 00:34:35 +01:00 committed by Jouni Malinen
parent 5ecdf06c8c
commit 4449efeb1d
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hostapd/Makefile
View file

@ -688,6 +688,7 @@ NEED_SHA256=y
NEED_TLS_PRF_SHA256=y NEED_TLS_PRF_SHA256=y
LIBS += -lcrypto LIBS += -lcrypto
LIBS_h += -lcrypto LIBS_h += -lcrypto
LIBS_n += -lcrypto
ifdef CONFIG_TLS_ADD_DL ifdef CONFIG_TLS_ADD_DL
LIBS += -ldl LIBS += -ldl
LIBS_h += -ldl LIBS_h += -ldl
@ -716,6 +717,7 @@ endif
ifeq ($(CONFIG_CRYPTO), gnutls) ifeq ($(CONFIG_CRYPTO), gnutls)
LIBS += -lgcrypt LIBS += -lgcrypt
LIBS_h += -lgcrypt LIBS_h += -lgcrypt
LIBS_n += -lgcrypt
CONFIG_INTERNAL_RC4=y CONFIG_INTERNAL_RC4=y
CONFIG_INTERNAL_DH_GROUP5=y CONFIG_INTERNAL_DH_GROUP5=y
endif endif
@ -1301,9 +1303,6 @@ ifdef CONFIG_WPA_TRACE
NOBJS += ../src/utils/trace.o NOBJS += ../src/utils/trace.o
LIBS_n += -lbfd LIBS_n += -lbfd
endif endif
ifdef TLS_FUNCS
LIBS_n += -lcrypto
endif
HOBJS += hlr_auc_gw.o ../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).o ../src/utils/wpabuf.o ../src/crypto/milenage.o HOBJS += hlr_auc_gw.o ../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).o ../src/utils/wpabuf.o ../src/crypto/milenage.o
HOBJS += ../src/crypto/aes-encblock.o HOBJS += ../src/crypto/aes-encblock.o