From: Jo-Philipp Wich Date: Tue, 10 Mar 2015 17:55:46 +0000 (+0100) Subject: Merge pull request #304 from nmav/ocserv-crypt X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=dd2b05289b40002b2e4c098abfc88052e423215f;hp=31e7adea63a4e7174d7f91daa9d323ee78a17a18 Merge pull request #304 from nmav/ocserv-crypt luci-app-ocserv: uclibc's crypt() doesn't support sha2crypt --- diff --git a/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua index 8cf35b79b..c4be1818f 100644 --- a/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua +++ b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua @@ -30,7 +30,7 @@ function pwd.write(self, section, value) pass = value else local t = tonumber(nixio.getpid()*os.time()) - local salt = "$5$" .. t .. "$" + local salt = "$1$" .. t .. "$" pass = nixio.crypt(value, salt) end Value.write(self, section, pass)