[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  bdcacd93b14ed7381a922b41d74c481224ef9fa1 (commit)
      from  3c1a60e56f090f0478ab0405766003b680982745 (commit)


- Log -----------------------------------------------------------------
commit bdcacd93b14ed7381a922b41d74c481224ef9fa1
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Sat Aug 12 20:02:24 2017 +0200

    Fix some typo and comments
    [skip ci]
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4149)

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

Summary of changes:
 doc/man3/SSL_alloc_buffers.pod | 4 ++--
 test/asn1_encode_test.c        | 2 +-
 test/asynciotest.c             | 2 +-
 test/sslapitest.c              | 2 +-
 test/sslbuffertest.c           | 2 +-
 test/testutil.h                | 6 +++---
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/man3/SSL_alloc_buffers.pod b/doc/man3/SSL_alloc_buffers.pod
index de33efb..94bd058 100644
--- a/doc/man3/SSL_alloc_buffers.pod
+++ b/doc/man3/SSL_alloc_buffers.pod
@@ -20,7 +20,7 @@ The B<SSL_MODE_RELEASE_BUFFERS> mode releases read or write buffers whenever
 the buffers have been drained. These functions allow applications to manually
 control when buffers are freed and allocated.
 
-After freeing the buffers, the buffers are automatically reallocted upon a
+After freeing the buffers, the buffers are automatically reallocated upon a
 new read or write. The SSL_alloc_buffers() does not need to be called, but
 can be used to make sure the buffers are pre-allocated. This can be used to
 avoid allocation during data processing or with CRYPTO_set_mem_functions()
@@ -44,7 +44,7 @@ The SSL_free_buffers() function returns 1 if the buffers have been freed. This
 value is also returned if the buffers had been freed before calling
 SSL_free_buffers().
 The SSL_alloc_buffers() function returns 1 if the buffers have been allocated.
-This valus is also returned if the buffers had been allocated before calling
+This value is also returned if the buffers had been allocated before calling
 SSL_alloc_buffers().
 
 =back
diff --git a/test/asn1_encode_test.c b/test/asn1_encode_test.c
index b8ec168..3b8d418 100644
--- a/test/asn1_encode_test.c
+++ b/test/asn1_encode_test.c
@@ -672,7 +672,7 @@ static int do_decode_custom(const TEST_CUSTOM_DATA *custom_data,
 {
     unsigned char *encoding = NULL;
     /*
-     * We force the defaults to be explicitely encoded to make sure we test
+     * We force the defaults to be explicitly encoded to make sure we test
      * for defaults that shouldn't be present (i.e. we check for failure)
      */
     size_t encoding_length = make_custom_der(custom_data, &encoding, 1);
diff --git a/test/asynciotest.c b/test/asynciotest.c
index aa6076b..fdb9770 100644
--- a/test/asynciotest.c
+++ b/test/asynciotest.c
@@ -325,7 +325,7 @@ static int test_asyncio(int test)
             goto end;
 
         /*
-         * Now read the test data. It may take more attemps here because
+         * Now read the test data. It may take more attempts here because
          * it could fail once for each byte read, including all overhead
          * bytes from the record header/padding etc.
          */
diff --git a/test/sslapitest.c b/test/sslapitest.c
index f7b0ad8..1c43686 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -91,7 +91,7 @@ static void server_keylog_callback(const SSL *ssl, const char *line)
 
     /* If the log doesn't fit, error out. */
     if (server_log_buffer_index + line_length > sizeof(server_log_buffer) - 1) {
-        TEST_info("Server og too full");
+        TEST_info("Server log too full");
         error_writing_log = 1;
         return;
     }
diff --git a/test/sslbuffertest.c b/test/sslbuffertest.c
index 6010976..a1c3c6a 100644
--- a/test/sslbuffertest.c
+++ b/test/sslbuffertest.c
@@ -105,7 +105,7 @@ static int test_func(int test)
         if (!TEST_size_t_eq(len, sizeof(testdata)))
             goto end;
         /*
-         * Now read the test data. It may take more attemps here because
+         * Now read the test data. It may take more attempts here because
          * it could fail once for each byte read, including all overhead
          * bytes from the record header/padding etc.
          */
diff --git a/test/testutil.h b/test/testutil.h
index f779fd5..1e18ea1 100644
--- a/test/testutil.h
+++ b/test/testutil.h
@@ -41,7 +41,7 @@
  * int global_init(void);
  *
  * This function should return zero if there is an unrecoverable error and
- * non-zero if the intialization was successful.
+ * non-zero if the initialization was successful.
  */
 
 /* Adds a simple test case. */
@@ -235,8 +235,8 @@ int test_mem_ne(const char *, int, const char *, const char *,
 
 /*
  * Check a boolean result for being true or false.
- * They return 1 if the condition is true (i.e. the value is non-zro).
- * Otherwise, they return 0 and pretty-prints diagnostics using |desc|.
+ * They return 1 if the condition is true (i.e. the value is non-zero).
+ * Otherwise, they return 0 and pretty-prints diagnostics using |s|.
  * These should not be called directly, use the TEST_xxx macros below instead.
  */
 int test_true(const char *file, int line, const char *s, int b);