From 3489e3b6396ee9944a6a2e19e675ca54c36993b4 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 22 Aug 2018 14:59:50 +0200 Subject: Update to FreeBSD head 2018-09-17 Git mirror commit 6c2192b1ef8c50788c751f878552526800b1e319. Update #3472. --- libbsd.py | 556 +++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 294 insertions(+), 262 deletions(-) (limited to 'libbsd.py') diff --git a/libbsd.py b/libbsd.py index dc6f5702..0ac6c1a1 100644 --- a/libbsd.py +++ b/libbsd.py @@ -59,12 +59,15 @@ _defaults = { 'include-paths': ['rtemsbsd/include', 'freebsd/sys', 'freebsd/sys/contrib/ck/include', + 'freebsd/sys/contrib/libsodium/src/libsodium/include', + 'freebsd/sys/contrib/libsodium/src/libsodium/include/sodium', 'freebsd/sys/contrib/pf', 'freebsd/crypto', 'freebsd/sys/net', 'freebsd/include', 'freebsd/lib', 'freebsd/lib/libbsdstat', + 'freebsd/lib/libcapsicum', 'freebsd/lib/libcasper', 'freebsd/lib/libc/include', 'freebsd/lib/libc/isc/include', @@ -386,6 +389,8 @@ class base(builder.Module): 'sys/contrib/ck/include/gcc/x86/ck_f_pr.h', 'sys/contrib/ck/include/gcc/x86/ck_pr.h', 'sys/fs/devfs/devfs_int.h', + 'sys/rpc/netconfig.h', + 'sys/rpc/types.h', 'sys/security/audit/audit.h', 'sys/security/mac/mac_framework.h', 'sys/sys/acl.h', @@ -426,8 +431,8 @@ class base(builder.Module): 'sys/sys/khelp.h', 'sys/sys/kobj.h', 'sys/sys/kthread.h', - 'sys/sys/ktr.h', 'sys/sys/ktr_class.h', + 'sys/sys/ktr.h', 'sys/sys/libkern.h', 'sys/sys/limits.h', 'sys/sys/linker.h', @@ -446,6 +451,7 @@ class base(builder.Module): 'sys/sys/mount.h', 'sys/sys/_mutex.h', 'sys/sys/mutex.h', + 'sys/sys/nlist_aout.h', 'sys/sys/_null.h', 'sys/sys/nv.h', 'sys/sys/osd.h', @@ -473,10 +479,11 @@ class base(builder.Module): 'sys/sys/_semaphore.h', 'sys/sys/seq.h', 'sys/sys/sf_buf.h', + 'sys/sys/sglist.h', 'sys/sys/sigio.h', 'sys/sys/signalvar.h', - 'sys/sys/smp.h', 'sys/sys/sleepqueue.h', + 'sys/sys/smp.h', 'sys/sys/sockbuf.h', 'sys/sys/socketvar.h', 'sys/sys/sockopt.h', @@ -490,11 +497,8 @@ class base(builder.Module): 'sys/sys/systm.h', 'sys/sys/_task.h', 'sys/sys/taskqueue.h', - 'sys/sys/tslog.h', - 'sys/sys/nlist_aout.h', - 'sys/rpc/netconfig.h', - 'sys/rpc/types.h', 'sys/sys/tree.h', + 'sys/sys/tslog.h', 'sys/sys/ucred.h', 'sys/sys/un.h', 'sys/sys/unpcb.h', @@ -666,10 +670,6 @@ class mmc(builder.Module): mm = self.manager self.addKernelSpaceHeaderFiles( [ - 'sys/arm/at91/at91_mcireg.h', - 'sys/arm/at91/at91_pdcreg.h', - 'sys/arm/at91/at91reg.h', - 'sys/arm/at91/at91var.h', 'sys/dev/mmc/bridge.h', 'sys/dev/mmc/mmcbrvar.h', 'sys/dev/mmc/mmc_ioctl.h', @@ -682,13 +682,18 @@ class mmc(builder.Module): ) self.addKernelSpaceSourceFiles( [ - 'sys/arm/at91/at91_mci.c', 'sys/dev/mmc/mmc.c', 'sys/dev/mmc/mmcsd.c', 'sys/dev/mmc/mmc_subr.c', ], mm.generator['source']() ) + self.addRTEMSSourceFiles( + [ + 'sys/arm/at91/at91_mci.c', + ], + mm.generator['source']() + ) # # MMC @@ -2318,8 +2323,22 @@ class opencrypto(builder.Module): mm = self.manager self.addKernelSpaceHeaderFiles( [ + 'sys/contrib/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna32.h', + 'sys/contrib/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.h', + 'sys/contrib/libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.h', + 'sys/contrib/libsodium/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h', + 'sys/contrib/libsodium/src/libsodium/include/sodium/crypto_verify_16.h', + 'sys/contrib/libsodium/src/libsodium/include/sodium/crypto_verify_32.h', + 'sys/contrib/libsodium/src/libsodium/include/sodium/crypto_verify_64.h', + 'sys/contrib/libsodium/src/libsodium/include/sodium/export.h', + 'sys/contrib/libsodium/src/libsodium/include/sodium/private/common.h', + 'sys/contrib/libsodium/src/libsodium/include/sodium/private/implementations.h', + 'sys/contrib/libsodium/src/libsodium/include/sodium/randombytes.h', + 'sys/contrib/libsodium/src/libsodium/include/sodium/runtime.h', + 'sys/contrib/libsodium/src/libsodium/include/sodium/utils.h', 'sys/opencrypto/cast.h', 'sys/opencrypto/castsb.h', + 'sys/opencrypto/_cryptodev.h', 'sys/opencrypto/cryptodev.h', 'sys/opencrypto/cryptosoft.h', 'sys/opencrypto/deflate.h', @@ -2327,31 +2346,36 @@ class opencrypto(builder.Module): 'sys/opencrypto/gmac.h', 'sys/opencrypto/rmd160.h', 'sys/opencrypto/skipjack.h', - 'sys/opencrypto/xform_auth.h', - 'sys/opencrypto/xform_comp.h', - 'sys/opencrypto/xform_enc.h', - 'sys/opencrypto/xform.h', - 'sys/opencrypto/xform_userland.h', 'sys/opencrypto/xform_aes_icm.c', 'sys/opencrypto/xform_aes_xts.c', + 'sys/opencrypto/xform_auth.h', 'sys/opencrypto/xform_blf.c', 'sys/opencrypto/xform_cast5.c', 'sys/opencrypto/xform_cml.c', + 'sys/opencrypto/xform_comp.h', 'sys/opencrypto/xform_deflate.c', 'sys/opencrypto/xform_des1.c', 'sys/opencrypto/xform_des3.c', + 'sys/opencrypto/xform_enc.h', 'sys/opencrypto/xform_gmac.c', + 'sys/opencrypto/xform.h', 'sys/opencrypto/xform_md5.c', 'sys/opencrypto/xform_null.c', + 'sys/opencrypto/xform_poly1305.h', 'sys/opencrypto/xform_rijndael.c', 'sys/opencrypto/xform_rmd160.c', 'sys/opencrypto/xform_sha1.c', 'sys/opencrypto/xform_sha2.c', 'sys/opencrypto/xform_skipjack.c', + 'sys/opencrypto/xform_userland.h', ] ) self.addKernelSpaceSourceFiles( [ + 'sys/contrib/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.c', + 'sys/contrib/libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c', + 'sys/contrib/libsodium/src/libsodium/crypto_verify/sodium/verify.c', + 'sys/crypto/libsodium/utils.c', 'sys/opencrypto/cast.c', 'sys/opencrypto/criov.c', 'sys/opencrypto/crypto.c', @@ -2363,6 +2387,7 @@ class opencrypto(builder.Module): 'sys/opencrypto/rmd160.c', 'sys/opencrypto/skipjack.c', 'sys/opencrypto/xform.c', + 'sys/opencrypto/xform_poly1305.c', ], mm.generator['source']() ) @@ -2397,6 +2422,7 @@ class crypto(builder.Module): 'sys/crypto/rijndael/rijndael.h', 'sys/crypto/rijndael/rijndael_local.h', 'sys/crypto/sha1.h', + 'sys/crypto/sha2/sha224.h', 'sys/crypto/sha2/sha256.h', 'sys/crypto/sha2/sha384.h', 'sys/crypto/sha2/sha512.h', @@ -2594,8 +2620,8 @@ class user_space(builder.Module): 'include/ifaddrs.h', 'include/mpool.h', 'include/netconfig.h', - 'include/netdb.h', 'include/nlist.h', + 'include/nl_types.h', 'include/nsswitch.h', 'include/resolv.h', 'include/res_update.h', @@ -2632,6 +2658,7 @@ class user_space(builder.Module): 'include/sysexits.h', 'lib/lib80211/lib80211_ioctl.h', 'lib/lib80211/lib80211_regdomain.h', + 'lib/libcapsicum/capsicum_helpers.h', 'lib/libcasper/libcasper/libcasper.h', 'lib/libcasper/services/cap_dns/cap_dns.h', 'lib/libcasper/services/cap_syslog/cap_syslog.h', @@ -2998,165 +3025,166 @@ class crypto_openssl(builder.Module): mm = self.manager self.addUserSpaceHeaderFiles( [ - 'crypto/openssl/engines/e_cswift_err.h', - 'crypto/openssl/engines/e_aep_err.h', - 'crypto/openssl/engines/e_gmp_err.h', - 'crypto/openssl/engines/ccgost/gost2001_keyx.h', - 'crypto/openssl/engines/ccgost/e_gost_err.h', - 'crypto/openssl/engines/ccgost/gost_params.h', - 'crypto/openssl/engines/ccgost/gost_lcl.h', - 'crypto/openssl/engines/ccgost/gost89.h', - 'crypto/openssl/engines/ccgost/gost_keywrap.h', - 'crypto/openssl/engines/ccgost/gosthash.h', - 'crypto/openssl/engines/e_chil_err.h', - 'crypto/openssl/engines/e_4758cca_err.h', - 'crypto/openssl/engines/e_capi_err.h', - 'crypto/openssl/engines/e_nuron_err.h', - 'crypto/openssl/engines/e_atalla_err.h', - 'crypto/openssl/engines/vendor_defns/sureware.h', - 'crypto/openssl/engines/vendor_defns/cswift.h', - 'crypto/openssl/engines/vendor_defns/atalla.h', - 'crypto/openssl/engines/vendor_defns/hwcryptohook.h', - 'crypto/openssl/engines/vendor_defns/hw_4758_cca.h', - 'crypto/openssl/engines/vendor_defns/aep.h', - 'crypto/openssl/engines/vendor_defns/hw_ubsec.h', - 'crypto/openssl/engines/e_sureware_err.h', - 'crypto/openssl/engines/e_ubsec_err.h', - 'crypto/openssl/ssl/ssl2.h', - 'crypto/openssl/ssl/ssl3.h', - 'crypto/openssl/ssl/dtls1.h', - 'crypto/openssl/ssl/kssl_lcl.h', - 'crypto/openssl/ssl/srtp.h', - 'crypto/openssl/ssl/tls1.h', - 'crypto/openssl/ssl/ssl23.h', - 'crypto/openssl/ssl/ssl_locl.h', - 'crypto/openssl/ssl/kssl.h', - 'crypto/openssl/ssl/ssl.h', - 'crypto/openssl/e_os.h', - 'crypto/openssl/e_os2.h', - 'crypto/openssl/crypto/bio/bio_lcl.h', + 'crypto/openssl/crypto/aes/aes.h', + 'crypto/openssl/crypto/aes/aes_locl.h', + 'crypto/openssl/crypto/arm_arch.h', + 'crypto/openssl/crypto/asn1/asn1.h', + 'crypto/openssl/crypto/asn1/asn1_int.h', + 'crypto/openssl/crypto/asn1/asn1_locl.h', + 'crypto/openssl/crypto/asn1/asn1_mac.h', + 'crypto/openssl/crypto/asn1/asn1t.h', + 'crypto/openssl/crypto/asn1/charmap.h', + 'crypto/openssl/crypto/bf/bf_locl.h', + 'crypto/openssl/crypto/bf/bf_pi.h', + 'crypto/openssl/crypto/bf/blowfish.h', 'crypto/openssl/crypto/bio/bio.h', - 'crypto/openssl/crypto/modes/modes_lcl.h', - 'crypto/openssl/crypto/modes/modes.h', - 'crypto/openssl/crypto/cms/cms.h', - 'crypto/openssl/crypto/cms/cms_lcl.h', - 'crypto/openssl/crypto/bn/bn_prime.h', - 'crypto/openssl/crypto/bn/bn_lcl.h', + 'crypto/openssl/crypto/bio/bio_lcl.h', 'crypto/openssl/crypto/bn/bn.h', + 'crypto/openssl/crypto/bn/bn_lcl.h', + 'crypto/openssl/crypto/bn/bn_prime.h', + 'crypto/openssl/crypto/bn_int.h', 'crypto/openssl/crypto/bn/rsaz_exp.h', + 'crypto/openssl/crypto/buffer/buffer.h', + 'crypto/openssl/crypto/camellia/camellia.h', + 'crypto/openssl/crypto/camellia/cmll_locl.h', + 'crypto/openssl/crypto/cast/cast.h', + 'crypto/openssl/crypto/cast/cast_lcl.h', + 'crypto/openssl/crypto/cast/cast_s.h', + 'crypto/openssl/crypto/cmac/cmac.h', + 'crypto/openssl/crypto/cms/cms.h', + 'crypto/openssl/crypto/cms/cms_lcl.h', + 'crypto/openssl/crypto/comp/comp.h', + 'crypto/openssl/crypto/conf/conf_api.h', + 'crypto/openssl/crypto/conf/conf_def.h', + 'crypto/openssl/crypto/conf/conf.h', + 'crypto/openssl/crypto/constant_time_locl.h', + 'crypto/openssl/crypto/cryptlib.h', + 'crypto/openssl/crypto/crypto.h', + 'crypto/openssl/crypto/des/des.h', + 'crypto/openssl/crypto/des/des_locl.h', + 'crypto/openssl/crypto/des/des_old.h', + 'crypto/openssl/crypto/des/des_ver.h', + 'crypto/openssl/crypto/des/rpc_des.h', + 'crypto/openssl/crypto/des/spr.h', + 'crypto/openssl/crypto/dh/dh.h', + 'crypto/openssl/crypto/dsa/dsa.h', + 'crypto/openssl/crypto/dsa/dsa_locl.h', + 'crypto/openssl/crypto/dso/dso.h', + 'crypto/openssl/crypto/ebcdic.h', 'crypto/openssl/crypto/ecdh/ecdh.h', 'crypto/openssl/crypto/ecdh/ech_locl.h', - 'crypto/openssl/crypto/dh/dh.h', + 'crypto/openssl/crypto/ecdsa/ecdsa.h', + 'crypto/openssl/crypto/ecdsa/ecs_locl.h', + 'crypto/openssl/crypto/ec/ec.h', + 'crypto/openssl/crypto/ec/ec_lcl.h', + 'crypto/openssl/crypto/engine/engine.h', + 'crypto/openssl/crypto/engine/eng_int.h', + 'crypto/openssl/crypto/err/err.h', + 'crypto/openssl/crypto/evp/evp.h', + 'crypto/openssl/crypto/evp/evp_locl.h', + 'crypto/openssl/crypto/fips_err.h', + 'crypto/openssl/crypto/hmac/hmac.h', + 'crypto/openssl/crypto/idea/idea.h', + 'crypto/openssl/crypto/idea/idea_lcl.h', + 'crypto/openssl/crypto/krb5/krb5_asn.h', + 'crypto/openssl/crypto/lhash/lhash.h', + 'crypto/openssl/crypto/md32_common.h', + 'crypto/openssl/crypto/md4/md4.h', + 'crypto/openssl/crypto/md4/md4_locl.h', + 'crypto/openssl/crypto/md5/md5.h', + 'crypto/openssl/crypto/md5/md5_locl.h', + 'crypto/openssl/crypto/mdc2/mdc2.h', + 'crypto/openssl/crypto/modes/modes.h', + 'crypto/openssl/crypto/modes/modes_lcl.h', + 'crypto/openssl/crypto/objects/obj_dat.h', + 'crypto/openssl/crypto/objects/objects.h', + 'crypto/openssl/crypto/objects/obj_mac.h', + 'crypto/openssl/crypto/objects/obj_xref.h', + 'crypto/openssl/crypto/ocsp/ocsp.h', + 'crypto/openssl/crypto/o_dir.h', + 'crypto/openssl/crypto/opensslconf.h', 'crypto/openssl/crypto/opensslv.h', + 'crypto/openssl/crypto/ossl_typ.h', + 'crypto/openssl/crypto/o_str.h', + 'crypto/openssl/crypto/o_time.h', + 'crypto/openssl/crypto/pem/pem2.h', + 'crypto/openssl/crypto/pem/pem.h', + 'crypto/openssl/crypto/pkcs12/pkcs12.h', + 'crypto/openssl/crypto/pkcs7/pkcs7.h', + 'crypto/openssl/crypto/ppc_arch.h', + 'crypto/openssl/crypto/pqueue/pqueue.h', + 'crypto/openssl/crypto/rand/rand.h', + 'crypto/openssl/crypto/rand/rand_lcl.h', + 'crypto/openssl/crypto/rc2/rc2.h', + 'crypto/openssl/crypto/rc2/rc2_locl.h', + 'crypto/openssl/crypto/rc4/rc4.h', + 'crypto/openssl/crypto/rc4/rc4_locl.h', 'crypto/openssl/crypto/ripemd/ripemd.h', - 'crypto/openssl/crypto/ripemd/rmd_locl.h', 'crypto/openssl/crypto/ripemd/rmdconst.h', - 'crypto/openssl/crypto/hmac/hmac.h', - 'crypto/openssl/crypto/rand/rand_lcl.h', - 'crypto/openssl/crypto/rand/rand.h', + 'crypto/openssl/crypto/ripemd/rmd_locl.h', + 'crypto/openssl/crypto/rsa/rsa.h', + 'crypto/openssl/crypto/rsa/rsa_locl.h', + 'crypto/openssl/crypto/seed/seed.h', + 'crypto/openssl/crypto/seed/seed_locl.h', + 'crypto/openssl/crypto/sha/sha.h', + 'crypto/openssl/crypto/sha/sha_locl.h', + 'crypto/openssl/crypto/sparc_arch.h', + 'crypto/openssl/crypto/srp/srp_grps.h', + 'crypto/openssl/crypto/srp/srp.h', + 'crypto/openssl/crypto/srp/srp_lcl.h', 'crypto/openssl/crypto/stack/safestack.h', 'crypto/openssl/crypto/stack/stack.h', - 'crypto/openssl/crypto/pem/pem.h', - 'crypto/openssl/crypto/pem/pem2.h', - 'crypto/openssl/crypto/evp/evp_locl.h', - 'crypto/openssl/crypto/evp/evp.h', - 'crypto/openssl/crypto/constant_time_locl.h', + 'crypto/openssl/crypto/symhacks.h', + 'crypto/openssl/crypto/ts/ts.h', 'crypto/openssl/crypto/txt_db/txt_db.h', - 'crypto/openssl/crypto/ebcdic.h', - 'crypto/openssl/crypto/cmac/cmac.h', - 'crypto/openssl/crypto/ppc_arch.h', - 'crypto/openssl/crypto/dsa/dsa.h', - 'crypto/openssl/crypto/dsa/dsa_locl.h', - 'crypto/openssl/crypto/md4/md4_locl.h', - 'crypto/openssl/crypto/md4/md4.h', - 'crypto/openssl/crypto/sha/sha_locl.h', - 'crypto/openssl/crypto/sha/sha.h', - 'crypto/openssl/crypto/arm_arch.h', - 'crypto/openssl/crypto/o_str.h', - 'crypto/openssl/crypto/ui/ui_locl.h', 'crypto/openssl/crypto/ui/ui_compat.h', 'crypto/openssl/crypto/ui/ui.h', - 'crypto/openssl/crypto/md32_common.h', - 'crypto/openssl/crypto/pkcs7/pkcs7.h', - 'crypto/openssl/crypto/crypto.h', - 'crypto/openssl/crypto/ossl_typ.h', - 'crypto/openssl/crypto/err/err.h', - 'crypto/openssl/crypto/sparc_arch.h', - 'crypto/openssl/crypto/dso/dso.h', - 'crypto/openssl/crypto/o_dir.h', - 'crypto/openssl/crypto/idea/idea.h', - 'crypto/openssl/crypto/idea/idea_lcl.h', - 'crypto/openssl/crypto/engine/eng_int.h', - 'crypto/openssl/crypto/engine/engine.h', - 'crypto/openssl/crypto/fips_err.h', - 'crypto/openssl/crypto/comp/comp.h', - 'crypto/openssl/crypto/ecdsa/ecdsa.h', - 'crypto/openssl/crypto/ecdsa/ecs_locl.h', - 'crypto/openssl/crypto/pkcs12/pkcs12.h', - 'crypto/openssl/crypto/srp/srp_lcl.h', - 'crypto/openssl/crypto/srp/srp_grps.h', - 'crypto/openssl/crypto/srp/srp.h', - 'crypto/openssl/crypto/x509v3/x509v3.h', - 'crypto/openssl/crypto/x509v3/pcy_int.h', + 'crypto/openssl/crypto/ui/ui_locl.h', + 'crypto/openssl/crypto/vms_rms.h', + 'crypto/openssl/crypto/whrlpool/whrlpool.h', + 'crypto/openssl/crypto/whrlpool/wp_locl.h', 'crypto/openssl/crypto/x509v3/ext_dat.h', - 'crypto/openssl/crypto/symhacks.h', - 'crypto/openssl/crypto/aes/aes.h', - 'crypto/openssl/crypto/aes/aes_locl.h', - 'crypto/openssl/crypto/bf/bf_locl.h', - 'crypto/openssl/crypto/bf/bf_pi.h', - 'crypto/openssl/crypto/bf/blowfish.h', - 'crypto/openssl/crypto/rc4/rc4_locl.h', - 'crypto/openssl/crypto/rc4/rc4.h', - 'crypto/openssl/crypto/ocsp/ocsp.h', - 'crypto/openssl/crypto/rc2/rc2.h', - 'crypto/openssl/crypto/rc2/rc2_locl.h', - 'crypto/openssl/crypto/md5/md5_locl.h', - 'crypto/openssl/crypto/md5/md5.h', - 'crypto/openssl/crypto/des/des_locl.h', - 'crypto/openssl/crypto/des/rpc_des.h', - 'crypto/openssl/crypto/des/des.h', - 'crypto/openssl/crypto/des/spr.h', - 'crypto/openssl/crypto/des/des_ver.h', - 'crypto/openssl/crypto/des/des_old.h', - 'crypto/openssl/crypto/cryptlib.h', - 'crypto/openssl/crypto/krb5/krb5_asn.h', - 'crypto/openssl/crypto/o_time.h', - 'crypto/openssl/crypto/opensslconf.h', - 'crypto/openssl/crypto/camellia/cmll_locl.h', - 'crypto/openssl/crypto/camellia/camellia.h', - 'crypto/openssl/crypto/x509/x509.h', + 'crypto/openssl/crypto/x509v3/pcy_int.h', + 'crypto/openssl/crypto/x509v3/x509v3.h', 'crypto/openssl/crypto/x509/vpm_int.h', + 'crypto/openssl/crypto/x509/x509.h', 'crypto/openssl/crypto/x509/x509_vfy.h', - 'crypto/openssl/crypto/seed/seed_locl.h', - 'crypto/openssl/crypto/seed/seed.h', - 'crypto/openssl/crypto/objects/obj_xref.h', - 'crypto/openssl/crypto/objects/obj_mac.h', - 'crypto/openssl/crypto/objects/objects.h', - 'crypto/openssl/crypto/objects/obj_dat.h', - 'crypto/openssl/crypto/ts/ts.h', - 'crypto/openssl/crypto/mdc2/mdc2.h', - 'crypto/openssl/crypto/pqueue/pqueue.h', - 'crypto/openssl/crypto/vms_rms.h', - 'crypto/openssl/crypto/buffer/buffer.h', - 'crypto/openssl/crypto/cast/cast.h', - 'crypto/openssl/crypto/cast/cast_s.h', - 'crypto/openssl/crypto/cast/cast_lcl.h', - 'crypto/openssl/crypto/rsa/rsa.h', - 'crypto/openssl/crypto/rsa/rsa_locl.h', - 'crypto/openssl/crypto/whrlpool/whrlpool.h', - 'crypto/openssl/crypto/whrlpool/wp_locl.h', - 'crypto/openssl/crypto/asn1/asn1.h', - 'crypto/openssl/crypto/asn1/asn1_int.h', - 'crypto/openssl/crypto/asn1/asn1_locl.h', - 'crypto/openssl/crypto/asn1/asn1_mac.h', - 'crypto/openssl/crypto/asn1/asn1t.h', - 'crypto/openssl/crypto/asn1/charmap.h', - 'crypto/openssl/crypto/ec/ec_lcl.h', - 'crypto/openssl/crypto/ec/ec.h', - 'crypto/openssl/crypto/conf/conf.h', - 'crypto/openssl/crypto/conf/conf_def.h', - 'crypto/openssl/crypto/conf/conf_api.h', - 'crypto/openssl/crypto/lhash/lhash.h', + 'crypto/openssl/engines/ccgost/e_gost_err.h', + 'crypto/openssl/engines/ccgost/gost2001_keyx.h', + 'crypto/openssl/engines/ccgost/gost89.h', + 'crypto/openssl/engines/ccgost/gosthash.h', + 'crypto/openssl/engines/ccgost/gost_keywrap.h', + 'crypto/openssl/engines/ccgost/gost_lcl.h', + 'crypto/openssl/engines/ccgost/gost_params.h', + 'crypto/openssl/engines/e_4758cca_err.h', + 'crypto/openssl/engines/e_aep_err.h', + 'crypto/openssl/engines/e_atalla_err.h', + 'crypto/openssl/engines/e_capi_err.h', + 'crypto/openssl/engines/e_chil_err.h', + 'crypto/openssl/engines/e_cswift_err.h', + 'crypto/openssl/engines/e_gmp_err.h', + 'crypto/openssl/engines/e_nuron_err.h', + 'crypto/openssl/engines/e_sureware_err.h', + 'crypto/openssl/engines/e_ubsec_err.h', + 'crypto/openssl/engines/vendor_defns/aep.h', + 'crypto/openssl/engines/vendor_defns/atalla.h', + 'crypto/openssl/engines/vendor_defns/cswift.h', + 'crypto/openssl/engines/vendor_defns/hw_4758_cca.h', + 'crypto/openssl/engines/vendor_defns/hwcryptohook.h', + 'crypto/openssl/engines/vendor_defns/hw_ubsec.h', + 'crypto/openssl/engines/vendor_defns/sureware.h', + 'crypto/openssl/e_os2.h', + 'crypto/openssl/e_os.h', + 'crypto/openssl/ssl/dtls1.h', + 'crypto/openssl/ssl/kssl.h', + 'crypto/openssl/ssl/kssl_lcl.h', + 'crypto/openssl/ssl/srtp.h', + 'crypto/openssl/ssl/ssl23.h', + 'crypto/openssl/ssl/ssl2.h', + 'crypto/openssl/ssl/ssl3.h', + 'crypto/openssl/ssl/ssl.h', + 'crypto/openssl/ssl/ssl_locl.h', + 'crypto/openssl/ssl/tls1.h', ] ) self.addUserSpaceSourceFiles( @@ -4333,118 +4361,56 @@ class usr_sbin_wpa_supplicant(builder.Module): mm = self.manager self.addUserSpaceHeaderFiles( [ - 'contrib/wpa/wpa_supplicant/ap.h', - 'contrib/wpa/wpa_supplicant/blacklist.h', - 'contrib/wpa/wpa_supplicant/bss.h', - 'contrib/wpa/wpa_supplicant/config.h', - 'contrib/wpa/wpa_supplicant/config_ssid.h', - 'contrib/wpa/wpa_supplicant/ctrl_iface.h', - 'contrib/wpa/wpa_supplicant/driver_i.h', - 'contrib/wpa/wpa_supplicant/gas_query.h', - 'contrib/wpa/wpa_supplicant/hs20_supplicant.h', - 'contrib/wpa/wpa_supplicant/interworking.h', - 'contrib/wpa/wpa_supplicant/mesh.h', - 'contrib/wpa/wpa_supplicant/mesh_mpm.h', - 'contrib/wpa/wpa_supplicant/mesh_rsn.h', - 'contrib/wpa/wpa_supplicant/notify.h', - 'contrib/wpa/wpa_supplicant/offchannel.h', - 'contrib/wpa/wpa_supplicant/scan.h', - 'contrib/wpa/wpa_supplicant/autoscan.h', - 'contrib/wpa/wpa_supplicant/wmm_ac.h', - 'contrib/wpa/wpa_supplicant/wnm_sta.h', - 'contrib/wpa/wpa_supplicant/wpas_glue.h', - 'contrib/wpa/wpa_supplicant/wpas_kay.h', - 'contrib/wpa/wpa_supplicant/wpa_supplicant_i.h', - 'contrib/wpa/wpa_supplicant/wps_supplicant.h', - 'contrib/wpa/wpa_supplicant/ibss_rsn.h', - 'contrib/wpa/wpa_supplicant/p2p_supplicant.h', - 'contrib/wpa/wpa_supplicant/wifi_display.h', - 'contrib/wpa/wpa_supplicant/sme.h', - 'contrib/wpa/wpa_supplicant/bgscan.h', - 'contrib/wpa/wpa_supplicant/dbus/dbus_common.h', - 'contrib/wpa/wpa_supplicant/dbus/dbus_old.h', - 'contrib/wpa/wpa_supplicant/dbus/dbus_new.h', 'contrib/wpa/src/ap/ap_config.h', 'contrib/wpa/src/ap/ap_drv_ops.h', - 'contrib/wpa/src/ap/hs20.h', 'contrib/wpa/src/ap/hostapd.h', - 'contrib/wpa/src/ap/ieee802_11.h', + 'contrib/wpa/src/ap/hs20.h', 'contrib/wpa/src/ap/ieee802_11_auth.h', + 'contrib/wpa/src/ap/ieee802_11.h', 'contrib/wpa/src/ap/p2p_hostapd.h', 'contrib/wpa/src/ap/pmksa_cache_auth.h', 'contrib/wpa/src/ap/sta_info.h', + 'contrib/wpa/src/ap/vlan.h', + 'contrib/wpa/src/ap/wmm.h', 'contrib/wpa/src/ap/wpa_auth.h', - 'contrib/wpa/src/ap/wpa_auth_i.h', 'contrib/wpa/src/ap/wpa_auth_ie.h', - 'contrib/wpa/src/ap/wmm.h', - 'contrib/wpa/src/utils/includes.h', - 'contrib/wpa/src/utils/base64.h', - 'contrib/wpa/src/utils/bitfield.h', - 'contrib/wpa/src/utils/build_config.h', - 'contrib/wpa/src/utils/common.h', - 'contrib/wpa/src/utils/eloop.h', - 'contrib/wpa/src/utils/ip_addr.h', - 'contrib/wpa/src/utils/list.h', - 'contrib/wpa/src/utils/os.h', - 'contrib/wpa/src/utils/platform.h', - 'contrib/wpa/src/utils/uuid.h', - 'contrib/wpa/src/utils/wpa_debug.h', - 'contrib/wpa/src/utils/wpabuf.h', - 'contrib/wpa/src/utils/trace.h', - 'contrib/wpa/src/utils/pcsc_funcs.h', - 'contrib/wpa/src/utils/ext_password.h', - 'contrib/wpa/src/utils/state_machine.h', + 'contrib/wpa/src/ap/wpa_auth_i.h', + 'contrib/wpa/src/common/ctrl_iface_common.h', + 'contrib/wpa/src/common/defs.h', + 'contrib/wpa/src/common/eapol_common.h', 'contrib/wpa/src/common/gas.h', 'contrib/wpa/src/common/hw_features_common.h', 'contrib/wpa/src/common/ieee802_11_common.h', 'contrib/wpa/src/common/ieee802_11_defs.h', - 'contrib/wpa/src/common/wpa_common.h', - 'contrib/wpa/src/common/defs.h', 'contrib/wpa/src/common/qca-vendor.h', - 'contrib/wpa/src/common/eapol_common.h', 'contrib/wpa/src/common/sae.h', - 'contrib/wpa/src/common/wpa_ctrl.h', 'contrib/wpa/src/common/version.h', - 'contrib/wpa/src/drivers/driver.h', - 'contrib/wpa/src/drivers/driver_ndis.h', - 'contrib/wpa/src/drivers/driver_nl80211.h', - 'contrib/wpa/src/drivers/linux_defines.h', - 'contrib/wpa/src/wps/http.h', - 'contrib/wpa/src/wps/http_client.h', - 'contrib/wpa/src/wps/http_server.h', - 'contrib/wpa/src/wps/httpread.h', - 'contrib/wpa/src/wps/wps.h', - 'contrib/wpa/src/wps/wps_i.h', - 'contrib/wpa/src/wps/wps_defs.h', - 'contrib/wpa/src/wps/upnp_xml.h', - 'contrib/wpa/src/wps/wps_attr_parse.h', - 'contrib/wpa/src/wps/wps_dev_attr.h', - 'contrib/wpa/src/wps/wps_er.h', - 'contrib/wpa/src/wps/wps_upnp.h', - 'contrib/wpa/src/wps/wps_upnp_i.h', - 'contrib/wpa/src/l2_packet/l2_packet.h', - 'contrib/wpa/src/rsn_supp/peerkey.h', - 'contrib/wpa/src/rsn_supp/pmksa_cache.h', - 'contrib/wpa/src/rsn_supp/preauth.h', - 'contrib/wpa/src/rsn_supp/wpa.h', - 'contrib/wpa/src/rsn_supp/wpa_i.h', - 'contrib/wpa/src/rsn_supp/wpa_ie.h', - 'contrib/wpa/src/p2p/p2p.h', - 'contrib/wpa/src/fst/fst.h', - 'contrib/wpa/src/fst/fst_ctrl_iface.h', - 'contrib/wpa/src/fst/fst_ctrl_aux.h', - 'contrib/wpa/src/crypto/md5.h', - 'contrib/wpa/src/crypto/sha256.h', - 'contrib/wpa/src/crypto/sha384.h', + 'contrib/wpa/src/common/wpa_common.h', + 'contrib/wpa/src/common/wpa_ctrl.h', + 'contrib/wpa/src/crypto/aes.h', 'contrib/wpa/src/crypto/aes_wrap.h', 'contrib/wpa/src/crypto/crypto.h', - 'contrib/wpa/src/crypto/random.h', 'contrib/wpa/src/crypto/dh_group5.h', - 'contrib/wpa/src/crypto/sha1.h', - 'contrib/wpa/src/crypto/tls.h', + 'contrib/wpa/src/crypto/md5.h', 'contrib/wpa/src/crypto/ms_funcs.h', - 'contrib/wpa/src/crypto/aes.h', + 'contrib/wpa/src/crypto/random.h', + 'contrib/wpa/src/crypto/sha1.h', + 'contrib/wpa/src/crypto/sha256.h', 'contrib/wpa/src/crypto/sha256_i.h', + 'contrib/wpa/src/crypto/sha384.h', + 'contrib/wpa/src/crypto/tls.h', + 'contrib/wpa/src/drivers/driver.h', + 'contrib/wpa/src/drivers/driver_ndis.h', + 'contrib/wpa/src/drivers/driver_nl80211.h', + 'contrib/wpa/src/drivers/linux_defines.h', + 'contrib/wpa/src/eap_common/chap.h', + 'contrib/wpa/src/eap_common/eap_common.h', + 'contrib/wpa/src/eap_common/eap_defs.h', + 'contrib/wpa/src/eap_common/eap_peap_common.h', + 'contrib/wpa/src/eap_common/eap_psk_common.h', + 'contrib/wpa/src/eap_common/eap_tlv_common.h', + 'contrib/wpa/src/eap_common/eap_ttls.h', + 'contrib/wpa/src/eap_common/eap_wsc_common.h', 'contrib/wpa/src/eapol_auth/eapol_auth_sm.h', 'contrib/wpa/src/eapol_supp/eapol_supp_sm.h', 'contrib/wpa/src/eap_peer/eap_config.h', @@ -4452,25 +4418,90 @@ class usr_sbin_wpa_supplicant(builder.Module): 'contrib/wpa/src/eap_peer/eap_i.h', 'contrib/wpa/src/eap_peer/eap_methods.h', 'contrib/wpa/src/eap_peer/eap_proxy.h', + 'contrib/wpa/src/eap_peer/eap_tls_common.h', 'contrib/wpa/src/eap_peer/mschapv2.h', 'contrib/wpa/src/eap_peer/tncc.h', - 'contrib/wpa/src/eap_peer/eap_tls_common.h', - 'contrib/wpa/src/eap_common/eap_defs.h', - 'contrib/wpa/src/eap_common/eap_wsc_common.h', - 'contrib/wpa/src/eap_common/eap_peap_common.h', - 'contrib/wpa/src/eap_common/eap_psk_common.h', - 'contrib/wpa/src/eap_common/eap_tlv_common.h', - 'contrib/wpa/src/eap_common/eap_common.h', - 'contrib/wpa/src/eap_common/chap.h', - 'contrib/wpa/src/eap_common/eap_ttls.h', 'contrib/wpa/src/eap_server/eap_methods.h', - 'contrib/wpa/src/eapol_supp/eapol_supp_sm.h', + 'contrib/wpa/src/fst/fst_ctrl_aux.h', + 'contrib/wpa/src/fst/fst_ctrl_iface.h', + 'contrib/wpa/src/fst/fst.h', + 'contrib/wpa/src/l2_packet/l2_packet.h', + 'contrib/wpa/src/p2p/p2p.h', 'contrib/wpa/src/radius/radius.h', + 'contrib/wpa/src/rsn_supp/peerkey.h', + 'contrib/wpa/src/rsn_supp/pmksa_cache.h', + 'contrib/wpa/src/rsn_supp/preauth.h', + 'contrib/wpa/src/rsn_supp/wpa.h', + 'contrib/wpa/src/rsn_supp/wpa_ie.h', + 'contrib/wpa/src/rsn_supp/wpa_i.h', 'contrib/wpa/src/tls/tlsv1_client.h', 'contrib/wpa/src/tls/tlsv1_cred.h', 'contrib/wpa/src/tls/tlsv1_server.h', - 'usr.sbin/wpa/wpa_supplicant/Packet32.h', + 'contrib/wpa/src/utils/base64.h', + 'contrib/wpa/src/utils/bitfield.h', + 'contrib/wpa/src/utils/build_config.h', + 'contrib/wpa/src/utils/common.h', + 'contrib/wpa/src/utils/eloop.h', + 'contrib/wpa/src/utils/ext_password.h', + 'contrib/wpa/src/utils/includes.h', + 'contrib/wpa/src/utils/ip_addr.h', + 'contrib/wpa/src/utils/list.h', + 'contrib/wpa/src/utils/module_tests.h', + 'contrib/wpa/src/utils/os.h', + 'contrib/wpa/src/utils/pcsc_funcs.h', + 'contrib/wpa/src/utils/platform.h', + 'contrib/wpa/src/utils/state_machine.h', + 'contrib/wpa/src/utils/trace.h', + 'contrib/wpa/src/utils/uuid.h', + 'contrib/wpa/src/utils/wpabuf.h', + 'contrib/wpa/src/utils/wpa_debug.h', + 'contrib/wpa/src/wps/http_client.h', + 'contrib/wpa/src/wps/http.h', + 'contrib/wpa/src/wps/httpread.h', + 'contrib/wpa/src/wps/http_server.h', + 'contrib/wpa/src/wps/upnp_xml.h', + 'contrib/wpa/src/wps/wps_attr_parse.h', + 'contrib/wpa/src/wps/wps_defs.h', + 'contrib/wpa/src/wps/wps_dev_attr.h', + 'contrib/wpa/src/wps/wps_er.h', + 'contrib/wpa/src/wps/wps.h', + 'contrib/wpa/src/wps/wps_i.h', + 'contrib/wpa/src/wps/wps_upnp.h', + 'contrib/wpa/src/wps/wps_upnp_i.h', + 'contrib/wpa/wpa_supplicant/ap.h', + 'contrib/wpa/wpa_supplicant/autoscan.h', + 'contrib/wpa/wpa_supplicant/bgscan.h', + 'contrib/wpa/wpa_supplicant/binder/binder.h', + 'contrib/wpa/wpa_supplicant/blacklist.h', + 'contrib/wpa/wpa_supplicant/bss.h', + 'contrib/wpa/wpa_supplicant/config.h', + 'contrib/wpa/wpa_supplicant/config_ssid.h', + 'contrib/wpa/wpa_supplicant/ctrl_iface.h', + 'contrib/wpa/wpa_supplicant/dbus/dbus_common.h', + 'contrib/wpa/wpa_supplicant/dbus/dbus_new.h', + 'contrib/wpa/wpa_supplicant/dbus/dbus_old.h', + 'contrib/wpa/wpa_supplicant/driver_i.h', + 'contrib/wpa/wpa_supplicant/gas_query.h', + 'contrib/wpa/wpa_supplicant/hs20_supplicant.h', + 'contrib/wpa/wpa_supplicant/ibss_rsn.h', + 'contrib/wpa/wpa_supplicant/interworking.h', + 'contrib/wpa/wpa_supplicant/mesh.h', + 'contrib/wpa/wpa_supplicant/mesh_mpm.h', + 'contrib/wpa/wpa_supplicant/mesh_rsn.h', + 'contrib/wpa/wpa_supplicant/notify.h', + 'contrib/wpa/wpa_supplicant/offchannel.h', + 'contrib/wpa/wpa_supplicant/p2p_supplicant.h', + 'contrib/wpa/wpa_supplicant/scan.h', + 'contrib/wpa/wpa_supplicant/sme.h', + 'contrib/wpa/wpa_supplicant/wifi_display.h', + 'contrib/wpa/wpa_supplicant/wmm_ac.h', + 'contrib/wpa/wpa_supplicant/wnm_sta.h', + 'contrib/wpa/wpa_supplicant/wpas_glue.h', + 'contrib/wpa/wpa_supplicant/wpas_kay.h', + 'contrib/wpa/wpa_supplicant/wpa_supplicant_i.h', + 'contrib/wpa/wpa_supplicant/wps_supplicant.h', 'usr.sbin/wpa/wpa_supplicant/ntddndis.h', + 'usr.sbin/wpa/wpa_supplicant/Packet32.h', ] ) self.addUserSpaceSourceFiles( @@ -4506,6 +4537,7 @@ class usr_sbin_wpa_supplicant(builder.Module): 'contrib/wpa/src/utils/uuid.c', 'contrib/wpa/src/utils/wpa_debug.c', 'contrib/wpa/src/utils/wpabuf.c', + 'contrib/wpa/src/common/ctrl_iface_common.c', 'contrib/wpa/src/common/gas.c', 'contrib/wpa/src/common/hw_features_common.c', 'contrib/wpa/src/common/ieee802_11_common.c', -- cgit v1.2.3