Git/ssh-audit
1
0
Fork 0
mirror of https://github.com/jtesta/ssh-audit.git synced 2024-11-24 03:21:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

OpenSSH-portable patch level 1 now considered equivalent to stock OpenBSD version.

Browse Source
This commit is contained in:
Joe Testa 2020-10-20 13:17:32 -04:00
parent 17780ff194
commit 240b705d61
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ssh_audit/software.py
View File

@ -90,6 +90,9 @@ class Software:
opatch = mx1.group(1) opatch = mx1.group(1)
if mx2 is not None: if mx2 is not None:
spatch = mx2.group(1) spatch = mx2.group(1)
# OpenBSD version and p1 versions are considered the same.
if ((spatch == '') and (opatch == '1')) or ((spatch == '1') and (opatch == '')):
return 0
if spatch < opatch: if spatch < opatch:
return -1 return -1
elif spatch > opatch: elif spatch > opatch:

2
test/test_version_compare.py
View File

@ -138,7 +138,7 @@ class TestVersionCompare:
assert s2.compare_version(s2) == 0 assert s2.compare_version(s2) == 0
assert s1.compare_version('2.1.1') == 0 assert s1.compare_version('2.1.1') == 0
assert s2.compare_version('2.1.1p2') == 0 assert s2.compare_version('2.1.1p2') == 0
assert s1.compare_version('2.1.1p1') != 0 assert s1.compare_version('2.1.1p1') == 0 # OpenBSD version and p1 version should be the same.
assert s1.compare_version('2.1.1p2') != 0 assert s1.compare_version('2.1.1p2') != 0
assert s2.compare_version('2.1.1') != 0 assert s2.compare_version('2.1.1') != 0
assert s2.compare_version('2.1.1p1') > 0 assert s2.compare_version('2.1.1p1') > 0