CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc

2020-06-22 Thread Christos Zoulas 
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

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc

2019-03-13 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Wed Mar 13 09:23:59 UTC 2019

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: ppccpuid.S

Log Message:
regen for openssl 1.1.1b.

not 100% sure this is right but my build works now.  here's what i did:

   % cd crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc
   % make regen

after checking that the openssl generator calling code had not change
(but the relevant .pl file had.)


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S

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/ppccpuid.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.11 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.12
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.11	Sun Jan  6 22:22:02 2019
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S	Wed Mar 13 09:23:59 2019
@@ -102,10 +102,11 @@ OPENSSL_atomic_add:
 .long	0
 
 
-.globl	OPENSSL_rdtsc
-.type	OPENSSL_rdtsc,@function
+.globl	OPENSSL_rdtsc_mftb
+.type	OPENSSL_rdtsc_mftb,@function
 .align	4
-OPENSSL_rdtsc:
+OPENSSL_rdtsc_mftb:
+	mftb	3
 	mfspr	0,287
 	srwi	0,0,0x10
 	cmplwi	0,0x1
@@ -128,6 +129,16 @@ OPENSSL_rdtsc:
 .byte	0,12,0x14,0,0,0,0,0
 
 
+.globl	OPENSSL_rdtsc_mfspr268
+.type	OPENSSL_rdtsc_mfspr268,@function
+.align	4
+OPENSSL_rdtsc_mfspr268:
+	mfspr	3,268
+	blr	
+.long	0
+.byte	0,12,0x14,0,0,0,0,0
+
+
 .globl	OPENSSL_cleanse
 .type	OPENSSL_cleanse,@function
 .align	4
@@ -188,10 +199,10 @@ CRYPTO_memcmp:
 .byte	0,12,0x14,0,0,0,3,0
 .long	0
 
-.globl	OPENSSL_instrument_bus
-.type	OPENSSL_instrument_bus,@function
+.globl	OPENSSL_instrument_bus_mftb
+.type	OPENSSL_instrument_bus_mftb,@function
 .align	4
-OPENSSL_instrument_bus:
+OPENSSL_instrument_bus_mftb:
 	mtctr	4
 
 	mftb	7
@@ -221,10 +232,10 @@ OPENSSL_instrument_bus:
 .long	0
 
 
-.globl	OPENSSL_instrument_bus2
-.type	OPENSSL_instrument_bus2,@function
+.globl	OPENSSL_instrument_bus2_mftb
+.type	OPENSSL_instrument_bus2_mftb,@function
 .align	4
-OPENSSL_instrument_bus2:
+OPENSSL_instrument_bus2_mftb:
 	mr	0,4
 	slwi	4,4,2
 
@@ -273,3 +284,89 @@ OPENSSL_instrument_bus2:
 .byte	0,12,0x14,0,0,0,3,0
 .long	0
 
+
+.globl	OPENSSL_instrument_bus_mfspr268
+.type	OPENSSL_instrument_bus_mfspr268,@function
+.align	4
+OPENSSL_instrument_bus_mfspr268:
+	mtctr	4
+
+	mfspr	7,268
+	li	8,0
+
+	dcbf	0,3
+	lwarx	6,0,3
+	add	6,6,8
+	stwcx.	6,0,3
+	stwx	6,0,3
+
+.Loop3:	mfspr	6,268
+	sub	8,6,7
+	mr	7,6
+	dcbf	0,3
+	lwarx	6,0,3
+	add	6,6,8
+	stwcx.	6,0,3
+	stwx	6,0,3
+	addi	3,3,4
+	bc	16,0,.Loop3
+
+	mr	3,4
+	blr	
+.long	0
+.byte	0,12,0x14,0,0,0,2,0
+.long	0
+
+
+.globl	OPENSSL_instrument_bus2_mfspr268
+.type	OPENSSL_instrument_bus2_mfspr268,@function
+.align	4
+OPENSSL_instrument_bus2_mfspr268:
+	mr	0,4
+	slwi	4,4,2
+
+	mfspr	7,268
+	li	8,0
+
+	dcbf	0,3
+	lwarx	6,0,3
+	add	6,6,8
+	stwcx.	6,0,3
+	stwx	6,0,3
+
+	mfspr	6,268
+	sub	8,6,7
+	mr	7,6
+	mr	9,8
+.Loop4:
+	dcbf	0,3
+	lwarx	6,0,3
+	add	6,6,8
+	stwcx.	6,0,3
+	stwx	6,0,3
+
+	addic.	5,5,-1
+	beq	.Ldone4
+
+	mfspr	6,268
+	sub	8,6,7
+	mr	7,6
+	.long	0x7f884840
+	mr	9,8
+
+	mfcr	6
+	not	6,6
+	rlwinm	6,6,1,29,29
+
+	sub.	4,4,6
+	add	3,3,6
+	bne	.Loop4
+
+.Ldone4:
+	srwi	4,4,2
+	sub	3,0,4
+	blr	
+.long	0
+.byte	0,12,0x14,0,0,0,3,0
+.long	0
+

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc

2019-01-06 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Jan  6 22:22:02 UTC 2019

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: ppccpuid.S
sha256p8-ppc.S sha512p8-ppc.S

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha256p8-ppc.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha512p8-ppc.S

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/ppccpuid.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.10 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.11
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.10	Sat Mar  3 22:25:18 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S	Sun Jan  6 17:22:02 2019
@@ -106,6 +106,17 @@ OPENSSL_atomic_add:
 .type	OPENSSL_rdtsc,@function
 .align	4
 OPENSSL_rdtsc:
+	mfspr	0,287
+	srwi	0,0,0x10
+	cmplwi	0,0x1
+	bgt	.Loop_rdtsc
+.Loop_rdtsc_601:
+	mfrtcu	5
+	mfrtcl	3
+	mfrtcu	4
+	.long	0x7c042840
+	bne	.Loop_rdtsc_601
+	blr	
 .Loop_rdtsc:
 	mftbu	5
 	mftb	3

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha256p8-ppc.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha256p8-ppc.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha256p8-ppc.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha256p8-ppc.S:1.2	Sun Sep 23 09:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha256p8-ppc.S	Sun Jan  6 17:22:02 2019
@@ -24,7 +24,7 @@ sha256_block_p8:
 	stvx	30,10,1
 	stvx	31,11,1
 	li	11,-4096+255
-	stw	12,348(1)
+	stw	12,300(1)
 	li	10,0x10
 	stw	26,304(1)
 	li	26,0x20
@@ -626,24 +626,17 @@ L16_xx:
 	vperm	4,4,7,9
 	.long	0x7C001F19
 	.long	0x7C8A1F19
-	li	10,175
+	addi	11,1,175
 	mtlr	8
-	li	11,191
 	mtspr	256,12
-	lvx	24,10,1
-	addi	10,10,32
-	lvx	25,11,1
-	addi	11,11,32
-	lvx	26,10,1
-	addi	10,10,32
-	lvx	27,11,1
-	addi	11,11,32
-	lvx	28,10,1
-	addi	10,10,32
-	lvx	29,11,1
-	addi	11,11,32
-	lvx	30,10,1
-	lvx	31,11,1
+	lvx	24,0,11
+	lvx	25,10,11
+	lvx	26,26,11
+	lvx	27,27,11
+	lvx	28,28,11
+	lvx	29,29,11
+	lvx	30,30,11
+	lvx	31,31,11
 	lwz	26,304(1)
 	lwz	27,308(1)
 	lwz	28,312(1)
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha512p8-ppc.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha512p8-ppc.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha512p8-ppc.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha512p8-ppc.S:1.2	Sun Sep 23 09:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha512p8-ppc.S	Sun Jan  6 17:22:02 2019
@@ -24,7 +24,7 @@ sha512_block_p8:
 	stvx	30,10,1
 	stvx	31,11,1
 	li	11,-4096+255
-	stw	12,348(1)
+	stw	12,300(1)
 	li	10,0x10
 	stw	26,304(1)
 	li	26,0x20
@@ -628,24 +628,17 @@ L16_xx:
 	.long	0x7C4A1F99
 	.long	0x7C9A1F99
 	.long	0x7CDB1F99
-	li	10,175
+	addi	11,1,175
 	mtlr	8
-	li	11,191
 	mtspr	256,12
-	lvx	24,10,1
-	addi	10,10,32
-	lvx	25,11,1
-	addi	11,11,32
-	lvx	26,10,1
-	addi	10,10,32
-	lvx	27,11,1
-	addi	11,11,32
-	lvx	28,10,1
-	addi	10,10,32
-	lvx	29,11,1
-	addi	11,11,32
-	lvx	30,10,1
-	lvx	31,11,1
+	lvx	24,0,11
+	lvx	25,10,11
+	lvx	26,26,11
+	lvx	27,27,11
+	lvx	28,28,11
+	lvx	29,29,11
+	lvx	30,30,11
+	lvx	31,31,11
 	lwz	26,304(1)
 	lwz	27,308(1)
 	lwz	28,312(1)

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc

2018-03-03 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Mar  4 03:25:18 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: aesp8-ppc.S
ghashp8-ppc.S ppccpuid.S
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc:
chacha-ppc.S chacha.inc poly1305-ppc.S poly1305-ppcfp.S
poly1305.inc

Log Message:
regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/aesp8-ppc.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ghashp8-ppc.S
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/chacha-ppc.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/chacha.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/poly1305-ppc.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/poly1305-ppcfp.S 
\
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/poly1305.inc
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S

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/aesp8-ppc.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/aesp8-ppc.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/aesp8-ppc.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/aesp8-ppc.S:1.1	Fri Oct 14 12:09:44 2016
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/aesp8-ppc.S	Sat Mar  3 22:25:18 2018
@@ -1832,3 +1832,1810 @@ _aesp8_ctr32_encrypt8x:
 .byte	0,12,0x04,0,0x80,6,6,0
 .long	0
 
+.globl	aes_p8_xts_encrypt
+.type	aes_p8_xts_encrypt,@function
+.align	5
+aes_p8_xts_encrypt:
+	mr	10,3
+	li	3,-1
+	cmplwi	5,16
+	bltlr
+
+	lis	0,0xfff0
+	mfspr	12,256
+	li	11,0
+	mtspr	256,0
+
+	vspltisb	9,0x07
+
+
+
+
+	li	3,15
+	lvx	8,0,8
+	lvsl	5,0,8
+	lvx	4,3,8
+
+	vperm	8,8,4,5
+
+	neg	11,10
+	lvsr	5,0,11
+	lvx	2,0,10
+	addi	10,10,15
+
+
+	cmplwi	7,0
+	beq	.Lxts_enc_no_key2
+
+	lvsl	7,0,7
+	lwz	9,240(7)
+	srwi	9,9,1
+	subi	9,9,1
+	li	3,16
+
+	lvx	0,0,7
+	lvx	1,3,7
+	addi	3,3,16
+	vperm	0,0,1,7
+	vxor	8,8,0
+	lvx	0,3,7
+	addi	3,3,16
+	mtctr	9
+
+.Ltweak_xts_enc:
+	vperm	1,1,0,7
+.long	0x11080D08
+	lvx	1,3,7
+	addi	3,3,16
+	vperm	0,0,1,7
+.long	0x11080508
+	lvx	0,3,7
+	addi	3,3,16
+	bc	16,0,.Ltweak_xts_enc
+
+	vperm	1,1,0,7
+.long	0x11080D08
+	lvx	1,3,7
+	vperm	0,0,1,7
+.long	0x11080509
+
+	li	8,0
+	b	.Lxts_enc
+
+.Lxts_enc_no_key2:
+	li	3,-16
+	and	5,5,3
+
+
+.Lxts_enc:
+	lvx	4,0,10
+	addi	10,10,16
+
+	lvsl	7,0,6
+	lwz	9,240(6)
+	srwi	9,9,1
+	subi	9,9,1
+	li	3,16
+
+	vslb	10,9,9
+	vor	10,10,9
+	vspltisb	11,1
+	vsldoi	10,10,11,15
+
+	cmplwi	5,96
+	bge	_aesp8_xts_encrypt6x
+
+	andi.	7,5,15
+	subic	0,5,32
+	subi	7,7,16
+	subfe	0,0,0
+	and	0,0,7
+	add	10,10,0
+
+	lvx	0,0,6
+	lvx	1,3,6
+	addi	3,3,16
+	vperm	2,2,4,5
+	vperm	0,0,1,7
+	vxor	2,2,8
+	vxor	2,2,0
+	lvx	0,3,6
+	addi	3,3,16
+	mtctr	9
+	b	.Loop_xts_enc
+
+.align	5
+.Loop_xts_enc:
+	vperm	1,1,0,7
+.long	0x10420D08
+	lvx	1,3,6
+	addi	3,3,16
+	vperm	0,0,1,7
+.long	0x10420508
+	lvx	0,3,6
+	addi	3,3,16
+	bc	16,0,.Loop_xts_enc
+
+	vperm	1,1,0,7
+.long	0x10420D08
+	lvx	1,3,6
+	li	3,16
+	vperm	0,0,1,7
+	vxor	0,0,8
+.long	0x10620509
+
+
+	nop	
+
+.long	0x7C602799
+	addi	4,4,16
+
+	subic.	5,5,16
+	beq	.Lxts_enc_done
+
+	vor	2,4,4
+	lvx	4,0,10
+	addi	10,10,16
+	lvx	0,0,6
+	lvx	1,3,6
+	addi	3,3,16
+
+	subic	0,5,32
+	subfe	0,0,0
+	and	0,0,7
+	add	10,10,0
+
+	vsrab	11,8,9
+	vaddubm	8,8,8
+	vsldoi	11,11,11,15
+	vand	11,11,10
+	vxor	8,8,11
+
+	vperm	2,2,4,5
+	vperm	0,0,1,7
+	vxor	2,2,8
+	vxor	3,3,0
+	vxor	2,2,0
+	lvx	0,3,6
+	addi	3,3,16
+
+	mtctr	9
+	cmplwi	5,16
+	bge	.Loop_xts_enc
+
+	vxor	3,3,8
+	lvsr	5,0,5
+	vxor	4,4,4
+	vspltisb	11,-1
+	vperm	4,4,11,5
+	vsel	2,2,3,4
+
+	subi	11,4,17
+	subi	4,4,16
+	mtctr	5
+	li	5,16
+.Loop_xts_enc_steal:
+	lbzu	0,1(11)
+	stb	0,16(11)
+	bc	16,0,.Loop_xts_enc_steal
+
+	mtctr	9
+	b	.Loop_xts_enc
+
+.Lxts_enc_done:
+	cmplwi	8,0
+	beq	.Lxts_enc_ret
+
+	vsrab	11,8,9
+	vaddubm	8,8,8
+	vsldoi	11,11,11,15
+	vand	11,11,10
+	vxor	8,8,11
+
+
+.long	0x7D004799
+
+.Lxts_enc_ret:
+	mtspr	256,12
+	li	3,0
+	blr	
+.long	0
+.byte	0,12,0x04,0,0x80,6,6,0
+.long	0
+
+
+.globl	aes_p8_xts_decrypt
+.type	aes_p8_xts_decrypt,@function
+.align	5
+aes_p8_xts_decrypt:
+	mr	10,3
+	li	3,-1
+	cmplwi	5,16
+	bltlr
+
+	lis	0,0xfff8
+	mfspr	12,256
+	li	11,0
+	mtspr	256,0
+
+	andi.	0,5,15
+	neg	0,0
+	andi.	0,0,16
+	sub	5,5,0
+
+	vspltisb	9,0x07
+
+
+
+
+	li	3,15
+	lvx	8,0,8
+	lvsl	5,0,8
+	lvx	4,3,8
+
+	vperm	8,8,4,5
+
+	neg	11,10
+	lvsr	5,0,11
+	lvx	2,0,10
+	addi	10,10,15
+
+
+	cmplwi	7,0
+	beq	.Lxts_dec_no_key2
+
+	lvsl	7,0,7
+	lwz	9,240(7)
+	srwi	9,9,1
+	subi	9,9,1
+	li	3,16
+
+	lvx	0,0,7
+	lvx	1,3,7
+	addi	3,3,16
+	vperm	0,0,1,7
+	vxor	8,8,0
+	lvx	0,3,7
+	addi	3,3,16
+	mtctr	9
+

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc

2016-10-18 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Oct 19 00:11:03 UTC 2016

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: Makefile

Log Message:
conditionalize bits


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/Makefile

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/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/Makefile:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/Makefile:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/Makefile:1.4	Fri Oct 14 12:09:44 2016
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/Makefile	Tue Oct 18 20:11:03 2016
@@ -1,7 +1,8 @@
-#	$NetBSD: Makefile,v 1.4 2016/10/14 16:09:44 spz Exp $
+#	$NetBSD: Makefile,v 1.5 2016/10/19 00:11:03 christos Exp $
 
-.include "bsd.own.mk"
+.include 
 
+BITS?=32
 CRYPTODIST=${NETBSDSRCDIR}/crypto
 .include "${NETBSDSRCDIR}/crypto/Makefile.openssl"
 XLATE=${OPENSSLSRC}/crypto/perlasm/ppc-xlate.pl
@@ -10,14 +11,14 @@ regen:
 	for i in $$(find ${OPENSSLSRC} -name \*ppc\*.pl); do \
 	case $$i in \
 	*xlate.pl) ;; \
-	*sha512*) perl $$i 32 sha512; \
+	*sha512*) perl $$i ${BITS} sha512; \
   sed -e 's/bc	25,0,/bdnz+	/' \
   -e 's/bclr	14,2/beqlr/' \
   -e 's/bclr	6,2/bnelr/' \
   -e 's/bclr	14,0/bltlr/' \
   -e 's/bclr	12,0/bltlr/' \
   < sha512 > $$(basename $$i .pl).S; \
-  perl $$i 32 sha256; \
+  perl $$i ${BITS} sha256; \
   sed -e 's/bc	25,0,/bdnz+	/' \
   -e 's/bclr	14,2/beqlr/' \
   -e 's/bclr	6,2/bnelr/' \
@@ -25,7 +26,7 @@ regen:
   -e 's/bclr	12,0/bltlr/' \
   < sha256 > $$(basename $$i .pl | sed s/512/256/).S; \
   rm -f sha512 sha256;; \
-*) perl $$i 32 | perl ${XLATE} linux32 | \
+*) perl $$i ${BITS} | perl ${XLATE} linux${BITS} | \
sed -e 's/bc	25,0,/bdnz+	/' \
-e 's/bclr	14,2/beqlr/' \
-e 's/bclr	6,2/bnelr/' \

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc

2013-08-04 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Sun Aug  4 17:15:21 UTC 2013

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: aes-ppc.S
ppccpuid.S sha512-ppc.S

Log Message:
Prefer . for the current address and not the PPC specific $.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/aes-ppc.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha512-ppc.S
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S

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/aes-ppc.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/aes-ppc.S:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/aes-ppc.S:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/aes-ppc.S:1.3	Thu Jul 26 19:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/aes-ppc.S	Sun Aug  4 17:15:21 2013
@@ -4,7 +4,7 @@
 .align	7
 .LAES_Te:
 	mflr	0
-	bcl	20,31,$+4
+	bcl	20,31,.+4
 	mflr	3
 	addi	3,3,120
 	mtlr	0
@@ -14,7 +14,7 @@
 .space	28
 .LAES_Td:
 	mflr	0
-	bcl	20,31,$+4
+	bcl	20,31,.+4
 	mflr	3
 	addi	3,3,2360
 	mtlr	0
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha512-ppc.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha512-ppc.S:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha512-ppc.S:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha512-ppc.S:1.3	Thu Jul 26 19:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/sha512-ppc.S	Sun Aug  4 17:15:21 2013
@@ -1301,7 +1301,7 @@ sha256_block_data_order:
 .align	6
 .LPICmeup:
 	mflr	0
-	bcl	20,31,$+4
+	bcl	20,31,.+4
 	mflr	7
 	addi	7,7,56
 	mtlr	0

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.6	Fri Feb  8 03:05:43 2013
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S	Sun Aug  4 17:15:21 2013
@@ -93,7 +93,7 @@ OPENSSL_cleanse:
 .Little:	mtctr	4
 	stb	0,0(3)
 	addi	3,3,1
-	bc	16,0,$-8
+	bc	16,0,.-8
 	blr	
 .Lot:	andi.	5,3,3
 	beq	.Laligned
@@ -106,7 +106,7 @@ OPENSSL_cleanse:
 	mtctr	5
 	stw	0,0(3)
 	addi	3,3,4
-	bc	16,0,$-8
+	bc	16,0,.-8
 	andi.	4,4,3
 	bne	.Little
 	blr

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc

2013-02-08 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Fri Feb  8 15:22:03 UTC 2013

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: Makefile

Log Message:
fix generation


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/Makefile

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/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/Makefile:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/Makefile:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/Makefile:1.2	Sun Jun  5 19:09:50 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/Makefile	Fri Feb  8 10:22:03 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2011/06/05 23:09:50 spz Exp $
+#	$NetBSD: Makefile,v 1.3 2013/02/08 15:22:03 christos Exp $
 
 .include bsd.own.mk
 
@@ -12,6 +12,7 @@ regen:
 	*xlate.pl) ;; \
 	*64*) ;; \
 	*) perl $$i 32 | perl ${XLATE} linux32 | \
-	   sed -e 's/bc	25,0,/bdnz+	/'  $$(basename $$i .pl).S ;; \
+	   sed -e 's/bc	25,0,/bdnz+	/' \
+		   -e 's/bclr	14,2/beqlr/'  $$(basename $$i .pl).S ;; \
 	esac; \
 	done

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc

2013-02-07 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Fri Feb  8 03:05:44 UTC 2013

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: ppccpuid.S

Log Message:
Change  bclr 14,2 to beqlr


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S

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/ppccpuid.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.5	Tue Feb  5 19:21:27 2013
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S	Fri Feb  8 03:05:43 2013
@@ -89,7 +89,7 @@ OPENSSL_cleanse:
 	li	0,0
 	bge	.Lot
 	cmplwi	4,0
-	bclr	14,2
+	beqlr
 .Little:	mtctr	4
 	stb	0,0(3)
 	addi	3,3,1

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc

2013-02-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Tue Feb  5 19:21:27 UTC 2013

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: ppccpuid.S

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S

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/ppccpuid.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.4	Fri Jul 27 19:01:23 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S	Tue Feb  5 14:21:27 2013
@@ -72,11 +72,11 @@ OPENSSL_atomic_add:
 .align	4
 OPENSSL_rdtsc:
 .Lrdtsc:
+	mftb	5
 	mftbu	4
 	mftb	3
-	mftbu	5
-	cmplw	4,5
-	bne-	.Lrdtsc
+	.long	0x7c032840
+	bne	.Lrdtsc
 	blr	
 .long	0
 .byte	0,12,0x14,0,0,0,0,0
@@ -89,13 +89,12 @@ OPENSSL_cleanse:
 	li	0,0
 	bge	.Lot
 	cmplwi	4,0
-	beqlr-
-.Little:
-	mtctr	4
+	bclr	14,2
+.Little:	mtctr	4
 	stb	0,0(3)
 	addi	3,3,1
-	bdnz	$-8
-	blr
+	bc	16,0,$-8
+	blr	
 .Lot:	andi.	5,3,3
 	beq	.Laligned
 	stb	0,0(3)
@@ -105,10 +104,9 @@ OPENSSL_cleanse:
 .Laligned:
 	srwi	5,4,2
 	mtctr	5
-.Lstore4:
 	stw	0,0(3)
 	addi	3,3,4
-	bdnz	.Lstore4
+	bc	16,0,$-8
 	andi.	4,4,3
 	bne	.Little
 	blr