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

Enip feature 1495 v3 #1810

Closed
wants to merge 34 commits into from
Closed

Enip feature 1495 v3 #1810

wants to merge 34 commits into from

Conversation

kwong-solana
Copy link
Contributor

  1. The enip-feature-1495-v3 branch contains support for the ENIP/CIP
    Industrial protocol
  2. As requested, we cleaned up the debug lines, fixed the copyright and squashed the commits into a single commit using the rebase command

cdillabaugh added 30 commits July 13, 2015 11:48
enip cip protocol support
2912b9c
fix match function parameters
641ace6
cleanup
4200fb3
rearrange encap header for 64bit
2a71b02
fix unit test
2e1f9b4
replace strtok with strtok_r
21eb38b
fix unit test, again
8e0965f
fix indentation, struct names, doxygen comments
6558be0
app layer for ENIP/CIP
1aaf02e
use AppLayerMatch
2734fc8
update parse and match code
91a8fbd
clean up, add packet stitch
d19609d
add unit tests, clean code
9eca5b3
logging
6858f1c
merge from master
0876bf6
fix unit test
306e8d9
comment app layer code
05f915f
fix unit test
8f22aa6
fix check on malloc
e4e7ffb
fix check on malloc
8c155b0
fix cip grammar seg fault
d9871cc
remove old implementation code
b77c233
clean up unit tests
8d1042c
attempt follow modbus, dnp3 style
e0adcd7
register txfree function
4f1caff
add enip command match
e1152ee
clean code, handle TCP resp
18ef4f9
clean unit tests
7d9167a
fix tcp duplicate
db3c43a
Merge branch 'master' of https://github.com/inliniac/suricata into en…
908df2a 
…ip-feature-1495-v3

1.  This merges the mainline master branch into the enip-feature-1495-v3
branch.
2.  The enip-feature-1495-v3 branch contains support for the ENIP/CIP
Industrial protocol

Conflicts:
	src/app-layer-detect-proto.c
	src/app-layer-parser.c
	src/app-layer-protos.c
	src/app-layer-protos.h
	src/detect-engine-state.h
	src/detect-engine.c
	src/detect.c
	src/detect.h
@kwong-solana kwong-solana mentioned this pull request Jan 26, 2016
Closed
@inliniac
Copy link
Contributor

Please don't update existing pull requests or their branches: https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Github_work_flow#Create-a-new-branch-for-incorporating-feedback

@inliniac
Copy link
Contributor

Replaced by #1819

@inliniac inliniac closed this Jan 28, 2016
@inliniac
Copy link
Contributor

Please close a PR if you replace it, and link to the replacement like I did above.

kwong-solana pushed a commit to kwong-solana/suricata that referenced this pull request Feb 1, 2016
1. The enip-feature-1495-v4 branch contains support for the ENIP/CIP
867fe23 
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
@kwong-solana kwong-solana mentioned this pull request Feb 1, 2016
Closed
kwong-solana pushed a commit to kwong-solana/suricata that referenced this pull request Apr 14, 2016
1. The enip-feature-1495-v6 branch contains support for the ENIP/CIP
fb8de53 
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
5.  As requested, added AFL entry points
@kwong-solana kwong-solana mentioned this pull request Apr 14, 2016
Closed
kwong-solana pushed a commit to kwong-solana/suricata that referenced this pull request Apr 14, 2016
Adding SCADA EtherNet/IP and CIP protocol support
d3d25fb 
1.  The enip-feature-1495-v6 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

5.  As requested, added AFL entry points
@kwong-solana kwong-solana mentioned this pull request Apr 14, 2016
Closed
kwong-solana pushed a commit to kwong-solana/suricata that referenced this pull request Apr 14, 2016
Adding SCADA EtherNet/IP and CIP protocol support
8935fd4 
1.  The enip-feature-1495-v7 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

5.  As requested, added AFL entry points
@kwong-solana kwong-solana mentioned this pull request Apr 14, 2016
Closed
kwong-solana pushed a commit to kwong-solana/suricata that referenced this pull request Apr 20, 2016
Adding SCADA EtherNet/IP and CIP protocol support
1cf8dda 
1.  The enip-feature-1495-v9 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

5.  As requested, added AFL entry points
@kwong-solana kwong-solana mentioned this pull request Apr 20, 2016
Closed
kwong-solana pushed a commit to kwong-solana/suricata that referenced this pull request Apr 25, 2016
Adding SCADA EtherNet/IP and CIP protocol support
50677a5 
1.  The enip-feature-1495-v10 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

5.  As requested, added AFL entry points
@kwong-solana kwong-solana mentioned this pull request Apr 25, 2016
Closed
kwong-solana pushed a commit to kwong-solana/suricata that referenced this pull request May 4, 2016
Adding SCADA EtherNet/IP and CIP protocol support
769d385 
1.  The enip-feature-1495-v11 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

5.  As requested, added AFL entry points
@kwong-solana kwong-solana mentioned this pull request May 4, 2016
Closed
kwong-solana pushed a commit to kwong-solana/suricata that referenced this pull request May 9, 2016
Adding SCADA EtherNet/IP and CIP protocol support
a53b924 
1.  The enip-feature-1495-v12 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

5.  As requested, added AFL entry points
@kwong-solana kwong-solana mentioned this pull request May 9, 2016
Closed
kwong-solana pushed a commit to kwong-solana/suricata that referenced this pull request May 25, 2016
Adding SCADA EtherNet/IP and CIP protocol support
b9d5726 
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
@kwong-solana kwong-solana mentioned this pull request May 25, 2016
Closed
kwong-solana added a commit to kwong-solana/suricata that referenced this pull request Sep 28, 2016
@kwong-solana
Adding SCADA EtherNet/IP and CIP protocol support
5cd8450 
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 kwong-solana mentioned this pull request Sep 28, 2016
Closed
kwong-solana added a commit to kwong-solana/suricata that referenced this pull request Sep 29, 2016
@kwong-solana
Adding SCADA EtherNet/IP and CIP protocol support
d2506b6 
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 kwong-solana mentioned this pull request Sep 29, 2016
Closed
kwong-solana added a commit to kwong-solana/suricata that referenced this pull request Sep 29, 2016
@kwong-solana
Adding SCADA EtherNet/IP and CIP protocol support
ffaa042 
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
@kwong-solana kwong-solana mentioned this pull request Sep 29, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
No milestone
2 participants
@kwong-solana @inliniac