[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  e7b81fe67a5dd95af72e090fff6fd0749ee88553 (commit)
      from  2e9645c8b9a81e7617395553088560847ac1b8c8 (commit)


- Log -----------------------------------------------------------------
commit e7b81fe67a5dd95af72e090fff6fd0749ee88553
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Thu Sep 19 17:26:04 2019 +1000

    Fix missing bn_mul_mont symbol in solaris fips module
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9943)

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

Summary of changes:
 crypto/sparcv9cap.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/crypto/sparcv9cap.c b/crypto/sparcv9cap.c
index e48ebf7e6d..ec825662e5 100644
--- a/crypto/sparcv9cap.c
+++ b/crypto/sparcv9cap.c
@@ -24,11 +24,6 @@ __attribute__ ((visibility("hidden")))
 #endif
 unsigned int OPENSSL_sparcv9cap_P[2] = { SPARCV9_TICK_PRIVILEGED, 0 };
 
-/*
- * TODO(3.0): Temporarily disabled some assembler that hasn't been brought into
- * the FIPS module yet.
- */
-#ifndef FIPS_MODE
 int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
                 const BN_ULONG *np, const BN_ULONG *n0, int num)
 {
@@ -91,7 +86,6 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
     }
     return bn_mul_mont_int(rp, ap, bp, np, n0, num);
 }
-#endif /* FIPS_MODE */
 
 unsigned long _sparcv9_rdtick(void);
 void _sparcv9_vis1_probe(void);