[openssl] master update

[kaduk at mit.edu]

The branch master has been updated
       via  670ff08e77c5b331443a3ed6d41564d863a47f06 (commit)
      from  2edb571b4b857e51620bfd93e240e39de40cb456 (commit)


- Log -----------------------------------------------------------------
commit 670ff08e77c5b331443a3ed6d41564d863a47f06
Author: Benjamin Kaduk <kaduk at mit.edu>
Date:   Fri Jun 12 19:56:11 2020 -0700

    Fix logic error for building x86 CAST assembly
    
    The assembly code is not PIC, so we should only try to build it
    when the configuration has disabled PIC, not the other way around.
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    (Merged from https://github.com/openssl/openssl/pull/12128)

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

Summary of changes:
 crypto/cast/build.info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/cast/build.info b/crypto/cast/build.info
index 8763f22405..01a3691d68 100644
--- a/crypto/cast/build.info
+++ b/crypto/cast/build.info
@@ -2,7 +2,7 @@ LIBS=../../libcrypto
 
 $CASTASM=c_enc.c
 # CAST assembly source is not PIC
-IF[{- !$disabled{asm} && !$disabled{pic} -}]
+IF[{- !$disabled{asm} && $disabled{pic} -}]
   $CASTASM_x86=cast-586.s
 
   # Now that we have defined all the arch specific variables, use the