diff options
| author | kali kaneko (leap communications) <kali@leap.se> | 2022-06-08 14:50:47 +0200 |
|---|---|---|
| committer | kali kaneko (leap communications) <kali@leap.se> | 2022-06-08 14:50:58 +0200 |
| commit | 44fcc216212a9150a7547e79dd3fca5064a78d8f (patch) | |
| tree | 232a0853fac23dd7747668becaa5bc8a5fe82516 | |
| parent | 7085ba13dfc52dcae64f7a0f39a854017b2e48c8 (diff) | |
[pkg] allow colon in tls-ciphers
| -rw-r--r-- | helpers/README.txt | 4 | ||||
| -rw-r--r-- | pkg/pickle/helpers/bitmask-root | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/helpers/README.txt b/helpers/README.txt new file mode 100644 index 0000000..8ab8e44 --- /dev/null +++ b/helpers/README.txt @@ -0,0 +1,4 @@ +The helpers now live in +pkg/pickle/helpers/ + +this folder is kept for backwards compatibility with the build process. diff --git a/pkg/pickle/helpers/bitmask-root b/pkg/pickle/helpers/bitmask-root index d33091c..e704bd9 100644 --- a/pkg/pickle/helpers/bitmask-root +++ b/pkg/pickle/helpers/bitmask-root @@ -89,7 +89,7 @@ def is_ipv6_disabled(): def tostr(s): return s.decode('utf-8') -VERSION = "16" +VERSION = "17" SCRIPT = "bitmask-root" NAMESERVER_TCP = "10.41.0.1" NAMESERVER_UDP = "10.42.0.1" @@ -174,7 +174,7 @@ PARAM_FORMATS = { "NUMBER": lambda s: re.match("^\d+$", s), "PROTO": lambda s: re.match("^(tcp|udp|tcp4|udp4)$", s), "IP": lambda s: is_valid_address(s), - "CIPHER": lambda s: re.match("^[A-Z0-9-]+$", s), + "CIPHER": lambda s: re.match("^[A-Z0-9-\:]+$", s), "USER": lambda s: re.match( "^[a-zA-Z0-9_\.\@][a-zA-Z0-9_\-\.\@]*\$?$", s), # IEEE Std 1003.1-2001 "FILE": lambda s: os.path.isfile(s), |