Overview

File 1068-Name-cipher-suites-consistently-across-ssl-docs.patch of Package erlang

From 3cd45f14afb81f0d569a3c3350fcab172c75d1f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Britto?= <jabcalves@gmail.com>
Date: Mon, 17 Aug 2020 15:32:23 -0300
Subject: [PATCH] Name cipher suites consistently across ssl docs

They are referenced as "cipher suites" most of the time, but as "cipher
suits" in a few places. This change renames these remaining occurences
to "cipher suites".

Also fixes typo: chipher -> cipher.
---
 lib/ssl/doc/src/notes.xml      | 2 +-
 lib/ssl/doc/src/ssl.xml        | 6 +++---
 lib/ssl/doc/src/using_ssl.xml  | 2 +-
 lib/ssl/src/ssl.erl            | 2 +-
 lib/ssl/src/ssl_cipher.erl     | 4 ++--
 lib/ssl/src/tls_record.erl     | 2 +-
 lib/ssl/test/ssl_ECC.erl       | 2 +-
 lib/ssl/test/ssl_ECC_SUITE.erl | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 1dde51c389..bd4d84f057 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -3578,7 +3578,7 @@
         <item>
           <p>
 	    Add support for PSK (Pre Shared Key) and SRP (Secure
-	    Remote Password) chipher suits, thanks to Andreas
+	    Remote Password) cipher suites, thanks to Andreas
 	    Schultz.</p>
           <p>
 	    Own Id: OTP-10450 Aux Id: kunagi-269 [180] </p>
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index cc661abb9e..596fbf45f3 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -1354,7 +1354,7 @@ fun(srp, Username :: binary(), UserState :: term()) ->
       <desc><p>Make <c>Deferred</c> suites become the least preferred
       suites, that is put them at the end of the cipher suite list
       <c>Suites</c> after removing them from <c>Suites</c> if
-      present. <c>Deferred</c> may be a list of cipher suits or a
+      present. <c>Deferred</c> may be a list of cipher suites or a
       list of filters in which case the filters are use on  <c>Suites</c> to
       extract the Deferred cipher list.</p> 
       </desc>
@@ -1717,7 +1717,7 @@ fun(srp, Username :: binary(), UserState :: term()) ->
       <desc><p>Make <c>Preferred</c> suites become the most preferred
       suites that is put them at the head of the cipher suite list
       <c>Suites</c> after removing them from <c>Suites</c> if
-      present. <c>Preferred</c> may be a list of cipher suits or a
+      present. <c>Preferred</c> may be a list of cipher suites or a
       list of filters in which case the filters are use on <c>Suites</c> to
       extract the preferred cipher list. </p>
       </desc>
diff --git a/lib/ssl/doc/src/using_ssl.xml b/lib/ssl/doc/src/using_ssl.xml
index ab9588d699..f29606b419 100644
--- a/lib/ssl/doc/src/using_ssl.xml
+++ b/lib/ssl/doc/src/using_ssl.xml
@@ -154,7 +154,7 @@ ok</code>
   </section>
 
   <section>
-    <title>Customizing cipher suits</title>
+    <title>Customizing cipher suites</title>
 
     <p>Fetch default cipher suite list for an TLS/DTLS version. Change default
     to all to get all possible cipher suites.</p>
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index f7e24d103e..ffb8d7434f 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -1122,7 +1122,7 @@ filter_cipher_suites(Suites, Filters0) ->
 %% Description: Make <Preferred> suites become the most prefered
 %%      suites that is put them at the head of the cipher suite list
 %%      and remove them from <Suites> if present. <Preferred> may be a
-%%      list of cipher suits or a list of filters in which case the
+%%      list of cipher suites or a list of filters in which case the
 %%      filters are use on Suites to extract the the preferred
 %%      cipher list.
 %% --------------------------------------------------------------------
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index ded01f23f6..6bc7f6e353 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -118,10 +118,10 @@ nonce_seed(Seed, CipherState) ->
 -spec cipher(cipher_enum(), #cipher_state{}, binary(), iodata(), ssl_record:ssl_version()) ->
 		    {binary(), #cipher_state{}}. 
 %%
-%% Description: Encrypts the data and the MAC using chipher described
+%% Description: Encrypts the data and the MAC using cipher described
 %% by cipher_enum() and updating the cipher state
 %% Used for "MAC then Cipher" suites where first an HMAC of the
-%% data is calculated and the data plus the HMAC is ecncrypted.
+%% data is calculated and the data plus the HMAC is encrypted.
 %%-------------------------------------------------------------------
 cipher(?NULL, CipherState, <<>>, Fragment, _Version) ->
     GenStreamCipherList = [Fragment, <<>>],
diff --git a/lib/ssl/src/tls_record.erl b/lib/ssl/src/tls_record.erl
index 8d67be687a..6e5c30760d 100644
--- a/lib/ssl/src/tls_record.erl
+++ b/lib/ssl/src/tls_record.erl
@@ -509,7 +509,7 @@ encode_fragments(_Type, _Version, _Data, CS, _CompS, _CipherS, _Seq, _CipherFrag
 	 #{sequence_number := SeqNo}) ->
     <<?UINT64(SeqNo), ?BYTE(Type), ?BYTE(MajVer), ?BYTE(MinVer)>>.
 
-%% 1/n-1 splitting countermeasure Rizzo/Duong-Beast, RC4 chiphers are
+%% 1/n-1 splitting countermeasure Rizzo/Duong-Beast, RC4 ciphers are
 %% not vulnerable to this attack.
 split_bin(<<FirstByte:8, Rest/binary>>, ChunkSize, Version, BCA, one_n_minus_one) when
       BCA =/= ?RC4 andalso ({3, 1} == Version orelse
diff --git a/lib/ssl/test/ssl_ECC.erl b/lib/ssl/test/ssl_ECC.erl
index 36d949f74b..d2b75740ba 100644
--- a/lib/ssl/test/ssl_ECC.erl
+++ b/lib/ssl/test/ssl_ECC.erl
@@ -30,7 +30,7 @@
 -include_lib("public_key/include/public_key.hrl").
 
 %% Test diffrent certificate chain types, note that it is the servers
-%% chain that affect what cipher suit that will be choosen
+%% chain that affect what cipher suite that will be choosen
 
 %% ECDH_RSA 
 client_ecdh_rsa_server_ecdh_rsa(Config) when is_list(Config) ->
diff --git a/lib/ssl/test/ssl_ECC_SUITE.erl b/lib/ssl/test/ssl_ECC_SUITE.erl
index 9b3a11e865..09f28d8505 100644
--- a/lib/ssl/test/ssl_ECC_SUITE.erl
+++ b/lib/ssl/test/ssl_ECC_SUITE.erl
@@ -158,7 +158,7 @@ end_per_testcase(_TestCase, Config) ->
 %% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
 %% Test diffrent certificate chain types, note that it is the servers
-%% chain that affect what cipher suit that will be choosen
+%% chain that affect what cipher suite that will be choosen
 
 %% ECDH_RSA 
 client_ecdh_rsa_server_ecdh_rsa(Config) when is_list(Config) ->
-- 
2.26.2
openSUSE Build Service is sponsored by
Places