[openssl] master update

matthias.st.pierre at ncp-e.com matthias.st.pierre at ncp-e.com
Mon Jul 1 08:11:18 UTC 2019


The branch master has been updated
       via  68756b12f55cb23536d531695619ad4a567916ab (commit)
      from  3f1679b26101561ae6974e450b0c8876ece152c6 (commit)


- Log -----------------------------------------------------------------
commit 68756b12f55cb23536d531695619ad4a567916ab
Author: Antoine Cœur <coeur at gmx.fr>
Date:   Mon Jul 1 02:02:06 2019 +0800

    Fix Typos
    
    CLA: trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/9275)

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

Summary of changes:
 CHANGES                          | 4 ++--
 NEWS                             | 2 +-
 apps/s_client.c                  | 2 +-
 crypto/evp/bio_ok.c              | 4 ++--
 crypto/store/store_lib.c         | 2 +-
 crypto/ui/ui_openssl.c           | 2 +-
 doc/HOWTO/proxy_certificates.txt | 2 +-
 doc/man3/CMS_final.pod           | 2 +-
 include/openssl/ec.h             | 2 +-
 include/openssl/store.h          | 4 ++--
 test/conf_include_test.c         | 2 +-
 test/dhtest.c                    | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CHANGES b/CHANGES
index b99241e..4c70b93 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6985,7 +6985,7 @@
      reason texts, thereby removing some of the footprint that may not
      be interesting if those errors aren't displayed anyway.
 
-     NOTE: it's still possible for any application or module to have it's
+     NOTE: it's still possible for any application or module to have its
      own set of error texts inserted.  The routines are there, just not
      used by default when no-err is given.
      [Richard Levitte]
@@ -8951,7 +8951,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
  Changes between 0.9.6g and 0.9.6h  [5 Dec 2002]
 
   *) New function OPENSSL_cleanse(), which is used to cleanse a section of
-     memory from it's contents.  This is done with a counter that will
+     memory from its contents.  This is done with a counter that will
      place alternating values in each byte.  This can be used to solve
      two issues: 1) the removal of calls to memset() by highly optimizing
      compilers, and 2) cleansing with other values than 0, since those can
diff --git a/NEWS b/NEWS
index 6c79bc2..aeb2eb7 100644
--- a/NEWS
+++ b/NEWS
@@ -605,7 +605,7 @@
 
   Major changes between OpenSSL 0.9.7h and OpenSSL 0.9.7i [14 Oct 2005]:
 
-      o Give EVP_MAX_MD_SIZE it's old value, except for a FIPS build.
+      o Give EVP_MAX_MD_SIZE its old value, except for a FIPS build.
 
   Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.7h [11 Oct 2005]:
 
diff --git a/apps/s_client.c b/apps/s_client.c
index 282d137..6f2d133 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -2395,7 +2395,7 @@ int s_client_main(int argc, char **argv)
             (void)BIO_flush(fbio);
             /*
              * The first line is the HTTP response.  According to RFC 7230,
-             * it's formated exactly like this:
+             * it's formatted exactly like this:
              *
              * HTTP/d.d ddd Reason text\r\n
              */
diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c
index 8fe2cbc..7f99f32 100644
--- a/crypto/evp/bio_ok.c
+++ b/crypto/evp/bio_ok.c
@@ -38,9 +38,9 @@
         of memory.
 
         BIO_f_reliable splits data stream into blocks. Each block is prefixed
-        with it's length and suffixed with it's digest. So you need only
+        with its length and suffixed with its digest. So you need only
         several Kbytes of memory to buffer single block before verifying
-        it's digest.
+        its digest.
 
         BIO_f_reliable goes further and adds several important capabilities:
 
diff --git a/crypto/store/store_lib.c b/crypto/store/store_lib.c
index ebe9182..8c55c43 100644
--- a/crypto/store/store_lib.c
+++ b/crypto/store/store_lib.c
@@ -228,7 +228,7 @@ int OSSL_STORE_close(OSSL_STORE_CTX *ctx)
  * Functions to generate OSSL_STORE_INFOs, one function for each type we
  * support having in them as well as a generic constructor.
  *
- * In all cases, ownership of the object is transfered to the OSSL_STORE_INFO
+ * In all cases, ownership of the object is transferred to the OSSL_STORE_INFO
  * and will therefore be freed when the OSSL_STORE_INFO is freed.
  */
 static OSSL_STORE_INFO *store_info_new(int type, void *data)
diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index 04d4f6e..2b5e5c1 100644
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -79,7 +79,7 @@
  * systems that require something different.
  *
  * Note: we do not use SGTTY unless it's defined by the configuration.  We
- * may eventually opt to remove it's use entirely.
+ * may eventually opt to remove its use entirely.
  */
 
 # if !defined(TERMIOS) && !defined(TERMIO) && !defined(SGTTY)
diff --git a/doc/HOWTO/proxy_certificates.txt b/doc/HOWTO/proxy_certificates.txt
index 2936cd6..3c42349 100644
--- a/doc/HOWTO/proxy_certificates.txt
+++ b/doc/HOWTO/proxy_certificates.txt
@@ -255,7 +255,7 @@ Here is some skeleton code you can fill in:
 
                       /*
                        * process_rights() is supposed to be a procedure
-                       * that takes a string and it's length, interprets
+                       * that takes a string and its length, interprets
                        * it and sets the bits in the YOUR_RIGHTS pointed
                        * at by the third argument.
                        */
diff --git a/doc/man3/CMS_final.pod b/doc/man3/CMS_final.pod
index eab335e..8270d53 100644
--- a/doc/man3/CMS_final.pod
+++ b/doc/man3/CMS_final.pod
@@ -12,7 +12,7 @@ CMS_final - finalise a CMS_ContentInfo structure
 
 =head1 DESCRIPTION
 
-CMS_final() finalises the structure B<cms>. It's purpose is to perform any
+CMS_final() finalises the structure B<cms>. Its purpose is to perform any
 operations necessary on B<cms> (digest computation for example) and set the
 appropriate fields. The parameter B<data> contains the content to be
 processed. The B<dcont> parameter contains a BIO to write content to after
diff --git a/include/openssl/ec.h b/include/openssl/ec.h
index af559cb..e523d0d 100644
--- a/include/openssl/ec.h
+++ b/include/openssl/ec.h
@@ -142,7 +142,7 @@ const EC_METHOD *EC_GROUP_method_of(const EC_GROUP *group);
  */
 int EC_METHOD_get_field_type(const EC_METHOD *meth);
 
-/** Sets the generator and it's order/cofactor of a EC_GROUP object.
+/** Sets the generator and its order/cofactor of a EC_GROUP object.
  *  \param  group      EC_GROUP object
  *  \param  generator  EC_POINT object with the generator.
  *  \param  order      the order of the group generated by the generator.
diff --git a/include/openssl/store.h b/include/openssl/store.h
index fa5ed1b..9200fd0 100644
--- a/include/openssl/store.h
+++ b/include/openssl/store.h
@@ -85,7 +85,7 @@ OSSL_STORE_INFO *OSSL_STORE_load(OSSL_STORE_CTX *ctx);
 int OSSL_STORE_eof(OSSL_STORE_CTX *ctx);
 
 /*
- * Check if an error occured
+ * Check if an error occurred
  * Returns 1 if it did, 0 otherwise.
  */
 int OSSL_STORE_error(OSSL_STORE_CTX *ctx);
@@ -117,7 +117,7 @@ int OSSL_STORE_close(OSSL_STORE_CTX *ctx);
  * Functions to generate OSSL_STORE_INFOs, one function for each type we
  * support having in them, as well as a generic constructor.
  *
- * In all cases, ownership of the object is transfered to the OSSL_STORE_INFO
+ * In all cases, ownership of the object is transferred to the OSSL_STORE_INFO
  * and will therefore be freed when the OSSL_STORE_INFO is freed.
  */
 OSSL_STORE_INFO *OSSL_STORE_INFO_new_NAME(char *name);
diff --git a/test/conf_include_test.c b/test/conf_include_test.c
index ba40aa1..16459c4 100644
--- a/test/conf_include_test.c
+++ b/test/conf_include_test.c
@@ -141,7 +141,7 @@ static int test_check_null_numbers(void)
     }
 
     /*
-     * Verify that a NULL config with a missing envrionment variable returns
+     * Verify that a NULL config with a missing environment variable returns
      * a failure code.
      */
     if (!TEST_int_eq(unsetenv("FNORD"), 0)
diff --git a/test/dhtest.c b/test/dhtest.c
index 1bbf565..7b2edec 100644
--- a/test/dhtest.c
+++ b/test/dhtest.c
@@ -193,7 +193,7 @@ static int dh_test(void)
     BN_free(q);
     BN_free(g);
  err2:
-    /* an error occured before priv_key was assigned to dh */
+    /* an error occurred before priv_key was assigned to dh */
     BN_free(priv_key);
  err3:
  success:


More information about the openssl-commits mailing list