[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  fa2a7490c0b22083388fb81497998730f000e82d (commit)
      from  eeb09f1bd7754e85e832853f46a726c761c93df1 (commit)


- Log -----------------------------------------------------------------
commit fa2a7490c0b22083388fb81497998730f000e82d
Author: Daniel Bevenius <daniel.bevenius at gmail.com>
Date:   Tue Jan 26 09:19:03 2021 +0100

    Fix typo in thread_once comments
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13964)

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

Summary of changes:
 include/internal/thread_once.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/internal/thread_once.h b/include/internal/thread_once.h
index d16c924998..f08d19e4dc 100644
--- a/include/internal/thread_once.h
+++ b/include/internal/thread_once.h
@@ -18,7 +18,7 @@
 #if !defined(FIPS_MODULE) || defined(ALLOW_RUN_ONCE_IN_FIPS)
 /*
  * DEFINE_RUN_ONCE: Define an initialiser function that should be run exactly
- * once. It takes no arguments and returns and int result (1 for success or
+ * once. It takes no arguments and returns an int result (1 for success or
  * 0 for failure). Typical usage might be:
  *
  * DEFINE_RUN_ONCE(myinitfunc)
@@ -50,7 +50,7 @@
 /*
  * DEFINE_RUN_ONCE_STATIC: Define an initialiser function that should be run
  * exactly once. This function will be declared as static within the file. It
- * takes no arguments and returns and int result (1 for success or 0 for
+ * takes no arguments and returns an int result (1 for success or 0 for
  * failure). Typical usage might be:
  *
  * DEFINE_RUN_ONCE_STATIC(myinitfunc)
@@ -74,7 +74,7 @@
 /*
  * DEFINE_RUN_ONCE_STATIC_ALT: Define an alternative initialiser function. This
  * function will be declared as static within the file. It takes no arguments
- * and returns and int result (1 for success or 0 for failure). An alternative
+ * and returns an int result (1 for success or 0 for failure). An alternative
  * initialiser function is expected to be associated with a primary initialiser
  * function defined via DEFINE_ONCE_STATIC where both functions use the same
  * CRYPTO_ONCE object to synchronise. Where an alternative initialiser function