Module Name:    src
Committed By:   christos
Date:           Tue Mar  6 18:36:09 UTC 2018

Modified Files:
        src/crypto/external/bsd/openssl/dist/crypto/modes: gcm128.c

Log Message:
fix v8 PMULL detection (Robert Swindells)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
    src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c:1.4 src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c:1.5
--- src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c:1.4	Thu Feb  8 16:51:29 2018
+++ src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c	Tue Mar  6 13:36:09 2018
@@ -668,7 +668,6 @@ void gcm_ghash_4bit_x86(u64 Xi[2], const
 #  if __ARM_MAX_ARCH__>=7
 #   define GHASH_ASM_ARM
 #   define GCM_FUNCREF_4BIT
-#   define PMULL_CAPABLE        (OPENSSL_armcap_P & ARMV8_PMULL)
 #   if defined(__arm__) || defined(__arm)
 #    define NEON_CAPABLE        (OPENSSL_armcap_P & ARMV7_NEON)
 #   endif
@@ -676,10 +675,13 @@ void gcm_init_neon(u128 Htable[16], cons
 void gcm_gmult_neon(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_neon(u64 Xi[2], const u128 Htable[16], const u8 *inp,
                     size_t len);
+#   if __ARM_MAX_ARCH__>=8
+#    define PMULL_CAPABLE        (OPENSSL_armcap_P & ARMV8_PMULL)
 void gcm_init_v8(u128 Htable[16], const u64 Xi[2]);
 void gcm_gmult_v8(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_v8(u64 Xi[2], const u128 Htable[16], const u8 *inp,
                   size_t len);
+#   endif
 #  endif
 # elif defined(__sparc__) || defined(__sparc)
 #  include "sparc_arch.h"

Reply via email to