From owner-svn-src-vendor@FreeBSD.ORG Sun Jan 11 21:24:09 2009 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D9841065702; Sun, 11 Jan 2009 21:24:09 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 292408FC13; Sun, 11 Jan 2009 21:24:09 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0BLO9Tl038743; Sun, 11 Jan 2009 21:24:09 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0BLO8Wf038719; Sun, 11 Jan 2009 21:24:08 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200901112124.n0BLO8Wf038719@svn.freebsd.org> From: Robert Watson Date: Sun, 11 Jan 2009 21:24:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187063 - in vendor/openbsm/dist: . bin/auditd bin/auditreduce bsm libauditd libbsm man sys/bsm test/bsm test/reference X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jan 2009 21:24:09 -0000 Author: rwatson Date: Sun Jan 11 21:24:07 2009 New Revision: 187063 URL: http://svn.freebsd.org/changeset/base/187063 Log: Vendor import of OpenBSM 1.1 alpha5, which incorporates the following changes since the last imported OpenBSM release: OpenBSM 1.1 alpha 5 - Stub libauditd(3) man page added. - All BSM error number constants with BSM_ERRNO_. - Interfaces to convert between local and BSM socket types and protocol families have been added: au_bsm_to_domain(3), au_bsm_to_socket_type(3), au_domain_to_bsm(3), and au_socket_type_to_bsm(3), along with definitions of constants in audit_domain.h and audit_socket_type.h. This improves interoperability by converting local constant spaces, which vary by OS, to and from Solaris constants (where available) or OpenBSM constants for protocol domains not present in Solaris (a fair number). These routines should be used when generating and interpreting extended socket tokens. - Fix build warnings with full gcc warnings enabled on most supported platforms. - Don't compile error strings into bsm_errno.c when building it in the kernel environment. - When started by launchd, use the label com.apple.auditd rather than org.trustedbsd.auditd. Obtained from: TrustedBSD Project Sponsored by: Apple Inc. Added: vendor/openbsm/dist/libauditd/libauditd.3 (contents, props changed) vendor/openbsm/dist/libbsm/au_domain.3 (contents, props changed) vendor/openbsm/dist/libbsm/au_socket_type.3 (contents, props changed) vendor/openbsm/dist/libbsm/bsm_domain.c (contents, props changed) vendor/openbsm/dist/libbsm/bsm_socket_type.c (contents, props changed) vendor/openbsm/dist/sys/bsm/audit_domain.h (contents, props changed) vendor/openbsm/dist/sys/bsm/audit_socket_type.h (contents, props changed) Modified: vendor/openbsm/dist/INSTALL vendor/openbsm/dist/NEWS vendor/openbsm/dist/VERSION vendor/openbsm/dist/bin/auditd/auditd.8 vendor/openbsm/dist/bin/auditd/auditd.c vendor/openbsm/dist/bin/auditd/auditd_darwin.c vendor/openbsm/dist/bin/auditd/auditd_fbsd.c vendor/openbsm/dist/bin/auditreduce/auditreduce.c vendor/openbsm/dist/bsm/auditd_lib.h vendor/openbsm/dist/bsm/libbsm.h vendor/openbsm/dist/configure vendor/openbsm/dist/configure.ac vendor/openbsm/dist/libauditd/Makefile.am vendor/openbsm/dist/libauditd/Makefile.in vendor/openbsm/dist/libauditd/auditd_lib.c vendor/openbsm/dist/libbsm/Makefile.am vendor/openbsm/dist/libbsm/Makefile.in vendor/openbsm/dist/libbsm/au_token.3 vendor/openbsm/dist/libbsm/bsm_audit.c vendor/openbsm/dist/libbsm/bsm_errno.c vendor/openbsm/dist/libbsm/bsm_io.c vendor/openbsm/dist/libbsm/bsm_token.c vendor/openbsm/dist/libbsm/libbsm.3 vendor/openbsm/dist/man/audit_user.5 vendor/openbsm/dist/sys/bsm/Makefile.am vendor/openbsm/dist/sys/bsm/Makefile.in vendor/openbsm/dist/sys/bsm/audit.h vendor/openbsm/dist/sys/bsm/audit_errno.h vendor/openbsm/dist/sys/bsm/audit_record.h vendor/openbsm/dist/test/bsm/generate.c vendor/openbsm/dist/test/reference/E2BIG_record vendor/openbsm/dist/test/reference/EACCES_record vendor/openbsm/dist/test/reference/EBADF_record vendor/openbsm/dist/test/reference/EBUSY_record vendor/openbsm/dist/test/reference/ECHILD_record vendor/openbsm/dist/test/reference/EDEADLK_record vendor/openbsm/dist/test/reference/EEXIST_record vendor/openbsm/dist/test/reference/EFAULT_record vendor/openbsm/dist/test/reference/EFBIG_record vendor/openbsm/dist/test/reference/EINTR_record vendor/openbsm/dist/test/reference/EINVAL_record vendor/openbsm/dist/test/reference/EIO_record vendor/openbsm/dist/test/reference/EISDIR_record vendor/openbsm/dist/test/reference/EMFILE_record vendor/openbsm/dist/test/reference/EMLINK_record vendor/openbsm/dist/test/reference/ENFILE_record vendor/openbsm/dist/test/reference/ENODEV_record vendor/openbsm/dist/test/reference/ENOENT_record vendor/openbsm/dist/test/reference/ENOEXEC_record vendor/openbsm/dist/test/reference/ENOMEM_record vendor/openbsm/dist/test/reference/ENOSPC_record vendor/openbsm/dist/test/reference/ENOTBLK_record vendor/openbsm/dist/test/reference/ENOTDIR_record vendor/openbsm/dist/test/reference/ENOTTY_record vendor/openbsm/dist/test/reference/ENXIO_record vendor/openbsm/dist/test/reference/EPERM_record vendor/openbsm/dist/test/reference/EPIPE_record vendor/openbsm/dist/test/reference/EROFS_record vendor/openbsm/dist/test/reference/ESPIPE_record vendor/openbsm/dist/test/reference/ESRCH_record vendor/openbsm/dist/test/reference/ETXTBSY_record vendor/openbsm/dist/test/reference/EXDEV_record vendor/openbsm/dist/test/reference/arg32_record vendor/openbsm/dist/test/reference/data_record vendor/openbsm/dist/test/reference/data_token vendor/openbsm/dist/test/reference/file_record vendor/openbsm/dist/test/reference/in_addr_record vendor/openbsm/dist/test/reference/ip_record vendor/openbsm/dist/test/reference/ipc_record vendor/openbsm/dist/test/reference/iport_record vendor/openbsm/dist/test/reference/opaque_record vendor/openbsm/dist/test/reference/path_record vendor/openbsm/dist/test/reference/process32_record vendor/openbsm/dist/test/reference/process32ex_record-IPv4 vendor/openbsm/dist/test/reference/process32ex_record-IPv6 vendor/openbsm/dist/test/reference/process64_record vendor/openbsm/dist/test/reference/process64ex_record-IPv4 vendor/openbsm/dist/test/reference/process64ex_record-IPv6 vendor/openbsm/dist/test/reference/return32_record vendor/openbsm/dist/test/reference/seq_record vendor/openbsm/dist/test/reference/socketex_record vendor/openbsm/dist/test/reference/socketex_token vendor/openbsm/dist/test/reference/subject32_record vendor/openbsm/dist/test/reference/subject32ex_record vendor/openbsm/dist/test/reference/text_record vendor/openbsm/dist/test/reference/zonename_record Modified: vendor/openbsm/dist/INSTALL ============================================================================== --- vendor/openbsm/dist/INSTALL Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/INSTALL Sun Jan 11 21:24:07 2009 (r187063) @@ -9,6 +9,12 @@ support are built conditionally. Typica ./configure make +If doing development work on OpenBSM with gcc, the following invocation of +configure may be preferred in order to generate full compiler warnings and +force the compile to fail if a warning is found: + + CFLAGS="-Wall -Werror" ./configure + To install, use: make install Modified: vendor/openbsm/dist/NEWS ============================================================================== --- vendor/openbsm/dist/NEWS Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/NEWS Sun Jan 11 21:24:07 2009 (r187063) @@ -1,5 +1,24 @@ OpenBSM Version History +OpenBSM 1.1 alpha 5 + +- Stub libauditd(3) man page added. +- All BSM error number constants with BSM_ERRNO_. +- Interfaces to convert between local and BSM socket types and protocol + families have been added: au_bsm_to_domain(3), au_bsm_to_socket_type(3), + au_domain_to_bsm(3), and au_socket_type_to_bsm(3), along with definitions + of constants in audit_domain.h and audit_socket_type.h. This improves + interoperability by converting local constant spaces, which vary by OS, to + and from Solaris constants (where available) or OpenBSM constants for + protocol domains not present in Solaris (a fair number). These routines + should be used when generating and interpreting extended socket tokens. +- Fix build warnings with full gcc warnings enabled on most supported + platforms. +- Don't compile error strings into bsm_errno.c when building it in the kernel + environment. +- When started by launchd, use the label com.apple.auditd rather than + org.trustedbsd.auditd. + OpenBSM 1.1 alpha 4 - With the addition of BSM error number mapping, we also need to map the @@ -393,4 +412,4 @@ OpenBSM 1.0 alpha 1 to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#21 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#27 $ Modified: vendor/openbsm/dist/VERSION ============================================================================== --- vendor/openbsm/dist/VERSION Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/VERSION Sun Jan 11 21:24:07 2009 (r187063) @@ -1 +1 @@ -OPENBSM_1_1_ALPHA_4 +OPENBSM_1_1_ALPHA_5 Modified: vendor/openbsm/dist/bin/auditd/auditd.8 ============================================================================== --- vendor/openbsm/dist/bin/auditd/auditd.8 Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/bin/auditd/auditd.8 Sun Jan 11 21:24:07 2009 (r187063) @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#16 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#17 $ .\" .Dd December 11, 2008 .Dt AUDITD 8 @@ -115,6 +115,7 @@ and are no longer available as arguments .Nm . .Sh SEE ALSO .Xr asl 3 , +.Xr libauditd 3 , .Xr audit 4 , .Xr audit_class 5 , .Xr audit_control 5 , Modified: vendor/openbsm/dist/bin/auditd/auditd.c ============================================================================== --- vendor/openbsm/dist/bin/auditd/auditd.c Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/bin/auditd/auditd.c Sun Jan 11 21:24:07 2009 (r187063) @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#40 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#41 $ */ #include @@ -252,7 +252,7 @@ do_trail_file(void) */ err = auditd_read_dirs(audit_warn_soft, audit_warn_hard); if (err) { - auditd_log_err("auditd_read_dirs() %s: %m", + auditd_log_err("auditd_read_dirs(): %s", auditd_strerror(err)); if (err == ADE_HARDLIM) audit_warn_allhard(); Modified: vendor/openbsm/dist/bin/auditd/auditd_darwin.c ============================================================================== --- vendor/openbsm/dist/bin/auditd/auditd_darwin.c Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/bin/auditd/auditd_darwin.c Sun Jan 11 21:24:07 2009 (r187063) @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#3 $ */ #include @@ -83,7 +83,7 @@ static int max_idletime = 0; #endif /* __BSM_INTERNAL_NOTIFY_KEY */ #ifndef __AUDIT_LAUNCHD_LABEL -#define __AUDIT_LAUNCHD_LABEL "org.trustedbsd.auditd" +#define __AUDIT_LAUNCHD_LABEL "com.apple.auditd" #endif /* __AUDIT_LAUNCHD_LABEL */ #define MAX_MSG_SIZE 4096 @@ -100,7 +100,7 @@ auditd_openlog(int debug, gid_t gid) if (debug) opt = ASL_OPT_STDERR; - au_aslclient = asl_open("auditd", "org.trustedbsd.auditd", opt); + au_aslclient = asl_open("auditd", "com.apple.auditd", opt); au_aslmsg = asl_new(ASL_TYPE_MSG); #ifdef ASL_KEY_READ_UID Modified: vendor/openbsm/dist/bin/auditd/auditd_fbsd.c ============================================================================== --- vendor/openbsm/dist/bin/auditd/auditd_fbsd.c Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/bin/auditd/auditd_fbsd.c Sun Jan 11 21:24:07 2009 (r187063) @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#2 $ */ #include @@ -35,9 +35,11 @@ #include #include +#include #include +#include #include -#include +#include #include #include Modified: vendor/openbsm/dist/bin/auditreduce/auditreduce.c ============================================================================== --- vendor/openbsm/dist/bin/auditreduce/auditreduce.c Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/bin/auditreduce/auditreduce.c Sun Jan 11 21:24:07 2009 (r187063) @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#29 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#31 $ */ /* @@ -41,6 +41,9 @@ */ #include + +#define _GNU_SOURCE /* Required for strptime() on glibc2. */ + #ifdef HAVE_FULL_QUEUE_H #include #else Modified: vendor/openbsm/dist/bsm/auditd_lib.h ============================================================================== --- vendor/openbsm/dist/bsm/auditd_lib.h Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/bsm/auditd_lib.h Sun Jan 11 21:24:07 2009 (r187063) @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#3 $ */ #ifndef _BSM_AUDITD_LIB_H_ @@ -57,7 +57,7 @@ * Path of auditd plist file for launchd. */ #define AUDITD_PLIST_FILE \ - "/System/Library/LaunchDaemons/org.trustedbsd.auditd.plist" + "/System/Library/LaunchDaemons/com.apple.auditd.plist" /* * Error return codes for auditd_lib functions. Modified: vendor/openbsm/dist/bsm/libbsm.h ============================================================================== --- vendor/openbsm/dist/bsm/libbsm.h Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/bsm/libbsm.h Sun Jan 11 21:24:07 2009 (r187063) @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#40 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#41 $ */ #ifndef _LIBBSM_H_ @@ -821,14 +821,22 @@ void au_print_tok_xml(FILE *outfp, to */ void au_print_xml_header(FILE *outfp); void au_print_xml_footer(FILE *outfp); -__END_DECLS /* - * Functions relating to BSM<->errno conversion. - */ -int au_bsm_to_errno(u_char bsm_error, int *errorp); -u_char au_errno_to_bsm(int error); -const char *au_strerror(u_char bsm_error); + * BSM library routines for converting between local and BSM constant spaces. + * (Note: some of these are replicated in audit_record.h for the benefit of + * the FreeBSD and Mac OS X kernels) + */ +int au_bsm_to_domain(u_short bsm_domain, int *local_domainp); +int au_bsm_to_errno(u_char bsm_error, int *errorp); +int au_bsm_to_socket_type(u_short bsm_socket_type, + int *local_socket_typep); +u_short au_domain_to_bsm(int local_domain); +u_char au_errno_to_bsm(int local_errno); +u_short au_socket_type_to_bsm(int local_socket_type); + +const char *au_strerror(u_char bsm_error); +__END_DECLS /* * The remaining APIs are associated with Apple's BSM implementation, in Modified: vendor/openbsm/dist/configure ============================================================================== --- vendor/openbsm/dist/configure Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/configure Sun Jan 11 21:24:07 2009 (r187063) @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#47 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#49 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha4. +# Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha5. # # Report bugs to . # @@ -729,8 +729,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.1alpha4' -PACKAGE_STRING='OpenBSM 1.1alpha4' +PACKAGE_VERSION='1.1alpha5' +PACKAGE_STRING='OpenBSM 1.1alpha5' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -1404,7 +1404,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.1alpha4 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.1alpha5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1474,7 +1474,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.1alpha4:";; + short | recursive ) echo "Configuration of OpenBSM 1.1alpha5:";; esac cat <<\_ACEOF @@ -1580,7 +1580,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.1alpha4 +OpenBSM configure 1.1alpha5 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1594,7 +1594,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.1alpha4, which was +It was created by OpenBSM $as_me 1.1alpha5, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -19076,7 +19076,7 @@ fi # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.1alpha4 + VERSION=1.1alpha5 cat >>confdefs.h <<_ACEOF @@ -23584,7 +23584,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenBSM $as_me 1.1alpha4, which was +This file was extended by OpenBSM $as_me 1.1alpha5, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23637,7 +23637,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.1alpha4 +OpenBSM config.status 1.1alpha5 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Modified: vendor/openbsm/dist/configure.ac ============================================================================== --- vendor/openbsm/dist/configure.ac Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/configure.ac Sun Jan 11 21:24:07 2009 (r187063) @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.1alpha4], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#48 $]) +AC_INIT([OpenBSM], [1.1alpha5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#49 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) Modified: vendor/openbsm/dist/libauditd/Makefile.am ============================================================================== --- vendor/openbsm/dist/libauditd/Makefile.am Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/libauditd/Makefile.am Sun Jan 11 21:24:07 2009 (r187063) @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#2 $ # if USE_NATIVE_INCLUDES @@ -13,5 +13,5 @@ lib_LTLIBRARIES = libauditd.la libauditd_la_SOURCES = \ auditd_lib.c -#man3_MANS = \ -# libauditd.3 +man3_MANS = \ + libauditd.3 Modified: vendor/openbsm/dist/libauditd/Makefile.in ============================================================================== --- vendor/openbsm/dist/libauditd/Makefile.in Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/libauditd/Makefile.in Sun Jan 11 21:24:07 2009 (r187063) @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#2 $ # VPATH = @srcdir@ @@ -51,7 +51,7 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libauditd_la_LIBADD = @@ -71,6 +71,9 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF $(LDFLAGS) -o $@ SOURCES = $(libauditd_la_SOURCES) DIST_SOURCES = $(libauditd_la_SOURCES) +man3dir = $(mandir)/man3 +NROFF = nroff +MANS = $(man3_MANS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -188,6 +191,9 @@ lib_LTLIBRARIES = libauditd.la libauditd_la_SOURCES = \ auditd_lib.c +man3_MANS = \ + libauditd.3 + all: all-am .SUFFIXES: @@ -285,6 +291,51 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-man3: $(man3_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)" + @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.3*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 3*) ;; \ + *) ext='3' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \ + done +uninstall-man3: + @$(NORMAL_UNINSTALL) + @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.3*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 3*) ;; \ + *) ext='3' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man3dir)/$$inst"; \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -362,9 +413,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) +all-am: Makefile $(LTLIBRARIES) $(MANS) installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -412,7 +463,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-man install-dvi: install-dvi-am @@ -422,7 +473,7 @@ install-html: install-html-am install-info: install-info-am -install-man: +install-man: install-man3 install-pdf: install-pdf-am @@ -448,7 +499,9 @@ ps: ps-am ps-am: -uninstall-am: uninstall-libLTLIBRARIES +uninstall-am: uninstall-libLTLIBRARIES uninstall-man + +uninstall-man: uninstall-man3 .MAKE: install-am install-strip @@ -459,16 +512,14 @@ uninstall-am: uninstall-libLTLIBRARIES install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-libLTLIBRARIES install-man install-man3 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES - + tags uninstall uninstall-am uninstall-libLTLIBRARIES \ + uninstall-man uninstall-man3 -#man3_MANS = \ -# libauditd.3 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: Modified: vendor/openbsm/dist/libauditd/auditd_lib.c ============================================================================== --- vendor/openbsm/dist/libauditd/auditd_lib.c Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/libauditd/auditd_lib.c Sun Jan 11 21:24:07 2009 (r187063) @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#2 $ */ #include @@ -823,7 +823,7 @@ audit_quick_stop(void) */ if (auditon(A_GETCOND, &cond, sizeof(cond)) < 0) return (-1); - if (cond == AUC_DISABLED) + if (cond == AUC_NOAUDIT) return (0); /* Added: vendor/openbsm/dist/libauditd/libauditd.3 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/openbsm/dist/libauditd/libauditd.3 Sun Jan 11 21:24:07 2009 (r187063) @@ -0,0 +1,60 @@ +.\"- +.\" Copyright (c) 2008 Apple Inc. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of Apple Inc. ("Apple") nor the names of +.\" its contributors may be used to endorse or promote products derived +.\" from this software without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR +.\" ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +.\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGE. +.\" +.\" $P4: //depot/projects/trustedbsd/openbsm/libauditd/libauditd.3#1 $ +.\" +.Dd December 27, 2008 +.Dt LIBAUDITD 3 +.Os +.Sh NAME +.Nm libauditd +.Nd "auditd support library" +.Sh LIBRARY +.Lb libauditd +.Sh DESCRIPTION +The +.Nm +library provides the internal implementation of +.Xr auditd 8 . +.Sh INTERFACES +There are no public interfaces in +.Nm . +.Sh SEE ALSO +.Xr auditd 8 . +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. +.Sh AUTHORS +.An -nosplit +This software was created by +.An Stacey Son . +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. Modified: vendor/openbsm/dist/libbsm/Makefile.am ============================================================================== --- vendor/openbsm/dist/libbsm/Makefile.am Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/libbsm/Makefile.am Sun Jan 11 21:24:07 2009 (r187063) @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#7 $ +# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#8 $ # if USE_NATIVE_INCLUDES @@ -14,11 +14,13 @@ libbsm_la_SOURCES = \ bsm_audit.c \ bsm_class.c \ bsm_control.c \ + bsm_domain.c \ bsm_errno.c \ bsm_event.c \ bsm_flags.c \ bsm_io.c \ bsm_mask.c \ + bsm_socket_type.c \ bsm_token.c \ bsm_user.c @@ -31,12 +33,14 @@ endif man3_MANS = \ au_class.3 \ au_control.3 \ + au_domain.3 \ au_errno.3 \ au_event.3 \ au_free_token.3 \ au_io.3 \ au_mask.3 \ au_open.3 \ + au_socket_type.3 \ au_token.3 \ au_user.3 \ libbsm.3 Modified: vendor/openbsm/dist/libbsm/Makefile.in ============================================================================== --- vendor/openbsm/dist/libbsm/Makefile.in Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/libbsm/Makefile.in Sun Jan 11 21:24:07 2009 (r187063) @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#12 $ +# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#13 $ # VPATH = @srcdir@ @@ -60,13 +60,15 @@ libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libbsm_la_LIBADD = am__libbsm_la_SOURCES_DIST = bsm_audit.c bsm_class.c bsm_control.c \ - bsm_errno.c bsm_event.c bsm_flags.c bsm_io.c bsm_mask.c \ - bsm_token.c bsm_user.c bsm_notify.c bsm_wrappers.c + bsm_domain.c bsm_errno.c bsm_event.c bsm_flags.c bsm_io.c \ + bsm_mask.c bsm_socket_type.c bsm_token.c bsm_user.c \ + bsm_notify.c bsm_wrappers.c @HAVE_AUDIT_SYSCALLS_TRUE@am__objects_1 = bsm_notify.lo \ @HAVE_AUDIT_SYSCALLS_TRUE@ bsm_wrappers.lo am_libbsm_la_OBJECTS = bsm_audit.lo bsm_class.lo bsm_control.lo \ - bsm_errno.lo bsm_event.lo bsm_flags.lo bsm_io.lo bsm_mask.lo \ - bsm_token.lo bsm_user.lo $(am__objects_1) + bsm_domain.lo bsm_errno.lo bsm_event.lo bsm_flags.lo bsm_io.lo \ + bsm_mask.lo bsm_socket_type.lo bsm_token.lo bsm_user.lo \ + $(am__objects_1) libbsm_la_OBJECTS = $(am_libbsm_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(top_builddir)/config@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp @@ -199,18 +201,20 @@ top_srcdir = @top_srcdir@ @USE_NATIVE_INCLUDES_FALSE@INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/sys @USE_NATIVE_INCLUDES_TRUE@INCLUDES = -I$(top_builddir) -I$(top_srcdir) lib_LTLIBRARIES = libbsm.la -libbsm_la_SOURCES = bsm_audit.c bsm_class.c bsm_control.c bsm_errno.c \ - bsm_event.c bsm_flags.c bsm_io.c bsm_mask.c bsm_token.c \ - bsm_user.c $(am__append_1) +libbsm_la_SOURCES = bsm_audit.c bsm_class.c bsm_control.c bsm_domain.c \ + bsm_errno.c bsm_event.c bsm_flags.c bsm_io.c bsm_mask.c \ + bsm_socket_type.c bsm_token.c bsm_user.c $(am__append_1) man3_MANS = \ au_class.3 \ au_control.3 \ + au_domain.3 \ au_errno.3 \ au_event.3 \ au_free_token.3 \ au_io.3 \ au_mask.3 \ au_open.3 \ + au_socket_type.3 \ au_token.3 \ au_user.3 \ libbsm.3 @@ -287,12 +291,14 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_audit.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_class.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_control.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_domain.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_errno.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_event.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_flags.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_io.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_mask.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_notify.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_socket_type.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_token.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_user.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsm_wrappers.Plo@am__quote@ Added: vendor/openbsm/dist/libbsm/au_domain.3 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/openbsm/dist/libbsm/au_domain.3 Sun Jan 11 21:24:07 2009 (r187063) @@ -0,0 +1,87 @@ +.\"- +.\" Copyright (c) 2008 Apple Inc. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of Apple Inc. ("Apple") nor the names of +.\" its contributors may be used to endorse or promote products derived +.\" from this software without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR +.\" ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +.\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGE. +.\" +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_domain.3#1 $ +.\" +.Dd December 28, 2008 +.Dt AU_BSM_TO_DOMAIN 3 +.Os +.Sh NAME +.Nm au_bsm_to_domain , +.Nm au_domain_to_bsm +.Nd "convert between BSM and local protocol domains" +.Sh LIBRARY +.Lb libbsm +.Sh SYNOPSIS +.In bsm/libbsm.h +.Ft int +.Fn au_bsm_to_domain "u_short bsm_domain" "int *local_domainp" +.Ft u_short +.Fn au_domain_to_bsm "int local_domain" +.Sh DESCRIPTION +These interfaces may be used to convert between the local and BSM protocol +domains. +The +.Fn au_bsm_to_domain +function accepts a BSM domain, +.Fa bsm_domain , +and converts it to a local domain, such as those passed to +.Xr socket 2 , +that will be stored in the integer pointed to by +.Fa local_domainp +if successful. +This call will fail if the BSM domain cannot be mapped into a local domain, +which may occur if the socket token was generated on another operating +system. +.Pp +.Fn au_domain_to_bsm +function accepts a local domain, and returns the BSM domain for it. +This call cannot fail, and instead returns a BSM domain indicating to a later +decoder that the domain could not be encoded. +.Sh RETURN VALULES +On success, +.Fn au_bsm_to_domain +returns 0 and a converted domain; on failure, it returns -1 but does not set +.Xr errno 2 . +.Sh SEE ALSO +.Xr au_bsm_to_socket_type 3 , +.Xr au_socket_type_to_bsm 3 , +.Xr au_to_socket_ex 3 , +.Xr libbsm 3 +.Sh HISTORY +.Fn au_bsm_to_domain +and +.Fn au_domain_to_bsm +were introduced in OpenBSM 1.1. +.Sh AUTHORS +These functions were implemented by +.An Robert Watson +under contract to Apple Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. Added: vendor/openbsm/dist/libbsm/au_socket_type.3 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/openbsm/dist/libbsm/au_socket_type.3 Sun Jan 11 21:24:07 2009 (r187063) @@ -0,0 +1,93 @@ +.\"- +.\" Copyright (c) 2008 Apple Inc. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of Apple Inc. ("Apple") nor the names of +.\" its contributors may be used to endorse or promote products derived +.\" from this software without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR +.\" ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +.\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGE. +.\" +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_socket_type.3#1 $ +.\" +.Dd December 28, 2008 +.Dt AU_BSM_TO_SOCKET_TYPE 3 +.Os +.Sh NAME +.Nm au_bsm_to_socket_type , +.Nm au_socket_type_to_bsm +.Nd "convert between BSM and local socket types" +.Sh LIBRARY +.Lb libbsm +.Sh SYNOPSIS +.In bsm/libbsm.h +.Ft int +.Fn au_bsm_to_socket_type "u_short bsm_socket_type" "int *local_socket_typep" +.Ft u_short +.Fn au_socket_type_to_bsm "int local_socket_type" +.Sh DESCRIPTION +These interfaces may be used to convert between the local and BSM socket +types. +The +.Fn au_bsm_to_socket_type +function accepts a BSM socket type, +.Fa bsm_socket_type , +and converts it to a local socket type, such as those passed to +.Xr socket 2 , +that will be stored in the integer pointed to by +.Fa local_socket_typep +if successful. +This call will fail if the BSM socket type cannot be mapped into a local +socket type, which may occur if the socket token was generated on another +operating system. +.Pp +.Fn au_socket_type_to_bsm +function accepts a local socket type, and returns the BSM socket type for it. +This call cannot fail, and instead returns a BSM socket type indicating to a +later decoder that the socket type could not be encoded. +.Sh RETURN VALULES +On success, +.Fn au_bsm_to_socket_type +returns 0 and a converted socket type; on failure, it returns -1 but does not +set +.Xr errno 2 . +.Pp +On success, +.Fn au_strerror +returns a pointer to an error string; on failure it will return +.Dv NULL . +.Sh SEE ALSO +.Xr au_bsm_to_domain 3 , +.Xr au_domain_to_bsm 3 , +.Xr au_to_socket_ex 3 , +.Xr libbsm 3 +.Sh HISTORY +.Fn au_bsm_to_socket_type +and +.Fn au_socket_type_to_bsm +were introduced in OpenBSM 1.1. +.Sh AUTHORS +These functions were implemented by +.An Robert Watson +under contract to Apple Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. Modified: vendor/openbsm/dist/libbsm/au_token.3 ============================================================================== --- vendor/openbsm/dist/libbsm/au_token.3 Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/libbsm/au_token.3 Sun Jan 11 21:24:07 2009 (r187063) @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#16 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#17 $ .\" .Dd April 19, 2005 .Dt AU_TOKEN 3 @@ -60,6 +60,7 @@ .Nm au_to_sock_inet32 , .Nm au_to_sock_inet128 , .Nm au_to_sock_inet , +.Nm au_to_socket_ex , .Nm au_to_subject32 , .Nm au_to_subject64 , .Nm au_to_subject , @@ -156,6 +157,8 @@ .Ft "token_t *" .Fn au_to_sock_int "struct sockaddr_in *so" .Ft "token_t *" +.Fn au_to_socket_ex "u_short so_domain" "u_short so_type" "struct sockaddr *sa_local" "struct sockaddr *sa_remote" +.Ft "token_t *" .Fo au_to_subject32 .Fa "au_id_t auid" "uid_t euid" "gid_t egid" "uid_t ruid" .Fa "gid_t rgid" "pid_t pid" "au_asid_t sid" "au_tid_t *tid" Modified: vendor/openbsm/dist/libbsm/bsm_audit.c ============================================================================== --- vendor/openbsm/dist/libbsm/bsm_audit.c Sun Jan 11 20:01:43 2009 (r187062) +++ vendor/openbsm/dist/libbsm/bsm_audit.c Sun Jan 11 21:24:07 2009 (r187063) @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#34 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#35 $ */ #include @@ -219,13 +219,16 @@ au_write(int d, token_t *tok) static int au_assemble(au_record_t *rec, short event) { - token_t *header, *tok, *trailer; - size_t tot_rec_size, hdrsize; - u_char *dptr; +#ifdef HAVE_AUDIT_SYSCALLS struct in6_addr *aptr; - int error; struct auditinfo_addr aia; struct timeval tm; + size_t hdrsize; +#endif /* HAVE_AUDIT_SYSCALLS */ + token_t *header, *tok, *trailer; + size_t tot_rec_size; + u_char *dptr; + int error; #ifdef HAVE_AUDIT_SYSCALLS /* Added: vendor/openbsm/dist/libbsm/bsm_domain.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/openbsm/dist/libbsm/bsm_domain.c Sun Jan 11 21:24:07 2009 (r187063) @@ -0,0 +1,499 @@ +/*- + * Copyright (c) 2008 Apple Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_domain.c#2 $ + */ + +#include +#include + +#include + +#include +#include + +struct bsm_domain { + u_short bd_bsm_domain; + int bd_local_domain; +}; + +#define PF_NO_LOCAL_MAPPING -600 + +static const struct bsm_domain bsm_domains[] = { + { BSM_PF_UNSPEC, PF_UNSPEC }, + { BSM_PF_LOCAL, PF_LOCAL }, + { BSM_PF_INET, PF_INET }, + { BSM_PF_IMPLINK, +#ifdef PF_IMPLINK + PF_IMPLINK +#else + PF_NO_LOCAL_MAPPING +#endif + }, + { BSM_PF_PUP, +#ifdef PF_PUP + PF_PUP +#else + PF_NO_LOCAL_MAPPING +#endif *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-vendor@FreeBSD.ORG Sun Jan 11 21:27:28 2009 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD595106566B; Sun, 11 Jan 2009 21:27:28 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 91EEF8FC13; Sun, 11 Jan 2009 21:27:28 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0BLRSVC038833; Sun, 11 Jan 2009 21:27:28 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0BLRSmh038832; Sun, 11 Jan 2009 21:27:28 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200901112127.n0BLRSmh038832@svn.freebsd.org> From: Robert Watson Date: Sun, 11 Jan 2009 21:27:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187064 - vendor/openbsm/1.1-ALPHA-5 X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jan 2009 21:27:29 -0000 Author: rwatson Date: Sun Jan 11 21:27:28 2009 New Revision: 187064 URL: http://svn.freebsd.org/changeset/base/187064 Log: Tag OpenBSM 1.1-alpha5 vendor import. Added: vendor/openbsm/1.1-ALPHA-5/ (props changed) - copied from r187063, vendor/openbsm/dist/ From owner-svn-src-vendor@FreeBSD.ORG Thu Jan 15 02:11:45 2009 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00124106564A; Thu, 15 Jan 2009 02:11:44 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DB5F78FC1B; Thu, 15 Jan 2009 02:11:44 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0F2Bid6060203; Thu, 15 Jan 2009 02:11:44 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0F2BiVx060200; Thu, 15 Jan 2009 02:11:44 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901150211.n0F2BiVx060200@svn.freebsd.org> From: Sam Leffler Date: Thu, 15 Jan 2009 02:11:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187258 - in vendor/wpa_supplicant: 0.3-latest 0.3-latest/contrib 0.3.8 0.3.8/contrib 0.3.8/doc 0.3.9 0.3.9/contrib 0.3.9/doc 0.4.8 0.4.8/contrib 0.4.8/doc 0.4.8/examples 0.4.8/wpa_gui ... X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jan 2009 02:11:45 -0000 Author: sam Date: Thu Jan 15 02:11:43 2009 New Revision: 187258 URL: http://svn.freebsd.org/changeset/base/187258 Log: flatten vendor branch Added: vendor/wpa_supplicant/0.3-latest/driver_ndis.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3-latest/contrib/wpa_supplicant/driver_ndis.c vendor/wpa_supplicant/0.3.8/COPYING (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/COPYING vendor/wpa_supplicant/0.3.8/ChangeLog (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/ChangeLog vendor/wpa_supplicant/0.3.8/Makefile (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/Makefile vendor/wpa_supplicant/0.3.8/README (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/README vendor/wpa_supplicant/0.3.8/aes.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/aes.c vendor/wpa_supplicant/0.3.8/aes_wrap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/aes_wrap.c vendor/wpa_supplicant/0.3.8/aes_wrap.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/aes_wrap.h vendor/wpa_supplicant/0.3.8/common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/common.c vendor/wpa_supplicant/0.3.8/common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/common.h vendor/wpa_supplicant/0.3.8/config.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/config.c vendor/wpa_supplicant/0.3.8/config.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/config.h vendor/wpa_supplicant/0.3.8/config_ssid.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/config_ssid.h vendor/wpa_supplicant/0.3.8/crypto.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/crypto.c vendor/wpa_supplicant/0.3.8/crypto.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/crypto.h vendor/wpa_supplicant/0.3.8/ctrl_iface.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/ctrl_iface.c vendor/wpa_supplicant/0.3.8/ctrl_iface.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/ctrl_iface.h vendor/wpa_supplicant/0.3.8/defconfig (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/defconfig vendor/wpa_supplicant/0.3.8/defs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/defs.h vendor/wpa_supplicant/0.3.8/developer.txt (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/developer.txt vendor/wpa_supplicant/0.3.8/doc/ (props changed) - copied from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/doc/ vendor/wpa_supplicant/0.3.8/driver.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/driver.h vendor/wpa_supplicant/0.3.8/drivers.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/drivers.c vendor/wpa_supplicant/0.3.8/eap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap.c vendor/wpa_supplicant/0.3.8/eap.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap.h vendor/wpa_supplicant/0.3.8/eap_aka.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_aka.c vendor/wpa_supplicant/0.3.8/eap_defs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_defs.h vendor/wpa_supplicant/0.3.8/eap_fast.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_fast.c vendor/wpa_supplicant/0.3.8/eap_gtc.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_gtc.c vendor/wpa_supplicant/0.3.8/eap_i.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_i.h vendor/wpa_supplicant/0.3.8/eap_leap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_leap.c vendor/wpa_supplicant/0.3.8/eap_md5.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_md5.c vendor/wpa_supplicant/0.3.8/eap_mschapv2.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_mschapv2.c vendor/wpa_supplicant/0.3.8/eap_otp.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_otp.c vendor/wpa_supplicant/0.3.8/eap_peap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_peap.c vendor/wpa_supplicant/0.3.8/eap_psk.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_psk.c vendor/wpa_supplicant/0.3.8/eap_sim.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_sim.c vendor/wpa_supplicant/0.3.8/eap_sim_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_sim_common.c vendor/wpa_supplicant/0.3.8/eap_sim_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_sim_common.h vendor/wpa_supplicant/0.3.8/eap_testing.txt (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_testing.txt vendor/wpa_supplicant/0.3.8/eap_tls.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_tls.c vendor/wpa_supplicant/0.3.8/eap_tls_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_tls_common.c vendor/wpa_supplicant/0.3.8/eap_tls_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_tls_common.h vendor/wpa_supplicant/0.3.8/eap_tlv.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_tlv.c vendor/wpa_supplicant/0.3.8/eap_tlv.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_tlv.h vendor/wpa_supplicant/0.3.8/eap_ttls.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_ttls.c vendor/wpa_supplicant/0.3.8/eap_ttls.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eap_ttls.h vendor/wpa_supplicant/0.3.8/eapol_sm.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eapol_sm.c vendor/wpa_supplicant/0.3.8/eapol_sm.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eapol_sm.h vendor/wpa_supplicant/0.3.8/eapol_test.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eapol_test.c vendor/wpa_supplicant/0.3.8/eloop.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eloop.c vendor/wpa_supplicant/0.3.8/eloop.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/eloop.h vendor/wpa_supplicant/0.3.8/hostap_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/hostap_common.h vendor/wpa_supplicant/0.3.8/l2_packet.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/l2_packet.h vendor/wpa_supplicant/0.3.8/md5.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/md5.c vendor/wpa_supplicant/0.3.8/md5.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/md5.h vendor/wpa_supplicant/0.3.8/ms_funcs.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/ms_funcs.c vendor/wpa_supplicant/0.3.8/ms_funcs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/ms_funcs.h vendor/wpa_supplicant/0.3.8/openssl-tls-extensions.patch (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/openssl-tls-extensions.patch vendor/wpa_supplicant/0.3.8/pcsc_funcs.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/pcsc_funcs.c vendor/wpa_supplicant/0.3.8/pcsc_funcs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/pcsc_funcs.h vendor/wpa_supplicant/0.3.8/preauth_test.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/preauth_test.c vendor/wpa_supplicant/0.3.8/radius_client.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/radius_client.c vendor/wpa_supplicant/0.3.8/radius_client.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/radius_client.h vendor/wpa_supplicant/0.3.8/rc4.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/rc4.c vendor/wpa_supplicant/0.3.8/rc4.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/rc4.h vendor/wpa_supplicant/0.3.8/sha1.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/sha1.c vendor/wpa_supplicant/0.3.8/sha1.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/sha1.h vendor/wpa_supplicant/0.3.8/tls.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/tls.h vendor/wpa_supplicant/0.3.8/tls_none.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/tls_none.c vendor/wpa_supplicant/0.3.8/tls_openssl.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/tls_openssl.c vendor/wpa_supplicant/0.3.8/todo.txt (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/todo.txt vendor/wpa_supplicant/0.3.8/version.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/version.h vendor/wpa_supplicant/0.3.8/wpa.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/wpa.c vendor/wpa_supplicant/0.3.8/wpa.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/wpa.h vendor/wpa_supplicant/0.3.8/wpa_cli.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/wpa_cli.c vendor/wpa_supplicant/0.3.8/wpa_ctrl.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/wpa_ctrl.c vendor/wpa_supplicant/0.3.8/wpa_ctrl.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/wpa_ctrl.h vendor/wpa_supplicant/0.3.8/wpa_passphrase.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/wpa_passphrase.c vendor/wpa_supplicant/0.3.8/wpa_supplicant.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/wpa_supplicant.c vendor/wpa_supplicant/0.3.8/wpa_supplicant.conf (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/wpa_supplicant.conf vendor/wpa_supplicant/0.3.8/wpa_supplicant.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/wpa_supplicant.h vendor/wpa_supplicant/0.3.8/wpa_supplicant_i.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.8/contrib/wpa_supplicant/wpa_supplicant_i.h vendor/wpa_supplicant/0.3.9/COPYING (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/COPYING vendor/wpa_supplicant/0.3.9/ChangeLog (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/ChangeLog vendor/wpa_supplicant/0.3.9/Makefile (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/Makefile vendor/wpa_supplicant/0.3.9/README (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/README vendor/wpa_supplicant/0.3.9/aes.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/aes.c vendor/wpa_supplicant/0.3.9/aes_wrap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/aes_wrap.c vendor/wpa_supplicant/0.3.9/aes_wrap.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/aes_wrap.h vendor/wpa_supplicant/0.3.9/common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/common.c vendor/wpa_supplicant/0.3.9/common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/common.h vendor/wpa_supplicant/0.3.9/config.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/config.c vendor/wpa_supplicant/0.3.9/config.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/config.h vendor/wpa_supplicant/0.3.9/config_ssid.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/config_ssid.h vendor/wpa_supplicant/0.3.9/crypto.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/crypto.c vendor/wpa_supplicant/0.3.9/crypto.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/crypto.h vendor/wpa_supplicant/0.3.9/ctrl_iface.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/ctrl_iface.c vendor/wpa_supplicant/0.3.9/ctrl_iface.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/ctrl_iface.h vendor/wpa_supplicant/0.3.9/defconfig (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/defconfig vendor/wpa_supplicant/0.3.9/defs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/defs.h vendor/wpa_supplicant/0.3.9/developer.txt (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/developer.txt vendor/wpa_supplicant/0.3.9/doc/ (props changed) - copied from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/doc/ vendor/wpa_supplicant/0.3.9/driver.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/driver.h vendor/wpa_supplicant/0.3.9/driver_ndis.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/driver_ndis.c vendor/wpa_supplicant/0.3.9/driver_ndis.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/driver_ndis.h vendor/wpa_supplicant/0.3.9/driver_ndis_.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/driver_ndis_.c vendor/wpa_supplicant/0.3.9/drivers.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/drivers.c vendor/wpa_supplicant/0.3.9/eap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap.c vendor/wpa_supplicant/0.3.9/eap.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap.h vendor/wpa_supplicant/0.3.9/eap_aka.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_aka.c vendor/wpa_supplicant/0.3.9/eap_defs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_defs.h vendor/wpa_supplicant/0.3.9/eap_fast.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_fast.c vendor/wpa_supplicant/0.3.9/eap_gtc.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_gtc.c vendor/wpa_supplicant/0.3.9/eap_i.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_i.h vendor/wpa_supplicant/0.3.9/eap_leap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_leap.c vendor/wpa_supplicant/0.3.9/eap_md5.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_md5.c vendor/wpa_supplicant/0.3.9/eap_mschapv2.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_mschapv2.c vendor/wpa_supplicant/0.3.9/eap_otp.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_otp.c vendor/wpa_supplicant/0.3.9/eap_peap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_peap.c vendor/wpa_supplicant/0.3.9/eap_psk.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_psk.c vendor/wpa_supplicant/0.3.9/eap_sim.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_sim.c vendor/wpa_supplicant/0.3.9/eap_sim_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_sim_common.c vendor/wpa_supplicant/0.3.9/eap_sim_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_sim_common.h vendor/wpa_supplicant/0.3.9/eap_testing.txt (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_testing.txt vendor/wpa_supplicant/0.3.9/eap_tls.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_tls.c vendor/wpa_supplicant/0.3.9/eap_tls_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_tls_common.c vendor/wpa_supplicant/0.3.9/eap_tls_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_tls_common.h vendor/wpa_supplicant/0.3.9/eap_tlv.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_tlv.c vendor/wpa_supplicant/0.3.9/eap_tlv.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_tlv.h vendor/wpa_supplicant/0.3.9/eap_ttls.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_ttls.c vendor/wpa_supplicant/0.3.9/eap_ttls.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eap_ttls.h vendor/wpa_supplicant/0.3.9/eapol_sm.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eapol_sm.c vendor/wpa_supplicant/0.3.9/eapol_sm.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eapol_sm.h vendor/wpa_supplicant/0.3.9/eapol_test.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eapol_test.c vendor/wpa_supplicant/0.3.9/eloop.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eloop.c vendor/wpa_supplicant/0.3.9/eloop.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/eloop.h vendor/wpa_supplicant/0.3.9/hostap_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/hostap_common.h vendor/wpa_supplicant/0.3.9/l2_packet.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/l2_packet.h vendor/wpa_supplicant/0.3.9/md5.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/md5.c vendor/wpa_supplicant/0.3.9/md5.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/md5.h vendor/wpa_supplicant/0.3.9/ms_funcs.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/ms_funcs.c vendor/wpa_supplicant/0.3.9/ms_funcs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/ms_funcs.h vendor/wpa_supplicant/0.3.9/openssl-tls-extensions.patch (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/openssl-tls-extensions.patch vendor/wpa_supplicant/0.3.9/pcsc_funcs.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/pcsc_funcs.c vendor/wpa_supplicant/0.3.9/pcsc_funcs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/pcsc_funcs.h vendor/wpa_supplicant/0.3.9/preauth_test.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/preauth_test.c vendor/wpa_supplicant/0.3.9/radius.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/radius.c vendor/wpa_supplicant/0.3.9/radius.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/radius.h vendor/wpa_supplicant/0.3.9/radius_client.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/radius_client.c vendor/wpa_supplicant/0.3.9/radius_client.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/radius_client.h vendor/wpa_supplicant/0.3.9/rc4.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/rc4.c vendor/wpa_supplicant/0.3.9/rc4.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/rc4.h vendor/wpa_supplicant/0.3.9/sha1.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/sha1.c vendor/wpa_supplicant/0.3.9/sha1.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/sha1.h vendor/wpa_supplicant/0.3.9/tls.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/tls.h vendor/wpa_supplicant/0.3.9/tls_none.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/tls_none.c vendor/wpa_supplicant/0.3.9/tls_openssl.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/tls_openssl.c vendor/wpa_supplicant/0.3.9/todo.txt (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/todo.txt vendor/wpa_supplicant/0.3.9/version.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/version.h vendor/wpa_supplicant/0.3.9/wpa.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/wpa.c vendor/wpa_supplicant/0.3.9/wpa.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/wpa.h vendor/wpa_supplicant/0.3.9/wpa_cli.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/wpa_cli.c vendor/wpa_supplicant/0.3.9/wpa_ctrl.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/wpa_ctrl.c vendor/wpa_supplicant/0.3.9/wpa_ctrl.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/wpa_ctrl.h vendor/wpa_supplicant/0.3.9/wpa_passphrase.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/wpa_passphrase.c vendor/wpa_supplicant/0.3.9/wpa_supplicant.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/wpa_supplicant.c vendor/wpa_supplicant/0.3.9/wpa_supplicant.conf (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/wpa_supplicant.conf vendor/wpa_supplicant/0.3.9/wpa_supplicant.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/wpa_supplicant.h vendor/wpa_supplicant/0.3.9/wpa_supplicant_i.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.3.9/contrib/wpa_supplicant/wpa_supplicant_i.h vendor/wpa_supplicant/0.4.8/COPYING (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/COPYING vendor/wpa_supplicant/0.4.8/ChangeLog (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/ChangeLog vendor/wpa_supplicant/0.4.8/Makefile (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/Makefile vendor/wpa_supplicant/0.4.8/README (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/README vendor/wpa_supplicant/0.4.8/aes.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/aes.c vendor/wpa_supplicant/0.4.8/aes_wrap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/aes_wrap.c vendor/wpa_supplicant/0.4.8/aes_wrap.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/aes_wrap.h vendor/wpa_supplicant/0.4.8/base64.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/base64.c vendor/wpa_supplicant/0.4.8/base64.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/base64.h vendor/wpa_supplicant/0.4.8/common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/common.c vendor/wpa_supplicant/0.4.8/common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/common.h vendor/wpa_supplicant/0.4.8/config.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/config.c vendor/wpa_supplicant/0.4.8/config.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/config.h vendor/wpa_supplicant/0.4.8/config_file.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/config_file.c vendor/wpa_supplicant/0.4.8/config_ssid.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/config_ssid.h vendor/wpa_supplicant/0.4.8/config_types.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/config_types.h vendor/wpa_supplicant/0.4.8/crypto.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/crypto.c vendor/wpa_supplicant/0.4.8/crypto.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/crypto.h vendor/wpa_supplicant/0.4.8/crypto_gnutls.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/crypto_gnutls.c vendor/wpa_supplicant/0.4.8/ctrl_iface.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/ctrl_iface.c vendor/wpa_supplicant/0.4.8/ctrl_iface.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/ctrl_iface.h vendor/wpa_supplicant/0.4.8/defconfig (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/defconfig vendor/wpa_supplicant/0.4.8/defs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/defs.h vendor/wpa_supplicant/0.4.8/doc/ (props changed) - copied from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/doc/ vendor/wpa_supplicant/0.4.8/driver.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/driver.h vendor/wpa_supplicant/0.4.8/driver_hostap.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/driver_hostap.h vendor/wpa_supplicant/0.4.8/driver_ndis.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/driver_ndis.c vendor/wpa_supplicant/0.4.8/driver_ndis.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/driver_ndis.h vendor/wpa_supplicant/0.4.8/driver_ndis_.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/driver_ndis_.c vendor/wpa_supplicant/0.4.8/driver_wired.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/driver_wired.c vendor/wpa_supplicant/0.4.8/drivers.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/drivers.c vendor/wpa_supplicant/0.4.8/eap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap.c vendor/wpa_supplicant/0.4.8/eap.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap.h vendor/wpa_supplicant/0.4.8/eap_aka.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_aka.c vendor/wpa_supplicant/0.4.8/eap_defs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_defs.h vendor/wpa_supplicant/0.4.8/eap_fast.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_fast.c vendor/wpa_supplicant/0.4.8/eap_gtc.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_gtc.c vendor/wpa_supplicant/0.4.8/eap_i.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_i.h vendor/wpa_supplicant/0.4.8/eap_leap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_leap.c vendor/wpa_supplicant/0.4.8/eap_md5.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_md5.c vendor/wpa_supplicant/0.4.8/eap_mschapv2.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_mschapv2.c vendor/wpa_supplicant/0.4.8/eap_otp.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_otp.c vendor/wpa_supplicant/0.4.8/eap_pax.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_pax.c vendor/wpa_supplicant/0.4.8/eap_pax_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_pax_common.c vendor/wpa_supplicant/0.4.8/eap_pax_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_pax_common.h vendor/wpa_supplicant/0.4.8/eap_peap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_peap.c vendor/wpa_supplicant/0.4.8/eap_psk.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_psk.c vendor/wpa_supplicant/0.4.8/eap_psk_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_psk_common.c vendor/wpa_supplicant/0.4.8/eap_psk_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_psk_common.h vendor/wpa_supplicant/0.4.8/eap_sim.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_sim.c vendor/wpa_supplicant/0.4.8/eap_sim_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_sim_common.c vendor/wpa_supplicant/0.4.8/eap_sim_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_sim_common.h vendor/wpa_supplicant/0.4.8/eap_testing.txt (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_testing.txt vendor/wpa_supplicant/0.4.8/eap_tls.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_tls.c vendor/wpa_supplicant/0.4.8/eap_tls_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_tls_common.c vendor/wpa_supplicant/0.4.8/eap_tls_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_tls_common.h vendor/wpa_supplicant/0.4.8/eap_tlv.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_tlv.c vendor/wpa_supplicant/0.4.8/eap_tlv.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_tlv.h vendor/wpa_supplicant/0.4.8/eap_ttls.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_ttls.c vendor/wpa_supplicant/0.4.8/eap_ttls.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eap_ttls.h vendor/wpa_supplicant/0.4.8/eapol_sm.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eapol_sm.c vendor/wpa_supplicant/0.4.8/eapol_sm.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eapol_sm.h vendor/wpa_supplicant/0.4.8/eapol_test.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eapol_test.c vendor/wpa_supplicant/0.4.8/eloop.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eloop.c vendor/wpa_supplicant/0.4.8/eloop.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/eloop.h vendor/wpa_supplicant/0.4.8/events.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/events.c vendor/wpa_supplicant/0.4.8/examples/ (props changed) - copied from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/examples/ vendor/wpa_supplicant/0.4.8/hostapd.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/hostapd.h vendor/wpa_supplicant/0.4.8/l2_packet.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/l2_packet.h vendor/wpa_supplicant/0.4.8/main.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/main.c vendor/wpa_supplicant/0.4.8/md5.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/md5.c vendor/wpa_supplicant/0.4.8/md5.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/md5.h vendor/wpa_supplicant/0.4.8/ms_funcs.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/ms_funcs.c vendor/wpa_supplicant/0.4.8/ms_funcs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/ms_funcs.h vendor/wpa_supplicant/0.4.8/openssl-tls-extensions.patch (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/openssl-tls-extensions.patch vendor/wpa_supplicant/0.4.8/pcsc_funcs.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/pcsc_funcs.c vendor/wpa_supplicant/0.4.8/pcsc_funcs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/pcsc_funcs.h vendor/wpa_supplicant/0.4.8/preauth.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/preauth.c vendor/wpa_supplicant/0.4.8/preauth.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/preauth.h vendor/wpa_supplicant/0.4.8/preauth_test.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/preauth_test.c vendor/wpa_supplicant/0.4.8/radius.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/radius.c vendor/wpa_supplicant/0.4.8/radius.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/radius.h vendor/wpa_supplicant/0.4.8/radius_client.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/radius_client.c vendor/wpa_supplicant/0.4.8/radius_client.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/radius_client.h vendor/wpa_supplicant/0.4.8/rc4.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/rc4.c vendor/wpa_supplicant/0.4.8/rc4.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/rc4.h vendor/wpa_supplicant/0.4.8/sha1.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/sha1.c vendor/wpa_supplicant/0.4.8/sha1.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/sha1.h vendor/wpa_supplicant/0.4.8/tls.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/tls.h vendor/wpa_supplicant/0.4.8/tls_gnutls.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/tls_gnutls.c vendor/wpa_supplicant/0.4.8/tls_none.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/tls_none.c vendor/wpa_supplicant/0.4.8/tls_openssl.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/tls_openssl.c vendor/wpa_supplicant/0.4.8/tls_schannel.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/tls_schannel.c vendor/wpa_supplicant/0.4.8/todo.txt (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/todo.txt vendor/wpa_supplicant/0.4.8/version.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/version.h vendor/wpa_supplicant/0.4.8/wpa.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/wpa.c vendor/wpa_supplicant/0.4.8/wpa.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/wpa.h vendor/wpa_supplicant/0.4.8/wpa_cli.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/wpa_cli.c vendor/wpa_supplicant/0.4.8/wpa_ctrl.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/wpa_ctrl.c vendor/wpa_supplicant/0.4.8/wpa_ctrl.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/wpa_ctrl.h vendor/wpa_supplicant/0.4.8/wpa_gui/ (props changed) - copied from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/wpa_gui/ vendor/wpa_supplicant/0.4.8/wpa_gui-qt4/ (props changed) - copied from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/wpa_gui-qt4/ vendor/wpa_supplicant/0.4.8/wpa_i.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/wpa_i.h vendor/wpa_supplicant/0.4.8/wpa_passphrase.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/wpa_passphrase.c vendor/wpa_supplicant/0.4.8/wpa_supplicant.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/wpa_supplicant.c vendor/wpa_supplicant/0.4.8/wpa_supplicant.conf (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/wpa_supplicant.conf vendor/wpa_supplicant/0.4.8/wpa_supplicant.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/wpa_supplicant.h vendor/wpa_supplicant/0.4.8/wpa_supplicant_i.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.4.8/contrib/wpa_supplicant/wpa_supplicant_i.h vendor/wpa_supplicant/0.5.8/COPYING (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/COPYING vendor/wpa_supplicant/0.5.8/ChangeLog (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/ChangeLog vendor/wpa_supplicant/0.5.8/FREEBSD-Xlist (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/FREEBSD-Xlist vendor/wpa_supplicant/0.5.8/FREEBSD-upgrade (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/FREEBSD-upgrade vendor/wpa_supplicant/0.5.8/Makefile (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/Makefile vendor/wpa_supplicant/0.5.8/README (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/README vendor/wpa_supplicant/0.5.8/aes.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/aes.c vendor/wpa_supplicant/0.5.8/aes.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/aes.h vendor/wpa_supplicant/0.5.8/aes_wrap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/aes_wrap.c vendor/wpa_supplicant/0.5.8/aes_wrap.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/aes_wrap.h vendor/wpa_supplicant/0.5.8/asn1.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/asn1.c vendor/wpa_supplicant/0.5.8/asn1.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/asn1.h vendor/wpa_supplicant/0.5.8/asn1_test.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/asn1_test.c vendor/wpa_supplicant/0.5.8/base64.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/base64.c vendor/wpa_supplicant/0.5.8/base64.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/base64.h vendor/wpa_supplicant/0.5.8/bignum.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/bignum.c vendor/wpa_supplicant/0.5.8/bignum.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/bignum.h vendor/wpa_supplicant/0.5.8/build_config.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/build_config.h vendor/wpa_supplicant/0.5.8/common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/common.c vendor/wpa_supplicant/0.5.8/common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/common.h vendor/wpa_supplicant/0.5.8/config.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/config.c vendor/wpa_supplicant/0.5.8/config.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/config.h vendor/wpa_supplicant/0.5.8/config_file.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/config_file.c vendor/wpa_supplicant/0.5.8/config_none.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/config_none.c vendor/wpa_supplicant/0.5.8/config_ssid.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/config_ssid.h vendor/wpa_supplicant/0.5.8/config_types.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/config_types.h vendor/wpa_supplicant/0.5.8/config_winreg.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/config_winreg.c vendor/wpa_supplicant/0.5.8/crypto.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/crypto.c vendor/wpa_supplicant/0.5.8/crypto.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/crypto.h vendor/wpa_supplicant/0.5.8/crypto_cryptoapi.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/crypto_cryptoapi.c vendor/wpa_supplicant/0.5.8/crypto_gnutls.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/crypto_gnutls.c vendor/wpa_supplicant/0.5.8/crypto_internal.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/crypto_internal.c vendor/wpa_supplicant/0.5.8/crypto_libtomcrypt.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/crypto_libtomcrypt.c vendor/wpa_supplicant/0.5.8/crypto_none.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/crypto_none.c vendor/wpa_supplicant/0.5.8/ctrl_iface.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/ctrl_iface.c vendor/wpa_supplicant/0.5.8/ctrl_iface.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/ctrl_iface.h vendor/wpa_supplicant/0.5.8/ctrl_iface_dbus.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/ctrl_iface_dbus.c vendor/wpa_supplicant/0.5.8/ctrl_iface_dbus.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/ctrl_iface_dbus.h vendor/wpa_supplicant/0.5.8/ctrl_iface_dbus_handlers.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c vendor/wpa_supplicant/0.5.8/ctrl_iface_dbus_handlers.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h vendor/wpa_supplicant/0.5.8/ctrl_iface_named_pipe.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/ctrl_iface_named_pipe.c vendor/wpa_supplicant/0.5.8/ctrl_iface_udp.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/ctrl_iface_udp.c vendor/wpa_supplicant/0.5.8/ctrl_iface_unix.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/ctrl_iface_unix.c vendor/wpa_supplicant/0.5.8/dbus-wpa_supplicant.conf (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/dbus-wpa_supplicant.conf vendor/wpa_supplicant/0.5.8/dbus_dict_helpers.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/dbus_dict_helpers.c vendor/wpa_supplicant/0.5.8/dbus_dict_helpers.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/dbus_dict_helpers.h vendor/wpa_supplicant/0.5.8/defconfig (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/defconfig vendor/wpa_supplicant/0.5.8/defs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/defs.h vendor/wpa_supplicant/0.5.8/des.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/des.c vendor/wpa_supplicant/0.5.8/doc/ (props changed) - copied from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/doc/ vendor/wpa_supplicant/0.5.8/driver.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/driver.h vendor/wpa_supplicant/0.5.8/driver_hostap.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/driver_hostap.h vendor/wpa_supplicant/0.5.8/driver_ndis.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/driver_ndis.c vendor/wpa_supplicant/0.5.8/driver_ndis.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/driver_ndis.h vendor/wpa_supplicant/0.5.8/driver_wired.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/driver_wired.c vendor/wpa_supplicant/0.5.8/drivers.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/drivers.c vendor/wpa_supplicant/0.5.8/eap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap.c vendor/wpa_supplicant/0.5.8/eap.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap.h vendor/wpa_supplicant/0.5.8/eap_aka.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_aka.c vendor/wpa_supplicant/0.5.8/eap_defs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_defs.h vendor/wpa_supplicant/0.5.8/eap_fast.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_fast.c vendor/wpa_supplicant/0.5.8/eap_gpsk.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_gpsk.c vendor/wpa_supplicant/0.5.8/eap_gpsk_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_gpsk_common.c vendor/wpa_supplicant/0.5.8/eap_gpsk_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_gpsk_common.h vendor/wpa_supplicant/0.5.8/eap_gtc.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_gtc.c vendor/wpa_supplicant/0.5.8/eap_i.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_i.h vendor/wpa_supplicant/0.5.8/eap_leap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_leap.c vendor/wpa_supplicant/0.5.8/eap_md5.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_md5.c vendor/wpa_supplicant/0.5.8/eap_methods.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_methods.c vendor/wpa_supplicant/0.5.8/eap_methods.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_methods.h vendor/wpa_supplicant/0.5.8/eap_mschapv2.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_mschapv2.c vendor/wpa_supplicant/0.5.8/eap_otp.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_otp.c vendor/wpa_supplicant/0.5.8/eap_pax.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_pax.c vendor/wpa_supplicant/0.5.8/eap_pax_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_pax_common.c vendor/wpa_supplicant/0.5.8/eap_pax_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_pax_common.h vendor/wpa_supplicant/0.5.8/eap_peap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_peap.c vendor/wpa_supplicant/0.5.8/eap_psk.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_psk.c vendor/wpa_supplicant/0.5.8/eap_psk_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_psk_common.c vendor/wpa_supplicant/0.5.8/eap_psk_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_psk_common.h vendor/wpa_supplicant/0.5.8/eap_sake.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_sake.c vendor/wpa_supplicant/0.5.8/eap_sake_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_sake_common.c vendor/wpa_supplicant/0.5.8/eap_sake_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_sake_common.h vendor/wpa_supplicant/0.5.8/eap_sim.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_sim.c vendor/wpa_supplicant/0.5.8/eap_sim_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_sim_common.c vendor/wpa_supplicant/0.5.8/eap_sim_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_sim_common.h vendor/wpa_supplicant/0.5.8/eap_testing.txt (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_testing.txt vendor/wpa_supplicant/0.5.8/eap_tls.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_tls.c vendor/wpa_supplicant/0.5.8/eap_tls_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_tls_common.c vendor/wpa_supplicant/0.5.8/eap_tls_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_tls_common.h vendor/wpa_supplicant/0.5.8/eap_tlv.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_tlv.c vendor/wpa_supplicant/0.5.8/eap_tlv.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_tlv.h vendor/wpa_supplicant/0.5.8/eap_ttls.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_ttls.c vendor/wpa_supplicant/0.5.8/eap_ttls.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_ttls.h vendor/wpa_supplicant/0.5.8/eap_vendor_test.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eap_vendor_test.c vendor/wpa_supplicant/0.5.8/eapol_sm.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eapol_sm.c vendor/wpa_supplicant/0.5.8/eapol_sm.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eapol_sm.h vendor/wpa_supplicant/0.5.8/eapol_test.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eapol_test.c vendor/wpa_supplicant/0.5.8/eloop.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eloop.c vendor/wpa_supplicant/0.5.8/eloop.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eloop.h vendor/wpa_supplicant/0.5.8/eloop_none.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eloop_none.c vendor/wpa_supplicant/0.5.8/eloop_win.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/eloop_win.c vendor/wpa_supplicant/0.5.8/events.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/events.c vendor/wpa_supplicant/0.5.8/examples/ (props changed) - copied from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/examples/ vendor/wpa_supplicant/0.5.8/hostapd.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/hostapd.h vendor/wpa_supplicant/0.5.8/includes.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/includes.h vendor/wpa_supplicant/0.5.8/l2_packet.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/l2_packet.h vendor/wpa_supplicant/0.5.8/libtommath.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/libtommath.c vendor/wpa_supplicant/0.5.8/main.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/main.c vendor/wpa_supplicant/0.5.8/md4.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/md4.c vendor/wpa_supplicant/0.5.8/md5.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/md5.c vendor/wpa_supplicant/0.5.8/md5.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/md5.h vendor/wpa_supplicant/0.5.8/mlme.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/mlme.c vendor/wpa_supplicant/0.5.8/mlme.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/mlme.h vendor/wpa_supplicant/0.5.8/ms_funcs.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/ms_funcs.c vendor/wpa_supplicant/0.5.8/ms_funcs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/ms_funcs.h vendor/wpa_supplicant/0.5.8/nmake.mak (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/nmake.mak vendor/wpa_supplicant/0.5.8/openssl-0.9.8d-tls-extensions.patch (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch vendor/wpa_supplicant/0.5.8/openssl-0.9.8e-tls-extensions.patch (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch vendor/wpa_supplicant/0.5.8/openssl-tls-extensions.patch (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/openssl-tls-extensions.patch vendor/wpa_supplicant/0.5.8/os.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/os.h vendor/wpa_supplicant/0.5.8/os_internal.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/os_internal.c vendor/wpa_supplicant/0.5.8/os_none.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/os_none.c vendor/wpa_supplicant/0.5.8/os_unix.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/os_unix.c vendor/wpa_supplicant/0.5.8/pcsc_funcs.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/pcsc_funcs.c vendor/wpa_supplicant/0.5.8/pcsc_funcs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/pcsc_funcs.h vendor/wpa_supplicant/0.5.8/pmksa_cache.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/pmksa_cache.c vendor/wpa_supplicant/0.5.8/pmksa_cache.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/pmksa_cache.h vendor/wpa_supplicant/0.5.8/preauth.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/preauth.c vendor/wpa_supplicant/0.5.8/preauth.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/preauth.h vendor/wpa_supplicant/0.5.8/preauth_test.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/preauth_test.c vendor/wpa_supplicant/0.5.8/radius.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/radius.c vendor/wpa_supplicant/0.5.8/radius.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/radius.h vendor/wpa_supplicant/0.5.8/radius_client.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/radius_client.c vendor/wpa_supplicant/0.5.8/radius_client.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/radius_client.h vendor/wpa_supplicant/0.5.8/rc4.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/rc4.c vendor/wpa_supplicant/0.5.8/rc4.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/rc4.h vendor/wpa_supplicant/0.5.8/rsa.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/rsa.c vendor/wpa_supplicant/0.5.8/rsa.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/rsa.h vendor/wpa_supplicant/0.5.8/sha1.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/sha1.c vendor/wpa_supplicant/0.5.8/sha1.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/sha1.h vendor/wpa_supplicant/0.5.8/sha256.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/sha256.c vendor/wpa_supplicant/0.5.8/sha256.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/sha256.h vendor/wpa_supplicant/0.5.8/state_machine.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/state_machine.h vendor/wpa_supplicant/0.5.8/tls.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/tls.h vendor/wpa_supplicant/0.5.8/tls_gnutls.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/tls_gnutls.c vendor/wpa_supplicant/0.5.8/tls_internal.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/tls_internal.c vendor/wpa_supplicant/0.5.8/tls_none.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/tls_none.c vendor/wpa_supplicant/0.5.8/tls_openssl.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/tls_openssl.c vendor/wpa_supplicant/0.5.8/tls_schannel.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/tls_schannel.c vendor/wpa_supplicant/0.5.8/tlsv1_client.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/tlsv1_client.c vendor/wpa_supplicant/0.5.8/tlsv1_client.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/tlsv1_client.h vendor/wpa_supplicant/0.5.8/tlsv1_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/tlsv1_common.c vendor/wpa_supplicant/0.5.8/tlsv1_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/tlsv1_common.h vendor/wpa_supplicant/0.5.8/todo.txt (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/todo.txt vendor/wpa_supplicant/0.5.8/version.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/version.h vendor/wpa_supplicant/0.5.8/wpa.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/wpa.c vendor/wpa_supplicant/0.5.8/wpa.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/wpa.h vendor/wpa_supplicant/0.5.8/wpa_cli.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/wpa_cli.c vendor/wpa_supplicant/0.5.8/wpa_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/wpa_common.h vendor/wpa_supplicant/0.5.8/wpa_ctrl.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/wpa_ctrl.c vendor/wpa_supplicant/0.5.8/wpa_ctrl.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/wpa_ctrl.h vendor/wpa_supplicant/0.5.8/wpa_gui/ (props changed) - copied from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/wpa_gui/ vendor/wpa_supplicant/0.5.8/wpa_gui-qt4/ (props changed) - copied from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/wpa_gui-qt4/ vendor/wpa_supplicant/0.5.8/wpa_i.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/wpa_i.h vendor/wpa_supplicant/0.5.8/wpa_passphrase.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/wpa_passphrase.c vendor/wpa_supplicant/0.5.8/wpa_supplicant.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/wpa_supplicant.c vendor/wpa_supplicant/0.5.8/wpa_supplicant.conf (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/wpa_supplicant.conf vendor/wpa_supplicant/0.5.8/wpa_supplicant.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/wpa_supplicant.h vendor/wpa_supplicant/0.5.8/wpa_supplicant_i.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/wpa_supplicant_i.h vendor/wpa_supplicant/0.5.8/x509v3.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/x509v3.c vendor/wpa_supplicant/0.5.8/x509v3.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/0.5.8/contrib/wpa_supplicant/x509v3.h vendor/wpa_supplicant/dist/COPYING (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/COPYING vendor/wpa_supplicant/dist/ChangeLog (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/ChangeLog vendor/wpa_supplicant/dist/FREEBSD-Xlist (contents, props changed) - copied, changed from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/FREEBSD-Xlist vendor/wpa_supplicant/dist/FREEBSD-upgrade (contents, props changed) - copied, changed from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/FREEBSD-upgrade vendor/wpa_supplicant/dist/Makefile (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/Makefile vendor/wpa_supplicant/dist/README (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/README vendor/wpa_supplicant/dist/aes.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/aes.c vendor/wpa_supplicant/dist/aes.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/aes.h vendor/wpa_supplicant/dist/aes_wrap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/aes_wrap.c vendor/wpa_supplicant/dist/aes_wrap.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/aes_wrap.h vendor/wpa_supplicant/dist/asn1.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/asn1.c vendor/wpa_supplicant/dist/asn1.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/asn1.h vendor/wpa_supplicant/dist/asn1_test.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/asn1_test.c vendor/wpa_supplicant/dist/base64.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/base64.c vendor/wpa_supplicant/dist/base64.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/base64.h vendor/wpa_supplicant/dist/bignum.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/bignum.c vendor/wpa_supplicant/dist/bignum.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/bignum.h vendor/wpa_supplicant/dist/build_config.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/build_config.h vendor/wpa_supplicant/dist/common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/common.c vendor/wpa_supplicant/dist/common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/common.h vendor/wpa_supplicant/dist/config.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/config.c vendor/wpa_supplicant/dist/config.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/config.h vendor/wpa_supplicant/dist/config_file.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/config_file.c vendor/wpa_supplicant/dist/config_none.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/config_none.c vendor/wpa_supplicant/dist/config_ssid.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/config_ssid.h vendor/wpa_supplicant/dist/config_types.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/config_types.h vendor/wpa_supplicant/dist/config_winreg.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/config_winreg.c vendor/wpa_supplicant/dist/crypto.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/crypto.c vendor/wpa_supplicant/dist/crypto.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/crypto.h vendor/wpa_supplicant/dist/crypto_cryptoapi.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/crypto_cryptoapi.c vendor/wpa_supplicant/dist/crypto_gnutls.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/crypto_gnutls.c vendor/wpa_supplicant/dist/crypto_internal.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/crypto_internal.c vendor/wpa_supplicant/dist/crypto_libtomcrypt.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/crypto_libtomcrypt.c vendor/wpa_supplicant/dist/crypto_none.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/crypto_none.c vendor/wpa_supplicant/dist/ctrl_iface.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/ctrl_iface.c vendor/wpa_supplicant/dist/ctrl_iface.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/ctrl_iface.h vendor/wpa_supplicant/dist/ctrl_iface_dbus.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/ctrl_iface_dbus.c vendor/wpa_supplicant/dist/ctrl_iface_dbus.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/ctrl_iface_dbus.h vendor/wpa_supplicant/dist/ctrl_iface_dbus_handlers.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c vendor/wpa_supplicant/dist/ctrl_iface_dbus_handlers.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h vendor/wpa_supplicant/dist/ctrl_iface_named_pipe.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/ctrl_iface_named_pipe.c vendor/wpa_supplicant/dist/ctrl_iface_udp.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/ctrl_iface_udp.c vendor/wpa_supplicant/dist/ctrl_iface_unix.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/ctrl_iface_unix.c vendor/wpa_supplicant/dist/dbus-wpa_supplicant.conf (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/dbus-wpa_supplicant.conf vendor/wpa_supplicant/dist/dbus-wpa_supplicant.service (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/dbus-wpa_supplicant.service vendor/wpa_supplicant/dist/dbus_dict_helpers.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/dbus_dict_helpers.c vendor/wpa_supplicant/dist/dbus_dict_helpers.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/dbus_dict_helpers.h vendor/wpa_supplicant/dist/defconfig (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/defconfig vendor/wpa_supplicant/dist/defs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/defs.h vendor/wpa_supplicant/dist/des.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/des.c vendor/wpa_supplicant/dist/developer.txt (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/developer.txt vendor/wpa_supplicant/dist/doc/ (props changed) - copied from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/doc/ vendor/wpa_supplicant/dist/driver.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/driver.h vendor/wpa_supplicant/dist/driver_hostap.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/driver_hostap.h vendor/wpa_supplicant/dist/driver_ndis.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/driver_ndis.c vendor/wpa_supplicant/dist/driver_ndis.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/driver_ndis.h vendor/wpa_supplicant/dist/driver_ndis_.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/driver_ndis_.c vendor/wpa_supplicant/dist/driver_wired.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/driver_wired.c vendor/wpa_supplicant/dist/drivers.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/drivers.c vendor/wpa_supplicant/dist/eap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap.c vendor/wpa_supplicant/dist/eap.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap.h vendor/wpa_supplicant/dist/eap_aka.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_aka.c vendor/wpa_supplicant/dist/eap_defs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_defs.h vendor/wpa_supplicant/dist/eap_fast.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_fast.c vendor/wpa_supplicant/dist/eap_gpsk.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_gpsk.c vendor/wpa_supplicant/dist/eap_gpsk_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_gpsk_common.c vendor/wpa_supplicant/dist/eap_gpsk_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_gpsk_common.h vendor/wpa_supplicant/dist/eap_gtc.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_gtc.c vendor/wpa_supplicant/dist/eap_i.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_i.h vendor/wpa_supplicant/dist/eap_leap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_leap.c vendor/wpa_supplicant/dist/eap_md5.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_md5.c vendor/wpa_supplicant/dist/eap_methods.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_methods.c vendor/wpa_supplicant/dist/eap_methods.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_methods.h vendor/wpa_supplicant/dist/eap_mschapv2.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_mschapv2.c vendor/wpa_supplicant/dist/eap_otp.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_otp.c vendor/wpa_supplicant/dist/eap_pax.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_pax.c vendor/wpa_supplicant/dist/eap_pax_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_pax_common.c vendor/wpa_supplicant/dist/eap_pax_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_pax_common.h vendor/wpa_supplicant/dist/eap_peap.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_peap.c vendor/wpa_supplicant/dist/eap_psk.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_psk.c vendor/wpa_supplicant/dist/eap_psk_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_psk_common.c vendor/wpa_supplicant/dist/eap_psk_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_psk_common.h vendor/wpa_supplicant/dist/eap_sake.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_sake.c vendor/wpa_supplicant/dist/eap_sake_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_sake_common.c vendor/wpa_supplicant/dist/eap_sake_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_sake_common.h vendor/wpa_supplicant/dist/eap_sim.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_sim.c vendor/wpa_supplicant/dist/eap_sim_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_sim_common.c vendor/wpa_supplicant/dist/eap_sim_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_sim_common.h vendor/wpa_supplicant/dist/eap_testing.txt (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_testing.txt vendor/wpa_supplicant/dist/eap_tls.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_tls.c vendor/wpa_supplicant/dist/eap_tls_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_tls_common.c vendor/wpa_supplicant/dist/eap_tls_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_tls_common.h vendor/wpa_supplicant/dist/eap_tlv.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_tlv.c vendor/wpa_supplicant/dist/eap_tlv.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_tlv.h vendor/wpa_supplicant/dist/eap_ttls.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_ttls.c vendor/wpa_supplicant/dist/eap_ttls.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_ttls.h vendor/wpa_supplicant/dist/eap_vendor_test.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eap_vendor_test.c vendor/wpa_supplicant/dist/eapol_sm.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eapol_sm.c vendor/wpa_supplicant/dist/eapol_sm.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eapol_sm.h vendor/wpa_supplicant/dist/eapol_test.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eapol_test.c vendor/wpa_supplicant/dist/eloop.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eloop.c vendor/wpa_supplicant/dist/eloop.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eloop.h vendor/wpa_supplicant/dist/eloop_none.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eloop_none.c vendor/wpa_supplicant/dist/eloop_win.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/eloop_win.c vendor/wpa_supplicant/dist/events.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/events.c vendor/wpa_supplicant/dist/examples/ (props changed) - copied from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/examples/ vendor/wpa_supplicant/dist/hostap_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/hostap_common.h vendor/wpa_supplicant/dist/hostapd.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/hostapd.h vendor/wpa_supplicant/dist/includes.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/includes.h vendor/wpa_supplicant/dist/l2_packet.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/l2_packet.h vendor/wpa_supplicant/dist/libtommath.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/libtommath.c vendor/wpa_supplicant/dist/main.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/main.c vendor/wpa_supplicant/dist/md4.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/md4.c vendor/wpa_supplicant/dist/md5.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/md5.c vendor/wpa_supplicant/dist/md5.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/md5.h vendor/wpa_supplicant/dist/mlme.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/mlme.c vendor/wpa_supplicant/dist/mlme.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/mlme.h vendor/wpa_supplicant/dist/ms_funcs.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/ms_funcs.c vendor/wpa_supplicant/dist/ms_funcs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/ms_funcs.h vendor/wpa_supplicant/dist/nmake.mak (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/nmake.mak vendor/wpa_supplicant/dist/openssl-0.9.8d-tls-extensions.patch (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch vendor/wpa_supplicant/dist/openssl-0.9.8e-tls-extensions.patch (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch vendor/wpa_supplicant/dist/openssl-tls-extensions.patch (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/openssl-tls-extensions.patch vendor/wpa_supplicant/dist/os.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/os.h vendor/wpa_supplicant/dist/os_internal.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/os_internal.c vendor/wpa_supplicant/dist/os_none.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/os_none.c vendor/wpa_supplicant/dist/os_unix.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/os_unix.c vendor/wpa_supplicant/dist/pcsc_funcs.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/pcsc_funcs.c vendor/wpa_supplicant/dist/pcsc_funcs.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/pcsc_funcs.h vendor/wpa_supplicant/dist/pmksa_cache.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/pmksa_cache.c vendor/wpa_supplicant/dist/pmksa_cache.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/pmksa_cache.h vendor/wpa_supplicant/dist/preauth.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/preauth.c vendor/wpa_supplicant/dist/preauth.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/preauth.h vendor/wpa_supplicant/dist/preauth_test.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/preauth_test.c vendor/wpa_supplicant/dist/radius.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/radius.c vendor/wpa_supplicant/dist/radius.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/radius.h vendor/wpa_supplicant/dist/radius_client.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/radius_client.c vendor/wpa_supplicant/dist/radius_client.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/radius_client.h vendor/wpa_supplicant/dist/rc4.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/rc4.c vendor/wpa_supplicant/dist/rc4.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/rc4.h vendor/wpa_supplicant/dist/rsa.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/rsa.c vendor/wpa_supplicant/dist/rsa.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/rsa.h vendor/wpa_supplicant/dist/sha1.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/sha1.c vendor/wpa_supplicant/dist/sha1.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/sha1.h vendor/wpa_supplicant/dist/sha256.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/sha256.c vendor/wpa_supplicant/dist/sha256.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/sha256.h vendor/wpa_supplicant/dist/state_machine.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/state_machine.h vendor/wpa_supplicant/dist/tests/ (props changed) - copied from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/tests/ vendor/wpa_supplicant/dist/tls.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/tls.h vendor/wpa_supplicant/dist/tls_gnutls.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/tls_gnutls.c vendor/wpa_supplicant/dist/tls_internal.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/tls_internal.c vendor/wpa_supplicant/dist/tls_none.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/tls_none.c vendor/wpa_supplicant/dist/tls_openssl.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/tls_openssl.c vendor/wpa_supplicant/dist/tls_schannel.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/tls_schannel.c vendor/wpa_supplicant/dist/tlsv1_client.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/tlsv1_client.c vendor/wpa_supplicant/dist/tlsv1_client.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/tlsv1_client.h vendor/wpa_supplicant/dist/tlsv1_common.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/tlsv1_common.c vendor/wpa_supplicant/dist/tlsv1_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/tlsv1_common.h vendor/wpa_supplicant/dist/todo.txt (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/todo.txt vendor/wpa_supplicant/dist/version.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/version.h vendor/wpa_supplicant/dist/wpa.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/wpa.c vendor/wpa_supplicant/dist/wpa.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/wpa.h vendor/wpa_supplicant/dist/wpa_cli.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/wpa_cli.c vendor/wpa_supplicant/dist/wpa_common.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/wpa_common.h vendor/wpa_supplicant/dist/wpa_ctrl.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/wpa_ctrl.c vendor/wpa_supplicant/dist/wpa_ctrl.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/wpa_ctrl.h vendor/wpa_supplicant/dist/wpa_gui/ (props changed) - copied from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/wpa_gui/ vendor/wpa_supplicant/dist/wpa_gui-qt4/ (props changed) - copied from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/wpa_gui-qt4/ vendor/wpa_supplicant/dist/wpa_i.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/wpa_i.h vendor/wpa_supplicant/dist/wpa_passphrase.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/wpa_passphrase.c vendor/wpa_supplicant/dist/wpa_supplicant.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/wpa_supplicant.c vendor/wpa_supplicant/dist/wpa_supplicant.conf (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/wpa_supplicant.conf vendor/wpa_supplicant/dist/wpa_supplicant.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/wpa_supplicant.h vendor/wpa_supplicant/dist/wpa_supplicant_i.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/wpa_supplicant_i.h vendor/wpa_supplicant/dist/x509v3.c (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/x509v3.c vendor/wpa_supplicant/dist/x509v3.h (props changed) - copied unchanged from r187255, vendor/wpa_supplicant/dist/contrib/wpa_supplicant/x509v3.h Deleted: vendor/wpa_supplicant/0.3-latest/contrib/ vendor/wpa_supplicant/0.3.8/contrib/ vendor/wpa_supplicant/0.3.9/contrib/ vendor/wpa_supplicant/0.4.8/contrib/ vendor/wpa_supplicant/0.5.8/contrib/ vendor/wpa_supplicant/dist/contrib/ Modified: vendor/wpa_supplicant/dist/doc/code_structure.doxygen (props changed) vendor/wpa_supplicant/dist/doc/ctrl_iface.doxygen (props changed) vendor/wpa_supplicant/dist/doc/docbook/Makefile (props changed) vendor/wpa_supplicant/dist/doc/docbook/wpa_background.8 (props changed) vendor/wpa_supplicant/dist/doc/docbook/wpa_background.sgml (props changed) vendor/wpa_supplicant/dist/doc/docbook/wpa_cli.8 (props changed) vendor/wpa_supplicant/dist/doc/docbook/wpa_cli.sgml (props changed) vendor/wpa_supplicant/dist/doc/docbook/wpa_passphrase.8 (props changed) vendor/wpa_supplicant/dist/doc/docbook/wpa_passphrase.sgml (props changed) vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.8 (props changed) vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.conf.5 (props changed) vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.conf.sgml (props changed) vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.sgml (props changed) vendor/wpa_supplicant/dist/doc/doxygen.fast (props changed) vendor/wpa_supplicant/dist/doc/doxygen.full (props changed) vendor/wpa_supplicant/dist/doc/driver_wrapper.doxygen (props changed) vendor/wpa_supplicant/dist/doc/eap.doxygen (props changed) vendor/wpa_supplicant/dist/doc/kerneldoc2doxygen.pl (props changed) vendor/wpa_supplicant/dist/doc/mainpage.doxygen (props changed) vendor/wpa_supplicant/dist/doc/porting.doxygen (props changed) vendor/wpa_supplicant/dist/doc/testing_tools.doxygen (props changed) vendor/wpa_supplicant/dist/doc/wpa_supplicant.fig (props changed) vendor/wpa_supplicant/dist/examples/ieee8021x.conf (props changed) vendor/wpa_supplicant/dist/examples/plaintext.conf (props changed) vendor/wpa_supplicant/dist/examples/wep.conf (props changed) vendor/wpa_supplicant/dist/examples/wpa-psk-tkip.conf (props changed) vendor/wpa_supplicant/dist/examples/wpa2-eap-ccmp.conf (props changed) vendor/wpa_supplicant/dist/tests/test_aes.c (props changed) vendor/wpa_supplicant/dist/tests/test_eap_sim_common.c (props changed) vendor/wpa_supplicant/dist/tests/test_md4.c (props changed) vendor/wpa_supplicant/dist/tests/test_md5.c (props changed) vendor/wpa_supplicant/dist/tests/test_ms_funcs.c (props changed) vendor/wpa_supplicant/dist/tests/test_sha1.c (props changed) vendor/wpa_supplicant/dist/tests/test_sha256.c (props changed) vendor/wpa_supplicant/dist/tests/test_x509v3.c (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/eventhistory.cpp (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/eventhistory.h (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/eventhistory.ui (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/eventhistory.ui.h (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/main.cpp (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/networkconfig.cpp (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/networkconfig.h (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/networkconfig.ui (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/networkconfig.ui.h (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/scanresults.cpp (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/scanresults.h (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/scanresults.ui (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/scanresults.ui.h (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/setup-mingw-cross-compiling (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/userdatarequest.cpp (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/userdatarequest.h (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/userdatarequest.ui (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/userdatarequest.ui.h (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/wpa_gui.pro (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/wpagui.cpp (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/wpagui.h (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/wpagui.ui (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/wpagui.ui.h (props changed) vendor/wpa_supplicant/dist/wpa_gui-qt4/wpamsg.h (props changed) vendor/wpa_supplicant/dist/wpa_gui/eventhistory.ui (props changed) vendor/wpa_supplicant/dist/wpa_gui/eventhistory.ui.h (props changed) vendor/wpa_supplicant/dist/wpa_gui/main.cpp (props changed) vendor/wpa_supplicant/dist/wpa_gui/networkconfig.ui (props changed) vendor/wpa_supplicant/dist/wpa_gui/networkconfig.ui.h (props changed) vendor/wpa_supplicant/dist/wpa_gui/scanresults.ui (props changed) vendor/wpa_supplicant/dist/wpa_gui/scanresults.ui.h (props changed) vendor/wpa_supplicant/dist/wpa_gui/setup-mingw-cross-compiling (props changed) vendor/wpa_supplicant/dist/wpa_gui/userdatarequest.ui (props changed) vendor/wpa_supplicant/dist/wpa_gui/userdatarequest.ui.h (props changed) vendor/wpa_supplicant/dist/wpa_gui/wpa_gui.pro (props changed) vendor/wpa_supplicant/dist/wpa_gui/wpagui.ui (props changed) vendor/wpa_supplicant/dist/wpa_gui/wpagui.ui.h (props changed) vendor/wpa_supplicant/dist/wpa_gui/wpamsg.h (props changed) Copied: vendor/wpa_supplicant/0.3-latest/driver_ndis.c (from r187255, vendor/wpa_supplicant/0.3-latest/contrib/wpa_supplicant/driver_ndis.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/wpa_supplicant/0.3-latest/driver_ndis.c Thu Jan 15 02:11:43 2009 (r187258, copy of r187255, vendor/wpa_supplicant/0.3-latest/contrib/wpa_supplicant/driver_ndis.c) @@ -0,0 +1,1589 @@ +/* + * WPA Supplicant - Windows/NDIS driver interface + * Copyright (c) 2004-2005, Jouni Malinen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Alternatively, this software may be distributed under the terms of BSD + * license. + * + * See README and COPYING for more details. + */ + +#include +#include +#include +#include +#include +#include + +#include "common.h" +#include "driver.h" +#include "wpa_supplicant.h" +#include "l2_packet.h" +#include "eloop.h" +#include "wpa.h" +#include "driver_ndis.h" + +int wpa_driver_register_event_cb(struct wpa_driver_ndis_data *drv); + +static void wpa_driver_ndis_poll(void *drv); + + +/* FIX: to be removed once this can be compiled with the complete NDIS + * header files */ +#ifndef OID_802_11_BSSID +#define OID_802_11_BSSID 0x0d010101 +#define OID_802_11_SSID 0x0d010102 +#define OID_802_11_INFRASTRUCTURE_MODE 0x0d010108 +#define OID_802_11_ADD_WEP 0x0D010113 +#define OID_802_11_REMOVE_WEP 0x0D010114 +#define OID_802_11_DISASSOCIATE 0x0D010115 +#define OID_802_11_BSSID_LIST 0x0d010217 +#define OID_802_11_AUTHENTICATION_MODE 0x0d010118 +#define OID_802_11_PRIVACY_FILTER 0x0d010119 +#define OID_802_11_BSSID_LIST_SCAN 0x0d01011A +#define OID_802_11_WEP_STATUS 0x0d01011B +#define OID_802_11_ENCRYPTION_STATUS OID_802_11_WEP_STATUS +#define OID_802_11_ADD_KEY 0x0d01011D +#define OID_802_11_REMOVE_KEY 0x0d01011E +#define OID_802_11_ASSOCIATION_INFORMATION 0x0d01011F +#define OID_802_11_TEST 0x0d010120 +#define OID_802_11_CAPABILITY 0x0d010122 +#define OID_802_11_PMKID 0x0d010123 + +#define NDIS_802_11_LENGTH_SSID 32 +#define NDIS_802_11_LENGTH_RATES 8 +#define NDIS_802_11_LENGTH_RATES_EX 16 + +typedef UCHAR NDIS_802_11_MAC_ADDRESS[6]; + +typedef struct NDIS_802_11_SSID { + ULONG SsidLength; + UCHAR Ssid[NDIS_802_11_LENGTH_SSID]; +} NDIS_802_11_SSID; + +typedef LONG NDIS_802_11_RSSI; + +typedef enum NDIS_802_11_NETWORK_TYPE { + Ndis802_11FH, + Ndis802_11DS, + Ndis802_11OFDM5, + Ndis802_11OFDM24, + Ndis802_11NetworkTypeMax +} NDIS_802_11_NETWORK_TYPE; + +typedef struct NDIS_802_11_CONFIGURATION_FH { + ULONG Length; + ULONG HopPattern; + ULONG HopSet; + ULONG DwellTime; +} NDIS_802_11_CONFIGURATION_FH; + +typedef struct NDIS_802_11_CONFIGURATION { + ULONG Length; + ULONG BeaconPeriod; + ULONG ATIMWindow; + ULONG DSConfig; + NDIS_802_11_CONFIGURATION_FH FHConfig; +} NDIS_802_11_CONFIGURATION; + +typedef enum NDIS_802_11_NETWORK_INFRASTRUCTURE { + Ndis802_11IBSS, + Ndis802_11Infrastructure, + Ndis802_11AutoUnknown, + Ndis802_11InfrastructureMax +} NDIS_802_11_NETWORK_INFRASTRUCTURE; + +typedef enum NDIS_802_11_AUTHENTICATION_MODE { + Ndis802_11AuthModeOpen, + Ndis802_11AuthModeShared, + Ndis802_11AuthModeAutoSwitch, + Ndis802_11AuthModeWPA, + Ndis802_11AuthModeWPAPSK, + Ndis802_11AuthModeWPANone, + Ndis802_11AuthModeWPA2, + Ndis802_11AuthModeWPA2PSK, + Ndis802_11AuthModeMax +} NDIS_802_11_AUTHENTICATION_MODE; + +typedef enum NDIS_802_11_WEP_STATUS { + Ndis802_11WEPEnabled, + Ndis802_11Encryption1Enabled = Ndis802_11WEPEnabled, + Ndis802_11WEPDisabled, + Ndis802_11EncryptionDisabled = Ndis802_11WEPDisabled, + Ndis802_11WEPKeyAbsent, + Ndis802_11Encryption1KeyAbsent = Ndis802_11WEPKeyAbsent, + Ndis802_11WEPNotSupported, + Ndis802_11EncryptionNotSupported = Ndis802_11WEPNotSupported, + Ndis802_11Encryption2Enabled, + Ndis802_11Encryption2KeyAbsent, + Ndis802_11Encryption3Enabled, + Ndis802_11Encryption3KeyAbsent +} NDIS_802_11_WEP_STATUS, NDIS_802_11_ENCRYPTION_STATUS; + +typedef enum NDIS_802_11_PRIVACY_FILTER { + Ndis802_11PrivFilterAcceptAll, + Ndis802_11PrivFilter8021xWEP +} NDIS_802_11_PRIVACY_FILTER; + +typedef UCHAR NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES]; +typedef UCHAR NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX]; + +typedef struct NDIS_WLAN_BSSID_EX { + ULONG Length; + NDIS_802_11_MAC_ADDRESS MacAddress; /* BSSID */ + UCHAR Reserved[2]; + NDIS_802_11_SSID Ssid; + ULONG Privacy; + NDIS_802_11_RSSI Rssi; + NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; + NDIS_802_11_CONFIGURATION Configuration; + NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; + NDIS_802_11_RATES_EX SupportedRates; + ULONG IELength; + UCHAR IEs[1]; +} NDIS_WLAN_BSSID_EX; + +typedef struct NDIS_802_11_BSSID_LIST_EX { + ULONG NumberOfItems; + NDIS_WLAN_BSSID_EX Bssid[1]; +} NDIS_802_11_BSSID_LIST_EX; + +typedef struct NDIS_802_11_FIXED_IEs { + UCHAR Timestamp[8]; + USHORT BeaconInterval; + USHORT Capabilities; +} NDIS_802_11_FIXED_IEs; + +typedef struct NDIS_802_11_WEP { + ULONG Length; + ULONG KeyIndex; + ULONG KeyLength; + UCHAR KeyMaterial[1]; +} NDIS_802_11_WEP; + +typedef ULONG NDIS_802_11_KEY_INDEX; +typedef ULONGLONG NDIS_802_11_KEY_RSC; + +typedef struct NDIS_802_11_KEY { + ULONG Length; + ULONG KeyIndex; + ULONG KeyLength; + NDIS_802_11_MAC_ADDRESS BSSID; + NDIS_802_11_KEY_RSC KeyRSC; + UCHAR KeyMaterial[1]; +} NDIS_802_11_KEY; + +typedef struct NDIS_802_11_REMOVE_KEY { + ULONG Length; + ULONG KeyIndex; + NDIS_802_11_MAC_ADDRESS BSSID; +} NDIS_802_11_REMOVE_KEY; + +typedef struct NDIS_802_11_AI_REQFI { + USHORT Capabilities; + USHORT ListenInterval; + NDIS_802_11_MAC_ADDRESS CurrentAPAddress; +} NDIS_802_11_AI_REQFI; + +typedef struct NDIS_802_11_AI_RESFI { + USHORT Capabilities; + USHORT StatusCode; + USHORT AssociationId; +} NDIS_802_11_AI_RESFI; + +typedef struct NDIS_802_11_ASSOCIATION_INFORMATION { + ULONG Length; + USHORT AvailableRequestFixedIEs; + NDIS_802_11_AI_REQFI RequestFixedIEs; + ULONG RequestIELength; + ULONG OffsetRequestIEs; + USHORT AvailableResponseFixedIEs; + NDIS_802_11_AI_RESFI ResponseFixedIEs; + ULONG ResponseIELength; + ULONG OffsetResponseIEs; +} NDIS_802_11_ASSOCIATION_INFORMATION; + +typedef struct NDIS_802_11_AUTHENTICATION_ENCRYPTION { + NDIS_802_11_AUTHENTICATION_MODE AuthModeSupported; + NDIS_802_11_ENCRYPTION_STATUS EncryptStatusSupported; +} NDIS_802_11_AUTHENTICATION_ENCRYPTION; + +typedef struct NDIS_802_11_CAPABILITY { + ULONG Length; + ULONG Version; + ULONG NoOfPMKIDs; + ULONG NoOfAuthEncryptPairSupported; + NDIS_802_11_AUTHENTICATION_ENCRYPTION + AuthenticationEncryptionSupported[1]; +} NDIS_802_11_CAPABILITY; + +typedef UCHAR NDIS_802_11_PMKID_VALUE[16]; + +typedef struct BSSID_INFO { + NDIS_802_11_MAC_ADDRESS BSSID; + NDIS_802_11_PMKID_VALUE PMKID; +} BSSID_INFO; + +typedef struct NDIS_802_11_PMKID { + ULONG Length; + ULONG BSSIDInfoCount; + BSSID_INFO BSSIDInfo[1]; +} NDIS_802_11_PMKID; + +typedef enum NDIS_802_11_STATUS_TYPE { + Ndis802_11StatusType_Authentication, + Ndis802_11StatusType_PMKID_CandidateList = 2, + Ndis802_11StatusTypeMax +} NDIS_802_11_STATUS_TYPE; + +typedef struct NDIS_802_11_STATUS_INDICATION { + NDIS_802_11_STATUS_TYPE StatusType; +} NDIS_802_11_STATUS_INDICATION; + +typedef struct PMKID_CANDIDATE { + NDIS_802_11_MAC_ADDRESS BSSID; + ULONG Flags; +} PMKID_CANDIDATE; + +#define NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED 0x01 + +typedef struct NDIS_802_11_PMKID_CANDIDATE_LIST { + ULONG Version; + ULONG NumCandidates; + PMKID_CANDIDATE CandidateList[1]; +} NDIS_802_11_PMKID_CANDIDATE_LIST; + +typedef struct NDIS_802_11_AUTHENTICATION_REQUEST { + ULONG Length; + NDIS_802_11_MAC_ADDRESS Bssid; + ULONG Flags; +} NDIS_802_11_AUTHENTICATION_REQUEST; + +#define NDIS_802_11_AUTH_REQUEST_REAUTH 0x01 +#define NDIS_802_11_AUTH_REQUEST_KEYUPDATE 0x02 +#define NDIS_802_11_AUTH_REQUEST_PAIRWISE_ERROR 0x06 +#define NDIS_802_11_AUTH_REQUEST_GROUP_ERROR 0x0E + +#endif + + +static int ndis_get_oid(struct wpa_driver_ndis_data *drv, unsigned int oid, + char *data, int len) +{ + char *buf; + PACKET_OID_DATA *o; + int ret; + + buf = malloc(sizeof(*o) + len); + if (buf == NULL) + return -1; + memset(buf, 0, sizeof(*o) + len); + o = (PACKET_OID_DATA *) buf; + o->Oid = oid; + o->Length = len; + + if (!PacketRequest(drv->adapter, FALSE, o)) { + wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%d) failed", + __func__, oid, len); + free(buf); + return -1; + } + if (o->Length > len) { + wpa_printf(MSG_DEBUG, "%s: oid=0x%x Length (%d) > len (%d)", + __func__, oid, (unsigned int) o->Length, len); + free(buf); + return -1; + } + memcpy(data, o->Data, o->Length); + ret = o->Length; + free(buf); + return ret; +} + + +static int ndis_set_oid(struct wpa_driver_ndis_data *drv, unsigned int oid, + char *data, int len) +{ + char *buf; + PACKET_OID_DATA *o; + + buf = malloc(sizeof(*o) + len); + if (buf == NULL) + return -1; + memset(buf, 0, sizeof(*o) + len); + o = (PACKET_OID_DATA *) buf; + o->Oid = oid; + o->Length = len; + if (data) + memcpy(o->Data, data, len); + + if (!PacketRequest(drv->adapter, TRUE, o)) { + wpa_printf(MSG_DEBUG, "%s: oid=0x%x len (%d) failed", + __func__, oid, len); + free(buf); + return -1; + } + free(buf); + return 0; +} + + +static int ndis_set_auth_mode(struct wpa_driver_ndis_data *drv, int mode) +{ + u32 auth_mode = mode; + if (ndis_set_oid(drv, OID_802_11_AUTHENTICATION_MODE, + (char *) &auth_mode, sizeof(auth_mode)) < 0) { + wpa_printf(MSG_DEBUG, "NDIS: Failed to set " + "OID_802_11_AUTHENTICATION_MODE (%d)", + (int) auth_mode); + return -1; + } + return 0; +} + + +static int ndis_get_auth_mode(struct wpa_driver_ndis_data *drv) +{ + u32 auth_mode; + int res; + res = ndis_get_oid(drv, OID_802_11_AUTHENTICATION_MODE, + (char *) &auth_mode, sizeof(auth_mode)); + if (res != sizeof(auth_mode)) { + wpa_printf(MSG_DEBUG, "NDIS: Failed to get " + "OID_802_11_AUTHENTICATION_MODE"); + return -1; + } + return auth_mode; +} + + +static int ndis_set_encr_status(struct wpa_driver_ndis_data *drv, int encr) +{ + u32 encr_status = encr; + if (ndis_set_oid(drv, OID_802_11_ENCRYPTION_STATUS, + (char *) &encr_status, sizeof(encr_status)) < 0) { + wpa_printf(MSG_DEBUG, "NDIS: Failed to set " + "OID_802_11_ENCRYPTION_STATUS (%d)", encr); + return -1; + } + return 0; +} + + +static int ndis_get_encr_status(struct wpa_driver_ndis_data *drv) +{ + u32 encr; + int res; + res = ndis_get_oid(drv, OID_802_11_ENCRYPTION_STATUS, + (char *) &encr, sizeof(encr)); + if (res != sizeof(encr)) { + wpa_printf(MSG_DEBUG, "NDIS: Failed to get " + "OID_802_11_ENCRYPTION_STATUS"); + return -1; + } + return encr; +} + + +static int wpa_driver_ndis_get_bssid(void *priv, u8 *bssid) +{ + struct wpa_driver_ndis_data *drv = priv; + + return ndis_get_oid(drv, OID_802_11_BSSID, bssid, ETH_ALEN) < 0 ? + -1 : 0; +} + + + +static int wpa_driver_ndis_get_ssid(void *priv, u8 *ssid) +{ + struct wpa_driver_ndis_data *drv = priv; + NDIS_802_11_SSID buf; + int res; + + res = ndis_get_oid(drv, OID_802_11_SSID, (char *) &buf, sizeof(buf)); + if (!res) { + wpa_printf(MSG_DEBUG, "NDIS: Failed to get SSID"); + return -1; + } + memcpy(ssid, buf.Ssid, buf.SsidLength); + return buf.SsidLength; +} + + +static int wpa_driver_ndis_set_ssid(struct wpa_driver_ndis_data *drv, + const u8 *ssid, size_t ssid_len) +{ + NDIS_802_11_SSID buf; + + memset(&buf, 0, sizeof(buf)); + buf.SsidLength = ssid_len; + memcpy(buf.Ssid, ssid, ssid_len); + return ndis_set_oid(drv, OID_802_11_SSID, (char *) &buf, sizeof(buf)); +} + + +/* Disconnect using OID_802_11_DISASSOCIATE. This will also turn the radio off. + */ +static int wpa_driver_ndis_radio_off(struct wpa_driver_ndis_data *drv) +{ + drv->radio_enabled = 0; + return ndis_set_oid(drv, OID_802_11_DISASSOCIATE, " ", 4); +} + + +/* Disconnect by setting SSID to random (i.e., likely not used). */ +static int wpa_driver_ndis_disconnect(struct wpa_driver_ndis_data *drv) +{ + char ssid[32]; + int i; + for (i = 0; i < 32; i++) + ssid[i] = rand() & 0xff; + return wpa_driver_ndis_set_ssid(drv, ssid, 32); +} + + +static int wpa_driver_ndis_deauthenticate(void *priv, const u8 *addr, + int reason_code) +{ + struct wpa_driver_ndis_data *drv = priv; + return wpa_driver_ndis_disconnect(drv); +} + + +static int wpa_driver_ndis_disassociate(void *priv, const u8 *addr, + int reason_code) +{ + struct wpa_driver_ndis_data *drv = priv; + return wpa_driver_ndis_disconnect(drv); +} + + +static int wpa_driver_ndis_set_wpa(void *priv, int enabled) +{ + wpa_printf(MSG_DEBUG, "%s: enabled=%d", __func__, enabled); + return 0; +} + + +static void wpa_driver_ndis_scan_timeout(void *eloop_ctx, void *timeout_ctx) +{ + wpa_printf(MSG_DEBUG, "Scan timeout - try to get results"); + wpa_supplicant_event(timeout_ctx, EVENT_SCAN_RESULTS, NULL); +} + + +static int wpa_driver_ndis_scan(void *priv, const u8 *ssid, size_t ssid_len) +{ + struct wpa_driver_ndis_data *drv = priv; + int res; + + if (!drv->radio_enabled) { + wpa_printf(MSG_DEBUG, "NDIS: turning radio on before the first" + " scan"); + if (wpa_driver_ndis_disconnect(drv) < 0) { + wpa_printf(MSG_DEBUG, "NDIS: failed to enable radio"); + } + drv->radio_enabled = 1; + } + + res = ndis_set_oid(drv, OID_802_11_BSSID_LIST_SCAN, " ", 4); + eloop_register_timeout(3, 0, wpa_driver_ndis_scan_timeout, drv, + drv->ctx); + return res; +} + + +static void wpa_driver_ndis_get_ies(struct wpa_scan_result *res, u8 *ie, + size_t ie_len) +{ + u8 *pos = ie; + u8 *end = ie + ie_len; + + if (ie_len < sizeof(NDIS_802_11_FIXED_IEs)) + return; + + pos += sizeof(NDIS_802_11_FIXED_IEs); + /* wpa_hexdump(MSG_MSGDUMP, "IEs", pos, end - pos); */ + while (pos + 1 < end && pos + 2 + pos[1] <= end) { + u8 ielen = 2 + pos[1]; + if (ielen > SSID_MAX_WPA_IE_LEN) { + pos += ielen; + continue; + } + if (pos[0] == GENERIC_INFO_ELEM && pos[1] >= 4 && + memcmp(pos + 2, "\x00\x50\xf2\x01", 4) == 0) { + memcpy(res->wpa_ie, pos, ielen); + res->wpa_ie_len = ielen; + } else if (pos[0] == RSN_INFO_ELEM) { + memcpy(res->rsn_ie, pos, ielen); + res->rsn_ie_len = ielen; + } + pos += ielen; + } +} + + +static int wpa_driver_ndis_get_scan_results(void *priv, + struct wpa_scan_result *results, + size_t max_size) +{ + struct wpa_driver_ndis_data *drv = priv; + NDIS_802_11_BSSID_LIST_EX *b; + size_t blen; + int len, count, i, j; + char *pos; + + blen = 65535; + b = malloc(blen); + if (b == NULL) + return -1; + memset(b, 0, blen); + len = ndis_get_oid(drv, OID_802_11_BSSID_LIST, (char *) b, blen); + if (len < 0) { + wpa_printf(MSG_DEBUG, "NDIS: failed to get scan results"); + free(b); + return -1; + } + count = b->NumberOfItems; + + if (count > max_size) + count = max_size; + + memset(results, 0, max_size * sizeof(struct wpa_scan_result)); + pos = (char *) &b->Bssid[0]; + for (i = 0; i < count; i++) { + NDIS_WLAN_BSSID_EX *bss = (NDIS_WLAN_BSSID_EX *) pos; + memcpy(results[i].bssid, bss->MacAddress, ETH_ALEN); + memcpy(results[i].ssid, bss->Ssid.Ssid, bss->Ssid.SsidLength); + results[i].ssid_len = bss->Ssid.SsidLength; + if (bss->Privacy) + results[i].caps = 1; /* FIX? */ + results[i].level = (int) bss->Rssi; + results[i].freq = bss->Configuration.DSConfig / 1000; + for (j = 0; j < sizeof(bss->SupportedRates); j++) { + if ((bss->SupportedRates[j] & 0x7f) > + results[i].maxrate) { + results[i].maxrate = + bss->SupportedRates[j] & 0x7f; + } + } + wpa_driver_ndis_get_ies(&results[i], bss->IEs, bss->IELength); + pos += bss->Length; + } + + free(b); + return count; +} + + +static int wpa_driver_ndis_remove_key(struct wpa_driver_ndis_data *drv, + int key_idx, const u8 *addr, + const u8 *bssid, int pairwise) +{ + NDIS_802_11_REMOVE_KEY rkey; + NDIS_802_11_KEY_INDEX index; + int res, res2; + + memset(&rkey, 0, sizeof(rkey)); + + rkey.Length = sizeof(rkey); + rkey.KeyIndex = key_idx; + if (pairwise) + rkey.KeyIndex |= 1 << 30; + memcpy(rkey.BSSID, bssid, ETH_ALEN); + + res = ndis_set_oid(drv, OID_802_11_REMOVE_KEY, (char *) &rkey, + sizeof(rkey)); + if (!pairwise) { + res2 = ndis_set_oid(drv, OID_802_11_REMOVE_WEP, + (char *) &index, sizeof(index)); + } else + res2 = 0; + + if (res < 0 && res2 < 0) + return res; + return 0; +} + + +static int wpa_driver_ndis_add_wep(struct wpa_driver_ndis_data *drv, + int pairwise, int key_idx, int set_tx, + const u8 *key, size_t key_len) +{ + NDIS_802_11_WEP *wep; + size_t len; + int res; + + len = 12 + key_len; + wep = malloc(len); + if (wep == NULL) + return -1; + memset(wep, 0, len); + wep->Length = len; + wep->KeyIndex = key_idx; + if (set_tx) + wep->KeyIndex |= 1 << 31; +#if 0 /* Setting bit30 does not seem to work with some NDIS drivers */ + if (pairwise) + wep->KeyIndex |= 1 << 30; +#endif + wep->KeyLength = key_len; + memcpy(wep->KeyMaterial, key, key_len); + + wpa_hexdump_key(MSG_MSGDUMP, "NDIS: OIS_802_11_ADD_WEP", + (char *) wep, len); + res = ndis_set_oid(drv, OID_802_11_ADD_WEP, (char *) wep, len); + + free(wep); + + return res; +} + +static int wpa_driver_ndis_set_key(void *priv, wpa_alg alg, const u8 *addr, + int key_idx, int set_tx, + const u8 *seq, size_t seq_len, + const u8 *key, size_t key_len) +{ + struct wpa_driver_ndis_data *drv = priv; + size_t len; + NDIS_802_11_KEY *nkey; + int i, res, pairwise; + u8 bssid[ETH_ALEN]; + + if (addr == NULL || memcmp(addr, "\xff\xff\xff\xff\xff\xff", + ETH_ALEN) == 0) { + /* Group Key */ + pairwise = 0; + wpa_driver_ndis_get_bssid(drv, bssid); + } else { + /* Pairwise Key */ + pairwise = 1; + memcpy(bssid, addr, ETH_ALEN); + } + + if (alg == WPA_ALG_NONE || key_len == 0) { + return wpa_driver_ndis_remove_key(drv, key_idx, addr, bssid, + pairwise); + } + + if (alg == WPA_ALG_WEP) { + return wpa_driver_ndis_add_wep(drv, pairwise, key_idx, set_tx, + key, key_len); + } + + len = 12 + 6 + 6 + 8 + key_len; + + nkey = malloc(len); + if (nkey == NULL) + return -1; + memset(nkey, 0, len); + + nkey->Length = len; + nkey->KeyIndex = key_idx; + if (set_tx) + nkey->KeyIndex |= 1 << 31; + if (pairwise) + nkey->KeyIndex |= 1 << 30; + if (seq && seq_len) + nkey->KeyIndex |= 1 << 29; + nkey->KeyLength = key_len; + memcpy(nkey->BSSID, bssid, ETH_ALEN); + if (seq && seq_len) { + for (i = 0; i < seq_len; i++) + nkey->KeyRSC |= seq[i] << (i * 8); + } + if (alg == WPA_ALG_TKIP && key_len == 32) { + memcpy(nkey->KeyMaterial, key, 16); + memcpy(nkey->KeyMaterial + 16, key + 24, 8); + memcpy(nkey->KeyMaterial + 24, key + 16, 8); + } else { + memcpy(nkey->KeyMaterial, key, key_len); + } + + wpa_hexdump_key(MSG_MSGDUMP, "NDIS: OIS_802_11_ADD_KEY", + (char *) nkey, len); + res = ndis_set_oid(drv, OID_802_11_ADD_KEY, (char *) nkey, len); + free(nkey); + + return res; +} + + +static int +wpa_driver_ndis_associate(void *priv, + struct wpa_driver_associate_params *params) +{ + struct wpa_driver_ndis_data *drv = priv; + u32 auth_mode, encr, priv_mode, mode; + + /* Note: Setting OID_802_11_INFRASTRUCTURE_MODE clears current keys, + * so static WEP keys needs to be set again after this. */ + if (params->mode == IEEE80211_MODE_IBSS) + mode = Ndis802_11IBSS; + else + mode = Ndis802_11Infrastructure; + if (ndis_set_oid(drv, OID_802_11_INFRASTRUCTURE_MODE, + (char *) &mode, sizeof(mode)) < 0) { + wpa_printf(MSG_DEBUG, "NDIS: Failed to set " + "OID_802_11_INFRASTRUCTURE_MODE (%d)", + (int) mode); + /* Try to continue anyway */ + } + + if (params->wpa_ie == NULL || params->wpa_ie_len == 0) { + if (params->auth_alg & AUTH_ALG_SHARED_KEY) { + if (params->auth_alg & AUTH_ALG_OPEN_SYSTEM) + auth_mode = Ndis802_11AuthModeAutoSwitch; + else + auth_mode = Ndis802_11AuthModeShared; + } else + auth_mode = Ndis802_11AuthModeOpen; + priv_mode = Ndis802_11PrivFilterAcceptAll; + } else if (params->wpa_ie[0] == RSN_INFO_ELEM) { + priv_mode = Ndis802_11PrivFilter8021xWEP; + if (params->key_mgmt_suite == KEY_MGMT_PSK) + auth_mode = Ndis802_11AuthModeWPA2PSK; + else + auth_mode = Ndis802_11AuthModeWPA2; + } else { + priv_mode = Ndis802_11PrivFilter8021xWEP; + if (params->key_mgmt_suite == KEY_MGMT_WPA_NONE) + auth_mode = Ndis802_11AuthModeWPANone; + else if (params->key_mgmt_suite == KEY_MGMT_PSK) + auth_mode = Ndis802_11AuthModeWPAPSK; + else + auth_mode = Ndis802_11AuthModeWPA; + } + + switch (params->pairwise_suite) { + case CIPHER_CCMP: + encr = Ndis802_11Encryption3Enabled; + break; + case CIPHER_TKIP: + encr = Ndis802_11Encryption2Enabled; + break; + case CIPHER_WEP40: + case CIPHER_WEP104: + encr = Ndis802_11Encryption1Enabled; + break; + case CIPHER_NONE: + if (params->group_suite == CIPHER_CCMP) + encr = Ndis802_11Encryption3Enabled; + else + encr = Ndis802_11Encryption2Enabled; + break; + default: + encr = Ndis802_11EncryptionDisabled; + }; + + if (ndis_set_oid(drv, OID_802_11_PRIVACY_FILTER, + (char *) &priv_mode, sizeof(priv_mode)) < 0) { + wpa_printf(MSG_DEBUG, "NDIS: Failed to set " + "OID_802_11_PRIVACY_FILTER (%d)", + (int) priv_mode); + /* Try to continue anyway */ + } + + ndis_set_auth_mode(drv, auth_mode); + ndis_set_encr_status(drv, encr); + + return wpa_driver_ndis_set_ssid(drv, params->ssid, params->ssid_len); +} + + +static int wpa_driver_ndis_set_pmkid(struct wpa_driver_ndis_data *drv) +{ + int len, count, i, ret; + struct ndis_pmkid_entry *entry; + NDIS_802_11_PMKID *p; + + count = 0; + entry = drv->pmkid; + while (entry) { + count++; + if (count >= drv->no_of_pmkid) + break; + entry = entry->next; + } + len = 8 + count * sizeof(BSSID_INFO); + p = malloc(len); + if (p == NULL) + return -1; + memset(p, 0, len); + p->Length = len; + p->BSSIDInfoCount = count; + entry = drv->pmkid; + for (i = 0; i < count; i++) { + memcpy(&p->BSSIDInfo[i].BSSID, entry->bssid, ETH_ALEN); + memcpy(&p->BSSIDInfo[i].PMKID, entry->pmkid, 16); + entry = entry->next; + } + wpa_hexdump(MSG_MSGDUMP, "NDIS: OID_802_11_PMKID", (char *) p, len); + ret = ndis_set_oid(drv, OID_802_11_PMKID, (char *) p, len); + free(p); + return ret; +} + + +static int wpa_driver_ndis_add_pmkid(void *priv, const u8 *bssid, + const u8 *pmkid) +{ + struct wpa_driver_ndis_data *drv = priv; + struct ndis_pmkid_entry *entry, *prev; + + if (drv->no_of_pmkid == 0) + return 0; + + prev = NULL; + entry = drv->pmkid; + while (entry) { + if (memcmp(entry->bssid, bssid, ETH_ALEN) == 0) + break; + prev = entry; + entry = entry->next; + } + + if (entry) { + /* Replace existing entry for this BSSID and move it into the + * beginning of the list. */ + memcpy(entry->pmkid, pmkid, 16); + if (prev) { + prev->next = entry->next; + entry->next = drv->pmkid; + drv->pmkid = entry; + } + } else { + entry = malloc(sizeof(*entry)); + if (entry) { + memcpy(entry->bssid, bssid, ETH_ALEN); + memcpy(entry->pmkid, pmkid, 16); + entry->next = drv->pmkid; + drv->pmkid = entry; + } + } + + return wpa_driver_ndis_set_pmkid(drv); +} + + +static int wpa_driver_ndis_remove_pmkid(void *priv, const u8 *bssid, + const u8 *pmkid) +{ + struct wpa_driver_ndis_data *drv = priv; + struct ndis_pmkid_entry *entry, *prev; + + if (drv->no_of_pmkid == 0) + return 0; + + entry = drv->pmkid; + prev = NULL; + drv->pmkid = NULL; + while (entry) { + if (memcmp(entry->bssid, bssid, ETH_ALEN) == 0 && + memcmp(entry->pmkid, pmkid, 16) == 0) { + if (prev) + prev->next = entry->next; + else + drv->pmkid = entry->next; + free(entry); + break; + } + prev = entry; + entry = entry->next; + } + return wpa_driver_ndis_set_pmkid(drv); +} + + +static int wpa_driver_ndis_flush_pmkid(void *priv) +{ + struct wpa_driver_ndis_data *drv = priv; + NDIS_802_11_PMKID p; + struct ndis_pmkid_entry *pmkid, *prev; + + if (drv->no_of_pmkid == 0) + return 0; + + pmkid = drv->pmkid; + drv->pmkid = NULL; + while (pmkid) { + prev = pmkid; + pmkid = pmkid->next; + free(prev); + } + + memset(&p, 0, sizeof(p)); + p.Length = 8; + p.BSSIDInfoCount = 0; + wpa_hexdump(MSG_MSGDUMP, "NDIS: OID_802_11_PMKID (flush)", + (char *) &p, 8); + return ndis_set_oid(drv, OID_802_11_PMKID, (char *) &p, 8); +} + + +static int wpa_driver_ndis_get_associnfo(struct wpa_driver_ndis_data *drv) +{ + char buf[512]; + NDIS_802_11_ASSOCIATION_INFORMATION *ai; + int len; + union wpa_event_data data; + + len = ndis_get_oid(drv, OID_802_11_ASSOCIATION_INFORMATION, buf, + sizeof(buf)); + if (len < 0) { + wpa_printf(MSG_DEBUG, "NDIS: failed to get association " + "information"); + return -1; + } + if (len > sizeof(buf)) { + /* Some drivers seem to be producing incorrect length for this + * data. Limit the length to the current buffer size to avoid + * crashing in hexdump. The data seems to be otherwise valid, + * so better try to use it. */ + wpa_printf(MSG_DEBUG, "NDIS: ignored bogus association " + "information length %d", len); + len = ndis_get_oid(drv, OID_802_11_ASSOCIATION_INFORMATION, + buf, sizeof(buf)); + if (len < -1) { + wpa_printf(MSG_DEBUG, "NDIS: re-reading association " + "information failed"); + return -1; + } + if (len > sizeof(buf)) { + wpa_printf(MSG_DEBUG, "NDIS: ignored bogus association" + " information length %d (re-read)", len); + len = sizeof(buf); + } + } + wpa_hexdump(MSG_MSGDUMP, "NDIS: association information", buf, len); + if (len < sizeof(*ai)) { + wpa_printf(MSG_DEBUG, "NDIS: too short association " + "information"); + return -1; + } + ai = (NDIS_802_11_ASSOCIATION_INFORMATION *) buf; + wpa_printf(MSG_DEBUG, "NDIS: ReqFixed=0x%x RespFixed=0x%x off_req=%d " + "off_resp=%d len_req=%d len_resp=%d", + ai->AvailableRequestFixedIEs, ai->AvailableResponseFixedIEs, + (int) ai->OffsetRequestIEs, (int) ai->OffsetResponseIEs, + (int) ai->RequestIELength, (int) ai->ResponseIELength); + + if (ai->OffsetRequestIEs + ai->RequestIELength > len || + ai->OffsetResponseIEs + ai->ResponseIELength > len) { + wpa_printf(MSG_DEBUG, "NDIS: association information - " + "IE overflow"); + return -1; + } + + wpa_hexdump(MSG_MSGDUMP, "NDIS: Request IEs", + buf + ai->OffsetRequestIEs, ai->RequestIELength); + wpa_hexdump(MSG_MSGDUMP, "NDIS: Response IEs", + buf + ai->OffsetResponseIEs, ai->ResponseIELength); + + memset(&data, 0, sizeof(data)); + data.assoc_info.req_ies = buf + ai->OffsetRequestIEs; + data.assoc_info.req_ies_len = ai->RequestIELength; + data.assoc_info.resp_ies = buf + ai->OffsetResponseIEs; + data.assoc_info.resp_ies_len = ai->ResponseIELength; + wpa_supplicant_event(drv->ctx, EVENT_ASSOCINFO, &data); + + return 0; +} + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-vendor@FreeBSD.ORG Thu Jan 15 03:27:28 2009 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD0721065670; Thu, 15 Jan 2009 03:27:28 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A10708FC1A; Thu, 15 Jan 2009 03:27:28 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0F3RSwu062366; Thu, 15 Jan 2009 03:27:28 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0F3RSIu062365; Thu, 15 Jan 2009 03:27:28 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901150327.n0F3RSIu062365@svn.freebsd.org> From: Sam Leffler Date: Thu, 15 Jan 2009 03:27:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187267 - vendor/wpa_supplicant/0.5.10 X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jan 2009 03:27:29 -0000 Author: sam Date: Thu Jan 15 03:27:28 2009 New Revision: 187267 URL: http://svn.freebsd.org/changeset/base/187267 Log: tag 0.5.10 Added: vendor/wpa_supplicant/0.5.10/ - copied from r187266, vendor/wpa_supplicant/dist/ From owner-svn-src-vendor@FreeBSD.ORG Thu Jan 15 04:25:23 2009 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33A56106564A; Thu, 15 Jan 2009 04:25:23 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2076D8FC12; Thu, 15 Jan 2009 04:25:23 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0F4PN8u063889; Thu, 15 Jan 2009 04:25:23 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0F4PMAD063862; Thu, 15 Jan 2009 04:25:22 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901150425.n0F4PMAD063862@svn.freebsd.org> From: Sam Leffler Date: Thu, 15 Jan 2009 04:25:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187274 - in vendor/wpa_supplicant/dist: . doc/docbook wpa_gui wpa_gui-qt4 X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jan 2009 04:25:23 -0000 Author: sam Date: Thu Jan 15 04:25:21 2009 New Revision: 187274 URL: http://svn.freebsd.org/changeset/base/187274 Log: vendor import of 0.5.11 Modified: vendor/wpa_supplicant/dist/ChangeLog vendor/wpa_supplicant/dist/Makefile vendor/wpa_supplicant/dist/base64.c vendor/wpa_supplicant/dist/common.c vendor/wpa_supplicant/dist/ctrl_iface.c vendor/wpa_supplicant/dist/ctrl_iface_dbus.c vendor/wpa_supplicant/dist/ctrl_iface_unix.c vendor/wpa_supplicant/dist/dbus_dict_helpers.c vendor/wpa_supplicant/dist/defconfig vendor/wpa_supplicant/dist/doc/docbook/wpa_background.8 vendor/wpa_supplicant/dist/doc/docbook/wpa_cli.8 vendor/wpa_supplicant/dist/doc/docbook/wpa_cli.sgml vendor/wpa_supplicant/dist/doc/docbook/wpa_passphrase.8 vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.8 vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.conf.5 vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.conf.sgml vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.sgml vendor/wpa_supplicant/dist/driver_hostap.h vendor/wpa_supplicant/dist/driver_ndis.c vendor/wpa_supplicant/dist/eap.c vendor/wpa_supplicant/dist/eap_aka.c vendor/wpa_supplicant/dist/eap_gpsk.c vendor/wpa_supplicant/dist/eap_gpsk_common.c vendor/wpa_supplicant/dist/eap_ttls.c vendor/wpa_supplicant/dist/eloop.c vendor/wpa_supplicant/dist/eloop.h vendor/wpa_supplicant/dist/eloop_none.c vendor/wpa_supplicant/dist/eloop_win.c vendor/wpa_supplicant/dist/main.c vendor/wpa_supplicant/dist/mlme.c vendor/wpa_supplicant/dist/os_unix.c vendor/wpa_supplicant/dist/preauth_test.c vendor/wpa_supplicant/dist/radius.c vendor/wpa_supplicant/dist/sha1.c vendor/wpa_supplicant/dist/tls_openssl.c vendor/wpa_supplicant/dist/version.h vendor/wpa_supplicant/dist/wpa.c vendor/wpa_supplicant/dist/wpa.h vendor/wpa_supplicant/dist/wpa_cli.c vendor/wpa_supplicant/dist/wpa_gui-qt4/networkconfig.cpp vendor/wpa_supplicant/dist/wpa_gui-qt4/scanresults.cpp vendor/wpa_supplicant/dist/wpa_gui-qt4/wpagui.cpp vendor/wpa_supplicant/dist/wpa_gui/networkconfig.ui.h vendor/wpa_supplicant/dist/wpa_gui/userdatarequest.ui.h vendor/wpa_supplicant/dist/wpa_gui/wpagui.ui.h vendor/wpa_supplicant/dist/wpa_i.h vendor/wpa_supplicant/dist/wpa_supplicant.c vendor/wpa_supplicant/dist/wpa_supplicant_i.h Modified: vendor/wpa_supplicant/dist/ChangeLog ============================================================================== --- vendor/wpa_supplicant/dist/ChangeLog Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/ChangeLog Thu Jan 15 04:25:21 2009 (r187274) @@ -1,5 +1,31 @@ ChangeLog for wpa_supplicant +2008-11-28 - v0.5.11 + * fixed race condition between disassociation event and group key + handshake to avoid getting stuck in incorrect state [Bug 261] + * updated D-Bus usage to avoid deprecated functions + * silence SIOCSIWAUTH ioctl failure message (these can be ignored in + most cases and are now only shown in debug output) + * increase timeout for IBSS connection + * driver_wext: do not overwrite BSS frequency if channel was already + received + * driver_wext: set interface down for mode switches, if needed (e.g., + for mac80211) + * driver_wext: fixed re-initialization of a removed and re-inserted + interface (e.g., USB dongle or on resume if driver was unloaded for + suspend) + * improve per-SSID scanning for drivers that report background scan + results frequently + * fixed scanning behavior after a failed initial association + * driver_wext: fixed processing of invalid event messages from kernel + not to crash wpa_supplicant (this could happen when using 64-bit + kernel with 32-bit userspace) + * fixed EAP-AKA to use RES Length field in AT_RES as length in bits, + not bytes + * fixed canceling of PMKSA caching when using drivers that generate + RSN IE and refuse to drop PMKIDs that wpa_supplicant does not know + about + 2008-02-19 - v0.5.10 * added support for Makefile builds to include debug-log-to-a-file functionality (CONFIG_DEBUG_FILE=y and -f on command line) Modified: vendor/wpa_supplicant/dist/Makefile ============================================================================== --- vendor/wpa_supplicant/dist/Makefile Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/Makefile Thu Jan 15 04:25:21 2009 (r187274) @@ -149,7 +149,10 @@ endif ifdef CONFIG_DRIVER_NDIS CFLAGS += -DCONFIG_DRIVER_NDIS -OBJS_d += driver_ndis.o driver_ndis_.o +OBJS_d += driver_ndis.o +ifdef CONFIG_NDIS_EVENTS_INTEGRATED +OBJS_d += driver_ndis_.o +endif ifndef CONFIG_L2_PACKET CONFIG_L2_PACKET=pcap endif @@ -745,10 +748,6 @@ ifdef CONFIG_DEBUG_FILE CFLAGS += -DCONFIG_DEBUG_FILE endif -ifdef CONFIG_DEBUG_SYSLOG -CFLAGS += -DCONFIG_DEBUG_SYSLOG -endif - OBJS += wpa_supplicant.o events.o OBJS_t := $(OBJS) eapol_test.o radius.o radius_client.o OBJS_t2 := $(OBJS) preauth_test.o Modified: vendor/wpa_supplicant/dist/base64.c ============================================================================== --- vendor/wpa_supplicant/dist/base64.c Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/base64.c Thu Jan 15 04:25:21 2009 (r187274) @@ -115,7 +115,7 @@ unsigned char * base64_decode(const unsi count++; } - if (count % 4) + if (count == 0 || count % 4) return NULL; olen = count / 4 * 3; Modified: vendor/wpa_supplicant/dist/common.c ============================================================================== --- vendor/wpa_supplicant/dist/common.c Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/common.c Thu Jan 15 04:25:21 2009 (r187274) @@ -16,10 +16,6 @@ #include "common.h" -#ifdef CONFIG_DEBUG_SYSLOG -#include -#endif /* CONFIG_DEBUG_SYSLOG */ - #ifdef CONFIG_DEBUG_FILE static FILE *out_file = NULL; @@ -27,7 +23,6 @@ static FILE *out_file = NULL; int wpa_debug_level = MSG_INFO; int wpa_debug_show_keys = 0; int wpa_debug_timestamp = 0; -int wpa_debug_syslog = 0; static int hex2num(char c) @@ -166,40 +161,6 @@ void wpa_debug_print_timestamp(void) printf("%ld.%06u: ", (long) tv.sec, (unsigned int) tv.usec); } -void wpa_debug_open_syslog(void) -{ -#ifdef CONFIG_DEBUG_SYSLOG - openlog("wpa_supplicant", LOG_PID | LOG_NDELAY, LOG_DAEMON); - wpa_debug_syslog++; -#endif -} - -void wpa_debug_close_syslog(void) -{ -#ifdef CONFIG_DEBUG_SYSLOG - if (wpa_debug_syslog) - closelog(); -#endif -} - -#ifdef CONFIG_DEBUG_SYSLOG -static int syslog_priority(int level) -{ - switch (level) { - case MSG_MSGDUMP: - case MSG_DEBUG: - return LOG_DEBUG; - case MSG_INFO: - return LOG_NOTICE; - case MSG_WARNING: - return LOG_WARNING; - case MSG_ERROR: - return LOG_ERR; - } - return LOG_INFO; -} -#endif /* CONFIG_DEBUG_SYSLOG */ - /** * wpa_printf - conditional printf @@ -218,11 +179,6 @@ void wpa_printf(int level, char *fmt, .. va_start(ap, fmt); if (level >= wpa_debug_level) { -#ifdef CONFIG_DEBUG_SYSLOG - if (wpa_debug_syslog) { - vsyslog(syslog_priority(level), fmt, ap); - } else { -#endif /* CONFIG_DEBUG_SYSLOG */ wpa_debug_print_timestamp(); #ifdef CONFIG_DEBUG_FILE if (out_file) { @@ -235,9 +191,6 @@ void wpa_printf(int level, char *fmt, .. #ifdef CONFIG_DEBUG_FILE } #endif /* CONFIG_DEBUG_FILE */ -#ifdef CONFIG_DEBUG_SYSLOG - } -#endif /* CONFIG_DEBUG_SYSLOG */ } va_end(ap); } Modified: vendor/wpa_supplicant/dist/ctrl_iface.c ============================================================================== --- vendor/wpa_supplicant/dist/ctrl_iface.c Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/ctrl_iface.c Thu Jan 15 04:25:21 2009 (r187274) @@ -76,6 +76,7 @@ static int wpa_supplicant_ctrl_iface_set } +#ifdef IEEE8021X_EAPOL static int wpa_supplicant_ctrl_iface_preauth(struct wpa_supplicant *wpa_s, char *addr) { @@ -94,6 +95,7 @@ static int wpa_supplicant_ctrl_iface_pre return 0; } +#endif /* IEEE8021X_EAPOL */ #ifdef CONFIG_PEERKEY @@ -1126,9 +1128,11 @@ char * wpa_supplicant_ctrl_iface_process wpa_s->reassociate = 1; wpa_supplicant_req_scan(wpa_s, 0, 0); } +#ifdef IEEE8021X_EAPOL } else if (os_strncmp(buf, "PREAUTH ", 8) == 0) { if (wpa_supplicant_ctrl_iface_preauth(wpa_s, buf + 8)) reply_len = -1; +#endif /* IEEE8021X_EAPOL */ #ifdef CONFIG_PEERKEY } else if (os_strncmp(buf, "STKSTART ", 9) == 0) { if (wpa_supplicant_ctrl_iface_stkstart(wpa_s, buf + 9)) Modified: vendor/wpa_supplicant/dist/ctrl_iface_dbus.c ============================================================================== --- vendor/wpa_supplicant/dist/ctrl_iface_dbus.c Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/ctrl_iface_dbus.c Thu Jan 15 04:25:21 2009 (r187274) @@ -30,10 +30,10 @@ #include "wpa_ctrl.h" #include "eap.h" -#define DBUS_VERSION (DBUS_VERSION_MAJOR << 8 | DBUS_VERSION_MINOR) +#define _DBUS_VERSION (DBUS_VERSION_MAJOR << 8 | DBUS_VERSION_MINOR) #define DBUS_VER(major, minor) ((major) << 8 | (minor)) -#if DBUS_VERSION < DBUS_VER(1,1) +#if _DBUS_VERSION < DBUS_VER(1,1) #define dbus_watch_get_unix_fd dbus_watch_get_fd #endif Modified: vendor/wpa_supplicant/dist/ctrl_iface_unix.c ============================================================================== --- vendor/wpa_supplicant/dist/ctrl_iface_unix.c Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/ctrl_iface_unix.c Thu Jan 15 04:25:21 2009 (r187274) @@ -305,7 +305,7 @@ wpa_supplicant_ctrl_iface_init(struct wp /* Group name not found - try to parse this as gid */ gid = strtol(gid_str, &endp, 10); if (*gid_str == '\0' || *endp != '\0') { - wpa_printf(MSG_DEBUG, "CTRL: Invalid group " + wpa_printf(MSG_ERROR, "CTRL: Invalid group " "'%s'", gid_str); goto fail; } Modified: vendor/wpa_supplicant/dist/dbus_dict_helpers.c ============================================================================== --- vendor/wpa_supplicant/dist/dbus_dict_helpers.c Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/dbus_dict_helpers.c Thu Jan 15 04:25:21 2009 (r187274) @@ -629,36 +629,56 @@ dbus_bool_t wpa_dbus_dict_open_read(DBus } +#define BYTE_ARRAY_CHUNK_SIZE 34 +#define BYTE_ARRAY_ITEM_SIZE (sizeof (char)) + static dbus_bool_t _wpa_dbus_dict_entry_get_byte_array( - DBusMessageIter *iter, int array_len, int array_type, + DBusMessageIter *iter, int array_type, struct wpa_dbus_dict_entry *entry) { - dbus_uint32_t i = 0; + dbus_uint32_t count = 0; dbus_bool_t success = FALSE; - char byte; + char *buffer; - /* Zero-length arrays are valid. */ - if (array_len == 0) { - entry->bytearray_value = NULL; - entry->array_type = DBUS_TYPE_BYTE; - success = TRUE; - goto done; - } + entry->bytearray_value = NULL; + entry->array_type = DBUS_TYPE_BYTE; - entry->bytearray_value = wpa_zalloc(array_len * sizeof(char)); - if (!entry->bytearray_value) { + buffer = wpa_zalloc(BYTE_ARRAY_ITEM_SIZE * BYTE_ARRAY_CHUNK_SIZE); + if (!buffer) { perror("_wpa_dbus_dict_entry_get_byte_array[dbus]: out of " "memory"); goto done; } - entry->array_type = DBUS_TYPE_BYTE; - entry->array_len = array_len; + entry->bytearray_value = buffer; + entry->array_len = 0; while (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_BYTE) { + char byte; + + if ((count % BYTE_ARRAY_CHUNK_SIZE) == 0 && count != 0) { + buffer = realloc(buffer, BYTE_ARRAY_ITEM_SIZE * + (count + BYTE_ARRAY_CHUNK_SIZE)); + if (buffer == NULL) { + perror("_wpa_dbus_dict_entry_get_byte_array[" + "dbus] out of memory trying to " + "retrieve the string array"); + goto done; + } + } + entry->bytearray_value = buffer; + dbus_message_iter_get_basic(iter, &byte); - entry->bytearray_value[i++] = byte; + entry->bytearray_value[count] = byte; + entry->array_len = ++count; dbus_message_iter_next(iter); } + + /* Zero-length arrays are valid. */ + if (entry->array_len == 0) { + free(entry->bytearray_value); + entry->bytearray_value = NULL; + } + success = TRUE; done: @@ -666,8 +686,11 @@ done: } +#define STR_ARRAY_CHUNK_SIZE 8 +#define STR_ARRAY_ITEM_SIZE (sizeof (char *)) + static dbus_bool_t _wpa_dbus_dict_entry_get_string_array( - DBusMessageIter *iter, int array_len, int array_type, + DBusMessageIter *iter, int array_type, struct wpa_dbus_dict_entry *entry) { dbus_uint32_t count = 0; @@ -677,13 +700,7 @@ static dbus_bool_t _wpa_dbus_dict_entry_ entry->strarray_value = NULL; entry->array_type = DBUS_TYPE_STRING; - /* Zero-length arrays are valid. */ - if (array_len == 0) { - success = TRUE; - goto done; - } - - buffer = wpa_zalloc(sizeof (char *) * 8); + buffer = wpa_zalloc(STR_ARRAY_ITEM_SIZE * STR_ARRAY_CHUNK_SIZE); if (buffer == NULL) { perror("_wpa_dbus_dict_entry_get_string_array[dbus] out of " "memory trying to retrieve a string array"); @@ -696,18 +713,15 @@ static dbus_bool_t _wpa_dbus_dict_entry_ const char *value; char *str; - if ((count % 8) == 0 && count != 0) { - char **tmp; - tmp = realloc(buffer, sizeof(char *) * (count + 8)); - if (tmp == NULL) { + if ((count % STR_ARRAY_CHUNK_SIZE) == 0 && count != 0) { + buffer = realloc(buffer, STR_ARRAY_ITEM_SIZE * + (count + STR_ARRAY_CHUNK_SIZE)); + if (buffer == NULL) { perror("_wpa_dbus_dict_entry_get_string_array[" "dbus] out of memory trying to " "retrieve the string array"); - free(buffer); - buffer = NULL; goto done; } - buffer = tmp; } entry->strarray_value = buffer; @@ -723,6 +737,13 @@ static dbus_bool_t _wpa_dbus_dict_entry_ entry->array_len = ++count; dbus_message_iter_next(iter); } + + /* Zero-length arrays are valid. */ + if (entry->array_len == 0) { + free(entry->strarray_value); + entry->strarray_value = NULL; + } + success = TRUE; done: @@ -734,7 +755,6 @@ static dbus_bool_t _wpa_dbus_dict_entry_ DBusMessageIter *iter_dict_val, struct wpa_dbus_dict_entry *entry) { int array_type = dbus_message_iter_get_element_type(iter_dict_val); - int array_len; dbus_bool_t success = FALSE; DBusMessageIter iter_array; @@ -743,20 +763,14 @@ static dbus_bool_t _wpa_dbus_dict_entry_ dbus_message_iter_recurse(iter_dict_val, &iter_array); - array_len = dbus_message_iter_get_array_len(&iter_array); - if (array_len < 0) - return FALSE; - switch (array_type) { case DBUS_TYPE_BYTE: success = _wpa_dbus_dict_entry_get_byte_array(&iter_array, - array_len, array_type, entry); break; case DBUS_TYPE_STRING: success = _wpa_dbus_dict_entry_get_string_array(&iter_array, - array_len, array_type, entry); break; @@ -946,9 +960,17 @@ void wpa_dbus_dict_entry_clear(struct wp break; case DBUS_TYPE_ARRAY: switch (entry->array_type) { - case DBUS_TYPE_BYTE: - free(entry->bytearray_value); - break; + case DBUS_TYPE_BYTE: { + free(entry->bytearray_value); + break; + } + case DBUS_TYPE_STRING: { + unsigned int i; + for (i = 0; i < entry->array_len; i++) + free(entry->strarray_value[i]); + free(entry->strarray_value); + break; + } } break; } Modified: vendor/wpa_supplicant/dist/defconfig ============================================================================== --- vendor/wpa_supplicant/dist/defconfig Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/defconfig Thu Jan 15 04:25:21 2009 (r187274) @@ -321,6 +321,3 @@ CONFIG_PEERKEY=y # Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) #CONFIG_DEBUG_FILE=y - -# Add support for logging via syslog -#CONFIG_DEBUG_SYSLOG=y Modified: vendor/wpa_supplicant/dist/doc/docbook/wpa_background.8 ============================================================================== --- vendor/wpa_supplicant/dist/doc/docbook/wpa_background.8 Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/doc/docbook/wpa_background.8 Thu Jan 15 04:25:21 2009 (r187274) @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "WPA_BACKGROUND" "8" "19 February 2008" "" "" +.TH "WPA_BACKGROUND" "8" "28 November 2008" "" "" .SH NAME wpa_background \- Background information on Wi-Fi Protected Access and IEEE 802.11i Modified: vendor/wpa_supplicant/dist/doc/docbook/wpa_cli.8 ============================================================================== --- vendor/wpa_supplicant/dist/doc/docbook/wpa_cli.8 Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/doc/docbook/wpa_cli.8 Thu Jan 15 04:25:21 2009 (r187274) @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "WPA_CLI" "8" "19 February 2008" "" "" +.TH "WPA_CLI" "8" "28 November 2008" "" "" .SH NAME wpa_cli \- WPA command line client @@ -57,17 +57,18 @@ current network. is description o case of OTP request, it includes the challenge from the authentication server. .PP -The reply to these requests can be given with 'identity', -'password', and 'otp' commands. needs to be copied from the -the matching request. 'password' and 'otp' commands can be used -regardless of whether the request was for PASSWORD or OTP. The -main difference between these two commands is that values given -with 'password' are remembered as long as wpa_supplicant is -running whereas values given with 'otp' are used only once and -then forgotten, i.e., wpa_supplicant will ask frontend for a new -value for every use. This can be used to implement -one-time-password lists and generic token card -based -authentication. +The reply to these requests can be given with +\fBidentity\fR, \fBpassword\fR, and +\fBotp\fR commands. needs to be copied from +the matching request. \fBpassword\fR and +\fBotp\fR commands can be used regardless of whether +the request was for PASSWORD or OTP. The main difference between these +two commands is that values given with \fBpassword\fR are +remembered as long as wpa_supplicant is running whereas values given +with \fBotp\fR are used only once and then forgotten, +i.e., wpa_supplicant will ask frontend for a new value for every use. +This can be used to implement one-time-password lists and generic token +card -based authentication. .PP Example request for password and a matching reply: .sp Modified: vendor/wpa_supplicant/dist/doc/docbook/wpa_cli.sgml ============================================================================== --- vendor/wpa_supplicant/dist/doc/docbook/wpa_cli.sgml Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/doc/docbook/wpa_cli.sgml Thu Jan 15 04:25:21 2009 (r187274) @@ -72,17 +72,18 @@ case of OTP request, it includes the challenge from the authentication server. - The reply to these requests can be given with 'identity', - 'password', and 'otp' commands. <id> needs to be copied from the - the matching request. 'password' and 'otp' commands can be used - regardless of whether the request was for PASSWORD or OTP. The - main difference between these two commands is that values given - with 'password' are remembered as long as wpa_supplicant is - running whereas values given with 'otp' are used only once and - then forgotten, i.e., wpa_supplicant will ask frontend for a new - value for every use. This can be used to implement - one-time-password lists and generic token card -based - authentication. + The reply to these requests can be given with + identity, password, and + otp commands. <id> needs to be copied from + the matching request. password and + otp commands can be used regardless of whether + the request was for PASSWORD or OTP. The main difference between these + two commands is that values given with password are + remembered as long as wpa_supplicant is running whereas values given + with otp are used only once and then forgotten, + i.e., wpa_supplicant will ask frontend for a new value for every use. + This can be used to implement one-time-password lists and generic token + card -based authentication. Example request for password and a matching reply: Modified: vendor/wpa_supplicant/dist/doc/docbook/wpa_passphrase.8 ============================================================================== --- vendor/wpa_supplicant/dist/doc/docbook/wpa_passphrase.8 Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/doc/docbook/wpa_passphrase.8 Thu Jan 15 04:25:21 2009 (r187274) @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "WPA_PASSPHRASE" "8" "19 February 2008" "" "" +.TH "WPA_PASSPHRASE" "8" "28 November 2008" "" "" .SH NAME wpa_passphrase \- Generate a WPA PSK from an ASCII passphrase for a SSID Modified: vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.8 ============================================================================== --- vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.8 Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.8 Thu Jan 15 04:25:21 2009 (r187274) @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "WPA_SUPPLICANT" "8" "19 February 2008" "" "" +.TH "WPA_SUPPLICANT" "8" "28 November 2008" "" "" .SH NAME wpa_supplicant \- Wi-Fi Protected Access client and IEEE 802.1X supplicant @@ -214,7 +214,11 @@ PMKSA caching .RE .SH "AVAILABLE DRIVERS" .PP -The available drivers to specify with the -D option are: +A summary of available driver backends is below. Support for each +of the driver backends is chosen at wpa_supplicant compile time. For a +list of supported driver backends that may be used with the -D option on +your system, refer to the help output of wpa_supplicant +(\fBwpa_supplicant -h\fR). .TP \fBhostap\fR (default) Host AP driver (Intersil Prism2/2.5/3). @@ -250,33 +254,47 @@ BSD 802.11 support (Atheros, etc.). \fBndis\fR Windows NDIS driver. .SH "COMMAND LINE OPTIONS" +.PP +Most command line options have global scope. Some are given per +interface, and are only valid if at least one \fB-i\fR option +is specified, otherwise they're ignored. Option groups for different +interfaces must be separated by \fB-N\fR option. +.TP +\fB-b br_ifname\fR +Optional bridge interface name. (Per interface) .TP \fB-B\fR Run daemon in the background. .TP \fB-i ifname\fR -Interface to listen on. +Interface to listen on. Multiple instances of this option can +be present, one per interface, separated by \fB-N\fR +option (see below). .TP \fB-c filename\fR -Path to configuration file. +Path to configuration file. (Per interface) .TP \fB-P PID_file\fR Path to PID file. .TP \fB-C ctrl_interface\fR -Path to ctrl_interface socket (only used if -c is not). +Path to ctrl_interface socket (Per interface. Only used if +\fB-c\fR is not). .TP \fB-g global ctrl_interface\fR -Path to global ctrl_interface socket. +Path to global ctrl_interface socket. If specified, interface +definitions may be omitted. .TP \fB-D driver\fR -Driver to use. See the available options below. +Driver to use. (Per interface, see the available options +below.) .TP \fB-f output file\fR Log output to specified file instead of stdout. .TP \fB-d\fR -Increase debugging verbosity (-dd even more). +Increase debugging verbosity (\fB-dd\fR even +more). .TP \fB-K\fR Include keys (passwords, etc.) in debug output. @@ -296,7 +314,12 @@ Help. Show a usage message. Show license (GPL and BSD). .TP \fB-q\fR -Decrease debugging verbosity (-qq even less). +Decrease debugging verbosity (\fB-qq\fR even +less). +.TP +\fB-u\fR +Enabled DBus control interface. If enabled, interface +definitions may be omitted. .TP \fB-v\fR Show version. @@ -367,9 +390,9 @@ with other versions) .TP \fBHost AP driver for Prism2/2.5/3 (development snapshot/v0.2.x)\fR (http://hostap.epitest.fi/) Driver needs to be set in -Managed mode ('iwconfig wlan0 mode managed'). Please note -that station firmware version needs to be 1.7.0 or newer to -work in WPA mode. +Managed mode (\fBiwconfig wlan0 mode managed\fR). +Please note that station firmware version needs to be 1.7.0 or +newer to work in WPA mode. .TP \fBLinuxant DriverLoader\fR (http://www.linuxant.com/driverloader/) @@ -506,8 +529,8 @@ can be used to enable WPA support: Add MODE="Managed" and WPA="y" to the network scheme in \fI/etc/pcmcia/wireless.opts\fR\&. .PP -Add the following block to the end of 'start' action handler -in \fI/etc/pcmcia/wireless\fR: +Add the following block to the end of \fBstart\fR +action handler in \fI/etc/pcmcia/wireless\fR: .sp .RS @@ -519,8 +542,8 @@ fi .fi .RE .PP -Add the following block to the end of 'stop' action handler -(may need to be separated from other actions) in +Add the following block to the end of \fBstop\fR +action handler (may need to be separated from other actions) in \fI/etc/pcmcia/wireless\fR: .sp .RS Modified: vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.conf.5 ============================================================================== --- vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.conf.5 Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.conf.5 Thu Jan 15 04:25:21 2009 (r187274) @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "WPA_SUPPLICANT.CONF" "5" "19 February 2008" "" "" +.TH "WPA_SUPPLICANT.CONF" "5" "28 November 2008" "" "" .SH NAME wpa_supplicant.conf \- configuration file for wpa_supplicant @@ -24,7 +24,7 @@ run in the background. Changes to configuration file can be reloaded be sending SIGHUP signal to \fBwpa_supplicant\fR ('killall -HUP wpa_supplicant'). Similarly, reloading can be triggered with -the 'wpa_cli reconfigure' command. +the \fBwpa_cli reconfigure\fR command. .PP Configuration file can include one or more network blocks, e.g., one for each used SSID. wpa_supplicant will automatically @@ -179,7 +179,7 @@ network={ .TP 3 6. Authentication for wired Ethernet. This can be used with -'wired' interface (-Dwired on command line). +\fBwired\fR interface (-Dwired on command line). .sp .RS Modified: vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.conf.sgml ============================================================================== --- vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.conf.sgml Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.conf.sgml Thu Jan 15 04:25:21 2009 (r187274) @@ -26,7 +26,7 @@ Changes to configuration file can be reloaded be sending SIGHUP signal to wpa_supplicant ('killall -HUP wpa_supplicant'). Similarly, reloading can be triggered with - the 'wpa_cli reconfigure' command. + the wpa_cli reconfigure command. Configuration file can include one or more network blocks, e.g., one for each used SSID. wpa_supplicant will automatically @@ -179,7 +179,7 @@ network={ Authentication for wired Ethernet. This can be used with - 'wired' interface (-Dwired on command line). + wired interface (-Dwired on command line).
ctrl_interface=/var/run/wpa_supplicant Modified: vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.sgml ============================================================================== --- vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.sgml Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/doc/docbook/wpa_supplicant.sgml Thu Jan 15 04:25:21 2009 (r187274) @@ -241,7 +241,11 @@ Available Drivers - The available drivers to specify with the -D option are: + A summary of available driver backends is below. Support for each + of the driver backends is chosen at wpa_supplicant compile time. For a + list of supported driver backends that may be used with the -D option on + your system, refer to the help output of wpa_supplicant + (wpa_supplicant -h). @@ -326,8 +330,19 @@ Command Line Options + Most command line options have global scope. Some are given per + interface, and are only valid if at least one option + is specified, otherwise they're ignored. Option groups for different + interfaces must be separated by option. + -b br_ifname + + Optional bridge interface name. (Per interface) + + + + -B Run daemon in the background. @@ -337,14 +352,16 @@ -i ifname - Interface to listen on. + Interface to listen on. Multiple instances of this option can + be present, one per interface, separated by + option (see below). -c filename - Path to configuration file. + Path to configuration file. (Per interface) @@ -358,21 +375,24 @@ -C ctrl_interface - Path to ctrl_interface socket (only used if -c is not). + Path to ctrl_interface socket (Per interface. Only used if + is not). -g global ctrl_interface - Path to global ctrl_interface socket. + Path to global ctrl_interface socket. If specified, interface + definitions may be omitted. -D driver - Driver to use. See the available options below. + Driver to use. (Per interface, see the available options + below.) @@ -386,7 +406,8 @@ -d - Increase debugging verbosity (-dd even more). + Increase debugging verbosity ( even + more). @@ -430,9 +451,19 @@ -q - Decrease debugging verbosity (-qq even less). + Decrease debugging verbosity ( even + less). + + + -u + + Enabled DBus control interface. If enabled, interface + definitions may be omitted. + + + -v @@ -523,9 +554,9 @@ wpa_supplicant \ snapshot/v0.2.x) (http://hostap.epitest.fi/) Driver needs to be set in - Managed mode ('iwconfig wlan0 mode managed'). Please note - that station firmware version needs to be 1.7.0 or newer to - work in WPA mode. + Managed mode (iwconfig wlan0 mode managed). + Please note that station firmware version needs to be 1.7.0 or + newer to work in WPA mode. @@ -729,8 +760,8 @@ wpa_supplicant -iwlan0 -c/etc/wpa_suppli Add MODE="Managed" and WPA="y" to the network scheme in /etc/pcmcia/wireless.opts. - Add the following block to the end of 'start' action handler - in /etc/pcmcia/wireless: + Add the following block to the end of start + action handler in /etc/pcmcia/wireless:
if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then @@ -739,8 +770,8 @@ fi
- Add the following block to the end of 'stop' action handler - (may need to be separated from other actions) in + Add the following block to the end of stop + action handler (may need to be separated from other actions) in /etc/pcmcia/wireless:
Modified: vendor/wpa_supplicant/dist/driver_hostap.h ============================================================================== --- vendor/wpa_supplicant/dist/driver_hostap.h Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/driver_hostap.h Thu Jan 15 04:25:21 2009 (r187274) @@ -84,9 +84,9 @@ enum { #define PRISM2_HOSTAPD_MAX_BUF_SIZE 1024 #define PRISM2_HOSTAPD_RID_HDR_LEN \ -((int) (&((struct prism2_hostapd_param *) 0)->u.rid.data)) +((size_t) (&((struct prism2_hostapd_param *) 0)->u.rid.data)) #define PRISM2_HOSTAPD_GENERIC_ELEMENT_HDR_LEN \ -((int) (&((struct prism2_hostapd_param *) 0)->u.generic_elem.data)) +((size_t) (&((struct prism2_hostapd_param *) 0)->u.generic_elem.data)) /* Maximum length for algorithm names (-1 for nul termination) used in ioctl() */ Modified: vendor/wpa_supplicant/dist/driver_ndis.c ============================================================================== --- vendor/wpa_supplicant/dist/driver_ndis.c Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/driver_ndis.c Thu Jan 15 04:25:21 2009 (r187274) @@ -42,7 +42,9 @@ int close(int fd); #include "driver_ndis.h" int wpa_driver_register_event_cb(struct wpa_driver_ndis_data *drv); +#ifdef CONFIG_NDIS_EVENTS_INTEGRATED void wpa_driver_ndis_event_pipe_cb(void *eloop_data, void *user_data); +#endif /* CONFIG_NDIS_EVENTS_INTEGRATED */ static void wpa_driver_ndis_deinit(void *priv); static void wpa_driver_ndis_poll(void *drv); Modified: vendor/wpa_supplicant/dist/eap.c ============================================================================== --- vendor/wpa_supplicant/dist/eap.c Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/eap.c Thu Jan 15 04:25:21 2009 (r187274) @@ -892,7 +892,7 @@ static int eap_sm_imsi_identity(struct e #endif /* PCSC_FUNCS */ -static int eap_sm_get_scard_identity(struct eap_sm *sm, struct wpa_ssid *ssid) +static int eap_sm_set_scard_pin(struct eap_sm *sm, struct wpa_ssid *ssid) { #ifdef PCSC_FUNCS if (scard_set_pin(sm->scard_ctx, ssid->pin)) { @@ -907,6 +907,17 @@ static int eap_sm_get_scard_identity(str eap_sm_request_pin(sm); return -1; } + return 0; +#else /* PCSC_FUNCS */ + return -1; +#endif /* PCSC_FUNCS */ +} + +static int eap_sm_get_scard_identity(struct eap_sm *sm, struct wpa_ssid *ssid) +{ +#ifdef PCSC_FUNCS + if (eap_sm_set_scard_pin(sm, ssid)) + return -1; return eap_sm_imsi_identity(sm, ssid); #else /* PCSC_FUNCS */ @@ -973,6 +984,9 @@ u8 * eap_sm_buildIdentity(struct eap_sm eap_sm_request_identity(sm); return NULL; } + } else if (config->pcsc) { + if (eap_sm_set_scard_pin(sm, config) < 0) + return NULL; } *len = sizeof(struct eap_hdr) + 1 + identity_len; Modified: vendor/wpa_supplicant/dist/eap_aka.c ============================================================================== --- vendor/wpa_supplicant/dist/eap_aka.c Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/eap_aka.c Thu Jan 15 04:25:21 2009 (r187274) @@ -292,7 +292,7 @@ static u8 * eap_aka_response_challenge(s msg = eap_sim_msg_init(EAP_CODE_RESPONSE, req->identifier, EAP_TYPE_AKA, EAP_AKA_SUBTYPE_CHALLENGE); wpa_printf(MSG_DEBUG, " AT_RES"); - eap_sim_msg_add(msg, EAP_SIM_AT_RES, data->res_len, + eap_sim_msg_add(msg, EAP_SIM_AT_RES, data->res_len * 8, data->res, data->res_len); wpa_printf(MSG_DEBUG, " AT_MAC"); eap_sim_msg_add_mac(msg, EAP_SIM_AT_MAC); Modified: vendor/wpa_supplicant/dist/eap_gpsk.c ============================================================================== --- vendor/wpa_supplicant/dist/eap_gpsk.c Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/eap_gpsk.c Thu Jan 15 04:25:21 2009 (r187274) @@ -240,8 +240,8 @@ const u8 * eap_gpsk_process_csuite_list( return NULL; } if (*list_len == 0 || (*list_len % sizeof(struct eap_gpsk_csuite))) { - wpa_printf(MSG_DEBUG, "EAP-GPSK: Invalid CSuite_List len %d", - *list_len); + wpa_printf(MSG_DEBUG, "EAP-GPSK: Invalid CSuite_List len %lu", + (unsigned long) *list_len); return NULL; } *list = pos; @@ -460,6 +460,7 @@ const u8 * eap_gpsk_validate_id_server(s data->id_server, data->id_server_len); wpa_hexdump_ascii(MSG_DEBUG, "EAP-GPSK: ID_Server in GPSK-3", pos, len); + return NULL; } pos += len; @@ -537,7 +538,9 @@ const u8 * eap_gpsk_validate_gpsk_3_mic( miclen = eap_gpsk_mic_len(data->vendor, data->specifier); if (end - pos < (int) miclen) { wpa_printf(MSG_DEBUG, "EAP-GPSK: Message too short for MIC " - "(left=%d miclen=%d)", end - pos, miclen); + "(left=%lu miclen=%lu)", + (unsigned long) (end - pos), + (unsigned long) miclen); return NULL; } if (eap_gpsk_compute_mic(data->sk, data->sk_len, data->vendor, @@ -589,8 +592,9 @@ static u8 * eap_gpsk_process_gpsk_3(stru return NULL; } if (pos != end) { - wpa_printf(MSG_DEBUG, "EAP-GPSK: Ignored %d bytes of extra " - "data in the end of GPSK-2", end - pos); + wpa_printf(MSG_DEBUG, "EAP-GPSK: Ignored %lu bytes of extra " + "data in the end of GPSK-2", + (unsigned long) (end - pos)); } req = (const struct eap_hdr *) reqData; Modified: vendor/wpa_supplicant/dist/eap_gpsk_common.c ============================================================================== --- vendor/wpa_supplicant/dist/eap_gpsk_common.c Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/eap_gpsk_common.c Thu Jan 15 04:25:21 2009 (r187274) @@ -376,8 +376,8 @@ static int eap_gpsk_compute_mic_aes(cons const u8 *data, size_t len, u8 *mic) { if (sk_len != 16) { - wpa_printf(MSG_DEBUG, "EAP-GPSK: Invalid SK length %d for " - "AES-CMAC MIC", sk_len); + wpa_printf(MSG_DEBUG, "EAP-GPSK: Invalid SK length %lu for " + "AES-CMAC MIC", (unsigned long) sk_len); return -1; } Modified: vendor/wpa_supplicant/dist/eap_ttls.c ============================================================================== --- vendor/wpa_supplicant/dist/eap_ttls.c Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/eap_ttls.c Thu Jan 15 04:25:21 2009 (r187274) @@ -673,7 +673,7 @@ static int eap_ttls_phase2_request_mscha /* MS-CHAP-Challenge */ challenge = eap_ttls_implicit_challenge( - sm, data, EAP_TTLS_MSCHAPV2_CHALLENGE_LEN * 2 + 1); + sm, data, EAP_TTLS_MSCHAPV2_CHALLENGE_LEN + 1); if (challenge == NULL) { os_free(buf); wpa_printf(MSG_ERROR, "EAP-TTLS/MSCHAPV2: Failed to derive " @@ -777,7 +777,8 @@ static int eap_ttls_phase2_request_mscha config->identity, config->identity_len); /* MS-CHAP-Challenge */ - challenge = eap_ttls_implicit_challenge(sm, data, EAP_TLS_KEY_LEN); + challenge = eap_ttls_implicit_challenge( + sm, data, EAP_TTLS_MSCHAP_CHALLENGE_LEN + 1); if (challenge == NULL) { os_free(buf); wpa_printf(MSG_ERROR, "EAP-TTLS/MSCHAP: Failed to derive " @@ -907,7 +908,8 @@ static int eap_ttls_phase2_request_chap( config->identity, config->identity_len); /* CHAP-Challenge */ - challenge = eap_ttls_implicit_challenge(sm, data, EAP_TLS_KEY_LEN); + challenge = eap_ttls_implicit_challenge( + sm, data, EAP_TTLS_CHAP_CHALLENGE_LEN + 1); if (challenge == NULL) { os_free(buf); wpa_printf(MSG_ERROR, "EAP-TTLS/CHAP: Failed to derive " Modified: vendor/wpa_supplicant/dist/eloop.c ============================================================================== --- vendor/wpa_supplicant/dist/eloop.c Thu Jan 15 04:19:03 2009 (r187273) +++ vendor/wpa_supplicant/dist/eloop.c Thu Jan 15 04:25:21 2009 (r187274) @@ -232,7 +232,10 @@ int eloop_register_timeout(unsigned int timeout = os_malloc(sizeof(*timeout)); if (timeout == NULL) return -1; - os_get_time(&timeout->time); + if (os_get_time(&timeout->time) < 0) { + os_free(timeout); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-vendor@FreeBSD.ORG Thu Jan 15 04:26:39 2009 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF1921065680; Thu, 15 Jan 2009 04:26:39 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 83A718FC13; Thu, 15 Jan 2009 04:26:39 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0F4Qdmj063954; Thu, 15 Jan 2009 04:26:39 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0F4QdPt063953; Thu, 15 Jan 2009 04:26:39 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901150426.n0F4QdPt063953@svn.freebsd.org> From: Sam Leffler Date: Thu, 15 Jan 2009 04:26:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187275 - vendor/wpa_supplicant/0.5.11 X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jan 2009 04:26:40 -0000 Author: sam Date: Thu Jan 15 04:26:39 2009 New Revision: 187275 URL: http://svn.freebsd.org/changeset/base/187275 Log: tag 0.5.11 release Added: vendor/wpa_supplicant/0.5.11/ - copied from r187274, vendor/wpa_supplicant/dist/