[src/trunk]: src/external/bsd/wpa/bin Fix MKCRYPTO=no build.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d5bd806d8aec
branches:  trunk
changeset: 346157:d5bd806d8aec
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jun 29 19:16:23 2016 +0000

description:
Fix MKCRYPTO=no build.

diffstat:

 external/bsd/wpa/bin/hostapd/Makefile               |  6 ++++--
 external/bsd/wpa/bin/hostapd/aes-xinternal.c        |  2 +-
 external/bsd/wpa/bin/wpa_passphrase/Makefile        |  4 +++-
 external/bsd/wpa/bin/wpa_supplicant/Makefile        |  8 +++++---
 external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c |  2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diffs (114 lines):

diff -r 6235889cb44d -r d5bd806d8aec external/bsd/wpa/bin/hostapd/Makefile
--- a/external/bsd/wpa/bin/hostapd/Makefile     Wed Jun 29 18:42:17 2016 +0000
+++ b/external/bsd/wpa/bin/hostapd/Makefile     Wed Jun 29 19:16:23 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/04/01 19:45:14 christos Exp $
+# $NetBSD: Makefile,v 1.9 2016/06/29 19:16:23 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -86,7 +86,6 @@
 
 # crypto
 SRCS+= \
-crypto_openssl.c \
 random.c \
 sha1-prf.c
 
@@ -150,6 +149,7 @@
 aes-eax.c \
 aes-encblock.c \
 aes-omac1.c \
+crypto_openssl.c \
 dh_groups.c \
 fips_prf_openssl.c \
 ms_funcs.c \
@@ -196,7 +196,9 @@
 LDADD+= -lssl -lcrypto -ldes
 .else
 CPPFLAGS+= -DINTERNAL_AES -DINTERNAL_MD5 -DINTERNAL_SHA1 -DCONFIG_NO_PBKDF2
+CPPFLAGS+= -DCONFIG_CRYPTO_INTERNAL
 SRCS+=  tls_none.c sha1-internal.c md5-internal.c aes-xinternal.c rc4.c
+SRCS+= sha1-pbkdf2.c sha1.c md5.c
 .endif
 
 .include <bsd.prog.mk>
diff -r 6235889cb44d -r d5bd806d8aec external/bsd/wpa/bin/hostapd/aes-xinternal.c
--- a/external/bsd/wpa/bin/hostapd/aes-xinternal.c      Wed Jun 29 18:42:17 2016 +0000
+++ b/external/bsd/wpa/bin/hostapd/aes-xinternal.c      Wed Jun 29 19:16:23 2016 +0000
@@ -4,7 +4,7 @@
 #include "aes.h"
 #include "aes_wrap.h"
 
-int aes_wrap(const u8 *kek, int n, const u8 *cipher, u8 *plain)
+int aes_wrap(const u8 *kek, size_t kek_len, int n, const u8 *cipher, u8 *plain)
 {
        return -1;
 }
diff -r 6235889cb44d -r d5bd806d8aec external/bsd/wpa/bin/wpa_passphrase/Makefile
--- a/external/bsd/wpa/bin/wpa_passphrase/Makefile      Wed Jun 29 18:42:17 2016 +0000
+++ b/external/bsd/wpa/bin/wpa_passphrase/Makefile      Wed Jun 29 19:16:23 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/04/01 19:45:14 christos Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/29 19:16:23 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -18,7 +18,9 @@
 LDADD+= -lssl -lcrypto -ldes
 .else
 CPPFLAGS+= -DINTERNAL_AES -DINTERNAL_MD5 -DINTERNAL_SHA1
+CPPFLAGS+= -DCONFIG_CRYPTO_INTERNAL
 SRCS+= tls_none.c md5-internal.c sha1-internal.c
+SRCS+= sha1-pbkdf2.c sha1.c md5.c
 .endif
 
 
diff -r 6235889cb44d -r d5bd806d8aec external/bsd/wpa/bin/wpa_supplicant/Makefile
--- a/external/bsd/wpa/bin/wpa_supplicant/Makefile      Wed Jun 29 18:42:17 2016 +0000
+++ b/external/bsd/wpa/bin/wpa_supplicant/Makefile      Wed Jun 29 19:16:23 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/03/23 09:35:25 roy Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/29 19:16:23 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -33,6 +33,7 @@
 preauth.c \
 random.c \
 scan.c \
+sha1-prf.c \
 wmm_ac.c \
 wpa.c \
 wpa_common.c \
@@ -102,7 +103,6 @@
 ms_funcs.c \
 mschapv2.c \
 sha1-tlsprf.c \
-sha1-prf.c \
 tls_openssl.c
 
 SRCS+=aes-ctr.c \
@@ -119,7 +119,9 @@
 .else
 CPPFLAGS+= -DINTERNAL_AES -DINTERNAL_MD5 -DINTERNAL_SHA1 -DCONFIG_NO_PBKDF2
 SRCS+= tls_none.c sha1-internal.c md5-internal.c aes-xinternal.c rc4.c
-SRCS+= aes-unwrap.c md5.c
+CPPFLAGS+= -DCONFIG_CRYPTO_INTERNAL
+#SRCS+= aes-unwrap.c md5.c
+SRCS+= sha1-pbkdf2.c sha1.c md5.c
 .endif
 
 .endif
diff -r 6235889cb44d -r d5bd806d8aec external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c
--- a/external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c       Wed Jun 29 18:42:17 2016 +0000
+++ b/external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c       Wed Jun 29 19:16:23 2016 +0000
@@ -4,7 +4,7 @@
 #include "aes.h"
 #include "aes_wrap.h"
 
-int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain)
+int aes_unwrap(const u8 *kek, size_t kek_len, int n, const u8 *cipher, u8 *plain)
 {
        return -1;
 }