summaryrefslogtreecommitdiff
path: root/src/conf_mode/vpn_rsa-keys.py
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-06-15 11:08:42 +0200
committerGitHub <noreply@github.com>2021-06-15 11:08:42 +0200
commit08f69fc2867218923a3f3878d3bc76ebea09cee2 (patch)
tree1ff04e1e0aba2167b746f2f1373544e3d38b055d /src/conf_mode/vpn_rsa-keys.py
parent78099bccc510c90ad7cfa5f56475ba024d5d53a7 (diff)
parent11b5636519b360074eb2877006f2d8d63d9f6610 (diff)
downloadvyos-1x-08f69fc2867218923a3f3878d3bc76ebea09cee2.tar.gz
vyos-1x-08f69fc2867218923a3f3878d3bc76ebea09cee2.zip
Merge pull request #881 from sarthurdev/ipsec_swanctl
ipsec: T2816: T645: T3613: Migrated IPsec to swanctl format
Diffstat (limited to 'src/conf_mode/vpn_rsa-keys.py')
-rwxr-xr-xsrc/conf_mode/vpn_rsa-keys.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/conf_mode/vpn_rsa-keys.py b/src/conf_mode/vpn_rsa-keys.py
index 6cf7eba6e..c6ff369ad 100755
--- a/src/conf_mode/vpn_rsa-keys.py
+++ b/src/conf_mode/vpn_rsa-keys.py
@@ -29,7 +29,8 @@ from Crypto.PublicKey.RSA import construct
airbag.enable()
LOCAL_KEY_PATHS = ['/config/auth/', '/config/ipsec.d/rsa-keys/']
-LOCAL_OUTPUT = '/etc/ipsec.d/certs/localhost.pub'
+LOCAL_OUTPUT = '/etc/swanctl/pubkey/localhost.pub'
+LOCAL_KEY_OUTPUT = '/etc/swanctl/private/localhost.key'
def get_config(config=None):
if config:
@@ -68,6 +69,7 @@ def generate(conf):
if 'local_key' in conf and 'file' in conf['local_key']:
local_key = conf['local_key']['file']
local_key_path = get_local_key(local_key)
+ call(f'sudo cp -f {local_key_path} {LOCAL_KEY_OUTPUT}')
call(f'sudo /usr/bin/openssl rsa -in {local_key_path} -pubout -out {LOCAL_OUTPUT}')
if 'rsa_key_name' in conf:
@@ -82,7 +84,7 @@ def generate(conf):
else:
remote_key = bytes('-----BEGIN PUBLIC KEY-----\n' + remote_key + '\n-----END PUBLIC KEY-----\n', 'utf-8')
- with open(f'/etc/ipsec.d/certs/{key_name}.pub', 'wb') as f:
+ with open(f'/etc/swanctl/pubkey/{key_name}.pub', 'wb') as f:
f.write(remote_key)
def migrate_from_vyatta_key(data):