tree e28923e1f8be4f71cf2671695ed30b6c31b13b52
parent 444d567b27731d8572ef37697dd12fd1c37c2f24
author Dmitry Shmidt <dimitrysh@google.com> 1364925936 -0700
committer Dmitry Shmidt <dimitrysh@google.com> 1364925936 -0700

Accumulative patch from commit 88c8bf311efa4eb64468bed9b41b3110ab9effff

88c8bf3 WPS NFC: Allow configuration token to be built from network block
e205401 WPS ER: Allow Enrollee to be specified with MAC address
c44a19c WPS ER: Document additional NFC command for ER operations
59307b3 WPS ER: Allow AP to be specified with BSSID
49e160a WPS: Fix use of pre-configured DH keys with multiple operations
5c9d63d WPS: Be more careful with pre-configured DH parameters
cd61936 hostapd: Show more helpful message for -g and -G errors

Change-Id: I7bfd1fa30214c54f2536679411ccd11bb4dd896d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>