bring in some more tools

Author: timyardley

pcaps/README.md

@@ -5,7 +5,7 @@
 * [CapSan](https://github.com/jsiwek/capsan) - Packet capture sanitizer/anonymizer for Jon Siwek at University of Illinois.
 
 # Protocol Organized PCAPs
-* [Jason Smith's Organized ICS PCAP repo](https://github.com/automayt/ICS-pcap) - A comprehensive collection of ICS/SCADA PCAPs organized by protocol. Make sure to have git lfs support and do a git lfs clone of the repo to get the actual files.
+* [Jason Smith's Organized ICS PCAP repo](https://github.com/automayt/ICS-pcap) - A comprehensive collection of ICS/SCADA PCAPs organized by protocol. Make sure to have git lfs support and do a git lfs clone of the linked repo to get the actual files.
 
 ## Captures
 * [Bro-IDS DNP3 & Modbus Captures](bro) - Test captures from the parser testing tree.

protocols/README.md

@@ -1,13 +1,15 @@
 # ICS Protocols
 ## Developed as a community asset
 
+## General / Miscellaneous Releases
+* [PoC 2013 SCADA Release](https://github.com/atimorin/PoC2013) - Power of Community 2013 conference special release of ICS/SCADA toolkit
+
 ## AMI
 * [Termineter](https://github.com/GrayHatLabs/john_commor_c1218) - c1218 powermeter emulator
 
 ## BACnet
 * [BACpypes](https://github.com/JoelBender/bacpypes) - BACpypes provides a BACnet application layer and network layer written in Python for daemons, scripting, and graphical interfaces.
 
-
 ## DNP3
 ### Protocol Implementation
 * [OpenDNP3](https://github.com/automatak/dnp3) - Opendnp3 is the de facto reference implementation of IEEE-1815 (DNP3) provided under the Apache License.
@@ -61,7 +63,6 @@
 * [FireEye TriStation Wireshark Dissector](https://github.com/stvemillertime/TriStation) - reverse engineered wireshark dissector from Mandiant/FireEye team after Triton discovery.
 * [Nozomi TriStation Wireshark Dissector](https://github.com/NozomiNetworks/tricotools) - another TriStation dissector, this time from Nozomi
 
-
 ## Zigbee
 * [Killerbee](https://github.com/riverloopsec/killerbee) - IEEE 802.15.4/ZigBee Security Research Toolkit.
 
@@ -70,7 +71,7 @@
 * [Scapy implementation of DLR (Device Level Ring) protocol](https://github.com/scy-phy/scapy-dlr)
 * [CPPPO - Communications Protocol Python Parser and Originator (EtherNet/IP CIP implementation)](https://github.com/pjkundert/cpppo) - Cpppo is used to implement binary communications protocol parsers. The protocol’s communication elements are described in terms of state machines which change state in response to input events, collecting the data and producing output data artifacts.
 * [pycomm](https://github.com/ruscito/pycomm) - **pycomm** is a package that includes a collection of modules used to communicate with PLCs. At the moment the first module in the package is **ab_comm**. **ab_comm** is a module that contains a set of classes used to interface Rockwell PLCs using Ethernet/IP protocol. The "clx" class can be used to communicate with Compactlogix, Controllogix PLCs The "slc" can be used to communicate with Micrologix or SLC PLCs
-
+* [pyCIP](https://github.com/cpchrispye/PyCIP) - CIP protocol implementation in Python3
 
 ## General Protocol Fuzzing
 * [AFL](http://lcamtuf.coredump.cx/afl/) - American fuzzy lop is a security-oriented fuzzer that employs a novel type of compile-time instrumentation and genetic algorithms to automatically discover clean, interesting test cases that trigger new internal states in the targeted binary.

scripts/README.md

@@ -5,6 +5,7 @@
 * [Redpoint](https://github.com/digitalbond/Redpoint) - Digital Bond's ICS Enumeration Tools (NMAP NSE scripts).
 * [Drainware NMAP SCADA NSEs](https://github.com/drainware/nmap-scada) - A collection of NSE scripts from drainware.
 * [Misc SCADA Tools](https://github.com/atimorin/scada-tools) - A collection of miscellaneous SCADA tools written in python.
+* [Siemens NSE Scripts](https://github.com/jpalanco/nmap-scada) - Siemens-based discovery sctripts
 
 ## Exploitation
 * [GE Proficy HMI SCADA CIMPLICITY Privilege Management Vulnerability - ICSA-16-194-02](https://github.com/offensive-security/exploit-database/blob/master/exploits/windows/local/40069.cpp) - Local privilege escalation exploit from ExploitDB.

tools/general/README.md

@@ -5,11 +5,17 @@
 * [AdvancedHMI](http://www.advancedhmi.com) - AdvancedHMI allows you to create HMI's. The software is based on the .NET framework and uses the popular Visual Studio as it's designer.
 * [IGSS Free 50](http://igss.schneider-electric.com/products/igss/download/free-scada.aspx) - IGSS FREE50 is a free edition of IGSS V11 (released May 2014) that is a full-featured SCADA System. Same functionality as the full offering, but is limited to setting up a project with no more than 50 objects.
 * [IndigoSCADA](http://www.enscada.com/a7khg9/IndigoSCADA.html) - A small footprint DCS - SCADA running on Linux and Windows. Development environment C/C++. HMI is based on QT library. Different technologies (EiC, GigaBASE, FastDB) have been integrated. OPC DA 2.05a, AE 1.10, HDA 1.20, DNP 3.0, RFC 1006, Modbus are supported.
+* [ioBroker](https://github.com/ioBroker/ioBroker) - ioBroker is an IoT platform that is modular and supports some ICS protocols such as [s7](https://github.com/ioBroker/ioBroker.s7), [modbus](https://github.com/ioBroker/ioBroker.modbus).
 * [OPCSystems.Net](https://www.opcsystems.com/downloads/downloads.php) - A wide variety of software available for time-limited trial use. SCADA, HMI, and OPC broadly covered.
 * [OpenSCADA (oscada)](http://oscada.org/main/) - OpenSCADA system is an open implementation of SCADA (Supervisory Control And Data Acquisition) and HMI (Human-Machine Interface) systems. The main properties of the system are: openness(GPL), multi-platform, modularity and scalability.
 * [openSCADA](http://openscada.org) - openSCADA is the companion project to [Eclipse SCADA](https://eclipse.org/eclipsescada/). It provides additional components for the Eclipse SCADA system.
 * [OSHMI - Open Substation HMI](https://sourceforge.net/projects/oshmiopensubstationhmi/) - Full featured HMI used in production substations (Brazil).
+* [pvbrowser](https://github.com/pvbrowser/pvb) - Simple process visualization
+* [PySCADA](https://github.com/trombastic/PyScada) - A Open Source SCADA System with HTML5 HMI, build using the Django framework.
+* [RapidSCADA](https://github.com/RapidScada/scada) - Rapid SCADA is an open-source full featured SCADA software that supports MODBUS and OPC.
 * [ScadaBR](https://sourceforge.net/projects/scadabr/) - ScadaBR is a SCADA (Supervisory Control and Data Acquisition) system with applications in Process Control and Automation, being developed and distributed using the open source model.
+* [SCADA-LTS](https://github.com/SCADA-LTS/Scada-LTS) - Actively maintained fork of ScadaBR
+
 
 ## Education Kits
 * [CybatiWorks](https://cybati.org/cybatiworks-one) - Control system cybersecurity platform enabling entities to understand control system environments and cybersecurity risks. Engages the participant in understanding, enumerating, penetrating and mitigating the engineering workstation, HMI, OPC, Historian, PLC/PAC/IED/R(M)TU/DCS and protocol communications. Made up of three key components, 1) Virtualized operating system providing cyber offensive and defensive capabilities for ICS and IT environments, 2) Leveraging the Raspberry PI with PiFace Digital to represent a variety of control system devices (e.g. PLCs, PACs, MTU/RTU, DCS, Physical Security, and 3) Low voltage, kinetic I/O supporting models such as a traffic light, water treatment facility, bottling plant and assembly line.