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

Merge pull request #6924 from derekyerger/strongswan-lattice-sha3

Browse source 
strongswan: add more crypto plugins
This commit is contained in:
Philip Prindeville 2021-04-08 22:26:56 -06:00 committed by GitHub
commit e44b2665e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
net/strongswan/Makefile
View file

@ -25,8 +25,10 @@ PKG_MOD_AVAILABLE:= \
agent \ agent \
attr \ attr \
attr-sql \ attr-sql \
bliss \
blowfish \ blowfish \
ccm \ ccm \
chapoly \
cmac \ cmac \
constraints \ constraints \
connmark \ connmark \
@ -60,7 +62,10 @@ PKG_MOD_AVAILABLE:= \
nonce \ nonce \
md4 \ md4 \
md5 \ md5 \
mgf1 \
mysql \ mysql \
newhope \
ntru \
openssl \ openssl \
pem \ pem \
pgp \ pgp \
@ -76,6 +81,7 @@ PKG_MOD_AVAILABLE:= \
revocation \ revocation \
sha1 \ sha1 \
sha2 \ sha2 \
sha3 \
smp \ smp \
socket-default \ socket-default \
socket-dynamic \ socket-dynamic \
@ -144,14 +150,17 @@ $(call Package/strongswan/Default)
+strongswan-charon \ +strongswan-charon \
+strongswan-charon-cmd \ +strongswan-charon-cmd \
+strongswan-ipsec \ +strongswan-ipsec \
+strongswan-libnttfft \
+strongswan-mod-addrblock \ +strongswan-mod-addrblock \
+strongswan-mod-aes \ +strongswan-mod-aes \
+strongswan-mod-af-alg \ +strongswan-mod-af-alg \
+strongswan-mod-agent \ +strongswan-mod-agent \
+strongswan-mod-attr \ +strongswan-mod-attr \
+strongswan-mod-attr-sql \ +strongswan-mod-attr-sql \
+strongswan-mod-bliss \
+strongswan-mod-blowfish \ +strongswan-mod-blowfish \
+strongswan-mod-ccm \ +strongswan-mod-ccm \
+strongswan-mod-chapoly \
+strongswan-mod-cmac \ +strongswan-mod-cmac \
+strongswan-mod-constraints \ +strongswan-mod-constraints \
+strongswan-mod-connmark \ +strongswan-mod-connmark \
@ -183,7 +192,10 @@ $(call Package/strongswan/Default)
+strongswan-mod-nonce \ +strongswan-mod-nonce \
+strongswan-mod-md4 \ +strongswan-mod-md4 \
+strongswan-mod-md5 \ +strongswan-mod-md5 \
+strongswan-mod-mgf1 \
+strongswan-mod-mysql \ +strongswan-mod-mysql \
+strongswan-mod-newhope \
+strongswan-mod-ntru \
+strongswan-mod-openssl \ +strongswan-mod-openssl \
+strongswan-mod-pem \ +strongswan-mod-pem \
+strongswan-mod-pgp \ +strongswan-mod-pgp \
@ -199,6 +211,7 @@ $(call Package/strongswan/Default)
+strongswan-mod-revocation \ +strongswan-mod-revocation \
+strongswan-mod-sha1 \ +strongswan-mod-sha1 \
+strongswan-mod-sha2 \ +strongswan-mod-sha2 \
+strongswan-mod-sha3 \
+strongswan-mod-smp \ +strongswan-mod-smp \
+strongswan-mod-socket-default \ +strongswan-mod-socket-default \
+strongswan-mod-sql \ +strongswan-mod-sql \
@ -361,6 +374,17 @@ $(call Package/strongswan/description/Default)
This package contains the ipsec utility. This package contains the ipsec utility.
endef endef
define Package/strongswan-libnttfft
$(call Package/strongswan/Default)
TITLE+= nttfft library
DEPENDS:= +strongswan
endef
define Package/strongswan-libnttfft/description
$(call Package/strongswan/description/Default)
This package contains the Number Theoretic Transforms library.
endef
define Package/strongswan-pki define Package/strongswan-pki
$(call Package/strongswan/Default) $(call Package/strongswan/Default)
TITLE+= PKI tool TITLE+= PKI tool
@ -518,6 +542,11 @@ opkg list-changed-conffiles | grep -qx /etc/ipsec.conf || {
} }
endef endef
define Package/strongswan-libnttfft/install
$(INSTALL_DIR) $(1)/usr/lib/ipsec
$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libnttfft.so.* $(1)/usr/lib/ipsec/
endef
define Package/strongswan-pki/install define Package/strongswan-pki/install
$(INSTALL_DIR) $(1)/etc/strongswan.d $(INSTALL_DIR) $(1)/etc/strongswan.d
$(CP) $(PKG_INSTALL_DIR)/etc/strongswan.d/pki.conf $(1)/etc/strongswan.d/ $(CP) $(PKG_INSTALL_DIR)/etc/strongswan.d/pki.conf $(1)/etc/strongswan.d/
@ -618,6 +647,7 @@ $(eval $(call BuildPackage,strongswan-isakmp))
$(eval $(call BuildPackage,strongswan-charon)) $(eval $(call BuildPackage,strongswan-charon))
$(eval $(call BuildPackage,strongswan-charon-cmd)) $(eval $(call BuildPackage,strongswan-charon-cmd))
$(eval $(call BuildPackage,strongswan-ipsec)) $(eval $(call BuildPackage,strongswan-ipsec))
$(eval $(call BuildPackage,strongswan-libnttfft))
$(eval $(call BuildPackage,strongswan-pki)) $(eval $(call BuildPackage,strongswan-pki))
$(eval $(call BuildPackage,strongswan-scepclient)) $(eval $(call BuildPackage,strongswan-scepclient))
$(eval $(call BuildPackage,strongswan-swanctl)) $(eval $(call BuildPackage,strongswan-swanctl))
@ -628,8 +658,10 @@ $(eval $(call BuildPlugin,af-alg,AF_ALG crypto interface to Linux Crypto API,+km
$(eval $(call BuildPlugin,agent,SSH agent signing,)) $(eval $(call BuildPlugin,agent,SSH agent signing,))
$(eval $(call BuildPlugin,attr,file based config,)) $(eval $(call BuildPlugin,attr,file based config,))
$(eval $(call BuildPlugin,attr-sql,SQL based config,+strongswan-charon)) $(eval $(call BuildPlugin,attr-sql,SQL based config,+strongswan-charon))
$(eval $(call BuildPlugin,bliss,BLISS crypto,+strongswan-libnttfft +strongswan-mod-mgf1 +strongswan-mod-hmac))
$(eval $(call BuildPlugin,blowfish,Blowfish crypto,)) $(eval $(call BuildPlugin,blowfish,Blowfish crypto,))
$(eval $(call BuildPlugin,ccm,CCM AEAD wrapper crypto,)) $(eval $(call BuildPlugin,ccm,CCM AEAD wrapper crypto,))
$(eval $(call BuildPlugin,chapoly,ChaCha20-Poly1305 AEAD crypto,))
$(eval $(call BuildPlugin,cmac,CMAC crypto,)) $(eval $(call BuildPlugin,cmac,CMAC crypto,))
$(eval $(call BuildPlugin,connmark,netfilter connection marking,)) $(eval $(call BuildPlugin,connmark,netfilter connection marking,))
$(eval $(call BuildPlugin,constraints,advanced X509 constraint checking,)) $(eval $(call BuildPlugin,constraints,advanced X509 constraint checking,))
@ -663,7 +695,10 @@ $(eval $(call BuildPlugin,load-tester,load testing,))
$(eval $(call BuildPlugin,nonce,nonce genereation,)) $(eval $(call BuildPlugin,nonce,nonce genereation,))
$(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,mysql,MySQL database interface,+strongswan-mod-sql +PACKAGE_strongswan-mod-mysql:libmysqlclient-r)) $(eval $(call BuildPlugin,mysql,MySQL database interface,+strongswan-mod-sql +PACKAGE_strongswan-mod-mysql:libmysqlclient-r))
$(eval $(call BuildPlugin,newhope,New Hope crypto,+strongswan-libnttfft +strongswan-mod-chapoly +strongswan-mod-sha3))
$(eval $(call BuildPlugin,ntru,NTRU crypto,+strongswan-mod-mgf1))
$(eval $(call BuildPlugin,openssl,OpenSSL crypto,+PACKAGE_strongswan-mod-openssl:libopenssl)) $(eval $(call BuildPlugin,openssl,OpenSSL crypto,+PACKAGE_strongswan-mod-openssl:libopenssl))
$(eval $(call BuildPlugin,pem,PEM decoding,)) $(eval $(call BuildPlugin,pem,PEM decoding,))
$(eval $(call BuildPlugin,pgp,PGP key decoding,)) $(eval $(call BuildPlugin,pgp,PGP key decoding,))
@ -679,6 +714,7 @@ $(eval $(call BuildPlugin,resolve,DNS resolver,))
$(eval $(call BuildPlugin,revocation,X509 CRL/OCSP revocation,)) $(eval $(call BuildPlugin,revocation,X509 CRL/OCSP revocation,))
$(eval $(call BuildPlugin,sha1,SHA1 crypto,)) $(eval $(call BuildPlugin,sha1,SHA1 crypto,))
$(eval $(call BuildPlugin,sha2,SHA2 crypto,)) $(eval $(call BuildPlugin,sha2,SHA2 crypto,))
$(eval $(call BuildPlugin,sha3,SHA3 and SHAKE crypto,))
$(eval $(call BuildPlugin,smp,SMP configuration and control interface,+PACKAGE_strongswan-mod-smp:libxml2)) $(eval $(call BuildPlugin,smp,SMP configuration and control interface,+PACKAGE_strongswan-mod-smp:libxml2))
$(eval $(call BuildPlugin,socket-default,default socket implementation for charon,)) $(eval $(call BuildPlugin,socket-default,default socket implementation for charon,))
$(eval $(call BuildPlugin,socket-dynamic,dynamic socket implementation for charon,)) $(eval $(call BuildPlugin,socket-dynamic,dynamic socket implementation for charon,))

11
net/strongswan/patches/101-musl-fixes.patch
View file

@ -81,3 +81,14 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
--- a/src/libstrongswan/plugins/bliss/bliss_huffman.c
+++ b/src/libstrongswan/plugins/bliss/bliss_huffman.c
@@ -17,6 +17,8 @@
#include "bliss_param_set.h"
#include <library.h>
+#undef fprintf
+#undef printf
#include <stdio.h>
#include <math.h>