aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix recursive importMaximilian Hils2017-05-265-46/+51
* fix mypy annotationsMaximilian Hils2017-05-2612-50/+47
* Merge pull request #2356 from mhils/bump-cryptographyMaximilian Hils2017-05-261-2/+2
|\
| * Update setup.pyMaximilian Hils2017-05-261-1/+1
| * bump cryptographyMaximilian Hils2017-05-261-1/+1
|/
* cleanup old tls_parserThomas Kriechbaumer2017-05-262-209/+0
* Merge pull request #2353 from ujjwal96/tls-parserThomas Kriechbaumer2017-05-266-20/+314
|\
| * Added ksy file and updated make.shUjjwal Verma2017-05-262-0/+140
| * Using kaitai struct to parse tls client helloUjjwal Verma2017-05-264-20/+174
* | fix requirementsThomas Kriechbaumer2017-05-261-1/+1
* | Merge pull request #2351 from Kriechi/fix-warningsMaximilian Hils2017-05-257-53/+32
|\ \ | |/ |/|
| * pathod: fix leaking fdsThomas Kriechbaumer2017-05-245-23/+18
| * pathod: properly verify certificate in testsThomas Kriechbaumer2017-05-242-30/+14
| * fix openssl cipher_list bytes/str deprecationThomas Kriechbaumer2017-05-242-2/+2
|/
* Merge pull request #2350 from Kriechi/improve-testsThomas Kriechbaumer2017-05-2426-241/+249
|\
| * cleanupThomas Kriechbaumer2017-05-243-4/+3
| * fix various fd/socket leaksThomas Kriechbaumer2017-05-2413-29/+45
| * connections tests: fix leaking socketsThomas Kriechbaumer2017-05-242-8/+9
| * proxy tests: fix leaking socketsThomas Kriechbaumer2017-05-243-14/+15
| * http1 tests: fix leaking socketsThomas Kriechbaumer2017-05-241-0/+1
| * http2 tests: fix leaking socketsThomas Kriechbaumer2017-05-241-84/+88
| * websocket tests: fix leaking socketsThomas Kriechbaumer2017-05-241-60/+62
| * fix array.{fromstring,tostring} deprecation warningThomas Kriechbaumer2017-05-241-2/+2
| * close existing server_conn before replacing itThomas Kriechbaumer2017-05-242-1/+7
| * upgrade pytest and remove our pytest.raises wrapperThomas Kriechbaumer2017-05-242-35/+10
| * fix typoThomas Kriechbaumer2017-05-241-1/+1
| * auto-close file after readingThomas Kriechbaumer2017-05-241-4/+5
| * TCP IPv6: fix leaking socketsThomas Kriechbaumer2017-05-241-0/+2
|/
* Merge pull request #2347 from MatthewShao/jest-devMaximilian Hils2017-05-225-1/+196
|\
| * [web] Add tests for js/components/FlowTable/FlowTableHead.jsMatthew Shao2017-05-223-1/+128
| * [web] Add tests for js/components/FlowTable/FlowRow.jsMatthew Shao2017-05-222-0/+68
|/
* Merge pull request #2191 from LuD1161/Issue#2139Maximilian Hils2017-05-221-1/+7
|\
| * Update options.pyThomas Kriechbaumer2017-05-191-2/+5
| * Added the level definition that can be usedLuD11612017-03-201-1/+4
* | Merge pull request #2342 from MatthewShao/jest-devMaximilian Hils2017-05-225-62/+162
|\ \
| * | [web] Fix 100% coverage for js/components/FlowTable/FlowColumns.jsMatthew Shao2017-05-222-1/+17
| * | [web] Set some value as constant, so _tflow.js would not change.Matthew Shao2017-05-221-3/+9
| * | [web] TFlow minor improved.Matthew Shao2017-05-215-15/+18
| * | [web] Add js/__tests__/ducks/_tflow.jsMatthew Shao2017-05-191-0/+97
| * | [web] Fix minior lint problem.Matthew Shao2017-05-191-0/+1
| * | [web] Updates test to use the new _tflow.js.Matthew Shao2017-05-193-63/+30
| * | [web] Add _tflow.js generator in test_app.pyMatthew Shao2017-05-191-1/+11
* | | disable double requires-io-master CI buildsThomas Kriechbaumer2017-05-192-1/+9
* | | Merge pull request #2337 from MatthewShao/jest-devMaximilian Hils2017-05-187-0/+529
|\| |
| * | [web] Update snapshot.Matthew Shao2017-05-182-2/+2
| * | [web] Minor fixes for component tests.Matthew Shao2017-05-183-5/+4
| * | [web] Add tests for js/components/FlowTable/FlowColumnsSpec.jsMatthew Shao2017-05-172-0/+259
| * | [web] Add a TFlow class to js/ducks/tutils.jsMatthew Shao2017-05-171-0/+27
| * | [web] Add tests for src/js/components/ValueEditor/ValueEditor.jsMatthew Shao2017-05-162-0/+176
| * | [web] Add tests for js/components/ValueEditor/ValidateEditor.jsMatthew Shao2017-05-162-0/+68