diff options
Diffstat (limited to 'src/medsrv')
18 files changed, 15 insertions, 5 deletions
diff --git a/src/medsrv/Makefile.in b/src/medsrv/Makefile.in index 95f02c580..85b1f0d92 100644 --- a/src/medsrv/Makefile.in +++ b/src/medsrv/Makefile.in @@ -51,6 +51,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/config/libtool.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(medsrvdir)" \ @@ -66,7 +67,7 @@ medsrv_fcgi_OBJECTS = $(am_medsrv_fcgi_OBJECTS) medsrv_fcgi_DEPENDENCIES = \ $(top_builddir)/src/libstrongswan/libstrongswan.la \ $(top_builddir)/src/libfast/libfast.la -DEFAULT_INCLUDES = -I.@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@ -115,6 +116,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BFDLIB = @BFDLIB@ BTLIB = @BTLIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -209,11 +211,14 @@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ c_plugins = @c_plugins@ +charon_natt_port = @charon_natt_port@ +charon_plugins = @charon_plugins@ +charon_udp_port = @charon_udp_port@ clearsilver_LIBS = @clearsilver_LIBS@ datadir = @datadir@ datarootdir = @datarootdir@ dbusservicedir = @dbusservicedir@ -default_pkcs11 = @default_pkcs11@ +dev_headers = @dev_headers@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ @@ -230,11 +235,12 @@ imcvdir = @imcvdir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +ipsec_script = @ipsec_script@ +ipsec_script_upper = @ipsec_script_upper@ ipsecdir = @ipsecdir@ ipsecgroup = @ipsecgroup@ ipseclibdir = @ipseclibdir@ ipsecuser = @ipsecuser@ -libcharon_plugins = @libcharon_plugins@ libdir = @libdir@ libexecdir = @libexecdir@ linux_headers = @linux_headers@ @@ -250,6 +256,7 @@ mkdir_p = @mkdir_p@ nm_CFLAGS = @nm_CFLAGS@ nm_LIBS = @nm_LIBS@ nm_ca_dir = @nm_ca_dir@ +nm_plugins = @nm_plugins@ oldincludedir = @oldincludedir@ openac_plugins = @openac_plugins@ p_plugins = @p_plugins@ @@ -259,7 +266,6 @@ pdfdir = @pdfdir@ piddir = @piddir@ pki_plugins = @pki_plugins@ plugindir = @plugindir@ -pluto_plugins = @pluto_plugins@ pool_plugins = @pool_plugins@ prefix = @prefix@ program_transform_name = @program_transform_name@ diff --git a/src/medsrv/controller/peer_controller.c b/src/medsrv/controller/peer_controller.c index edcf653b2..edcf653b2 100755..100644 --- a/src/medsrv/controller/peer_controller.c +++ b/src/medsrv/controller/peer_controller.c diff --git a/src/medsrv/controller/peer_controller.h b/src/medsrv/controller/peer_controller.h index f25c30281..f25c30281 100755..100644 --- a/src/medsrv/controller/peer_controller.h +++ b/src/medsrv/controller/peer_controller.h diff --git a/src/medsrv/controller/user_controller.c b/src/medsrv/controller/user_controller.c index 12bd938fe..35c9d90c8 100755..100644 --- a/src/medsrv/controller/user_controller.c +++ b/src/medsrv/controller/user_controller.c @@ -64,7 +64,11 @@ static chunk_t hash_password(char *login, char *password) } data = chunk_cata("cc", chunk_create(login, strlen(login)), chunk_create(password, strlen(password))); - hasher->allocate_hash(hasher, data, &hash); + if (!hasher->allocate_hash(hasher, data, &hash)) + { + hasher->destroy(hasher); + return chunk_empty; + } hasher->destroy(hasher); return hash; } diff --git a/src/medsrv/controller/user_controller.h b/src/medsrv/controller/user_controller.h index 9d23795d7..9d23795d7 100755..100644 --- a/src/medsrv/controller/user_controller.h +++ b/src/medsrv/controller/user_controller.h diff --git a/src/medsrv/filter/auth_filter.c b/src/medsrv/filter/auth_filter.c index d21abdc46..d21abdc46 100755..100644 --- a/src/medsrv/filter/auth_filter.c +++ b/src/medsrv/filter/auth_filter.c diff --git a/src/medsrv/filter/auth_filter.h b/src/medsrv/filter/auth_filter.h index c46de40a5..c46de40a5 100755..100644 --- a/src/medsrv/filter/auth_filter.h +++ b/src/medsrv/filter/auth_filter.h diff --git a/src/medsrv/templates/footer.cs b/src/medsrv/templates/footer.cs index db3601961..db3601961 100755..100644 --- a/src/medsrv/templates/footer.cs +++ b/src/medsrv/templates/footer.cs diff --git a/src/medsrv/templates/header.cs b/src/medsrv/templates/header.cs index 4ab4afd1e..4ab4afd1e 100755..100644 --- a/src/medsrv/templates/header.cs +++ b/src/medsrv/templates/header.cs diff --git a/src/medsrv/templates/peer/add.cs b/src/medsrv/templates/peer/add.cs index 28a994f7f..28a994f7f 100755..100644 --- a/src/medsrv/templates/peer/add.cs +++ b/src/medsrv/templates/peer/add.cs diff --git a/src/medsrv/templates/peer/edit.cs b/src/medsrv/templates/peer/edit.cs index 76fb9dafc..76fb9dafc 100755..100644 --- a/src/medsrv/templates/peer/edit.cs +++ b/src/medsrv/templates/peer/edit.cs diff --git a/src/medsrv/templates/peer/list.cs b/src/medsrv/templates/peer/list.cs index 205452641..205452641 100755..100644 --- a/src/medsrv/templates/peer/list.cs +++ b/src/medsrv/templates/peer/list.cs diff --git a/src/medsrv/templates/static/favicon.ico b/src/medsrv/templates/static/favicon.ico Binary files differindex d00459196..d00459196 100755..100644 --- a/src/medsrv/templates/static/favicon.ico +++ b/src/medsrv/templates/static/favicon.ico diff --git a/src/medsrv/templates/static/strongswan.png b/src/medsrv/templates/static/strongswan.png Binary files differindex 869188cdf..869188cdf 100755..100644 --- a/src/medsrv/templates/static/strongswan.png +++ b/src/medsrv/templates/static/strongswan.png diff --git a/src/medsrv/templates/static/style.css b/src/medsrv/templates/static/style.css index e109ce278..e109ce278 100755..100644 --- a/src/medsrv/templates/static/style.css +++ b/src/medsrv/templates/static/style.css diff --git a/src/medsrv/templates/user/add.cs b/src/medsrv/templates/user/add.cs index 8ba4e5c96..8ba4e5c96 100755..100644 --- a/src/medsrv/templates/user/add.cs +++ b/src/medsrv/templates/user/add.cs diff --git a/src/medsrv/templates/user/edit.cs b/src/medsrv/templates/user/edit.cs index 1f168498b..1f168498b 100755..100644 --- a/src/medsrv/templates/user/edit.cs +++ b/src/medsrv/templates/user/edit.cs diff --git a/src/medsrv/templates/user/login.cs b/src/medsrv/templates/user/login.cs index 1d6eadbbc..1d6eadbbc 100755..100644 --- a/src/medsrv/templates/user/login.cs +++ b/src/medsrv/templates/user/login.cs |
