Module Name: src
Committed By: christos
Date: Mon Jun 22 16:26:29 UTC 2020
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc:
keccak1600p8-ppc.S sha.inc
Log Message:
Regen and disable keccak asm
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/keccak1600p8-ppc.S
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha.inc
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/lib/libcrypto/arch/powerpc/keccak1600p8-ppc.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/keccak1600p8-ppc.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/keccak1600p8-ppc.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/keccak1600p8-ppc.S:1.2 Sat Apr 11 18:41:06 2020
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/keccak1600p8-ppc.S Mon Jun 22 12:26:29 2020
@@ -288,11 +288,11 @@ KeccakF1600:
.byte 0,12,0x04,1,0x80,0,1,0
.long 0
-.globl SHA3_absorb_vsx
-.type SHA3_absorb_vsx,@function
+.globl SHA3_absorb
+.type SHA3_absorb,@function
.align 5
-SHA3_absorb_vsx:
+SHA3_absorb:
stwu 1,-232(1)
li 10,39
li 11,55
@@ -590,11 +590,11 @@ SHA3_absorb_vsx:
.byte 0,12,0x04,1,0x80,0,4,0
.long 0
-.globl SHA3_squeeze_vsx
-.type SHA3_squeeze_vsx,@function
+.globl SHA3_squeeze
+.type SHA3_squeeze,@function
.align 5
-SHA3_squeeze_vsx:
+SHA3_squeeze:
mflr 9
subi 4,4,1
addi 8,3,4
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha.inc:1.3 Sat Apr 11 18:41:06 2020
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha.inc Mon Jun 22 12:26:29 2020
@@ -1,6 +1,6 @@
.PATH.S: ${.PARSEDIR}
-SHA_SRCS = sha1-ppc.S keccak1600p8-ppc.S keccak1600.c
-SHACPPFLAGS = -DSHA1_ASM -DKECCAK1600_ASM
+SHA_SRCS = sha1-ppc.S
+SHACPPFLAGS = -DSHA1_ASM
KECCAKNI = yes
.if NOT_USING_SHAXXX_FROM_LIBC
SHA_SRCS += sha512-ppc.S sha512p8-ppc.S
