forked from pool/strongswan
8cfc35877a
- Updated to strongSwan 5.3.5 providing the following changes: *Fixed a DoS vulnerability in the gmp plugin that was caused by insufficient input validation when verifying RSA signatures. More specifically, mpz_powm_sec() has two requirements regarding the passed exponent and modulus that the plugin did not enforce, if these are not met the calculation will result in a floating point exception that crashes the whole process. This vulnerability has been registered as CVE-2017-9022. Please refer to our blog for details. *Fixed a DoS vulnerability in the x509 plugin that was caused because the ASN.1 parser didn't handle ASN.1 CHOICE types properly, which could result in an infinite loop when parsing X.509 extensions that use such types. This vulnerability has been registered as CVE-2017-9023. Please refer to our blog for details. *The behavior during IKEv2 CHILD_SA rekeying has been changed in order to avoid traffic loss. When responding to a CREATE_CHILD_SA request to rekey a CHILD_SA the responder already has everything available to install and use the new CHILD_SA. However, this could lead to lost traffic as the initiator won't be able to process inbound packets until it processed the CREATE_CHILD_SA response and updated the inbound SA. To avoid this the responder now only installs the new inbound SA and delays installing the outbound SA until it receives the DELETE for the replaced CHILD_SA. *The messages transporting these DELETEs could reach the peer before packets sent with the deleted outbound SAs reach it. To reduce the chance of traffic loss due to this the inbound SA of the replaced CHILD_SA is not removed for a configurable amount of seconds (charon.delete_rekeyed_delay) after the DELETE has been processed. *The code base has been ported to Apple's ARM64 iOS platform, which required several changes regarding the use of variadic functions. This was necessary because the calling conventions for variadic and regular functions are different there. This means that assigning a non-variadic function to a variadic function pointer, as we did with our enumerator_t::enumerate() implementations and several callbacks, will result in crashes as the called function accesses the arguments differently than the OBS-URL: https://build.opensuse.org/request/show/513652 OBS-URL: https://build.opensuse.org/package/show/network:vpn/strongswan?expand=0&rev=99
92 lines
1.9 KiB
Diff
92 lines
1.9 KiB
Diff
diff --git a/src/ipsec/_ipsec.in b/src/ipsec/_ipsec.in
|
|
index ea399b8..ea8ed8a 100644
|
|
--- a/src/ipsec/_ipsec.in
|
|
+++ b/src/ipsec/_ipsec.in
|
|
@@ -46,6 +46,26 @@ IPSEC_DISTRO="Institute for Internet Technologies and Applications\nUniversity o
|
|
|
|
command_dir="$IPSEC_DIR"
|
|
|
|
+fipscheck()
|
|
+{
|
|
+ # when fips operation mode is not enabled, just report OK
|
|
+ read 2>/dev/null fips_enabled < /proc/sys/crypto/fips_enabled
|
|
+ test "X$fips_enabled" = "X1" || return 0
|
|
+
|
|
+ # complain when _fipscheck is missed
|
|
+ test -x "$IPSEC_DIR/_fipscheck" || {
|
|
+ echo "ipsec: please install strongswan-hmac package required in fips mode" >&2
|
|
+ return 4
|
|
+ }
|
|
+
|
|
+ # now execute it
|
|
+ $IPSEC_DIR/_fipscheck || {
|
|
+ rc=$?
|
|
+ echo "ipsec: strongSwan fips file integrity check failed" >&2
|
|
+ return $rc
|
|
+ }
|
|
+}
|
|
+
|
|
case "$1" in
|
|
'')
|
|
echo "$IPSEC_SCRIPT command [arguments]"
|
|
@@ -153,6 +173,7 @@ rereadall|purgeocsp|listcounters|resetcounters)
|
|
shift
|
|
if [ -e $IPSEC_CHARON_PID ]
|
|
then
|
|
+ fipscheck || exit $?
|
|
$IPSEC_STROKE "$op" "$@"
|
|
rc="$?"
|
|
fi
|
|
@@ -162,6 +183,7 @@ purgeike|purgecrls|purgecerts)
|
|
rc=7
|
|
if [ -e $IPSEC_CHARON_PID ]
|
|
then
|
|
+ fipscheck || exit $?
|
|
$IPSEC_STROKE "$1"
|
|
rc="$?"
|
|
fi
|
|
@@ -195,6 +217,7 @@ route|unroute)
|
|
fi
|
|
if [ -e $IPSEC_CHARON_PID ]
|
|
then
|
|
+ fipscheck || exit $?
|
|
$IPSEC_STROKE "$op" "$1"
|
|
rc="$?"
|
|
fi
|
|
@@ -204,6 +227,7 @@ secrets)
|
|
rc=7
|
|
if [ -e $IPSEC_CHARON_PID ]
|
|
then
|
|
+ fipscheck || exit $?
|
|
$IPSEC_STROKE rereadsecrets
|
|
rc="$?"
|
|
fi
|
|
@@ -211,6 +235,7 @@ secrets)
|
|
;;
|
|
start)
|
|
shift
|
|
+ fipscheck || exit $?
|
|
if [ -d /var/lock/subsys ]; then
|
|
touch /var/lock/subsys/ipsec
|
|
fi
|
|
@@ -289,6 +314,7 @@ up)
|
|
rc=7
|
|
if [ -e $IPSEC_CHARON_PID ]
|
|
then
|
|
+ fipscheck || exit $?
|
|
$IPSEC_STROKE up "$1"
|
|
rc="$?"
|
|
fi
|
|
@@ -338,6 +364,11 @@ esac
|
|
cmd="$1"
|
|
shift
|
|
|
|
+case $cmd in
|
|
+_fipscheck|_copyright|pki) ;;
|
|
+*) fipscheck || exit $? ;;
|
|
+esac
|
|
+
|
|
path="$command_dir/$cmd"
|
|
|
|
if [ ! -x "$path" ]
|