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.

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

Adding SCADA EtherNet/IP and CIP protocol support #2107

Closed
wants to merge 1 commit into from

Conversation

kwong-solana
Copy link
Contributor

  1. The enip-feature-1495-v13 branch contains support for the ENIP/CIP
    Industrial protocol
  2. This is an app layer implementation which uses the "enip" protocol
    and "cip_service" and "enip_command" keywords
  3. Rebased master to clean out commits done on master and then
    merged to latest code
  4. Addresses failed PR's
    Enip feature 1495 v3 #1810 and
    Enip feature 1495 v4 #1819 and
    1. The enip-feature-1495-v4 branch contains support for the ENIP/CIP #1827 and
    1. The enip-feature-1495-v6 branch contains support for the ENIP/CIP #2009 and
    Enip feature 1495 v7 #2011 and
    Adding SCADA EtherNet/IP and CIP protocol support #2012 and
    Adding SCADA EtherNet/IP and CIP protocol support #2019 and
    Adding SCADA EtherNet/IP and CIP protocol support #2030 and
    Adding SCADA EtherNet/IP and CIP protocol support #2068
  5. As requested, added AFL entry points

1.  The enip-feature-1495-v13 branch contains support for the ENIP/CIP
Industrial protocol

2. This is an app layer implementation which uses the "enip" protocol
and "cip_service" and "enip_command" keywords

3.  Rebased master to clean out commits done on master and then
merged to latest code

4.  Addresses failed PR's
OISF#1810 and
OISF#1819 and
OISF#1827 and
OISF#2009 and
OISF#2011 and
OISF#2012 and
OISF#2019 and
OISF#2030 and
OISF#2068

5.  As requested, added AFL entry points
@inliniac inliniac added this to the 3.2 milestone May 27, 2016
@inliniac
Copy link
Contributor

I rebased this but then I get a failing unittests. Could you rebase it to master and resubmit?

@inliniac inliniac closed this Sep 28, 2016
kwong-solana added a commit to kwong-solana/suricata that referenced this pull request Sep 28, 2016
1.  The enip-feature-1495-v13 branch contains support for the ENIP/CIP
Industrial protocol

2. This is an app layer implementation which uses the "enip" protocol
and "cip_service" and "enip_command" keywords

3.  Rebased master to clean out commits done on master and then
merged to latest code

4.  Addresses failed PR's
OISF#1810 and
OISF#1819 and
OISF#1827 and
OISF#2009 and
OISF#2011 and
OISF#2012 and
OISF#2019 and
OISF#2030 and
OISF#2068 and
OISF#2107

5.  As requested, added AFL entry points
@kwong-solana
Copy link
Contributor Author

done, added new branch enip-feature-1495-v14

On 28/09/2016 4:29 AM, Victor Julien wrote:

I rebased this but then I get a failing unittests. Could you rebase it
to master and resubmit?


You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#2107 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AMg0-rZzcIxsOTGdQ97hCQy3fkwc0wOAks5quiVMgaJpZM4ImokH.

Kevin Wong

Solana Networks Inc | 613.596.2557 x575 | kwong@solananetworks.com

http://www.solananetworks.com

http://www.sparrowiq.com

kwong-solana added a commit to kwong-solana/suricata that referenced this pull request Sep 29, 2016
1.  The enip-feature-1495-v15 branch contains support for the ENIP/CIP
Industrial protocol

2. This is an app layer implementation which uses the "enip" protocol
and "cip_service" and "enip_command" keywords

3.  Rebased master to clean out commits done on master and then
merged to latest code

4.  Addresses failed PR's
OISF#1810 and
OISF#1819 and
OISF#1827 and
OISF#2009 and
OISF#2011 and
OISF#2012 and
OISF#2019 and
OISF#2030 and
OISF#2068 and
OISF#2107 and
OISF#2305

5.  As requested, added AFL entry points
kwong-solana added a commit to kwong-solana/suricata that referenced this pull request Sep 29, 2016
1.  The enip-feature-1495-v16 branch contains support for the ENIP/CIP
Industrial protocol

2. This is an app layer implementation which uses the "enip" protocol
and "cip_service" and "enip_command" keywords

3.  Rebased master to clean out commits done on master and then
merged to latest code

4.  Addresses failed PR's
OISF#1810 and
OISF#1819 and
OISF#1827 and
OISF#2009 and
OISF#2011 and
OISF#2012 and
OISF#2019 and
OISF#2030 and
OISF#2068 and
OISF#2107 and
OISF#2305 and
OISF#2311

5.  As requested, added AFL entry points
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants