Merge pull request #1615 from drwetter/license_patch3.1dev

Amendment to "Relax the possible GPL license contradiction"
This commit is contained in:
Dirk Wetter 2020-05-06 09:18:51 +02:00 committed by GitHub
commit 693cb216f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 11 deletions

View File

@ -79,7 +79,7 @@ Options are either short or long options\. Any long or short option requiring a
\fB\-\-help\fR (or no arg) display command line help
.
.P
\fB\-b, \-\-banner\fR displays testssl\.sh banner, including license, usage conditions, version of testssl\.sh, detected openssl version, its path to it, # of ciphers of openssl, its build date and the architecture
\fB\-b, \-\-banner\fR displays testssl\.sh banner, including license, usage conditions, version of testssl\.sh, detected openssl version, its path to it, # of ciphers of openssl, its build date and the architecture\.
.
.P
\fB\-v, \-\-version\fR same as before
@ -902,10 +902,15 @@ TLSWG Draft: The Transport Layer Security (TLS) Protocol Version 1\.3
Developed by Dirk Wetter, David Cooper and many others, see CREDITS\.md \.
.
.SH "COPYRIGHT"
Copyright © 2012 Dirk Wetter\. License GPLv2: Free Software Foundation, Inc\. This is free software: you are free to change and redistribute it under the terms of the license\. Usage WITHOUT ANY WARRANTY\. USE at your OWN RISK!
Copyright © 2012 Dirk Wetter\. License GPLv2: Free Software Foundation, Inc\. This is free software: you are free to change and redistribute it under the terms of the license, see LICENSE\.
.P
Attribution is important for the future of this project - also in the internet\. Thus if you\'re offering a scanner based on testssl\.sh as a public
and/or paid service in the internet you are strongly encouraged to mention to your audience that you\'re using this program and where to get this program
from\. That helps us to get bugfixes, other feedback and more contributions\.
.
.P
If you\'re offering testssl\.sh as a public and / or paid service in the internet you need to mention to your audience that you\'re using this program and where to get this program from\.
Usage WITHOUT ANY WARRANTY\. USE at your OWN RISK!
.
.
.SH "LIMITATION"
All native Windows platforms emulating Linux are known to be slow\.

View File

@ -147,7 +147,7 @@ linked OpenSSL binaries for major operating systems are supplied in <code>./bin/
<p><code>--help</code> (or no arg) display command line help</p>
<p><code>-b, --banner</code> displays testssl.sh banner, including license, usage conditions, version of testssl.sh, detected openssl version, its path to it, # of ciphers of openssl, its build date and the architecture</p>
<p><code>-b, --banner</code> displays testssl.sh banner, including license, usage conditions, version of testssl.sh, detected openssl version, its path to it, # of ciphers of openssl, its build date and the architecture.</p>
<p><code>-v, --version</code> same as before</p>
@ -638,10 +638,18 @@ This is to prevent giving out a misleading or wrong grade.</p>
<h2 id="COPYRIGHT">COPYRIGHT</h2>
<p>Copyright © 2012 Dirk Wetter. License GPLv2: Free Software Foundation, Inc.
This is free software: you are free to change and redistribute it under the terms of the license. Usage WITHOUT ANY WARRANTY. USE at your OWN RISK!</p>
This is free software: you are free to change and redistribute it under the terms of the license, see LICENSE.</p>
<p>
Attribution is important for the future of this project - also in the
internet. Thus if you're offering a scanner based on testssl.sh as a public
and/or paid service in the internet you are strongly encouraged to mention to
your audience that you're using this program and where to get this program
from. That helps us to get bugfixes, other feedback and more contributions.
</p>
<p> Usage WITHOUT ANY WARRANTY. USE at your OWN RISK!</p>
<p>If you're offering testssl.sh as a public and / or paid service in the internet you need to mention to your audience that you're using this program and
where to get this program from.</p>
<h2 id="LIMITATION">LIMITATION</h2>

View File

@ -70,7 +70,7 @@ Options are either short or long options. Any long or short option requiring a v
`--help` (or no arg) display command line help
`-b, --banner` displays testssl.sh banner, including license, usage conditions, version of testssl.sh, detected openssl version, its path to it, # of ciphers of openssl, its build date and the architecture
`-b, --banner` displays testssl.sh banner, including license, usage conditions, version of testssl.sh, detected openssl version, its path to it, # of ciphers of openssl, its build date and the architecture.
`-v, --version` same as before
@ -536,10 +536,15 @@ Developed by Dirk Wetter, David Cooper and many others, see CREDITS.md .
## COPYRIGHT
Copyright © 2012 Dirk Wetter. License GPLv2: Free Software Foundation, Inc.
This is free software: you are free to change and redistribute it under the terms of the license. Usage WITHOUT ANY WARRANTY. USE at your OWN RISK!
This is free software: you are free to change and redistribute it under the terms of the license, see LICENSE.
If you're offering testssl.sh as a public and / or paid service in the internet you need to mention to your audience that you're using this program and
where to get this program from.
Attribution is important for the future of this project - also in the
internet. Thus if you're offering a scanner based on testssl.sh as a public
and/or paid service in the internet you are strongly encouraged to mention to
your audience that you're using this program and where to get this program
from. That helps us to get bugfixes, other feedback and more contributions.
Usage WITHOUT ANY WARRANTY. USE at your OWN RISK!
## LIMITATION