Skip to content

Commit 19760b2

Browse files
authored
Merge pull request #1980 from drwetter/fix_1978_3.0
Fix minor inconsistency in description of cipher categories (3.0)
2 parents 99be556 + a239ac7 commit 19760b2

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

doc/testssl.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ Any single check switch supplied as an argument prevents testssl\.sh from doing
188188
\fB\-E, \-\-cipher\-per\-proto\fR is similar to \fB\-e, \-\-each\-cipher\fR\. It checks each of the possible ciphers, here: per protocol\. If you want to display each cipher tested you need to add \fB\-\-show\-each\fR\. The output is sorted by security strength, it lists the encryption bits though\.
189189
.
190190
.P
191-
\fB\-s, \-\-std, \-\-standard\fR tests certain lists of cipher suites by strength\. Those lists are (\fBopenssl ciphers $LIST\fR, $LIST from below:)
191+
\fB\-s, \-\-std, \-\-standard\fR tests certain lists of cipher suites / cipher categories by strength\. Those lists are (\fBopenssl ciphers $LIST\fR, $LIST from below:)
192192
.
193193
.IP "\(bu" 4
194194
\fBNULL encryption ciphers\fR: \'NULL:eNULL\'

doc/testssl.1.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/testssl.1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ Any single check switch supplied as an argument prevents testssl.sh from doing a
154154

155155
`-E, --cipher-per-proto` is similar to `-e, --each-cipher`. It checks each of the possible ciphers, here: per protocol. If you want to display each cipher tested you need to add `--show-each`. The output is sorted by security strength, it lists the encryption bits though.
156156

157-
`-s, --std, --standard` tests certain lists of cipher suites by strength. Those lists are (`openssl ciphers $LIST`, $LIST from below:)
157+
`-s, --std, --standard` tests certain lists of cipher suites / cipher catagories by strength. Those lists are (`openssl ciphers $LIST`, $LIST from below:)
158158

159159
* `NULL encryption ciphers`: 'NULL:eNULL'
160160
* `Anonymous NULL ciphers`: 'aNULL:ADH'

t/25_baseline_starttls.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ unlike($openssl_out, qr/$openssl_regex_bl/, "");
130130
$tests++;
131131

132132

133-
$uri="news.newsguy.com:119";
133+
$uri="140.238.219.117:119";
134134

135135
# unlink "tmp.json";
136136
printf "\n%s\n", "STARTTLS NNTP unit tests via sockets --> $uri ...";

testssl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17242,7 +17242,7 @@ help() {
1724217242
single check as <options> ("$PROG_NAME URI" does everything except -E and -g):
1724317243
-e, --each-cipher checks each local cipher remotely
1724417244
-E, --cipher-per-proto checks those per protocol
17245-
-s, --std, --standard tests certain lists of cipher suites by strength
17245+
-s, --std, --standard tests standard cipher categories by strength
1724617246
-p, --protocols checks TLS/SSL protocols (including SPDY/HTTP2)
1724717247
-g, --grease tests several server implementation bugs like GREASE and size limitations
1724817248
-S, --server-defaults displays the server's default picks and certificate info

0 commit comments

Comments
 (0)