[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  30573117bbfef0991b522fd0f7c3d4abc5e296cd (commit)
      from  1ac64327dfd8d20072a34e73116ab222d77a24d0 (commit)


- Log -----------------------------------------------------------------
commit 30573117bbfef0991b522fd0f7c3d4abc5e296cd
Author: Nan Xiao <nan at chinadtrace.org>
Date:   Tue Apr 6 16:14:46 2021 +0800

    Fix typo in store_meth.c
    
    CLA: trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14776)

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

Summary of changes:
 crypto/store/store_meth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/store/store_meth.c b/crypto/store/store_meth.c
index be78adaab8..a2ab341fe9 100644
--- a/crypto/store/store_meth.c
+++ b/crypto/store/store_meth.c
@@ -281,7 +281,7 @@ static OSSL_STORE_LOADER *inner_loader_fetch(OSSL_LIB_CTX *libctx,
     }
 
     /*
-     * If we have been passed neither a scheme_id or a scheme, we have an
+     * If we have been passed neither a scheme_id nor a scheme, we have an
      * internal programming error.
      */
     if (!ossl_assert(id != 0 || scheme != NULL)) {