summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@debian.org>2016-03-14 21:13:31 +0100
committerYves-Alexis Perez <corsac@debian.org>2016-03-14 21:58:01 +0100
commit8e32f50ac2c90358c14cd36753aa360e8d80ccab (patch)
tree9309d0ce48d385c1d02536138de73f137aa814f9
parentfe970c8ce313d5d5cf4af8e75051f7f85c13b163 (diff)
downloadvyos-strongswan-8e32f50ac2c90358c14cd36753aa360e8d80ccab.tar.gz
vyos-strongswan-8e32f50ac2c90358c14cd36753aa360e8d80ccab.zip
enable aesni plugin on i386 and amd64.
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules15
2 files changed, 13 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index d96cc5c28..bdc675cbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ strongswan (5.3.5-2) UNRELEASED; urgency=medium
* debian/rules:
- migrate debug package to ddeb.
- enable systemd and swanctl. closes: #813788
+ - enable aesni plugin on i386 and amd64.
* debian/control:
- drop strongswan-dbg package.
- add strongswan-swanctl and charon-systemd packages.
diff --git a/debian/rules b/debian/rules
index 337b03a02..6bc1a670c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,13 +35,13 @@ CONFIGUREARGS := --libdir=/usr/lib --libexecdir=/usr/lib \
include /usr/share/dpkg/architecture.mk
# the padlock plugin only makes sense on i386
-# RdRand only makes sense on i386 and amd64
+# AESNI and RdRand only make sense on i386 and amd64
ifeq ($(DEB_BUILD_ARCH_CPU),i386)
- CONFIGUREARGS += --enable-padlock --enable-rdrand
+ CONFIGUREARGS += --enable-padlock --enable-rdrand --enable-aesni
endif
ifeq ($(DEB_BUILD_ARCH_CPU),amd64)
- CONFIGUREARGS += --enable-rdrand
+ CONFIGUREARGS += --enable-rdrand --enable-aesni
endif
ifeq ($(DEB_BUILD_ARCH_OS),linux)
@@ -127,12 +127,20 @@ ifeq ($(DEB_BUILD_ARCH_CPU),i386)
dh_install -p libstrongswan-extra-plugins usr/lib/ipsec/plugins/libstrongswan-rdrand.so
dh_install -p libstrongswan-extra-plugins usr/share/strongswan/templates/config/plugins/rdrand.conf
dh_install -p libstrongswan-extra-plugins etc/strongswan.d/charon/rdrand.conf
+
+ dh_install -p libstrongswan-standard-plugins usr/lib/ipsec/plugins/libstrongswan-aesni.so
+ dh_install -p libstrongswan-standard-plugins usr/share/strongswan/templates/config/plugins/aesni.conf
+ dh_install -p libstrongswan-standard-plugins etc/strongswan.d/charon/aesni.conf
endif
ifeq ($(DEB_BUILD_ARCH_CPU), amd64)
dh_install -p libstrongswan-extra-plugins usr/lib/ipsec/plugins/libstrongswan-rdrand.so
dh_install -p libstrongswan-extra-plugins usr/share/strongswan/templates/config/plugins/rdrand.conf
dh_install -p libstrongswan-extra-plugins etc/strongswan.d/charon/rdrand.conf
+
+ dh_install -p libstrongswan-standard-plugins usr/lib/ipsec/plugins/libstrongswan-aesni.so
+ dh_install -p libstrongswan-standard-plugins usr/share/strongswan/templates/config/plugins/aesni.conf
+ dh_install -p libstrongswan-standard-plugins etc/strongswan.d/charon/aesni.conf
endif
# then install the rest, ignoring the above
@@ -144,6 +152,7 @@ endif
-Xlibstrongswan-farp.so -X farp.conf \
-Xlibstrongswan-padlock.so -X padlock.conf \
-Xlibstrongswan-rdrand.so -X rdrand.conf \
+ -Xlibstrongswan-aesni.so -X aesni.conf \
-Xlibstrongswan-af-alg.so -X af-alg.conf \
-Xstrongswan.service