Skip to content

Commit 97a0fb8

Browse files
committed
Change openssl PKA engine loading
Change openssl PKA engine loading by removing the global openssl configuration file that loads the PKA engine (openssl.cnf.mlnx) and loading the engine in the openssl engine code. Signed-off-by: Feras Bisharat <fbisharat@nvidia.com>
1 parent 5737988 commit 97a0fb8

File tree

16 files changed

+9
-2669
lines changed

16 files changed

+9
-2669
lines changed

debian/strongswan.postinst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/sh
22
set -e
33

4-
cp -f /etc/ssl/openssl.cnf /etc/ssl/openssl.cnf.orig
54
# Use the new strongswan.service instead of the legacy strongswan-starter
65
# systemctl unmask strongswan-starter.service
76
# systemctl enable strongswan-starter.service

debian/strongswan.prerm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/sh
22
set -e
33

4-
cp -f /etc/ssl/openssl.cnf.orig /etc/ssl/openssl.cnf
54
systemctl disable strongswan-starter.service
65
systemctl disable strongswan.service
76

init/systemd/strongswan.service.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ After=network-online.target
44

55
[Service]
66
Type=notify
7-
ExecStartPre=/bin/cp -f /etc/ssl/openssl.cnf.orig /etc/ssl/openssl.cnf
87
ExecStart=@SBINDIR@/charon-systemd
9-
ExecStartPost=/bin/sleep 2
10-
ExecStartPost=/bin/bash -c 'if lscpu | grep Flags | grep sha1 | grep sha2 | grep -q aes 2>/dev/null; then /bin/cp -f /etc/ssl/openssl.cnf.mlnx /etc/ssl/openssl.cnf; fi'
118
ExecStartPost=@SBINDIR@/swanctl --load-all --noprompt
129
ExecReload=@SBINDIR@/swanctl --reload
1310
ExecReload=@SBINDIR@/swanctl --load-all --noprompt

install-config

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,5 @@ set -e
44
OS=$(lsb_release -i -s)
55
UV=$(lsb_release -r -s)
66

7-
if [ "$OS" = "Ubuntu" ]
8-
then
9-
if [ "$UV" = "22.04" ]
10-
then
11-
cp -f openssl-conf/Ubuntu22_04/openssl.cnf debian/strongswan/etc/ssl/openssl.cnf.mlnx
12-
else
13-
cp -f openssl-conf/Ubuntu20_04/openssl.cnf debian/strongswan/etc/ssl/openssl.cnf.mlnx
14-
fi
15-
elif [ "$OS" = "Debian" ]
16-
then
17-
cp -f openssl-conf/Debian10/openssl.cnf debian/strongswan/etc/ssl/openssl.cnf.mlnx
18-
fi
19-
207
cp -f mlnx-conf/BFL.swanctl.conf debian/strongswan/etc/swanctl/conf.d
218
cp -f mlnx-conf/BFR.swanctl.conf debian/strongswan/etc/swanctl/conf.d

0 commit comments

Comments
 (0)