(try to) resolve merge conflict

This commit is contained in:
Dirk 2020-04-28 13:35:24 +02:00
parent 8566ca80bc
commit 13a76bc719
2 changed files with 15 additions and 7 deletions

View File

@ -1,11 +1,19 @@
## Change Log
### Features implemented / improvements in 3.1
* Renamed PFS into FS
### Features implemented / improvements in 3.1dev
* Extend Server (cipher) preference: always now in wide mode instead of running all ciphers in the end (per default)
* Improved compatibility with OpenSSL 3.0
* Renamed PFS/perfect forward secrecy --> FS/forward secrecy
* Improved mass testing
* Align better colors of ciphers with standard cipherlists
* Added several ciphers to colored ciphers
* Percent output char problem fixed
* Several display/output fixes
* Security fix: DNS input
* Rating
* Don't use external pwd anymore
* Rating (via SSL Labs)
### Features implemented / improvements in 3.0

View File

@ -40,9 +40,9 @@ linked OpenSSL binaries for major operating systems are supplied in `./bin/`.
1) SSL/TLS protocol check
2) standard cipher categories to give you upfront an idea for the ciphers supported
2) checks forward secrecy: ciphers and elliptical curves
3) checks forward secrecy: ciphers and elliptical curves
3) standard cipher categories to give you upfront an idea for the ciphers supported
4) server preferences (server order)
@ -54,9 +54,9 @@ linked OpenSSL binaries for major operating systems are supplied in `./bin/`.
8) testing each of 370 preconfigured ciphers
9) client simulation
8) client simulation
10) Result of script in form of a grade
9) Result of script in form of a grade
## OPTIONS AND PARAMETERS