[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  200ae2ee8e1cec5c9af2ea36298bf6583bcd415d (commit)
       via  75e35c9ad1a0075d443202866fb1760d2e889d4e (commit)
      from  c720fc35f4aa90cdc7cdc424b976c5322fb0098e (commit)


- Log -----------------------------------------------------------------
commit 200ae2ee8e1cec5c9af2ea36298bf6583bcd415d
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Fri Jun 19 23:33:24 2020 +0200

    Fix one typo in a comment.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12209)

commit 75e35c9ad1a0075d443202866fb1760d2e889d4e
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Fri Jun 19 23:22:09 2020 +0200

    Fix `no-ts` builds.
    `ess_lib.c` is called from `cms` and `ts` modules.
    
    Fixes #12155
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12209)

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

Summary of changes:
 crypto/ess/build.info       | 3 ++-
 include/internal/refcount.h | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/crypto/ess/build.info b/crypto/ess/build.info
index fa2bc41d08..3570633d73 100644
--- a/crypto/ess/build.info
+++ b/crypto/ess/build.info
@@ -1,6 +1,7 @@
 LIBS=../../libcrypto
 
-IF[{- !$disabled{'cms'} and !$disabled{'ts'} -}]
+# compile ess_lib.c when cms or ts are enabled
+IF[{- !$disabled{'cms'} or !$disabled{'ts'} -}]
   SOURCE[../../libcrypto]= ess_lib.c
 ENDIF
 
diff --git a/include/internal/refcount.h b/include/internal/refcount.h
index 4feecf971c..1d1af772cc 100644
--- a/include/internal/refcount.h
+++ b/include/internal/refcount.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -145,7 +145,7 @@ static __inline int CRYPTO_DOWN_REF(volatile int *val, int *ret, void *lock)
 
 /*
  * All the refcounting implementations above define HAVE_ATOMICS, so if it's
- * still undefined here (such as when OPENSSL_DEV_NO_ATMOICS is defined), it
+ * still undefined here (such as when OPENSSL_DEV_NO_ATOMICS is defined), it
  * means we need to implement a fallback.  This fallback uses locks.
  */
 # ifndef HAVE_ATOMICS