OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

acme: Support selecting ECC certificates from Luci 

As pointed out by @andersk, acme.sh already supports ECC certificates, and
they can be set manually in the uci file, just not in Luci. Fix this by
changing the key size selector into a listbox, and adding ECC certs as
options.

Fixes #7825.

Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
This commit is contained in:
Toke Høiland-Jørgensen 2019-01-08 11:27:12 +01:00 committed by Toke Høiland-Jørgensen
parent 0551b498e4
commit 5a1f294667
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/acme/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=acme PKG_NAME:=acme
PKG_VERSION:=2.7.9 PKG_VERSION:=2.7.9
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_LICENSE:=GPLv3 PKG_LICENSE:=GPLv3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

11
net/acme/files/acme-cbi.lua
View File

@ -53,10 +53,15 @@ us = cs:option(Flag, "use_staging", translate("Use staging server"),
"(use for testing; the certificate won't be valid).")) "(use for testing; the certificate won't be valid)."))
us.rmempty = false us.rmempty = false
kl = cs:option(Value, "keylength", translate("Key length"), kl = cs:option(ListValue, "keylength", translate("Key size"),
translate("Number of bits (minimum 2048).")) translate("Key size (and type) for the generated certificate."))
kl:value("2048", "RSA 2048 bits")
kl:value("4096", "RSA 4096 bits")
kl:value("8192", "RSA 8192 bits")
kl:value("ec-256", "ECC 256 bits")
kl:value("ec-384", "ECC 384 bits")
kl.default = "2048"
kl.rmempty = false kl.rmempty = false
kl.datatype = "and(uinteger,min(2048))"
if uhttpd_presence then if uhttpd_presence then
u = cs:option(Flag, "update_uhttpd", translate("Use for uhttpd"), u = cs:option(Flag, "update_uhttpd", translate("Use for uhttpd"),