[openssl-commits] [openssl] master update

[matthias.st.pierre at ncp-e.com]

The branch master has been updated
       via  dd07e68b2066745caa7f0d9f866cfb6fdf0fc89f (commit)
      from  d597208c034722d09612c805e4894b0019bdd710 (commit)


- Log -----------------------------------------------------------------
commit dd07e68b2066745caa7f0d9f866cfb6fdf0fc89f
Author: Dr. Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
Date:   Fri Feb 16 15:45:32 2018 +0100

    Fix miscellaneous typos in docs and source
    
    - d2i_PKC8PrivateKey -> d2i_PKCS8PrivateKey
    - bechmark -> benchmark
    - ciperhsuite -> ciphersuite
    - EncyptedPreMasterSecret -> EncryptedPreMasterSecret
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5570)

-----------------------------------------------------------------------

Summary of changes:
 crypto/bn/asm/ppc.pl            | 2 +-
 doc/man1/speed.pod              | 4 ++--
 doc/man3/d2i_PrivateKey.pod     | 2 +-
 ssl/t1_trce.c                   | 4 ++--
 test/recipes/70-test_tls13psk.t | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/crypto/bn/asm/ppc.pl b/crypto/bn/asm/ppc.pl
index 39349ae..d197f96 100644
--- a/crypto/bn/asm/ppc.pl
+++ b/crypto/bn/asm/ppc.pl
@@ -40,7 +40,7 @@
 #dsa  512 bits   0.0087s   0.0106s    114.3     94.5
 #dsa 1024 bits   0.0256s   0.0313s     39.0     32.0
 #
-#	Same bechmark with this assembler code:
+#	Same benchmark with this assembler code:
 #
 #rsa  512 bits   0.0056s   0.0005s    178.6   2049.2
 #rsa 1024 bits   0.0283s   0.0015s     35.3    674.1
diff --git a/doc/man1/speed.pod b/doc/man1/speed.pod
index f57f55a..b20af84 100644
--- a/doc/man1/speed.pod
+++ b/doc/man1/speed.pod
@@ -73,11 +73,11 @@ is only effective if RSA algorithm is specified to test.
 
 =item B<-seconds num>
 
-Run bechmarks for B<num> seconds.
+Run benchmarks for B<num> seconds.
 
 =item B<-bytes num>
 
-Run bechmarks on B<num>-byte buffers. Affects ciphers, digests and the CSPRNG.
+Run benchmarks on B<num>-byte buffers. Affects ciphers, digests and the CSPRNG.
 
 =item B<[zero or more test algorithms]>
 
diff --git a/doc/man3/d2i_PrivateKey.pod b/doc/man3/d2i_PrivateKey.pod
index f5b4667..813c8a6 100644
--- a/doc/man3/d2i_PrivateKey.pod
+++ b/doc/man3/d2i_PrivateKey.pod
@@ -44,7 +44,7 @@ These functions are similar to the d2i_X509() functions; see L<d2i_X509(3)>.
 
 All these functions use DER format and unencrypted keys. Applications wishing
 to encrypt or decrypt private keys should use other functions such as
-d2i_PKC8PrivateKey() instead.
+d2i_PKCS8PrivateKey() instead.
 
 If the B<*a> is not NULL when calling d2i_PrivateKey() or d2i_AutoPrivateKey()
 (i.e. an existing structure is being reused) and the key format is PKCS#8
diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index 3186b98..55f1824 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -1086,10 +1086,10 @@ static int ssl_print_client_keyex(BIO *bio, int indent, const SSL *ssl,
     case SSL_kRSAPSK:
         if (TLS1_get_version(ssl) == SSL3_VERSION) {
             ssl_print_hex(bio, indent + 2,
-                          "EncyptedPreMasterSecret", msg, msglen);
+                          "EncryptedPreMasterSecret", msg, msglen);
         } else {
             if (!ssl_print_hexbuf(bio, indent + 2,
-                                  "EncyptedPreMasterSecret", 2, &msg, &msglen))
+                                  "EncryptedPreMasterSecret", 2, &msg, &msglen))
                 return 0;
         }
         break;
diff --git a/test/recipes/70-test_tls13psk.t b/test/recipes/70-test_tls13psk.t
index fa30dd1..fedc527 100644
--- a/test/recipes/70-test_tls13psk.t
+++ b/test/recipes/70-test_tls13psk.t
@@ -63,7 +63,7 @@ $proxy->start();
 ok(TLSProxy::Message->fail(), "PSK not last");
 
 #Test 3: Attempt a resume after an HRR where PSK hash matches selected
-#        ciperhsuite. Should see PSK on second ClientHello
+#        ciphersuite. Should see PSK on second ClientHello
 $proxy->clear();
 $proxy->clientflags("-sess_in ".$session);
 $proxy->serverflags("-curves P-256");