summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNataliia Solomko <natalirs1985@gmail.com>2024-08-17 13:26:51 +0300
committerc-po <25299219+c-po@users.noreply.github.com>2024-08-20 05:15:07 +0000
commit424f2374a364537b9bd7941700fdf18edbb695bc (patch)
tree49237f93fd097bdc738f369297dd2d3043958a33
parentf6c0fea07059f8543df1cb2fe8f8e53ffc0fc8db (diff)
downloadvyos-1x-424f2374a364537b9bd7941700fdf18edbb695bc.tar.gz
vyos-1x-424f2374a364537b9bd7941700fdf18edbb695bc.zip
op_mode: T3961: Generate PKI expect 2 character country code
(cherry picked from commit 71d6d0fe31db13f4ddf5c75209b9bba88a1e0a32)
-rwxr-xr-xsrc/op_mode/pki.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/op_mode/pki.py b/src/op_mode/pki.py
index 57b97a47d..e26d51bad 100755
--- a/src/op_mode/pki.py
+++ b/src/op_mode/pki.py
@@ -316,7 +316,13 @@ def generate_certificate_request(private_key=None, key_type=None, return_request
default_values = get_default_values()
subject = {}
- subject['country'] = ask_input('Enter country code:', default=default_values['country'])
+ while True:
+ country = ask_input('Enter country code:', default=default_values['country'])
+ if len(country) != 2:
+ print("Country name must be a 2 character country code")
+ continue
+ subject['country'] = country
+ break
subject['state'] = ask_input('Enter state:', default=default_values['state'])
subject['locality'] = ask_input('Enter locality:', default=default_values['locality'])
subject['organization'] = ask_input('Enter organization name:', default=default_values['organization'])