Browse Source

Merge pull request #15890 from CodeFetch/patch-11

strongswan: fix PSK config generation
lilik-openwrt-22.03
Philip Prindeville 4 years ago
committed by GitHub
parent
commit
056e926c45
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
  1. +1
    -1
      net/strongswan/Makefile
  2. +4
    -2
      net/strongswan/files/swanctl.init

+ 1
- 1
net/strongswan/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=strongswan PKG_NAME:=strongswan
PKG_VERSION:=5.9.2 PKG_VERSION:=5.9.2
PKG_RELEASE:=10
PKG_RELEASE:=11
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/ PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/


+ 4
- 2
net/strongswan/files/swanctl.init View File

@ -486,12 +486,14 @@ config_remote() {
swanctl_xappend0 "secrets {" swanctl_xappend0 "secrets {"
swanctl_xappend1 "ike {" swanctl_xappend1 "ike {"
swanctl_xappend2 "secret = $pre_shared_key" swanctl_xappend2 "secret = $pre_shared_key"
if [ -z "$local_id" ]; then
if [ -n "$local_id" ]; then
swanctl_xappend2 "id1 = $local_id" swanctl_xappend2 "id1 = $local_id"
if [ -z "$remote_id" ]; then
if [ -n "$remote_id" ]; then
swanctl_xappend2 "id2 = $remote_id" swanctl_xappend2 "id2 = $remote_id"
fi fi
fi fi
swanctl_xappend1 "}"
swanctl_xappend0 "}"
else else
fatal "AuthenticationMode $auth_mode not supported" fatal "AuthenticationMode $auth_mode not supported"
fi fi


Loading…
Cancel
Save