Changeset 4269

Show
Ignore:
Timestamp:
08/21/08 14:10:07 (3 months ago)
Author:
martin
Message:

a (incomplete) implementation of draft-sheffer-ikev2-gtc-00.txt using PAM

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/configure.in

    r4259 r4269  
    399399    [if test x$enableval = xyes; then 
    400400        eap_md5=true 
     401    fi] 
     402) 
     403 
     404AC_ARG_ENABLE( 
     405    [eap-gtc], 
     406    AS_HELP_STRING([--enable-eap-gtc],[build PAM based GTC authenication module for EAP (default is NO).]), 
     407    [if test x$enableval = xyes; then 
     408        eap_gtc=true 
    401409    fi] 
    402410) 
    …… 
    718726    AC_SUBST(nm_CFLAGS) 
    719727    AC_SUBST(nm_LIBS) 
     728fi 
     729 
     730if test x$eap_gtc = xtrue; then 
     731    AC_HAVE_LIBRARY([pam],[LIBS="$LIBS"],[AC_MSG_ERROR([PAM library not found])]) 
     732    AC_CHECK_HEADER([security/pam_appl.h],,[AC_MSG_ERROR([PAM header security/pam_appl.h not found!])]) 
    720733fi 
    721734 
    …… 
    821834AM_CONDITIONAL(USE_EAP_IDENTITY, test x$eap_identity = xtrue) 
    822835AM_CONDITIONAL(USE_EAP_MD5, test x$eap_md5 = xtrue) 
     836AM_CONDITIONAL(USE_EAP_GTC, test x$eap_gtc = xtrue) 
    823837AM_CONDITIONAL(USE_EAP_AKA, test x$eap_aka = xtrue) 
    824838 
    …… 
    888902    src/charon/plugins/eap_identity/Makefile 
    889903    src/charon/plugins/eap_md5/Makefile 
     904    src/charon/plugins/eap_gtc/Makefile 
    890905    src/charon/plugins/eap_sim/Makefile 
    891906    src/charon/plugins/smp/Makefile 

  • trunk/src/charon/Makefile.am

    r4238 r4269  
    166166endif 
    167167 
     168if USE_EAP_GTC 
     169  SUBDIRS += plugins/eap_gtc 
     170  PLUGINS += eapgtc 
     171endif 
     172 
    168173if USE_EAP_AKA 
    169174  SUBDIRS += plugins/eap_aka 

  • trunk/src/charon/sa/authenticators/eap/eap_method.c

    r3589 r4269  
    1818#include "eap_method.h" 
    1919 
    20 ENUM_BEGIN(eap_type_names, EAP_IDENTITY, EAP_TOKEN_CARD, 
     20ENUM_BEGIN(eap_type_names, EAP_IDENTITY, EAP_GTC, 
    2121    "EAP_IDENTITY", 
    2222    "EAP_NOTIFICATION", 
    2323    "EAP_NAK", 
    2424    "EAP_MD5", 
    25     "EAP_ONE_TIME_PASSWORD", 
    26     "EAP_TOKEN_CARD"); 
    27 ENUM_NEXT(eap_type_names, EAP_SIM, EAP_SIM, EAP_TOKEN_CARD, 
     25    "EAP_OTP", 
     26    "EAP_GTC"); 
     27ENUM_NEXT(eap_type_names, EAP_SIM, EAP_SIM, EAP_GTC, 
    2828    "EAP_SIM"); 
    2929ENUM_NEXT(eap_type_names, EAP_AKA, EAP_AKA, EAP_SIM, 

  • trunk/src/charon/sa/authenticators/eap/eap_method.h

    r3589 r4269  
    5353    EAP_NAK = 3, 
    5454    EAP_MD5 = 4, 
    55     EAP_ONE_TIME_PASSWORD = 5, 
    56     EAP_TOKEN_CARD = 6, 
     55    EAP_OTP = 5, 
     56    EAP_GTC = 6, 
    5757    EAP_SIM = 18, 
    5858    EAP_AKA = 23, 

  • trunk/src/libstrongswan/utils/leak_detective.c

    r4130 r4269  
    263263    "dlopen", 
    264264    "dlerror", 
     265    "dlclose", 
    265266    /* mysql functions */ 
    266267    "mysql_init_character_set", 

  • trunk/src/starter/confread.c

    r4140 r4269  
    589589                conn->eap_type = 4; 
    590590            } 
     591            else if (streq(kw->value, "gtc")) 
     592            { 
     593                conn->eap_type = 6; 
     594            } 
    591595            else 
    592596            {