[openssl-commits] [openssl] master update

[kaduk at mit.edu]

The branch master has been updated
       via  19f05ebc3f5346d89ec7e71feb5504dbd093721a (commit)
      from  32f3b98d1302d4c0950dc1bf94b50269b6edbd95 (commit)


- Log -----------------------------------------------------------------
commit 19f05ebc3f5346d89ec7e71feb5504dbd093721a
Author: Keshav Kini <keshav.kini at gmail.com>
Date:   Mon Oct 9 23:32:56 2017 -0700

    Fix typos
    
    CLA: trivial
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/4513)

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

Summary of changes:
 crypto/include/internal/md32_common.h | 6 +++---
 include/openssl/crypto.h              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/include/internal/md32_common.h b/crypto/include/internal/md32_common.h
index 6e4ce14..cd49a60 100644
--- a/crypto/include/internal/md32_common.h
+++ b/crypto/include/internal/md32_common.h
@@ -22,7 +22,7 @@
  * HASH_CBLOCK
  *      size of a unit chunk HASH_BLOCK operates on.
  * HASH_LONG
- *      has to be at lest 32 bit wide.
+ *      has to be at least 32 bit wide.
  * HASH_CTX
  *      context structure that at least contains following
  *      members:
@@ -48,7 +48,7 @@
  *      name of "block" function capable of treating *unaligned* input
  *      message in original (data) byte order, implemented externally.
  * HASH_MAKE_STRING
- *      macro convering context variables to an ASCII hash string.
+ *      macro converting context variables to an ASCII hash string.
  *
  * MD5 example:
  *
@@ -243,7 +243,7 @@
 #endif
 
 /*
- * Time for some action:-)
+ * Time for some action :-)
  */
 
 int HASH_UPDATE(HASH_CTX *c, const void *data_, size_t len)
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index c2aa07c..8df7f3c 100644
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -211,7 +211,7 @@ void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx);
  * The old locking functions have been removed completely without compatibility
  * macros. This is because the old functions either could not properly report
  * errors, or the returned error values were not clearly documented.
- * Replacing the locking functions with with no-ops would cause race condition
+ * Replacing the locking functions with no-ops would cause race condition
  * issues in the affected applications. It is far better for them to fail at
  * compile time.
  * On the other hand, the locking callbacks are no longer used.  Consequently,