[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  99592c73e7167990082626a46ea9286c152f85fd (commit)
      from  c3be39f2e47ec6c538ef1060d35dbee5c286ea4f (commit)


- Log -----------------------------------------------------------------
commit 99592c73e7167990082626a46ea9286c152f85fd
Author: Rashmica Gupta <rashmica.g at gmail.com>
Date:   Tue May 7 12:42:59 2019 +1000

    crypto/ppccap.c: Fix which hwcap value used to check for HWCAP_ARCH_3_00
    
    CLA: trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/8889)

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

Summary of changes:
 crypto/ppccap.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index 9601674..0d5ab79 100644
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -323,6 +323,7 @@ void OPENSSL_cpuid_setup(void)
 #ifdef OSSL_IMPLEMENT_GETAUXVAL
     {
         unsigned long hwcap = getauxval(HWCAP);
+        unsigned long hwcap2 = getauxval(HWCAP2);
 
         if (hwcap & HWCAP_FPU) {
             OPENSSL_ppccap_P |= PPC_FPU;
@@ -341,11 +342,11 @@ void OPENSSL_cpuid_setup(void)
         if (hwcap & HWCAP_ALTIVEC) {
             OPENSSL_ppccap_P |= PPC_ALTIVEC;
 
-            if ((hwcap & HWCAP_VSX) && (getauxval(HWCAP2) & HWCAP_VEC_CRYPTO))
+            if ((hwcap & HWCAP_VSX) && (hwcap2 & HWCAP_VEC_CRYPTO))
                 OPENSSL_ppccap_P |= PPC_CRYPTO207;
         }
 
-        if (hwcap & HWCAP_ARCH_3_00) {
+        if (hwcap2 & HWCAP_ARCH_3_00) {
             OPENSSL_ppccap_P |= PPC_MADD300;
         }
     }