From 2a36205840072ec51a7166d23298491a90164d63 Mon Sep 17 00:00:00 2001
From: cuongdt1994 <63875204+cuongdt1994@users.noreply.github.com>
Date: Tue, 6 Jun 2023 03:19:49 +0700
Subject: Don't use deprecated crypt module.

---
 src/conf_mode/vpn_openconnect.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/conf_mode/vpn_openconnect.py b/src/conf_mode/vpn_openconnect.py
index 83021a3e6..dd347eb03 100755
--- a/src/conf_mode/vpn_openconnect.py
+++ b/src/conf_mode/vpn_openconnect.py
@@ -30,7 +30,7 @@ from vyos.util import is_listen_port_bind_service
 from vyos.util import dict_search
 from vyos.xml import defaults
 from vyos import ConfigError
-from crypt import crypt, mksalt, METHOD_SHA512
+from passlib.hash import sha512_crypt
 from time import sleep
 
 from vyos import airbag
@@ -45,7 +45,8 @@ radius_servers = cfg_dir + '/radius_servers'
 
 # Generate hash from user cleartext password
 def get_hash(password):
-    return crypt(password, mksalt(METHOD_SHA512))
+    return sha512_crypt.hash("password")
+
 
 
 def _default_dict_cleanup(origin: dict, default_values: dict) -> dict:
-- 
cgit v1.2.3


From 65654946aa4577c753f66b2577119c74f2ba7777 Mon Sep 17 00:00:00 2001
From: cuongdt1994 <63875204+cuongdt1994@users.noreply.github.com>
Date: Tue, 6 Jun 2023 04:49:05 +0700
Subject: T5260: Do not use deprecated python crypt module

Remove the quotes, this will always return the hash for string "password".
---
 src/conf_mode/vpn_openconnect.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/conf_mode/vpn_openconnect.py b/src/conf_mode/vpn_openconnect.py
index dd347eb03..3d5dc12a4 100755
--- a/src/conf_mode/vpn_openconnect.py
+++ b/src/conf_mode/vpn_openconnect.py
@@ -45,7 +45,7 @@ radius_servers = cfg_dir + '/radius_servers'
 
 # Generate hash from user cleartext password
 def get_hash(password):
-    return sha512_crypt.hash("password")
+    return sha512_crypt.hash(password)
 
 
 
-- 
cgit v1.2.3