summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-04-24 10:20:39 +0200
committerGitHub <noreply@github.com>2024-04-24 10:20:39 +0200
commita63e934073744772dc9fd919b7bb376ed9ceeab3 (patch)
treea6acb95013c327ad44ad856ce0b27264528b7209 /src
parent5b3f2b5708d18f14b4ff24b37119947258ea4e78 (diff)
parenta849d913dc6a86c698dc215350a46b7af72bb99e (diff)
downloadvyos-1x-a63e934073744772dc9fd919b7bb376ed9ceeab3.tar.gz
vyos-1x-a63e934073744772dc9fd919b7bb376ed9ceeab3.zip
Merge pull request #3345 from Embezzle/T6259
PKI: T6259: Support RFC822 names in certificate generation
Diffstat (limited to 'src')
-rwxr-xr-xsrc/op_mode/pki.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/op_mode/pki.py b/src/op_mode/pki.py
index ad2c1ada0..b1ca6ee29 100755
--- a/src/op_mode/pki.py
+++ b/src/op_mode/pki.py
@@ -306,7 +306,7 @@ def parse_san_string(san_string):
output.append(ipaddress.IPv4Address(value))
elif tag == 'ipv6':
output.append(ipaddress.IPv6Address(value))
- elif tag == 'dns':
+ elif tag == 'dns' or tag == 'rfc822':
output.append(value)
return output
@@ -324,7 +324,7 @@ def generate_certificate_request(private_key=None, key_type=None, return_request
subject_alt_names = None
if ask_san and ask_yes_no('Do you want to configure Subject Alternative Names?'):
- print("Enter alternative names in a comma separate list, example: ipv4:1.1.1.1,ipv6:fe80::1,dns:vyos.net")
+ print("Enter alternative names in a comma separate list, example: ipv4:1.1.1.1,ipv6:fe80::1,dns:vyos.net,rfc822:user@vyos.net")
san_string = ask_input('Enter Subject Alternative Names:')
subject_alt_names = parse_san_string(san_string)