Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #20832 from hgl/strongswan

Browse source 
strongswan: enable nonce unconditionally
This commit is contained in:
Philip Prindeville 2023-04-24 08:34:55 -06:00 committed by GitHub
commit 6a3e5464ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/strongswan/Makefile
View file

@ -59,7 +59,6 @@ PKG_MOD_AVAILABLE:= \
ldap \ ldap \
led \ led \
load-tester \ load-tester \
nonce \
md4 \ md4 \
md5 \ md5 \
mgf1 \ mgf1 \
@ -200,7 +199,6 @@ $(call Package/strongswan/Default)
+strongswan-mod-ldap \ +strongswan-mod-ldap \
+strongswan-mod-led \ +strongswan-mod-led \
+strongswan-mod-load-tester \ +strongswan-mod-load-tester \
+strongswan-mod-nonce \
+strongswan-mod-md4 \ +strongswan-mod-md4 \
+strongswan-mod-md5 \ +strongswan-mod-md5 \
+strongswan-mod-mgf1 \ +strongswan-mod-mgf1 \
@ -272,7 +270,6 @@ $(call Package/strongswan/Default)
+strongswan-mod-kernel-netlink \ +strongswan-mod-kernel-netlink \
+strongswan-mod-md5 \ +strongswan-mod-md5 \
+strongswan-mod-mgf1 \ +strongswan-mod-mgf1 \
+strongswan-mod-nonce \
+strongswan-mod-pem \ +strongswan-mod-pem \
+strongswan-mod-pgp \ +strongswan-mod-pgp \
+strongswan-mod-pkcs1 \ +strongswan-mod-pkcs1 \
@ -312,7 +309,6 @@ $(call Package/strongswan/Default)
+strongswan-mod-kernel-netlink \ +strongswan-mod-kernel-netlink \
+strongswan-mod-md5 \ +strongswan-mod-md5 \
+strongswan-mod-mgf1 \ +strongswan-mod-mgf1 \
+strongswan-mod-nonce \
+strongswan-mod-pubkey \ +strongswan-mod-pubkey \
+strongswan-mod-random \ +strongswan-mod-random \
+strongswan-mod-sha1 \ +strongswan-mod-sha1 \
@ -341,7 +337,6 @@ $(call Package/strongswan/Default)
@(PACKAGE_strongswan-mod-kdf||PACKAGE_strongswan-mod-openssl||PACKAGE_strongswan-mod-wolfssl) \ @(PACKAGE_strongswan-mod-kdf||PACKAGE_strongswan-mod-openssl||PACKAGE_strongswan-mod-wolfssl) \
+strongswan-mod-kernel-netlink \ +strongswan-mod-kernel-netlink \
+strongswan-mod-mgf1 \ +strongswan-mod-mgf1 \
+strongswan-mod-nonce \
+strongswan-mod-pubkey \ +strongswan-mod-pubkey \
+strongswan-mod-random \ +strongswan-mod-random \
+strongswan-mod-sha1 \ +strongswan-mod-sha1 \
@ -470,6 +465,7 @@ CONFIGURE_ARGS+= \
--disable-scripts \ --disable-scripts \
--disable-static \ --disable-static \
--disable-fast \ --disable-fast \
--enable-nonce \
--enable-mgf1 \ --enable-mgf1 \
--enable-mediation \ --enable-mediation \
--with-systemdsystemunitdir=no \ --with-systemdsystemunitdir=no \
@ -493,8 +489,11 @@ define Package/strongswan/install
$(INSTALL_DIR) $(1)/etc $(INSTALL_DIR) $(1)/etc
$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/strongswan.conf $(1)/etc/ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/strongswan.conf $(1)/etc/
echo -e "\ninclude /var/ipsec/strongswan.conf" >> $(1)/etc/strongswan.conf echo -e "\ninclude /var/ipsec/strongswan.conf" >> $(1)/etc/strongswan.conf
$(INSTALL_DIR) $(1)/usr/lib/ipsec $(INSTALL_DIR) $(1)/etc/strongswan.d/charon
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/strongswan.d/charon/nonce.conf $(1)/etc/strongswan.d/charon/
$(INSTALL_DIR) $(1)/usr/lib/ipsec/plugins
$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libstrongswan.so.* $(1)/usr/lib/ipsec/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libstrongswan.so.* $(1)/usr/lib/ipsec/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-nonce.so $(1)/usr/lib/ipsec/plugins/
endef endef
define Package/strongswan-default/install define Package/strongswan-default/install
@ -700,7 +699,6 @@ $(eval $(call BuildPlugin,kernel-netlink,netlink kernel interface,))
$(eval $(call BuildPlugin,ldap,LDAP,+PACKAGE_strongswan-mod-ldap:libopenldap)) $(eval $(call BuildPlugin,ldap,LDAP,+PACKAGE_strongswan-mod-ldap:libopenldap))
$(eval $(call BuildPlugin,led,LED blink on IKE activity,)) $(eval $(call BuildPlugin,led,LED blink on IKE activity,))
$(eval $(call BuildPlugin,load-tester,load testing,)) $(eval $(call BuildPlugin,load-tester,load testing,))
$(eval $(call BuildPlugin,nonce,nonce generation,))
$(eval $(call BuildPlugin,md4,MD4 crypto,)) $(eval $(call BuildPlugin,md4,MD4 crypto,))
$(eval $(call BuildPlugin,md5,MD5 crypto,)) $(eval $(call BuildPlugin,md5,MD5 crypto,))
$(eval $(call BuildPlugin,mgf1,MGF1 crypto,)) $(eval $(call BuildPlugin,mgf1,MGF1 crypto,))