update conpot, pull from master

This commit is contained in:
Marco Ochse
2018-02-27 17:49:58 +00:00
parent 7a507156bd
commit fc0f3ad0fb
2 changed files with 22 additions and 13 deletions

View File

@ -1,6 +1,6 @@
gevent>=1.0
pysnmp==4.3.5
pysmi==0.1.3
pysnmp
pysmi
lxml
bottle
jinja2
@ -11,13 +11,16 @@ libtaxii>=1.1.0
MySQL-python
xlrd
crc16
enum
natsort
scapy
enum34
hpfeeds
modbus-tk
stix-validator
stix
cybox
bacpypes==0.13.8
bacpypes==0.16.1
pyghmi
mixbox
modbus-tk
cpppo