Commit Graph

3861 Commits

Author SHA1 Message Date
Dirk Wetter
a9f4bb5fb5
Merge pull request #1810 from drwetter/starttls_injection
STARTTLS injection
2020-12-29 14:40:58 +01:00
Dirk Wetter
e1a43e6e16
Merge branch '3.1dev' into starttls_injection 2020-12-29 13:46:18 +01:00
Dirk Wetter
7c66535628 resolve merge conflict 2020-12-29 13:44:04 +01:00
Dirk Wetter
ffe223f6e6
Merge pull request #1807 from tosticated/custom_http_headers
Custom HTTP request headers support added. Addresses #1770
2020-12-26 12:13:59 +01:00
tosticated
351f36c943 Changed parameter to --reqheader for custom HTTP headers. 2020-12-25 20:10:02 +01:00
tosticated
1473cdf02d
Update CHANGELOG.md 2020-12-24 22:00:42 +01:00
tosticated
c1a565fad8 Custom HTTP request headers support added. Addresses #1770 2020-12-22 22:33:25 +01:00
Dirk Wetter
2682d032b8
Merge pull request #1801 from drwetter/tmpfix_order_idsfriendly+U
Fix order for -U and --ids-friendly
2020-12-12 12:03:22 +01:00
Dirk Wetter
39132fe3d0 Fix order for -U and --ids-friendly
Workaround for bug see #1717. In addition: Bring  the test closer to a cleaner style,
as the others

Should --ids-firednly could be as well be removed when travis runs faster.
2020-12-11 20:49:15 +01:00
Dirk Wetter
4f375de26c
Merge pull request #1799 from PeterDaveHello/RefactorDockerfileApkUsage
Refactor `apk` usage in Dockerfile
2020-12-09 09:17:00 +01:00
Peter Dave Hello
abc5694408 Clean up apk cache in Dockerfile after packages installed
This will make the image smaller.
2020-12-09 15:52:04 +08:00
Peter Dave Hello
da84740000 Remove --no-cache for apk in Dockerfile
As there is `apk upgrade` and `apk update`, the apk index will already
be existed. `--no-cache` is for `apk` when there is no `apk update`
behavior and it's expected to be no local cache left, not suitable for
the use case here, which wants to upgrade all the package to the latest
when packaging the image.
2020-12-09 15:47:07 +08:00
Dirk Wetter
2cb96d4e9e
Merge pull request #1798 from drwetter/client_always_wide
Client simulation per default as wide
2020-12-08 23:23:55 +01:00
Dirk Wetter
d76829cd28 wide mode for client simulation 2020-12-08 19:52:42 +01:00
Dirk Wetter
e7fa4ff4ce Client simulation per default as wide
... in order to be consistent with run_server_preference().

The wide formatting of other tests need some inspection and
off the top off my head are not as perfectly formatted so that
they should not run per default in wide mode.
2020-12-08 19:43:07 +01:00
Dirk Wetter
f6e2a5c381
Merge pull request #1797 from atroost/hex2curves
Hex2curves
2020-12-03 12:44:21 +01:00
Alexander Troost
7029ada0ba fixing typo in md file 2020-11-28 14:06:26 +01:00
Alexander Troost
57ffe08dd4 Adding a hex2curves util. 2020-11-28 14:04:00 +01:00
Dirk Wetter
ea6d99fe93
Merge pull request #1795 from drwetter/no_code_update
Trying to save resources for poor Travis/CI ;-)
2020-11-28 10:08:53 +01:00
Dirk Wetter
a780ad6174
fix '|" 2020-11-27 20:24:46 +01:00
Dirk Wetter
1cd5510955 Trying to save resources for poor Travis/CI ;-)
See 3b38a5dea3
2020-11-27 18:10:43 +01:00
Dirk Wetter
19494a6d8b
Merge pull request #1794 from drwetter/drwetter-patch-1
Minor changes to Readme Dockerfile again
2020-11-27 17:05:22 +01:00
Dirk Wetter
c88d22a0f0
Update Dockerfile.md 2020-11-27 17:05:03 +01:00
Dirk Wetter
2655e91255
Update Readme.md 2020-11-27 17:00:34 +01:00
Dirk Wetter
20c57289d1
Merge pull request #1792 from drwetter/docker_docu_polish
Consolidate docker sections in Readme.md and Dockerfile.md
2020-11-27 16:35:03 +01:00
Dirk Wetter
1a7e4f1e92 consolidate docker sections in Readme.md and Dockerfile.md
see #1791
2020-11-27 16:33:23 +01:00
Dirk Wetter
849c031597
Merge pull request #1789 from drwetter/skip_sometunittests
Trying to reduced the runtime of travis
2020-11-27 15:24:06 +01:00
Dirk Wetter
96d4b4f08b Trying to reduced the runtime of travis
Often in the past travis was hitting a limit (50min?).

This is a try to make reasonable cuts to the unit tests:
- For STARTTLS some checks with OPenSSL are skipped
- For JSON and HTML outputs --ids-friendly was added assumming we
  don't change the output of ticketbleed, CCSI, HeartBleed and ROBOT any more.
- There's also not point to run those checks against badssl
- for  the diff check we switch to 'or diag' to display a dfifference
2020-11-27 13:19:52 +01:00
Dirk Wetter
a5d93486ad
Merge pull request #1788 from drwetter/diff_unittest
Diff unittest
2020-11-26 20:04:22 +01:00
Dirk
665209bf60 typos 2020-11-26 16:27:40 +01:00
Dirk
1b63760bc3 Add baseline master file for testssl.sh 2020-11-26 16:05:08 +01:00
Dirk Wetter
9aafc452d8
Merge pull request #1787 from drwetter/unittest_reorder
Unittest reorder
2020-11-26 16:04:02 +01:00
Dirk
a98ede0720 Finalize first diff check for travis 2020-11-26 15:58:13 +01:00
Dirk
49d321cfbb Add "command not found" 2020-11-26 13:41:44 +01:00
Dirk
191efddaee document changes from previous commits 2020-11-26 13:07:49 +01:00
Dirk
0c20b21fc2 Better order, "command not found added" 2020-11-26 13:02:10 +01:00
Dirk Wetter
9ea7446203 Add STARTTLS injection to Changelog 2020-11-26 10:48:32 +01:00
Dirk Wetter
5c5c4dcd58 Merge branch '3.1dev' into starttls_smtp_injection
Resolving conflicts because of do_winshock
2020-11-26 10:45:02 +01:00
Dirk Wetter
cc40d2f559
Merge pull request #1786 from drwetter/new-templates
Update issue templates
2020-11-25 21:19:48 +01:00
Dirk Wetter
b47bc9e871
Update bug_report.md 2020-11-25 21:19:26 +01:00
Dirk Wetter
cab2ee7706
Update bug_report.md 2020-11-25 21:13:44 +01:00
Dirk Wetter
0ed7ede6de
Update other-issues---question.md 2020-11-25 21:12:47 +01:00
Dirk
9ee939397e Merge remote-tracking branch 'origin/template_update' into new-templates 2020-11-25 21:11:18 +01:00
Dirk Wetter
d1481616db Update issue templates
Use the new style suggested bu github
2020-11-25 21:07:54 +01:00
Dirk Wetter
4a62b365a9 remove old universal template 2020-11-25 20:12:00 +01:00
Dirk Wetter
21d0910b50
Merge pull request #1781 from drwetter/fix_1779_3.1dev
Fix reading SSLv2 socket
2020-11-24 21:58:05 +01:00
Dirk
3a15383273 Fix reading SSLv2 socket
This fixes #1779. There was a problem introduced in
3cd1273439 which counted
the size of the file name rather than the size of the
socket reply.

The helper function count_chars() is now not used anymore.
It maybe useful in the future though.
2020-11-20 11:23:20 +01:00
Dirk Wetter
ac99fbe078
Merge pull request #1773 from drwetter/ca-update
Update certificate stores
2020-11-14 11:11:10 +01:00
Dirk Wetter
2c4799e154
Merge pull request #1518 from dcooper16/html_colors
Make colors in HTML output more accessible
2020-11-14 11:10:47 +01:00
Dirk Wetter
ce802634b6 Update remaining: Apple / Java / Microsoft
* also ca_hashes.txt

* Used Java SDK 15 instead of JRE 8
* Used Windows 20H2
* Java Keystore has added 5 certificates (90 --> 95)

Updated Readme and make it more reproducible
2020-11-13 22:01:17 +01:00