Skip to content

python: T8859: validate min_keysize once in verify_diffie_hellman_length #5194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
andamasov wants to merge 1 commit into
base: rolling
Choose a base branch
from
+3 −3
Draft

python: T8859: validate min_keysize once in verify_diffie_hellman_length #5194

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions python/vyos/configverify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,16 +432,16 @@ def verify_diffie_hellman_length(file, min_keysize):
from vyos.utils.process import cmd

try:
keysize = str(min_keysize)
except:
min_keysize_int = int(min_keysize)
except (TypeError, ValueError):
return False

if os.path.exists(file):
out = cmd(f'openssl dhparam -inform PEM -in {file} -text')
prog = re.compile('\d+\s+bit')
if prog.search(out):
bits = prog.search(out)[0].split()[0]
if int(bits) >= int(min_keysize):
if int(bits) >= min_keysize_int:
return True

return False
Expand Down
Loading