nut: enable peer certificate verification

Enable CERTVERIFY, CERTREQUEST, and related options for requiring
verified certificates from peers.

While we are at it, alphabetize the list of PKG_CONFIG_DEPENDS in the
Makefile

Signed-off-by: Daniel F. Dickinson <redacted>

diff --git a/net/nut/Config.in b/net/nut/Config.in
index 884319c7187c0f7c3885d9afb7b8f66743098572..2dfc3c9c39ad8a31a379eab35dc841bd68c43162 100644 (file)
--- a/net/nut/Config.in
+++ b/net/nut/Config.in
@@ -20,6 +20,14 @@
                        3493 from upsd will no longer net you interesting passwords.
                default y
 
+       config NUT_SSL_CERTVERIFY
+               depends on PACKAGE_nut && (NUT_SSL || NUT_SSL_NSS)
+               bool "Build with support for certificate verification when using SSL"
+               help
+                       When using SSL, enables configuration options for verification of peer's
+                       certificate before connecting to the peer.
+               default y
+
        config NUT_DRIVER_USB
                depends on PACKAGE_nut
                bool "Build with support for USB drivers"

diff --git a/net/nut/Makefile b/net/nut/Makefile
index dfa31198e008036b336fec66861bd5c84ccb2051..d4bb8195dc969be8a43315df6d1cf35e3b73ea0a 100644 (file)
--- a/net/nut/Makefile
+++ b/net/nut/Makefile
@@ -23,13 +23,14 @@ PKG_MAINTAINER:=Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
 PKG_INSTALL:=1
 
 PKG_CONFIG_DEPENDS:= \
+  CONFIG_PACKAGE_nut-web-cgi \
+  CONFIG_NUT_DRIVER_NEON \
+  CONFIG_NUT_DRIVER_SERIAL \
   CONFIG_NUT_DRIVER_SNMP \
   CONFIG_NUT_DRIVER_USB \
-  CONFIG_NUT_DRIVER_SERIAL \
-  CONFIG_NUT_DRIVER_NEON \
-  CONFIG_NUT_SSL_NSS \
   CONFIG_NUT_SSL \
-  CONFIG_PACKAGE_nut-web-cgi
+  CONFIG_NUT_SSL_CERTVERIFY \
+  CONFIG_NUT_SSL_NSS
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -609,6 +610,7 @@ CONFIGURE_ARGS += \
   $(if $(CONFIG_NUT_SSL),--with-ssl=openssl) \
   $(if $(CONFIG_NUT_SSL_NSS),--with-ssl=nss,--without-nss) \
   $(if $(CONFIG_NUT_SSL),,$(if $(CONFIG_NUT_SSL_NSS),,--without-ssl)) \
+  $(if $(CONFIG_NUT_SSL)$(CONFIG_NUT_SSL_NSS),$(if $(CONFIG_NUT_SSL_CERTVERIFY),--with-ssl-client-validation,--without-ssl-client-validation)) \
   --without-libltdl \
   --enable-docs-changelog=no \
   --without-macosx_ups \