support for post-quantum cryptography by including the bliss, mgf1, newhope, ntru and sha3 plugins.

2 files changed, 15 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac9325bd251b..c9f63518d1b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Oct 20 14:14:43 UTC 2016
+# Thu Oct 27 20:55:39 UTC 2016
 pkgbase = strongswan
 	pkgdesc = open source IPsec implementation
 	pkgver = 5.5.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.strongswan.org
 	arch = i686
 	arch = x86_64
@@ -41,6 +41,8 @@ pkgbase = strongswan
 	backup = etc/strongswan.d/charon/aesni.conf
 	backup = etc/strongswan.d/charon/attr-sql.conf
 	backup = etc/strongswan.d/charon/attr.conf
+	backup = etc/strongswan.d/charon/bliss.conf
+	backup = etc/strongswan.d/charon/chapoly.conf
 	backup = etc/strongswan.d/charon/cmac.conf
 	backup = etc/strongswan.d/charon/connmark.conf
 	backup = etc/strongswan.d/charon/constraints.conf
@@ -69,7 +71,10 @@ pkgbase = strongswan
 	backup = etc/strongswan.d/charon/hmac.conf
 	backup = etc/strongswan.d/charon/kernel-netlink.conf
 	backup = etc/strongswan.d/charon/md5.conf
+	backup = etc/strongswan.d/charon/mgf1.conf
 	backup = etc/strongswan.d/charon/nonce.conf
+	backup = etc/strongswan.d/charon/newhope.conf
+	backup = etc/strongswan.d/charon/ntru.conf
 	backup = etc/strongswan.d/charon/openssl.conf
 	backup = etc/strongswan.d/charon/pem.conf
 	backup = etc/strongswan.d/charon/pgp.conf
@@ -84,6 +89,7 @@ pkgbase = strongswan
 	backup = etc/strongswan.d/charon/revocation.conf
 	backup = etc/strongswan.d/charon/sha1.conf
 	backup = etc/strongswan.d/charon/sha2.conf
+	backup = etc/strongswan.d/charon/sha3.conf
 	backup = etc/strongswan.d/charon/socket-default.conf
 	backup = etc/strongswan.d/charon/sql.conf
 	backup = etc/strongswan.d/charon/sqlite.conf
@@ -95,7 +101,6 @@ pkgbase = strongswan
 	backup = etc/strongswan.d/charon/xauth-eap.conf
 	backup = etc/strongswan.d/charon/xauth-generic.conf
 	backup = etc/strongswan.d/charon/xcbc.conf
-	backup = etc/strongswan.d/charon/chapoly.conf
 	backup = etc/strongswan.d/charon/unity.conf
 	source = https://download.strongswan.org/strongswan-5.5.1.tar.bz2
 	source = configure_ac.patch
diff --git a/PKGBUILD b/PKGBUILD
index 1b4e647684dd..48cee52d4b43 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 
 pkgname=strongswan
 pkgver=5.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="open source IPsec implementation"
 url='http://www.strongswan.org'
 license=("GPL")
@@ -26,14 +26,14 @@ backup=(
     etc/swanctl/swanctl.conf
     etc/strongswan.conf
     etc/strongswan.d/{charon-logging.conf,charon.conf,pki.conf,pool.conf,scepclient.conf,starter.conf,swanctl.conf}
-    etc/strongswan.d/charon/{aesni.conf,attr-sql.conf,attr.conf,cmac.conf,connmark.conf,\
+    etc/strongswan.d/charon/{aesni.conf,attr-sql.conf,attr.conf,bliss.conf,chapoly.conf,cmac.conf,connmark.conf,\
 constraints.conf,curl.conf,des.conf,dhcp.conf,dnskey.conf,eap-aka-3gpp2.conf,eap-aka.conf,\
 eap-gtc.conf,eap-identity.conf,eap-md5.conf,eap-mschapv2.conf,eap-radius.conf,eap-sim-file.conf,\
 eap-sim.conf,eap-simaka-pseudonym.conf,eap-simaka-reauth.conf,eap-tls.conf,ext-auth.conf,farp.conf,\
-fips-prf.conf,forecast.conf,gmp.conf,ha.conf,hmac.conf,kernel-netlink.conf,md5.conf,nonce.conf,openssl.conf,\
+fips-prf.conf,forecast.conf,gmp.conf,ha.conf,hmac.conf,kernel-netlink.conf,md5.conf,mgf1.conf,nonce.conf,newhope.conf,ntru.conf,openssl.conf,\
 pem.conf,pgp.conf,pkcs1.conf,pkcs12.conf,pkcs7.conf,pkcs8.conf,pubkey.conf,random.conf,rc2.conf,resolve.conf,\
-revocation.conf,sha1.conf,sha2.conf,socket-default.conf,sql.conf,sqlite.conf,sshkey.conf,stroke.conf,updown.conf,\
-vici.conf,x509.conf,xauth-eap.conf,xauth-generic.conf,xcbc.conf,chapoly.conf,unity.conf}
+revocation.conf,sha1.conf,sha2.conf,sha3.conf,socket-default.conf,sql.conf,sqlite.conf,sshkey.conf,stroke.conf,updown.conf,\
+vici.conf,x509.conf,xauth-eap.conf,xauth-generic.conf,xcbc.conf,unity.conf}
 )
 
 source=("https://download.strongswan.org/strongswan-${pkgver}.tar.bz2"
@@ -75,7 +75,8 @@ build() {
         --disable-mysql --disable-ldap --enable-cmd --enable-forecast --enable-connmark \
         --enable-aesni --enable-eap-ttls --enable-radattr --enable-xauth-pam --enable-xauth-noauth \
         --enable-eap-dynamic --enable-eap-peap --enable-eap-tls --enable-chapoly --enable-unity \
-        --with-capabilities=libcap
+        --with-capabilities=libcap --enable-newhope --enable-ntru --enable-mgf1 --enable-sha3 \
+        --enable-bliss
 # if you want networkmanager support, add --enable-nm
 #       --enable-ruby-gems --enable-python-eggs
   make