mirror of https://github.com/hak5/openwrt.git
openssl: add package for openssl.cnf, misc changes
- Add the /etc/ssl/openssl.cnf as a separate package, to avoid breaking the transitional mechanism, allowing libopenssl_1.0* and libopenssl_1.1* to coexist. - Remove the (selecting) dependency on @KERNEL_AIO - Use global SOURCE_DATE_EPOCH Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>openwrt-19.07
parent
2eeb2853ed
commit
29b69e840a
|
@ -250,11 +250,14 @@ config OPENSSL_ENGINE
|
||||||
This enables alternative cryptography implementations,
|
This enables alternative cryptography implementations,
|
||||||
most commonly for interfacing with external crypto devices,
|
most commonly for interfacing with external crypto devices,
|
||||||
or supporting new/alternative ciphers and digests.
|
or supporting new/alternative ciphers and digests.
|
||||||
|
Note that you need to enable KERNEL_AIO to be able to build the
|
||||||
|
afalg engine package.
|
||||||
|
|
||||||
config OPENSSL_ENGINE_CRYPTO
|
config OPENSSL_ENGINE_CRYPTO
|
||||||
bool
|
bool
|
||||||
select OPENSSL_ENGINE
|
select OPENSSL_ENGINE
|
||||||
select PACKAGE_kmod-cryptodev
|
select PACKAGE_kmod-cryptodev
|
||||||
|
select PACKAGE_libopenssl-conf
|
||||||
prompt "Acceleration support through /dev/crypto"
|
prompt "Acceleration support through /dev/crypto"
|
||||||
help
|
help
|
||||||
This enables use of hardware acceleration through OpenBSD
|
This enables use of hardware acceleration through OpenBSD
|
||||||
|
@ -284,4 +287,3 @@ config OPENSSL_WITH_GOST
|
||||||
https://github.com/gost-engine/engine
|
https://github.com/gost-engine/engine
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -104,24 +104,37 @@ define Package/openssl-util
|
||||||
$(call Package/openssl/Default)
|
$(call Package/openssl/Default)
|
||||||
SECTION:=utils
|
SECTION:=utils
|
||||||
CATEGORY:=Utilities
|
CATEGORY:=Utilities
|
||||||
DEPENDS:=+libopenssl
|
DEPENDS:=+libopenssl +libopenssl-conf
|
||||||
TITLE+= (utility)
|
TITLE+= (utility)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/openssl-util/conffiles
|
|
||||||
/etc/ssl/openssl.cnf
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/openssl-util/description
|
define Package/openssl-util/description
|
||||||
$(call Package/openssl/Default/description)
|
$(call Package/openssl/Default/description)
|
||||||
This package contains the OpenSSL command-line utility.
|
This package contains the OpenSSL command-line utility.
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
define Package/libopenssl-conf
|
||||||
|
$(call Package/openssl/Default)
|
||||||
|
SUBMENU:=SSL
|
||||||
|
TITLE:=/etc/ssl/openssl.cnf config file
|
||||||
|
DEPENDS:=libopenssl
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/libopenssl-conf/conffiles
|
||||||
|
/etc/ssl/openssl.cnf
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/libopenssl-conf/description
|
||||||
|
$(call Package/openssl/Default/description)
|
||||||
|
This package installs the OpenSSL configuration file /etc/ssl/openssl.cnf.
|
||||||
|
endef
|
||||||
|
|
||||||
define Package/libopenssl-afalg
|
define Package/libopenssl-afalg
|
||||||
$(call Package/openssl/Default)
|
$(call Package/openssl/Default)
|
||||||
SUBMENU:=SSL
|
SUBMENU:=SSL
|
||||||
TITLE:=AFALG hardware acceleration engine
|
TITLE:=AFALG hardware acceleration engine
|
||||||
DEPENDS:=libopenssl @OPENSSL_ENGINE @KERNEL_AIO @!LINUX_3_18 +kmod-crypto-user
|
DEPENDS:=libopenssl @OPENSSL_ENGINE @KERNEL_AIO @!LINUX_3_18 +kmod-crypto-user \
|
||||||
|
+libopenssl-conf
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/libopenssl-afalg/description
|
define Package/libopenssl-afalg/description
|
||||||
|
@ -136,7 +149,8 @@ define Package/libopenssl-padlock
|
||||||
$(call Package/openssl/Default)
|
$(call Package/openssl/Default)
|
||||||
SUBMENU:=SSL
|
SUBMENU:=SSL
|
||||||
TITLE:=VIA Padlock hardware acceleration engine
|
TITLE:=VIA Padlock hardware acceleration engine
|
||||||
DEPENDS:=libopenssl @OPENSSL_ENGINE @TARGET_x86 +kmod-crypto-hw-padlock
|
DEPENDS:=libopenssl @OPENSSL_ENGINE @TARGET_x86 +kmod-crypto-hw-padlock \
|
||||||
|
+libopenssl-conf
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/libopenssl-padlock/description
|
define Package/libopenssl-padlock/description
|
||||||
|
@ -335,9 +349,12 @@ define Package/libopenssl/install
|
||||||
$(if $(CONFIG_OPENSSL_ENGINE),$(INSTALL_DIR) $(1)/usr/lib/$(ENGINES_DIR))
|
$(if $(CONFIG_OPENSSL_ENGINE),$(INSTALL_DIR) $(1)/usr/lib/$(ENGINES_DIR))
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/openssl-util/install
|
define Package/libopenssl-conf/install
|
||||||
$(INSTALL_DIR) $(1)/etc/ssl
|
$(INSTALL_DIR) $(1)/etc/ssl
|
||||||
$(CP) $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(1)/etc/ssl/
|
$(CP) $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(1)/etc/ssl/
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/openssl-util/install
|
||||||
$(INSTALL_DIR) $(1)/usr/bin
|
$(INSTALL_DIR) $(1)/usr/bin
|
||||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/
|
||||||
endef
|
endef
|
||||||
|
@ -353,6 +370,7 @@ define Package/libopenssl-padlock/install
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(call BuildPackage,libopenssl))
|
$(eval $(call BuildPackage,libopenssl))
|
||||||
|
$(eval $(call BuildPackage,libopenssl-conf))
|
||||||
$(eval $(call BuildPackage,libopenssl-afalg))
|
$(eval $(call BuildPackage,libopenssl-afalg))
|
||||||
$(eval $(call BuildPackage,libopenssl-padlock))
|
$(eval $(call BuildPackage,libopenssl-padlock))
|
||||||
$(eval $(call BuildPackage,openssl-util))
|
$(eval $(call BuildPackage,openssl-util))
|
||||||
|
|
Loading…
Reference in New Issue