[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  6d418dbcd36c2e5e264fd4a007afcc8deeb8ab46 (commit)
      from  4c8e6f7d20c74c7711823d7d724c39ab7eb5eeaf (commit)


- Log -----------------------------------------------------------------
commit 6d418dbcd36c2e5e264fd4a007afcc8deeb8ab46
Author: Daniel Bevenius <daniel.bevenius at gmail.com>
Date:   Wed May 5 05:39:56 2021 +0200

    Clarify two comments (typos) in fipsprov.c
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15150)

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

Summary of changes:
 providers/fips/fipsprov.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c
index a7d335b78a..841c80bab7 100644
--- a/providers/fips/fipsprov.c
+++ b/providers/fips/fipsprov.c
@@ -671,14 +671,14 @@ int OSSL_provider_init(const OSSL_CORE_HANDLE *handle,
         return 0;
     }
     /*
-     * Disable the conditional error check if is disabled in the fips config
-     * file
+     * Disable the conditional error check if it's disabled in the fips config
+     * file.
      */
     if (fgbl->selftest_params.conditional_error_check != NULL
         && strcmp(fgbl->selftest_params.conditional_error_check, "0") == 0)
         SELF_TEST_disable_conditional_error_state();
 
-    /* Disable the security check if is disabled in the fips config file */
+    /* Disable the security check if it's disabled in the fips config file. */
     if (fgbl->fips_security_check_option != NULL
         && strcmp(fgbl->fips_security_check_option, "0") == 0)
         fgbl->fips_security_checks = 0;