diff --git a/doc/testssl.1 b/doc/testssl.1 index 42df27d..36131c0 100644 --- a/doc/testssl.1 +++ b/doc/testssl.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "TESTSSL" "1" "September 2018" "" "" +.TH "TESTSSL" "1" "November 2018" "" "" . .SH "NAME" \fBtestssl\fR @@ -318,23 +318,26 @@ Security headers (X\-Frame\-Options, X\-XSS\-Protection, \.\.\., CSP headers) \fB\-\-wide\fR Except the "each cipher output" all tests displays the single cipher name (scheme see below)\. This option enables testssl\.sh to display also for the following sections the same output as for testing each ciphers: BEAST, PFS, RC4\. The client simulation has also a wide mode\. The difference here is restricted to a column aligned output and a proper headline\. The environment variable \fBWIDE\fR can be used instead\. . .P -\fB\-\-mapping \fR +\fB\-\-mapping \fR . .IP "\(bu" 4 \fBopenssl\fR: use the OpenSSL cipher suite name as the primary name cipher suite name form (default), . .IP "\(bu" 4 -\fBrfc\fR: use the RFC cipher suite name as the primary name cipher suite name form\. +\fBiana\fR: use the IANA cipher suite name as the primary name cipher suite name form\. . .IP "\(bu" 4 -\fBno\-openssl\fR: don\'t display the OpenSSL cipher suite name, display RFC names only\. +\fBno\-openssl\fR: don\'t display the OpenSSL cipher suite name, display IANA names only\. . .IP "\(bu" 4 -\fBno\-rfc\fR: don\'t display the RFC cipher suite name, display OpenSSL names only\. +\fBno\-iana\fR: don\'t display the IANA cipher suite name, display OpenSSL names only\. . .IP "" 0 . .P +Please note that in testssl\.sh 3,0 you can still use \fBrfc\fR instead of \fBiana\fR and \fBno\-rfc\fR instead of \fBno\-iana\fR but it\'ll disappear after 3\.0\. +. +.P \fB\-\-show\-each\fR This is an option for all wide modes only: it displays all ciphers tested \-\- not only succeeded ones\. \fBSHOW_EACH_C\fR is your friend if you prefer to set this via the shell environment\. . .P @@ -738,7 +741,7 @@ TLSWG Draft: The Transport Layer Security (TLS) Protocol Version 1\.3 \fBetc/*pem\fR Here are the certificate stores from Apple, Linux, Mozilla Firefox, Windows\. . .P -\fBetc/mapping\-rfc\.txt\fR Provides a mandatory file with mapping from OpenSSL cipher suites names to the ones from IANA / used in the RFCs\. +\fBetc/cipher\-mapping\.txt\fR Provides a mandatory file with mapping from OpenSSL cipher suites names to the ones from IANA / used in the RFCs\. . .P \fBetc/tls_data\.txt\fR Provides a mandatory file for ciphers (bash sockets) and key material\. diff --git a/doc/testssl.1.html b/doc/testssl.1.html index 5856d20..086f277 100644 --- a/doc/testssl.1.html +++ b/doc/testssl.1.html @@ -334,16 +334,19 @@ The same can be achieved by setting the environment variable WARNINGS--wide Except the "each cipher output" all tests displays the single cipher name (scheme see below). This option enables testssl.sh to display also for the following sections the same output as for testing each ciphers: BEAST, PFS, RC4. The client simulation has also a wide mode. The difference here is restricted to a column aligned output and a proper headline. The environment variable WIDE can be used instead.

-

--mapping <openssl|rfc|no-openssl|no-rfc>

+

--mapping <openssl|iana|no-openssl|no-iana>

  • openssl: use the OpenSSL cipher suite name as the primary name cipher suite name form (default),
    • -
  • rfc: use the RFC cipher suite name as the primary name cipher suite name form.
    • -
  • no-openssl: don't display the OpenSSL cipher suite name, display RFC names only.
    • -
  • no-rfc: don't display the RFC cipher suite name, display OpenSSL names only.
    • +
  • iana: use the IANA cipher suite name as the primary name cipher suite name form.
    • +
  • no-openssl: don't display the OpenSSL cipher suite name, display IANA names only.
    • +
  • no-iana: don't display the IANA cipher suite name, display OpenSSL names only.
+

Please note that in testssl.sh 3,0 you can still use rfc instead of iana and no-rfc instead of no-iana but it'll disappear +after 3.0.

+

--show-each This is an option for all wide modes only: it displays all ciphers tested -- not only succeeded ones. SHOW_EACH_C is your friend if you prefer to set this via the shell environment.

--color <0|1|2|3> It determines the use of colors on the screen: 2 is the default and makes use of ANSI and termcap escape codes on your terminal. 1 just uses non-colored mark-up like bold, italics, underline, reverse. 0 means no mark-up at all = no escape codes. 3 will color ciphers and EC according to an internal (not yet perfect) rating. Setting the environment variable COLOR achieves the same result.

@@ -541,11 +544,11 @@ to create the hashes for HPKP.

FILES

-

etc/*pem Here are the certificate stores from Apple, Linux, Mozilla Firefox, Windows.

+

etc/*pem Here are the certificate stores from Apple, Linux, Mozilla Firefox, Windows.

-

etc/mapping-rfc.txt Provides a mandatory file with mapping from OpenSSL cipher suites names to the ones from IANA / used in the RFCs.

+

etc/cipher-mapping.txt Provides a mandatory file with mapping from OpenSSL cipher suites names to the ones from IANA / used in the RFCs.

-

etc/tls_data.txt Provides a mandatory file for ciphers (bash sockets) and key material.

+

etc/tls_data.txt Provides a mandatory file for ciphers (bash sockets) and key material.

AUTHORS

@@ -571,7 +574,7 @@ to create the hashes for HPKP.
  1. -
  2. September 2018
    3. +
  3. November 2018
  4. testssl(1)
diff --git a/doc/testssl.1.md b/doc/testssl.1.md index 573ee84..5323a0f 100644 --- a/doc/testssl.1.md +++ b/doc/testssl.1.md @@ -257,12 +257,15 @@ The same can be achieved by setting the environment variable `WARNINGS`. `--wide` Except the "each cipher output" all tests displays the single cipher name (scheme see below). This option enables testssl.sh to display also for the following sections the same output as for testing each ciphers: BEAST, PFS, RC4. The client simulation has also a wide mode. The difference here is restricted to a column aligned output and a proper headline. The environment variable `WIDE` can be used instead. -`--mapping ` +`--mapping ` * `openssl`: use the OpenSSL cipher suite name as the primary name cipher suite name form (default), -* `rfc`: use the RFC cipher suite name as the primary name cipher suite name form. -* `no-openssl`: don't display the OpenSSL cipher suite name, display RFC names only. -* `no-rfc`: don't display the RFC cipher suite name, display OpenSSL names only. +* `iana`: use the IANA cipher suite name as the primary name cipher suite name form. +* `no-openssl`: don't display the OpenSSL cipher suite name, display IANA names only. +* `no-iana`: don't display the IANA cipher suite name, display OpenSSL names only. + +Please note that in testssl.sh 3,0 you can still use `rfc` instead of `iana` and `no-rfc` instead of `no-iana` but it'll disappear +after 3.0. `--show-each` This is an option for all wide modes only: it displays all ciphers tested -- not only succeeded ones. `SHOW_EACH_C` is your friend if you prefer to set this via the shell environment. @@ -466,11 +469,11 @@ does the same on the plain text IMAP port. Please note that for plain TLS-encryp ## FILES -**etc/\*pem** Here are the certificate stores from Apple, Linux, Mozilla Firefox, Windows. +**etc/\*pem** Here are the certificate stores from Apple, Linux, Mozilla Firefox, Windows. -**etc/mapping-rfc.txt** Provides a mandatory file with mapping from OpenSSL cipher suites names to the ones from IANA / used in the RFCs. +**etc/cipher-mapping.txt** Provides a mandatory file with mapping from OpenSSL cipher suites names to the ones from IANA / used in the RFCs. -**etc/tls_data.txt** Provides a mandatory file for ciphers (bash sockets) and key material. +**etc/tls_data.txt** Provides a mandatory file for ciphers (bash sockets) and key material. ## AUTHORS diff --git a/openssl-rfc.mapping.html b/openssl-rfc.mapping.html index 0838ad6..4b35805 100644 --- a/openssl-rfc.mapping.html +++ b/openssl-rfc.mapping.html @@ -1,6 +1,6 @@ - Mapping OpenSSL cipher suite names to RFC names + Mapping OpenSSL cipher suite names to IANA names