Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Overall Code Additions and Modifications for scapy-cip-enip #1

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open

Overall Code Additions and Modifications for scapy-cip-enip #1

wants to merge 35 commits into from

Commits on Aug 1, 2016

  1. Update cip.py

    @m4tthew-d
    m4tthew-d authored Aug 1, 2016
    Configuration menu
    Copy the full SHA
    ca6aca1 View commit details
    Browse the repository at this point in the history

  2. Update enip_cpf.py

    @m4tthew-d
    m4tthew-d authored Aug 1, 2016
    Configuration menu
    Copy the full SHA
    d2c893e View commit details
    Browse the repository at this point in the history

  3. Update enip_tcp.py

    @m4tthew-d
    m4tthew-d authored Aug 1, 2016
    Configuration menu
    Copy the full SHA
    b18f077 View commit details
    Browse the repository at this point in the history

  4. Update plc.py

    @m4tthew-d
    m4tthew-d authored Aug 1, 2016
    Configuration menu
    Copy the full SHA
    0c8783d View commit details
    Browse the repository at this point in the history

  5. Update utils.py

    @m4tthew-d
    m4tthew-d authored Aug 1, 2016
    Configuration menu
    Copy the full SHA
    a0e5917 View commit details
    Browse the repository at this point in the history

  6. Add files via upload

    @m4tthew-d
    m4tthew-d authored Aug 1, 2016
    Configuration menu
    Copy the full SHA
    c8d116d View commit details
    Browse the repository at this point in the history

  7. Merge pull request #7 from m4tthew-d/m4tthew-d-patch-7 

    Added enip.py via upload
    @m4tthew-d
    m4tthew-d authored Aug 1, 2016
    Configuration menu
    Copy the full SHA
    952aca5 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #6 from m4tthew-d/m4tthew-d-patch-6 

    Update utils.py
    @m4tthew-d
    m4tthew-d authored Aug 1, 2016
    Configuration menu
    Copy the full SHA
    4e98f74 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #5 from m4tthew-d/m4tthew-d-patch-5 

    Update plc.py
    @m4tthew-d
    m4tthew-d authored Aug 1, 2016
    Configuration menu
    Copy the full SHA
    d9378a7 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #2 from m4tthew-d/m4tthew-d-patch-2 

    Update enip_cpf.py
    @m4tthew-d
    m4tthew-d authored Aug 1, 2016
    Configuration menu
    Copy the full SHA
    05f2f2a View commit details
    Browse the repository at this point in the history

  11. Merge pull request #3 from m4tthew-d/m4tthew-d-patch-3 

    Updated enip_tcp.py and moved portions to enip.py
    @m4tthew-d
    m4tthew-d authored Aug 1, 2016
    Configuration menu
    Copy the full SHA
    41c249a View commit details
    Browse the repository at this point in the history

  12. Update cip.py

    @m4tthew-d
    m4tthew-d authored Aug 1, 2016
    Configuration menu
    Copy the full SHA
    480a242 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #1 from m4tthew-d/m4tthew-d-patch-1 

    Update cip.py
    @m4tthew-d
    m4tthew-d authored Aug 1, 2016
    Configuration menu
    Copy the full SHA
    e24e2f7 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2016

  1. Update enip_tcp.py

    @m4tthew-d
    m4tthew-d authored Aug 2, 2016
    Configuration menu
    Copy the full SHA
    98bcbe5 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2016

  1. Added field classes 

    Added field classes and function to merge dictionaries for use with ITEM_ID lists in cip.py file
    @m4tthew-d
    m4tthew-d authored Aug 8, 2016
    Configuration menu
    Copy the full SHA
    cfa8119 View commit details
    Browse the repository at this point in the history

  2. Updated file references 

    Updated file references to take into account reorganization of some code to new or different files.
    @m4tthew-d
    m4tthew-d authored Aug 8, 2016
    Configuration menu
    Copy the full SHA
    2bb05cc View commit details
    Browse the repository at this point in the history

  3. Additional classes for CIP Packet Dissection 

    Added more CIP packet classes and more scapy_all.bind_layers() statements.
Corrected issue of malformed packet creation when communicating with PLC.
Modified field types in CIP_ReqForwardOpen for a more favorable display.
    @m4tthew-d
    m4tthew-d authored Aug 8, 2016
    Configuration menu
    Copy the full SHA
    146ce5e View commit details
    Browse the repository at this point in the history

  4. Expanded Item ID Numbers 

    Expanded Item ID numbers and changed CPF_Address_Item into CPF_Item and created separate classes for Address and Data Items.
    @m4tthew-d
    m4tthew-d authored Aug 8, 2016
    Configuration menu
    Copy the full SHA
    9dc516c View commit details
    Browse the repository at this point in the history

  5. Relocated most ENIP classes to file enip.py 

    Also updated tests in '__main__' accordingly
    @m4tthew-d
    m4tthew-d authored Aug 8, 2016
    Configuration menu
    Copy the full SHA
    e26b9a6 View commit details
    Browse the repository at this point in the history

  6. Relocated most ENIP classes to file enip.py 

    Added more scapy_all.bind_layers() statements and altered code and '__main__' to reflect relocation.
    @m4tthew-d
    m4tthew-d authored Aug 8, 2016
    Configuration menu
    Copy the full SHA
    4341b9e View commit details
    Browse the repository at this point in the history

  7. New file, compilation of ENIP related classes 

    Added dictionary of device profiles IDs for EtherNet/IP devices
    @m4tthew-d
    m4tthew-d authored Aug 8, 2016
    Configuration menu
    Copy the full SHA
    d14ed5d View commit details
    Browse the repository at this point in the history

  8. Relocated most ENIP classes to file enip.py 

    Updated code reference to reflect relocation of code
    @m4tthew-d
    m4tthew-d authored Aug 8, 2016
    Configuration menu
    Copy the full SHA
    dcc353f View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2016

  1. Corrected bind-layers issue with CPF Data Item

    @m4tthew-d
    m4tthew-d authored Oct 19, 2016
    Configuration menu
    Copy the full SHA
    34d8168 View commit details
    Browse the repository at this point in the history

  2. Corrected bind-layers issue with CPF Data Item

    @m4tthew-d
    m4tthew-d authored Oct 19, 2016
    Configuration menu
    Copy the full SHA
    a4f2d2e View commit details
    Browse the repository at this point in the history

  3. Fixed binding for ENIP UDP on testbed

    @m4tthew-d
    m4tthew-d authored Oct 19, 2016
    Configuration menu
    Copy the full SHA
    a7701c0 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2017

  1. 1/23/17 - Updated CIP with Electronic Key Segment handling

    @m4tthew-d
    m4tthew-d committed Jan 23, 2017
    Configuration menu
    Copy the full SHA
    8672c26 View commit details
    Browse the repository at this point in the history

  2. Added CIP_DataSegment and corrected CIP_LogicSegmentPadded extract_pa… 

    …dding function
    @m4tthew-d
    m4tthew-d committed Jan 23, 2017
    Configuration menu
    Copy the full SHA
    a9eb72d View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2017

  1. Forward Close Req/Resp

    @m4tthew-d
    m4tthew-d committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    a612af0 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2017

  1. Corrected layer binding by port number for UDP

    @m4tthew-d
    m4tthew-d committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    f1c902f View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2017

  1. Corrected CIP via SendUnitData layers

    @m4tthew-d
    m4tthew-d committed Feb 1, 2017
    Configuration menu
    Copy the full SHA
    aeca227 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2017

  1. Added CIP_Generic for unknown services data

    @m4tthew-d
    m4tthew-d committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    467c062 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2017

  1. Fixed bug in GetAttributeList

    @m4tthew-d
    m4tthew-d committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    a9fec77 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2017

  1. Changed originator_serial_number to XLEIntField in Forward Open/Close… 

    … Req/Resp
    @m4tthew-d
    m4tthew-d committed Feb 6, 2017
    Configuration menu
    Copy the full SHA
    1608252 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2017

  1. Corrected bind_layers for read_tag

    @m4tthew-d
    m4tthew-d committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    bc3df64 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2017

  1. Delete trial.py

    @m4tthew-d
    m4tthew-d authored Feb 14, 2017
    Configuration menu
    Copy the full SHA
    3aed8f7 View commit details
    Browse the repository at this point in the history