CVS commit: src/crypto/external/bsd/openssl/dist/crypto/modes
Module Name:src Committed By: christos Date: Thu Apr 8 12:31:49 UTC 2021 Modified Files: src/crypto/external/bsd/openssl/dist/crypto/modes: gcm128.c Log Message: Disable again the assembly version of gcm_ghash_4bit for the 32 bit sparc since it uses ldx/stx. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ 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.11 src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c:1.12 --- src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c:1.11 Thu Mar 25 14:51:19 2021 +++ src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c Thu Apr 8 08:31:49 2021 @@ -689,13 +689,15 @@ void gcm_ghash_v8(u64 Xi[2], const u128 # endif # elif defined(__sparc__) || defined(__sparc) # include "sparc_arch.h" -# define GHASH_ASM_SPARC -# define GCM_FUNCREF_4BIT +# if defined(__arch64__) +# define GHASH_ASM_SPARC +# define GCM_FUNCREF_4BIT extern unsigned int OPENSSL_sparcv9cap_P[]; void gcm_init_vis3(u128 Htable[16], const u64 Xi[2]); void gcm_gmult_vis3(u64 Xi[2], const u128 Htable[16]); void gcm_ghash_vis3(u64 Xi[2], const u128 Htable[16], const u8 *inp, size_t len); +# endif /* __arch64__ */ # elif defined(OPENSSL_CPUID_OBJ) && (defined(__powerpc__) || defined(__ppc__) || defined(_ARCH_PPC)) # include "ppc_arch.h" # define GHASH_ASM_PPC
CVS commit: src/crypto/external/bsd/openssl/dist/crypto/modes
Module Name:src Committed By: christos Date: Mon Jun 22 19:55:43 UTC 2020 Modified Files: src/crypto/external/bsd/openssl/dist/crypto/modes: gcm128.c Log Message: reduce diff with upstream. we always compile with v8 assembly and detect at runtime. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ 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.8 src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c:1.9 --- src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c:1.8 Sun Jun 21 18:17:35 2020 +++ src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c Mon Jun 22 15:55:43 2020 @@ -668,6 +668,7 @@ 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 @@ -675,18 +676,15 @@ 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" -# define GHASH_ASM_SPARC -# define GCM_FUNCREF_4BIT +# define GHASH_ASM_SPARC +# define GCM_FUNCREF_4BIT extern unsigned int OPENSSL_sparcv9cap_P[]; void gcm_init_vis3(u128 Htable[16], const u64 Xi[2]); void gcm_gmult_vis3(u64 Xi[2], const u128 Htable[16]);
CVS commit: src/crypto/external/bsd/openssl/dist/crypto/modes
Module Name:src Committed By: christos Date: Sun Jun 21 22:17:35 UTC 2020 Modified Files: src/crypto/external/bsd/openssl/dist/crypto/modes: gcm128.c Log Message: Revert to the upstream version To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ 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.7 src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c:1.8 --- src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c:1.7 Sat Mar 21 20:53:07 2020 +++ src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c Sun Jun 21 18:17:35 2020 @@ -685,7 +685,6 @@ void gcm_ghash_v8(u64 Xi[2], const u128 # endif # elif defined(__sparc__) || defined(__sparc) # include "sparc_arch.h" -# if defined(__arch64__) # define GHASH_ASM_SPARC # define GCM_FUNCREF_4BIT extern unsigned int OPENSSL_sparcv9cap_P[]; @@ -693,7 +692,6 @@ void gcm_init_vis3(u128 Htable[16], cons void gcm_gmult_vis3(u64 Xi[2], const u128 Htable[16]); void gcm_ghash_vis3(u64 Xi[2], const u128 Htable[16], const u8 *inp, size_t len); -# endif # elif defined(OPENSSL_CPUID_OBJ) && (defined(__powerpc__) || defined(__ppc__) || defined(_ARCH_PPC)) # include "ppc_arch.h" # define GHASH_ASM_PPC
CVS commit: src/crypto/external/bsd/openssl/dist/crypto/modes
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"
