From c2cc5002e629d3866946974b93da4c95962db9fd Mon Sep 17 00:00:00 2001
From: Pierre LALET <pierre.lalet@cea.fr>
Date: Sun, 20 Aug 2017 03:17:04 +0200
Subject: [PATCH] Do not load tls module by default
---
scapy/config.py | 2 +-
test/configs/travis.utsc | 5 ++++-
test/configs/windows.utsc | 5 ++++-
test/configs/windows2.utsc | 5 ++++-
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/scapy/config.py b/scapy/config.py
index b0f54d4c..b4a0d135 100755
--- a/scapy/config.py
+++ b/scapy/config.py
@@ -431,7 +431,7 @@ debug_tls:When 1, print some TLS session secrets when they are computed.
netcache = NetCache()
geoip_city = '/usr/share/GeoIP/GeoIPCity.dat'
geoip_city_ipv6 = '/usr/share/GeoIP/GeoIPCityv6.dat'
- load_layers = ["l2", "inet", "dhcp", "dns", "dot11", "gprs", "tls",
+ load_layers = ["l2", "inet", "dhcp", "dns", "dot11", "gprs",
"hsrp", "inet6", "ir", "isakmp", "l2tp", "mgcp",
"mobileip", "netbios", "netflow", "ntp", "ppp", "pptp",
"radius", "rip", "rtp", "skinny", "smb", "snmp",
diff --git a/test/configs/travis.utsc b/test/configs/travis.utsc
index c8dd3cf7..933451ff 100644
--- a/test/configs/travis.utsc
+++ b/test/configs/travis.utsc
@@ -5,7 +5,10 @@
],
"onlyfailed": true,
"preexec": {
- "../scapy/contrib/*.uts": "load_contrib(\"%name%\")"
+ "../scapy/contrib/*.uts": "load_contrib(\"%name%\")",
+ "cert.uts": "load_layer(\"tls\")",
+ "sslv2.uts": "load_layer(\"tls\")",
+ "tls*.uts": "load_layer(\"tls\")"
},
"format": "text"
}
diff --git a/test/configs/windows.utsc b/test/configs/windows.utsc
index 462da81c..42b6759b 100644
--- a/test/configs/windows.utsc
+++ b/test/configs/windows.utsc
@@ -5,7 +5,10 @@
],
"onlyfailed": true,
"preexec": {
- "scapy\\contrib\\*.uts": "load_contrib(\"%name%\")"
+ "scapy\\contrib\\*.uts": "load_contrib(\"%name%\")",
+ "test\\cert.uts": "load_layer(\"tls\")",
+ "test\\sslv2.uts": "load_layer(\"tls\")",
+ "test\\tls*.uts": "load_layer(\"tls\")"
},
"format": "text",
"kw_ko": [
diff --git a/test/configs/windows2.utsc b/test/configs/windows2.utsc
index 843ab142..0f708f8f 100644
--- a/test/configs/windows2.utsc
+++ b/test/configs/windows2.utsc
@@ -5,7 +5,10 @@
],
"onlyfailed": true,
"preexec": {
- "..\\scapy\\contrib\\*.uts": "load_contrib(\"%name%\")"
+ "..\\scapy\\contrib\\*.uts": "load_contrib(\"%name%\")",
+ "cert.uts": "load_layer(\"tls\")",
+ "sslv2.uts": "load_layer(\"tls\")",
+ "tls*.uts": "load_layer(\"tls\")"
},
"format": "html",
"kw_ko": [
--
GitLab