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

2021-08-10 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Tue Aug 10 10:43:42 UTC 2021

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: bn.inc

Log Message:
PR/56318: Izumi Tsutsui: Don't include mips.S for 32 bit mips because it
does not work for mips1


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.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/mips/bn.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.7 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.8
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.7	Mon Apr 26 14:06:09 2021
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc	Tue Aug 10 06:43:42 2021
@@ -1,6 +1,7 @@
 .include "mips.inc"
 
-.if ${MIPS_LE}
+# Don't include mips.S for 32 bit mips because it does not work for mips1
+.if ${MIPS_LE} && ${MIPS_64} == "64"
 .PATH.S: ${.PARSEDIR}
 
 BN_SRCS = mips${MIPS_64}.S

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

2021-04-26 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Mon Apr 26 20:01:13 UTC 2021

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: mips.inc

Log Message:
Handle the compat builds and both the n64 and non n64 variants


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.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/mips/mips.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.inc:1.1	Mon Apr 26 14:06:09 2021
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.inc	Mon Apr 26 16:01:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mips.inc,v 1.1 2021/04/26 18:06:09 christos Exp $
+# $NetBSD: mips.inc,v 1.2 2021/04/26 20:01:13 christos Exp $
 
 .ifndef MIPS_LE
 
@@ -8,10 +8,11 @@ MIPS_LE=0
 MIPS_LE=1
 .	endif
 
-.	if empty(MACHINE_ARCH:Mmips*64*)
-MIPS_64=
-.	else
+.	if (!empty(MACHINE_ARCH:Mmipsn64*) && empty(COPTS:M-mabi=*32*)) || \
+	   (!empty(MACHINE_ARCH:Mmips64*) && !empty(COPTS:M-mabi=*64*))
 MIPS_64=64
+.	else
+MIPS_64=
 .	endif
 
 .endif

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

2021-04-26 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Mon Apr 26 18:06:09 UTC 2021

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: aes.inc bn.inc
crypto.inc poly1305.inc sha.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: mips.inc

Log Message:
Centralize the logic for endian and 64 bit availability.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.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/mips/aes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc:1.5	Fri Mar  9 16:49:55 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc	Mon Apr 26 14:06:09 2021
@@ -1,7 +1,8 @@
-.if empty(MACHINE_ARCH:M*eb)
+.include "mips.inc"
+.if ${MIPS_LE}
 .PATH.S: ${.PARSEDIR}
 
-#AES_SRCS = aes-mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
+#AES_SRCS = aes-mips${MIPS_64}.S
 #AESCPPFLAGS = -DAES_ASM
 .endif
 

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.6	Fri Mar  9 16:49:55 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc	Mon Apr 26 14:06:09 2021
@@ -1,7 +1,9 @@
-.if empty(MACHINE_ARCH:M*eb)
+.include "mips.inc"
+
+.if ${MIPS_LE}
 .PATH.S: ${.PARSEDIR}
 
-BN_SRCS = mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
+BN_SRCS = mips${MIPS_64}.S
 .endif
 
 .include "../../bn.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc:1.6	Fri Mar  9 16:49:55 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc	Mon Apr 26 14:06:09 2021
@@ -1,9 +1,12 @@
-.if empty(MACHINE_ARCH:M*eb)
+.include "mips.inc"
+
+.if ${MIPS_LE}
 .PATH.S: ${.PARSEDIR}
 
-SHA_SRCS += sha1-mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
-SHA_SRCS += sha512-mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
+SHA_SRCS += sha1-mips${MIPS_64}.S
+SHA_SRCS += sha512-mips${MIPS_64}.S
 
 SHACPPFLAGS = -DSHA1_ASM
 .endif
+
 .include "../../sha.inc"

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.7 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.8
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.7	Mon Sep 24 07:03:40 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc	Mon Apr 26 14:06:09 2021
@@ -1,7 +1,9 @@
-.if empty(MACHINE_ARCH:M*eb)
+.include "mips.inc"
+
+.if ${MIPS_LE}
 .PATH.S: ${.PARSEDIR}
 
-CRYPTO_SRCS += mips-mont${"${COPTS:M*-mabi=64*}" == "":?:64}.S
+CRYPTO_SRCS += mips-mont${MIPS_64}.S
 .endif
 
 .include "../../crypto.inc"

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc:1.4	Fri Mar  9 16:49:55 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc	Mon Apr 26 14:06:09 2021
@@ -1,5 +1,6 @@
-.if empty(MACHINE_ARCH:M*eb)
-.if !empty(MACHINE_ARCH:Mmips64*)
+.include "mips.inc"
+
+.if ${MIPS_LE} && ${MIPS_64} == "64"
 
 .PATH.S: ${.PARSEDIR}
 
@@ -7,6 +8,5 @@ POLY1305_SRCS = poly1305-mips64.S
 POLY1305_CPPFLAGS+=-DPOLY1305_ASM
 
 .endif
-.endif
 
 .include "../../poly1305.inc"

Added files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.inc:1.1
--- /dev/null	Mon Apr 26 14:06:09 2021
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.inc	Mon Apr 26 14:06:09 2021
@@ -0,0 +1,17 @@
+# $NetBSD: mips.inc,v 1.1 2021/04/26 18:06:09 christos Exp $
+
+.ifndef MIPS_LE
+
+.	if

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

2020-06-21 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Jun 21 22:16:16 UTC 2020

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: mips.S
mips64.S

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.S
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips64.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/mips/mips.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.S:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.S:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.S:1.3	Sat Mar 21 20:53:12 2020
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.S	Sun Jun 21 18:16:16 2020
@@ -316,9 +316,8 @@ bn_sqr_words_internal:
 	sw	$11,-2*4($4)
 
 	.set	noreorder
-	sw	$10,-4($4)
 	bgtz	$8,.L_bn_sqr_words_loop
-	nop
+	sw	$10,-4($4)
 
 	beqz	$6,.L_bn_sqr_words_return
 	nop
@@ -589,9 +588,8 @@ bn_div_3_words:
 
 	lw	$4,($7)
 	move	$10,$5
-	lw	$5,-4($7)
 	bne	$4,$6,bn_div_3_words_internal
-	 nop
+	 lw	$5,-4($7)
 	li	$2,-1
 	jr	$31
 	move	$4,$2

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips64.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips64.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips64.S:1.4	Sat Mar 21 20:53:12 2020
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips64.S	Sun Jun 21 18:16:16 2020
@@ -313,9 +313,8 @@ bn_sqr_words_internal:
 	sd	$11,-2*8($4)
 
 	.set	noreorder
-	sd	$10,-8($4)
 	bgtz	$8,.L_bn_sqr_words_loop
-	nop
+	sd	$10,-8($4)
 
 	beqz	$6,.L_bn_sqr_words_return
 	nop
@@ -586,9 +585,8 @@ bn_div_3_words:
 
 	ld	$4,($7)
 	move	$10,$5
-	ld	$5,-8($7)
 	bne	$4,$6,bn_div_3_words_internal
-	 nop
+	 ld	$5,-8($7)
 	li	$2,-1
 	jr	$31
 	move	$4,$2

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

2018-03-09 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Fri Mar  9 21:49:55 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: aes.inc bn.inc
crypto.inc poly1305.inc sha.inc

Log Message:
match opening ( with closing ) instead of closing }.
fixes mips builds... partly.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.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/mips/aes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc:1.4	Fri Mar  9 12:40:23 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc	Fri Mar  9 21:49:55 2018
@@ -1,4 +1,4 @@
-.if empty(MACHINE_ARCH:M*eb}
+.if empty(MACHINE_ARCH:M*eb)
 .PATH.S: ${.PARSEDIR}
 
 #AES_SRCS = aes-mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.5	Fri Mar  9 12:40:23 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc	Fri Mar  9 21:49:55 2018
@@ -1,4 +1,4 @@
-.if empty(MACHINE_ARCH:M*eb}
+.if empty(MACHINE_ARCH:M*eb)
 .PATH.S: ${.PARSEDIR}
 
 BN_SRCS = mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.5	Fri Mar  9 12:40:23 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc	Fri Mar  9 21:49:55 2018
@@ -1,4 +1,4 @@
-.if empty(MACHINE_ARCH:M*eb}
+.if empty(MACHINE_ARCH:M*eb)
 .PATH.S: ${.PARSEDIR}
 
 CRYPTO_SRCS += mips-mont${"${COPTS:M*-mabi=64*}" == "":?:64}.S
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc:1.5	Fri Mar  9 12:40:23 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc	Fri Mar  9 21:49:55 2018
@@ -1,4 +1,4 @@
-.if empty(MACHINE_ARCH:M*eb}
+.if empty(MACHINE_ARCH:M*eb)
 .PATH.S: ${.PARSEDIR}
 
 SHA_SRCS += sha1-mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc:1.3	Fri Mar  9 12:40:23 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc	Fri Mar  9 21:49:55 2018
@@ -1,4 +1,4 @@
-.if empty(MACHINE_ARCH:M*eb}
+.if empty(MACHINE_ARCH:M*eb)
 .if !empty(MACHINE_ARCH:Mmips64*)
 
 .PATH.S: ${.PARSEDIR}

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

2018-03-09 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Fri Mar  9 12:40:24 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: aes.inc bn.inc
crypto.inc poly1305.inc sha.inc

Log Message:
use the proper match pattern


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.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/mips/aes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc:1.3	Fri Mar  9 07:39:30 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc	Fri Mar  9 07:40:23 2018
@@ -1,4 +1,4 @@
-.if empty(MACHINE_ARCH:M*eh}
+.if empty(MACHINE_ARCH:M*eb}
 .PATH.S: ${.PARSEDIR}
 
 #AES_SRCS = aes-mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.4	Fri Mar  9 07:39:30 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc	Fri Mar  9 07:40:23 2018
@@ -1,4 +1,4 @@
-.if empty(MACHINE_ARCH:M*eh}
+.if empty(MACHINE_ARCH:M*eb}
 .PATH.S: ${.PARSEDIR}
 
 BN_SRCS = mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.4	Fri Mar  9 07:39:30 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc	Fri Mar  9 07:40:23 2018
@@ -1,4 +1,4 @@
-.if empty(MACHINE_ARCH:M*eh}
+.if empty(MACHINE_ARCH:M*eb}
 .PATH.S: ${.PARSEDIR}
 
 CRYPTO_SRCS += mips-mont${"${COPTS:M*-mabi=64*}" == "":?:64}.S
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc:1.4	Fri Mar  9 07:39:30 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc	Fri Mar  9 07:40:23 2018
@@ -1,4 +1,4 @@
-.if empty(MACHINE_ARCH:M*eh}
+.if empty(MACHINE_ARCH:M*eb}
 .PATH.S: ${.PARSEDIR}
 
 SHA_SRCS += sha1-mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc:1.2	Fri Mar  9 07:39:30 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc	Fri Mar  9 07:40:23 2018
@@ -1,4 +1,4 @@
-.if empty(MACHINE_ARCH:M*eh}
+.if empty(MACHINE_ARCH:M*eb}
 .if !empty(MACHINE_ARCH:Mmips64*)
 
 .PATH.S: ${.PARSEDIR}

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

2018-03-09 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Fri Mar  9 12:39:30 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: aes.inc bn.inc
crypto.inc poly1305.inc sha.inc

Log Message:
Disable assembly stubs for the big endian variants of mips (could be more
precise? are all of them broken?)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.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/mips/aes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc:1.2	Wed Mar  7 14:44:31 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc	Fri Mar  9 07:39:30 2018
@@ -1,6 +1,8 @@
+.if empty(MACHINE_ARCH:M*eh}
 .PATH.S: ${.PARSEDIR}
 
 #AES_SRCS = aes-mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
 #AESCPPFLAGS = -DAES_ASM
+.endif
 
 .include "../../aes.inc"

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.3	Wed Mar  7 14:44:31 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc	Fri Mar  9 07:39:30 2018
@@ -1,5 +1,7 @@
+.if empty(MACHINE_ARCH:M*eh}
 .PATH.S: ${.PARSEDIR}
 
 BN_SRCS = mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
+.endif
 
 .include "../../bn.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.3	Wed Mar  7 14:44:31 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc	Fri Mar  9 07:39:30 2018
@@ -1,6 +1,8 @@
+.if empty(MACHINE_ARCH:M*eh}
 .PATH.S: ${.PARSEDIR}
 
 CRYPTO_SRCS += mips-mont${"${COPTS:M*-mabi=64*}" == "":?:64}.S
+.endif
 CRYPTO_SRCS += libc-memequal.c
 
 .include "../../crypto.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc:1.3	Wed Mar  7 14:44:31 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc	Fri Mar  9 07:39:30 2018
@@ -1,7 +1,9 @@
+.if empty(MACHINE_ARCH:M*eh}
 .PATH.S: ${.PARSEDIR}
 
 SHA_SRCS += sha1-mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
 SHA_SRCS += sha512-mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
 
 SHACPPFLAGS = -DSHA1_ASM
+.endif
 .include "../../sha.inc"

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc:1.1	Mon Mar  5 11:43:50 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/poly1305.inc	Fri Mar  9 07:39:30 2018
@@ -1,3 +1,4 @@
+.if empty(MACHINE_ARCH:M*eh}
 .if !empty(MACHINE_ARCH:Mmips64*)
 
 .PATH.S: ${.PARSEDIR}
@@ -6,5 +7,6 @@ POLY1305_SRCS = poly1305-mips64.S
 POLY1305_CPPFLAGS+=-DPOLY1305_ASM
 
 .endif
+.endif
 
 .include "../../poly1305.inc"

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

2018-03-07 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Mar  7 19:44:31 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: aes.inc bn.inc
crypto.inc sha.inc

Log Message:
only use the 64 bit abi if specified on the command line.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/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/mips/aes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc:1.1	Sat Mar  3 19:59:44 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/aes.inc	Wed Mar  7 14:44:31 2018
@@ -1,6 +1,6 @@
 .PATH.S: ${.PARSEDIR}
 
-#AES_SRCS = aes-mips.S
+#AES_SRCS = aes-mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
 #AESCPPFLAGS = -DAES_ASM
 
 .include "../../aes.inc"

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc:1.2	Mon Mar  5 11:43:50 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/bn.inc	Wed Mar  7 14:44:31 2018
@@ -1,5 +1,5 @@
 .PATH.S: ${.PARSEDIR}
 
-BN_SRCS = mips${${MACHINE_ARCH:Mmips64*} == "":?:64}.S
+BN_SRCS = mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
 
 .include "../../bn.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.2	Mon Mar  5 11:43:50 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc	Wed Mar  7 14:44:31 2018
@@ -1,6 +1,6 @@
 .PATH.S: ${.PARSEDIR}
 
-CRYPTO_SRCS += mips-mont${${MACHINE_ARCH:Mmips64*} == "":?:64}.S
+CRYPTO_SRCS += mips-mont${"${COPTS:M*-mabi=64*}" == "":?:64}.S
 CRYPTO_SRCS += libc-memequal.c
 
 .include "../../crypto.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc:1.2	Mon Mar  5 11:43:50 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/sha.inc	Wed Mar  7 14:44:31 2018
@@ -1,7 +1,7 @@
 .PATH.S: ${.PARSEDIR}
 
-SHA_SRCS += sha1-mips${${MACHINE_ARCH:Mmips64*} == "":?:64}.S
-SHA_SRCS += sha512-mips${${MACHINE_ARCH:Mmips64*} == "":?:64}.S
+SHA_SRCS += sha1-mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
+SHA_SRCS += sha512-mips${"${COPTS:M*-mabi=64*}" == "":?:64}.S
 
 SHACPPFLAGS = -DSHA1_ASM
 .include "../../sha.inc"

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

2018-03-06 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Tue Mar  6 13:47:25 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: mips64.S

Log Message:
Avoid branch delay spot warnings: Warning: macro instruction expanded into
multiple instructions in a branch delay slot
XXX: Manually need to fix in auto-generation.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips64.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/mips/mips64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips64.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips64.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips64.S:1.1	Mon Mar  5 11:43:50 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips64.S	Tue Mar  6 08:47:25 2018
@@ -297,8 +297,9 @@ bn_sqr_words_internal:
 	sd	$11,-2*8($4)
 
 	.set	noreorder
-	bgtz	$8,.L_bn_sqr_words_loop
 	sd	$10,-8($4)
+	bgtz	$8,.L_bn_sqr_words_loop
+	nop
 
 	beqz	$6,.L_bn_sqr_words_return
 	nop
@@ -564,8 +565,9 @@ bn_div_3_words:
 
 	ld	$4,($7)
 	move	$10,$5
-	bne	$4,$6,bn_div_3_words_internal
 	ld	$5,-8($7)
+	bne	$4,$6,bn_div_3_words_internal
+	nop
 	li	$2,-1
 	jr	$31
 	move	$4,$2