adding plugin for EAP-MS-CHAPv2
This commit is contained in:
parent
73883705bd
commit
f98cdf7a47
10
configure.in
10
configure.in
|
@ -449,6 +449,14 @@ AC_ARG_ENABLE(
|
||||||
fi]
|
fi]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
AC_ARG_ENABLE(
|
||||||
|
[eap-mschapv2],
|
||||||
|
AS_HELP_STRING([--enable-eap-mschapv2],[build MS-CHAPv2 authenication module for EAP (default is NO).]),
|
||||||
|
[if test x$enableval = xyes; then
|
||||||
|
eap_mschapv2=true
|
||||||
|
fi]
|
||||||
|
)
|
||||||
|
|
||||||
AC_ARG_ENABLE(
|
AC_ARG_ENABLE(
|
||||||
[kernel-netlink],
|
[kernel-netlink],
|
||||||
AS_HELP_STRING([--disable-kernel-netlink],[disable the netlink kernel interface. (default is NO).]),
|
AS_HELP_STRING([--disable-kernel-netlink],[disable the netlink kernel interface. (default is NO).]),
|
||||||
|
@ -934,6 +942,7 @@ AM_CONDITIONAL(USE_EAP_IDENTITY, test x$eap_identity = xtrue)
|
||||||
AM_CONDITIONAL(USE_EAP_MD5, test x$eap_md5 = xtrue)
|
AM_CONDITIONAL(USE_EAP_MD5, test x$eap_md5 = xtrue)
|
||||||
AM_CONDITIONAL(USE_EAP_GTC, test x$eap_gtc = xtrue)
|
AM_CONDITIONAL(USE_EAP_GTC, test x$eap_gtc = xtrue)
|
||||||
AM_CONDITIONAL(USE_EAP_AKA, test x$eap_aka = xtrue)
|
AM_CONDITIONAL(USE_EAP_AKA, test x$eap_aka = xtrue)
|
||||||
|
AM_CONDITIONAL(USE_EAP_MSCHAPV2, test x$eap_mschapv2 = xtrue)
|
||||||
AM_CONDITIONAL(USE_KERNEL_NETLINK, test x$kernel_netlink = xtrue)
|
AM_CONDITIONAL(USE_KERNEL_NETLINK, test x$kernel_netlink = xtrue)
|
||||||
AM_CONDITIONAL(USE_KERNEL_PFKEY, test x$kernel_pfkey = xtrue)
|
AM_CONDITIONAL(USE_KERNEL_PFKEY, test x$kernel_pfkey = xtrue)
|
||||||
AM_CONDITIONAL(USE_KERNEL_KLIPS, test x$kernel_klips = xtrue)
|
AM_CONDITIONAL(USE_KERNEL_KLIPS, test x$kernel_klips = xtrue)
|
||||||
|
@ -1012,6 +1021,7 @@ AC_OUTPUT(
|
||||||
src/charon/plugins/eap_gtc/Makefile
|
src/charon/plugins/eap_gtc/Makefile
|
||||||
src/charon/plugins/eap_sim/Makefile
|
src/charon/plugins/eap_sim/Makefile
|
||||||
src/charon/plugins/eap_sim_file/Makefile
|
src/charon/plugins/eap_sim_file/Makefile
|
||||||
|
src/charon/plugins/eap_mschapv2/Makefile
|
||||||
src/charon/plugins/kernel_netlink/Makefile
|
src/charon/plugins/kernel_netlink/Makefile
|
||||||
src/charon/plugins/kernel_pfkey/Makefile
|
src/charon/plugins/kernel_pfkey/Makefile
|
||||||
src/charon/plugins/kernel_klips/Makefile
|
src/charon/plugins/kernel_klips/Makefile
|
||||||
|
|
|
@ -216,6 +216,11 @@ if USE_EAP_AKA
|
||||||
PLUGINS += eapaka
|
PLUGINS += eapaka
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if USE_EAP_MSCHAPV2
|
||||||
|
SUBDIRS += plugins/eap_mschapv2
|
||||||
|
PLUGINS += eapmschapv2
|
||||||
|
endif
|
||||||
|
|
||||||
if USE_MEDSRV
|
if USE_MEDSRV
|
||||||
SUBDIRS += plugins/medsrv
|
SUBDIRS += plugins/medsrv
|
||||||
PLUGINS += medsrv
|
PLUGINS += medsrv
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
|
||||||
|
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
|
||||||
|
|
||||||
|
AM_CFLAGS = -rdynamic
|
||||||
|
|
||||||
|
plugin_LTLIBRARIES = libstrongswan-eapmschapv2.la
|
||||||
|
|
||||||
|
libstrongswan_eapmschapv2_la_SOURCES = \
|
||||||
|
eap_mschapv2_plugin.h eap_mschapv2_plugin.c \
|
||||||
|
eap_mschapv2.h eap_mschapv2.c
|
||||||
|
libstrongswan_eapmschapv2_la_LDFLAGS = -module
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,59 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2009 Tobias Brunner
|
||||||
|
* Hochschule fuer Technik Rapperswil
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
|
* under the terms of the GNU General Public License as published by the
|
||||||
|
* Free Software Foundation; either version 2 of the License, or (at your
|
||||||
|
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||||
|
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
* for more details.
|
||||||
|
*
|
||||||
|
* $Id$
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @defgroup eap_mschapv2_i eap_mschapv2
|
||||||
|
* @{ @ingroup eap_mschapv2
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef EAP_MSCHAPV2_H_
|
||||||
|
#define EAP_MSCHAPV2_H_
|
||||||
|
|
||||||
|
typedef struct eap_mschapv2_t eap_mschapv2_t;
|
||||||
|
|
||||||
|
#include <sa/authenticators/eap/eap_method.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of the eap_method_t interface using EAP-MS-CHAPv2.
|
||||||
|
*/
|
||||||
|
struct eap_mschapv2_t {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implemented eap_method_t interface.
|
||||||
|
*/
|
||||||
|
eap_method_t eap_method_interface;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates the EAP method EAP-MS-CHAPv2 acting as server.
|
||||||
|
*
|
||||||
|
* @param server ID of the EAP server
|
||||||
|
* @param peer ID of the EAP client
|
||||||
|
* @return eap_mschapv2_t object
|
||||||
|
*/
|
||||||
|
eap_mschapv2_t *eap_mschapv2_create_server(identification_t *server, identification_t *peer);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates the EAP method EAP-MS-CHAPv2 acting as peer.
|
||||||
|
*
|
||||||
|
* @param server ID of the EAP server
|
||||||
|
* @param peer ID of the EAP client
|
||||||
|
* @return eap_mschapv2_t object
|
||||||
|
*/
|
||||||
|
eap_mschapv2_t *eap_mschapv2_create_peer(identification_t *server, identification_t *peer);
|
||||||
|
|
||||||
|
#endif /* EAP_MSCHAPV2_H_ @}*/
|
|
@ -0,0 +1,52 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2009 Tobias Brunner
|
||||||
|
* Hochschule fuer Technik Rapperswil
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
|
* under the terms of the GNU General Public License as published by the
|
||||||
|
* Free Software Foundation; either version 2 of the License, or (at your
|
||||||
|
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||||
|
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
* for more details.
|
||||||
|
*
|
||||||
|
* $Id$
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "eap_mschapv2_plugin.h"
|
||||||
|
|
||||||
|
#include "eap_mschapv2.h"
|
||||||
|
|
||||||
|
#include <daemon.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implementation of plugin_t.destroy
|
||||||
|
*/
|
||||||
|
static void destroy(eap_mschapv2_plugin_t *this)
|
||||||
|
{
|
||||||
|
charon->eap->remove_method(charon->eap,
|
||||||
|
(eap_constructor_t)eap_mschapv2_create_server);
|
||||||
|
charon->eap->remove_method(charon->eap,
|
||||||
|
(eap_constructor_t)eap_mschapv2_create_peer);
|
||||||
|
free(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* see header file
|
||||||
|
*/
|
||||||
|
plugin_t *plugin_create()
|
||||||
|
{
|
||||||
|
eap_mschapv2_plugin_t *this = malloc_thing(eap_mschapv2_plugin_t);
|
||||||
|
|
||||||
|
this->plugin.destroy = (void(*)(plugin_t*))destroy;
|
||||||
|
|
||||||
|
charon->eap->add_method(charon->eap, EAP_MSCHAPV2, 0, EAP_SERVER,
|
||||||
|
(eap_constructor_t)eap_mschapv2_create_server);
|
||||||
|
charon->eap->add_method(charon->eap, EAP_MSCHAPV2, 0, EAP_PEER,
|
||||||
|
(eap_constructor_t)eap_mschapv2_create_peer);
|
||||||
|
|
||||||
|
return &this->plugin;
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,49 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2009 Tobias Brunner
|
||||||
|
* Hochschule fuer Technik Rapperswil
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
|
* under the terms of the GNU General Public License as published by the
|
||||||
|
* Free Software Foundation; either version 2 of the License, or (at your
|
||||||
|
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||||
|
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
* for more details.
|
||||||
|
*
|
||||||
|
* $Id$
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @defgroup eap_mschapv2 eap_mschapv2
|
||||||
|
* @ingroup cplugins
|
||||||
|
*
|
||||||
|
* @defgroup eap_mschapv2_plugin eap_mschapv2_plugin
|
||||||
|
* @{ @ingroup eap_mschapv2
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef EAP_MSCHAPV2_PLUGIN_H_
|
||||||
|
#define EAP_MSCHAPV2_PLUGIN_H_
|
||||||
|
|
||||||
|
#include <plugins/plugin.h>
|
||||||
|
|
||||||
|
typedef struct eap_mschapv2_plugin_t eap_mschapv2_plugin_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* EAP-MS-CHAPv2 plugin
|
||||||
|
*/
|
||||||
|
struct eap_mschapv2_plugin_t {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* implements plugin interface
|
||||||
|
*/
|
||||||
|
plugin_t plugin;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a eap_mschapv2_plugin instance.
|
||||||
|
*/
|
||||||
|
plugin_t *plugin_create();
|
||||||
|
|
||||||
|
#endif /* EAP_MSCHAPV2_PLUGIN_H_ @}*/
|
|
@ -28,7 +28,9 @@ ENUM_NEXT(eap_type_names, EAP_SIM, EAP_SIM, EAP_GTC,
|
||||||
"EAP_SIM");
|
"EAP_SIM");
|
||||||
ENUM_NEXT(eap_type_names, EAP_AKA, EAP_AKA, EAP_SIM,
|
ENUM_NEXT(eap_type_names, EAP_AKA, EAP_AKA, EAP_SIM,
|
||||||
"EAP_AKA");
|
"EAP_AKA");
|
||||||
ENUM_NEXT(eap_type_names, EAP_EXPANDED, EAP_EXPERIMENTAL, EAP_AKA,
|
ENUM_NEXT(eap_type_names, EAP_MSCHAPV2, EAP_MSCHAPV2, EAP_AKA,
|
||||||
|
"EAP_MSCHAPV2");
|
||||||
|
ENUM_NEXT(eap_type_names, EAP_EXPANDED, EAP_EXPERIMENTAL, EAP_MSCHAPV2,
|
||||||
"EAP_EXPANDED",
|
"EAP_EXPANDED",
|
||||||
"EAP_EXPERIMENTAL");
|
"EAP_EXPERIMENTAL");
|
||||||
ENUM_END(eap_type_names, EAP_EXPERIMENTAL);
|
ENUM_END(eap_type_names, EAP_EXPERIMENTAL);
|
||||||
|
|
|
@ -56,6 +56,7 @@ enum eap_type_t {
|
||||||
EAP_GTC = 6,
|
EAP_GTC = 6,
|
||||||
EAP_SIM = 18,
|
EAP_SIM = 18,
|
||||||
EAP_AKA = 23,
|
EAP_AKA = 23,
|
||||||
|
EAP_MSCHAPV2 = 26,
|
||||||
EAP_EXPANDED = 254,
|
EAP_EXPANDED = 254,
|
||||||
EAP_EXPERIMENTAL = 255,
|
EAP_EXPERIMENTAL = 255,
|
||||||
};
|
};
|
||||||
|
|
|
@ -621,6 +621,10 @@ load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg)
|
||||||
{
|
{
|
||||||
conn->eap_type = 6;
|
conn->eap_type = 6;
|
||||||
}
|
}
|
||||||
|
else if (streq(kw->value, "mschapv2"))
|
||||||
|
{
|
||||||
|
conn->eap_type = 26;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
conn->eap_type = atoi(kw->value);
|
conn->eap_type = atoi(kw->value);
|
||||||
|
|
Loading…
Reference in New Issue