Skip to content

Commit 4e87e86

Browse files
committed
Fixed major problems with the code(editor trouble)
modified: gnutls.py
1 parent 01bae3d commit 4e87e86

File tree

1 file changed

+20
-25
lines changed

1 file changed

+20
-25
lines changed

cve_bin_tool/checkers/gnutls.py

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,25 @@
66
"""
77
from ..util import regex_find
88

9-
def get_version(lines, filename)
10-
"""
11-
returns version information for gnutls found in given file.
12-
Verfies using the tools gnutls-cli and gnu-serv
13-
Verifies using the libraries libgnutls.so and libgnutls-dane.so
14-
"""
15-
regex = [r"gnutls-cli ([3]+\.[0-9]+\.[0-9]+)"]
16-
regex_2 = [r"gnutls-serv ([3]+\.[0-9]+\.[0-9]+)"]
17-
version_info = dict()
18-
if filename[::-1].startswith(("gnutls-cli")[::-1]):
19-
version_info["is_or_contains"] = "is"
20-
if filename[::-1].startswith(("gnutls-serv")[::-1]):
21-
version_info["is_or_contains"] = "is"
22-
23-
if "is_or_contains" in version_info:
24-
version_info["modulename"] = "gnutls-cli"
25-
version_info["version"] = regex_find(lines, *regex)
26-
elif "is_or_contains" in version_info:
27-
version_info["modulename"] = "gnutls-serv"
28-
version_info["version"] = regex_find(lines, *regex2)
9+
def get_version(lines, filename):
10+
"""
11+
returns version information for gnutls found in given file.
12+
Verfies using the tools gnutls-cli
13+
Verifies using the libraries libgnutls.so and libgnutls-dane.so
14+
"""
15+
regex = [r"gnutls-cli ([3]+\.[0-9]+\.[0-9]+)"]
16+
version_info = dict()
17+
if filename[::-1].startswith(("gnutls-cli")[::-1]):
18+
version_info["is_or_contains"] = "is"
19+
if filename[::-1].startswith(("gnutls-serv")[::-1]):
20+
version_info["is_or_contains"] = "is"
2921

30-
elif "libgnutls.so" in filename:
31-
version_info["is_or_contains"] = "is"
32-
elif "libgnutls-dane.so" in filename:
33-
version_info["is_or_contains"] = "is"
22+
if "is_or_contains" in version_info:
23+
version_info["modulename"] = "gnutls-cli"
24+
version_info["version"] = regex_find(lines, *regex)
25+
elif "libgnutls.so" in filename:
26+
version_info["is_or_contains"] = "is"
27+
elif "libgnutls-dane.so" in filename:
28+
version_info["is_or_contains"] = "is"
3429

35-
return version_info
30+
return version_info

0 commit comments

Comments
 (0)