Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2024-11-25 00:38:24 -05:00
Code Issues Projects Releases Wiki Activity

DPP: Move TCP encapsulation into a separate source code file

Browse Source 
This continues splitting dpp.c into smaller pieces.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2020-05-11 11:59:46 +03:00 committed by Jouni Malinen
parent 21c612017b
commit 3aaf269f67
8 changed files with 1478 additions and 1453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hostapd/Android.mk
View File

@ -542,6 +542,7 @@ OBJS += src/common/dpp_backup.c
OBJS += src/common/dpp_crypto.c OBJS += src/common/dpp_crypto.c
OBJS += src/common/dpp_pkex.c OBJS += src/common/dpp_pkex.c
OBJS += src/common/dpp_reconfig.c OBJS += src/common/dpp_reconfig.c
OBJS += src/common/dpp_tcp.c
OBJS += src/ap/dpp_hostapd.c OBJS += src/ap/dpp_hostapd.c
OBJS += src/ap/gas_query_ap.c OBJS += src/ap/gas_query_ap.c
NEED_AES_SIV=y NEED_AES_SIV=y

1
hostapd/Makefile
View File

@ -573,6 +573,7 @@ OBJS += ../src/common/dpp_backup.o
OBJS += ../src/common/dpp_crypto.o OBJS += ../src/common/dpp_crypto.o
OBJS += ../src/common/dpp_pkex.o OBJS += ../src/common/dpp_pkex.o
OBJS += ../src/common/dpp_reconfig.o OBJS += ../src/common/dpp_reconfig.o
OBJS += ../src/common/dpp_tcp.o
OBJS += ../src/ap/dpp_hostapd.o OBJS += ../src/ap/dpp_hostapd.o
OBJS += ../src/ap/gas_query_ap.o OBJS += ../src/ap/gas_query_ap.o
NEED_AES_SIV=y NEED_AES_SIV=y

1455
src/common/dpp.c
View File

File diff suppressed because it is too large Load Diff

9
src/common/dpp_i.h
View File

@ -46,6 +46,8 @@ int dpp_prepare_channel_list(struct dpp_authentication *auth,
struct hostapd_hw_modes *own_modes, u16 num_modes); struct hostapd_hw_modes *own_modes, u16 num_modes);
void dpp_auth_fail(struct dpp_authentication *auth, const char *txt); void dpp_auth_fail(struct dpp_authentication *auth, const char *txt);
int dpp_gen_uri(struct dpp_bootstrap_info *bi); int dpp_gen_uri(struct dpp_bootstrap_info *bi);
void dpp_write_adv_proto(struct wpabuf *buf);
void dpp_write_gas_query(struct wpabuf *buf, struct wpabuf *query);
/* dpp_backup.c */ /* dpp_backup.c */
@ -140,5 +142,12 @@ char * dpp_sign_connector(struct dpp_configurator *conf,
int dpp_test_gen_invalid_key(struct wpabuf *msg, int dpp_test_gen_invalid_key(struct wpabuf *msg,
const struct dpp_curve_params *curve); const struct dpp_curve_params *curve);
/* dpp_tcp.c */
void dpp_controller_conn_status_result_wait_timeout(void *eloop_ctx,
void *timeout_ctx);
void dpp_tcp_init_flush(struct dpp_global *dpp);
void dpp_relay_flush_controllers(struct dpp_global *dpp);
#endif /* CONFIG_DPP */ #endif /* CONFIG_DPP */
#endif /* DPP_I_H */ #endif /* DPP_I_H */

1462
src/common/dpp_tcp.c Normal file
View File

File diff suppressed because it is too large Load Diff

1
tests/fuzzing/dpp-uri/Makefile
View File

@ -26,6 +26,7 @@ OBJS += $(SRC)/common/dpp_backup.o
OBJS += $(SRC)/common/dpp_crypto.o OBJS += $(SRC)/common/dpp_crypto.o
OBJS += $(SRC)/common/dpp_pkex.o OBJS += $(SRC)/common/dpp_pkex.o
OBJS += $(SRC)/common/dpp_reconfig.o OBJS += $(SRC)/common/dpp_reconfig.o
OBJS += $(SRC)/common/dpp_tcp.o
dpp-uri: dpp-uri.o $(OBJS) $(LIBS) dpp-uri: dpp-uri.o $(OBJS) $(LIBS)
$(LDO) $(LDFLAGS) -o $@ $^ -lcrypto $(LDO) $(LDFLAGS) -o $@ $^ -lcrypto

1
wpa_supplicant/Android.mk
View File

@ -252,6 +252,7 @@ OBJS += src/common/dpp_backup.c
OBJS += src/common/dpp_crypto.c OBJS += src/common/dpp_crypto.c
OBJS += src/common/dpp_pkex.c OBJS += src/common/dpp_pkex.c
OBJS += src/common/dpp_reconfig.c OBJS += src/common/dpp_reconfig.c
OBJS += src/common/dpp_tcp.c
OBJS += dpp_supplicant.c OBJS += dpp_supplicant.c
NEED_AES_SIV=y NEED_AES_SIV=y
NEED_HMAC_SHA256_KDF=y NEED_HMAC_SHA256_KDF=y

1
wpa_supplicant/Makefile
View File

@ -284,6 +284,7 @@ OBJS += ../src/common/dpp_backup.o
OBJS += ../src/common/dpp_crypto.o OBJS += ../src/common/dpp_crypto.o
OBJS += ../src/common/dpp_pkex.o OBJS += ../src/common/dpp_pkex.o
OBJS += ../src/common/dpp_reconfig.o OBJS += ../src/common/dpp_reconfig.o
OBJS += ../src/common/dpp_tcp.o
OBJS += dpp_supplicant.o OBJS += dpp_supplicant.o
NEED_AES_SIV=y NEED_AES_SIV=y
NEED_HMAC_SHA256_KDF=y NEED_HMAC_SHA256_KDF=y