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

2023-05-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 16 19:22:58 UTC 2023

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

Log Message:
include earm to <=5


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.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/arm/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.14 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.15
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.14	Tue May 16 05:52:30 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc	Tue May 16 15:22:58 2023
@@ -1,3 +1,4 @@
+.include "arm.inc"
 .PATH.S: ${.PARSEDIR}
 
 CPUID_SRCS += armv4cpuid.S armcap.c armv4-mont.S armv4-gf2m.S
@@ -5,7 +6,7 @@ CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
 CPPFLAGS += -DOPENSSL_CPUID_OBJ
 
-.if ${MACHINE_ARCH:Nearmv[45]*} == ""
+.if ${ARM_MAX_ARCH} <= 5
 COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS   # no atomic 64 bit ops
 .endif
 



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

2023-05-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 16 19:22:58 UTC 2023

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

Log Message:
include earm to <=5


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc

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



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

2023-05-16 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Tue May 16 18:25:54 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes.inc ec.inc

Log Message:
openssl: Limit armv8 stuff to aarch64.

Strictly speaking there is armv8 aarch32, e.g. AES instructions are
exposed to 32-bit mode, but OpenSSL's `*_armv8.S' files are staunchly
aarch64 and don't work when built for aarch64 32-bit compat libraries
(which could take advantage of armv8 instructions, but only if the
code is actually aarch32, which it isn't).

The armv8 stuff is still included in aarch64 /usr/lib/libcrypto, just
not in the 32-bit compat libraries.

With any luck, this will fix the aarch64 clang build (again).


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc

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



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

2023-05-16 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Tue May 16 18:25:54 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes.inc ec.inc

Log Message:
openssl: Limit armv8 stuff to aarch64.

Strictly speaking there is armv8 aarch32, e.g. AES instructions are
exposed to 32-bit mode, but OpenSSL's `*_armv8.S' files are staunchly
aarch64 and don't work when built for aarch64 32-bit compat libraries
(which could take advantage of armv8 instructions, but only if the
code is actually aarch32, which it isn't).

The armv8 stuff is still included in aarch64 /usr/lib/libcrypto, just
not in the 32-bit compat libraries.

With any luck, this will fix the aarch64 clang build (again).


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.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/arm/aes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.6	Sun May 14 17:50:29 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc	Tue May 16 18:25:54 2023
@@ -3,10 +3,7 @@
 .PATH.S: ${.PARSEDIR}
 AES_SRCS += aes-armv4.S aes_cbc.c aesv8-armx.S
 
-.if ${ARM_MAX_ARCH} >= 8
-AES_SRCS+=vpaes-armv8.S
-AESCPPFLAGS += -DVPAES_ASM
-.elif ${ARM_MAX_ARCH} >= 7
+.if ${ARM_MAX_ARCH} >= 7
 AES_SRCS+=bsaes-armv7.S
 AESCPPFLAGS += -DBSAES_ASM
 .endif

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc:1.1	Sun May 14 17:50:29 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc	Tue May 16 18:25:54 2023
@@ -1,9 +1,6 @@
 .PATH.S: ${.PARSEDIR}
 
-.if ${ARM_MAX_ARCH} >= 8
-EC_SRCS += ecp_nistz256-armv8.S
-ECNI = yes
-.elif ${ARM_MAX_ARCH} >= 4
+.if ${ARM_MAX_ARCH} >= 4
 EC_SRCS += ecp_nistz256-armv4.S
 ECNI = yes
 .endif



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

2023-05-16 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue May 16 09:52:30 UTC 2023

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

Log Message:
Simplify previous, from Riastradh


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.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/arm/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.13 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.14
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.13	Mon May 15 14:27:29 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc	Tue May 16 09:52:30 2023
@@ -5,7 +5,7 @@ CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
 CPPFLAGS += -DOPENSSL_CPUID_OBJ
 
-.if ${MACHINE_ARCH:Nearmv[4,5]*} == ""
+.if ${MACHINE_ARCH:Nearmv[45]*} == ""
 COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS   # no atomic 64 bit ops
 .endif
 



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

2023-05-16 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue May 16 09:52:30 UTC 2023

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

Log Message:
Simplify previous, from Riastradh


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc

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



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

2023-05-15 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon May 15 14:27:29 UTC 2023

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

Log Message:
armv4 also needs the atomic hack


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc

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



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

2023-05-15 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon May 15 14:27:29 UTC 2023

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

Log Message:
armv4 also needs the atomic hack


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.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/arm/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.12 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.13
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.12	Mon May 15 14:08:17 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc	Mon May 15 14:27:29 2023
@@ -5,7 +5,7 @@ CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
 CPPFLAGS += -DOPENSSL_CPUID_OBJ
 
-.if ${MACHINE_ARCH:Nearmv5*} == ""
+.if ${MACHINE_ARCH:Nearmv[4,5]*} == ""
 COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS   # no atomic 64 bit ops
 .endif
 



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

2023-05-15 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon May 15 14:08:17 UTC 2023

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

Log Message:
Fix armv5


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

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



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

2023-05-15 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon May 15 14:08:17 UTC 2023

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

Log Message:
Fix armv5


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.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/arm/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.11 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.12
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.11	Sat May  9 13:16:42 2020
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc	Mon May 15 14:08:17 2023
@@ -5,5 +5,9 @@ CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
 CPPFLAGS += -DOPENSSL_CPUID_OBJ
 
+.if ${MACHINE_ARCH:Nearmv5*} == ""
+COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS   # no atomic 64 bit ops
+.endif
+
 .include "../../crypto.inc"
 



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

2023-05-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 14 17:50:29 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: ec.inc

Log Message:
make arm build


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.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/arm/aes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.5	Wed Mar  7 15:38:39 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc	Sun May 14 13:50:29 2023
@@ -1,13 +1,15 @@
 .include "arm.inc"
 
 .PATH.S: ${.PARSEDIR}
-AES_SRCS += aes-armv4.S aes_cbc.c
+AES_SRCS += aes-armv4.S aes_cbc.c aesv8-armx.S
 
-.if ${ARM_MAX_ARCH} >= 7
+.if ${ARM_MAX_ARCH} >= 8
+AES_SRCS+=vpaes-armv8.S
+AESCPPFLAGS += -DVPAES_ASM
+.elif ${ARM_MAX_ARCH} >= 7
 AES_SRCS+=bsaes-armv7.S
-.elif ${ARM_MAX_ARCH} >= 8
-AES_SRCS+=aesv8-armx.S
+AESCPPFLAGS += -DBSAES_ASM
 .endif
 
-AESCPPFLAGS = -DAES_ASM -DBSAES_ASM
+AESCPPFLAGS += -DAES_ASM
 .include "../../aes.inc"

Added files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc:1.1
--- /dev/null	Sun May 14 13:50:29 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc	Sun May 14 13:50:29 2023
@@ -0,0 +1,12 @@
+.PATH.S: ${.PARSEDIR}
+
+.if ${ARM_MAX_ARCH} >= 8
+EC_SRCS += ecp_nistz256-armv8.S
+ECNI = yes
+.elif ${ARM_MAX_ARCH} >= 4
+EC_SRCS += ecp_nistz256-armv4.S
+ECNI = yes
+.endif
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
+.include "../../ec.inc"



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

2023-05-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 14 17:50:29 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: ec.inc

Log Message:
make arm build


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc

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



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

2020-06-22 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Jun 22 19:56:36 UTC 2020

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

Log Message:
Always compile in v8 support.


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

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



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

2020-06-22 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Jun 22 19:56:36 UTC 2020

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

Log Message:
Always compile in v8 support.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.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/arm/modes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc:1.4	Wed Mar  7 15:38:39 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc	Mon Jun 22 15:56:36 2020
@@ -3,9 +3,8 @@
 .PATH.S: ${.PARSEDIR}
 MODES_SRCS += ghash-armv4.S
 
-.if ${ARM_MAX_ARCH} >= 8
 MODES_SRCS += ghashv8-armx.S
-.endif
+AFLAGS.ghashv8-armx.S = -Wa,-march=armv8.4-a
 
 MODESCPPFLAGS = -DGHASH_ASM
 .include "../../modes.inc"



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

2020-02-29 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Feb 29 17:14:40 UTC 2020

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

Log Message:
earmv5 / earmv5eb is a valid MACHINE_ARCH, so match it when
setting __ARM_MAX_ARCH__.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm.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/arm/arm.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm.inc:1.2	Fri Mar  9 01:34:30 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm.inc	Sat Feb 29 17:14:40 2020
@@ -4,7 +4,8 @@
 	${MACHINE_ARCH} == "armeb" || \
 	${MACHINE_ARCH} == "arm"
 ARM_MAX_ARCH=4
-.	elif ${MACHINE_ARCH} == "earm" || \
+.	elif !empty(MACHINE_ARCH:Mearmv5*) || \
+	${MACHINE_ARCH} == "earm" || \
 	${MACHINE_ARCH} == "earmhf" || \
 	${MACHINE_ARCH} == "earmeb" || \
 	${MACHINE_ARCH} == "earmhfeb"



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

2020-02-29 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Feb 29 17:14:40 UTC 2020

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

Log Message:
earmv5 / earmv5eb is a valid MACHINE_ARCH, so match it when
setting __ARM_MAX_ARCH__.


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

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



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

2018-09-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Sep 30 09:46:41 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: arm_asm.h

Log Message:
Newer gcc seems to use __ARM_ARCH_ISA_THUMB to tell use we have thumb
instructions available


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm_asm.h

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/arm/arm_asm.h
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm_asm.h:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm_asm.h:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm_asm.h:1.1	Tue Mar 10 13:28:47 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm_asm.h	Sun Sep 30 09:46:41 2018
@@ -1,4 +1,4 @@
-#if defined (_ARM_ARCH_4T)
+#if defined (_ARM_ARCH_4T) || defined(__ARM_ARCH_ISA_THUMB)
 # define RET		bx		lr
 #else
 # define RET		mov		pc, lr



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

2018-09-30 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Sep 30 09:46:41 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: arm_asm.h

Log Message:
Newer gcc seems to use __ARM_ARCH_ISA_THUMB to tell use we have thumb
instructions available


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm_asm.h

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



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

2018-09-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Sep 29 19:45:18 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes-armv4.S
aesv8-armx.S arm64cpuid.S armv4-gf2m.S armv4-mont.S armv4cpuid.S
armv8-mont.S bsaes-armv7.S chacha-armv4.S chacha-armv8.S
ecp_nistz256-armv4.S ecp_nistz256-armv8.S ghash-armv4.S
ghashv8-armx.S keccak1600-armv4.S keccak1600-armv8.S
poly1305-armv4.S poly1305-armv8.S sha1-armv4-large.S sha1-armv8.S
sha256-armv4.S sha512-armv4.S sha512-armv8.S vpaes-armv8.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/arm/aes-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghashv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha256-armv4.S
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-mont.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv4-large.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv4.S
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm64cpuid.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv4.S 
\
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv8.S 
\
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/vpaes-armv8.S
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv8-mont.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv8.S
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S

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



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

2018-09-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Sep 29 19:45:18 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes-armv4.S
aesv8-armx.S arm64cpuid.S armv4-gf2m.S armv4-mont.S armv4cpuid.S
armv8-mont.S bsaes-armv7.S chacha-armv4.S chacha-armv8.S
ecp_nistz256-armv4.S ecp_nistz256-armv8.S ghash-armv4.S
ghashv8-armx.S keccak1600-armv4.S keccak1600-armv8.S
poly1305-armv4.S poly1305-armv8.S sha1-armv4-large.S sha1-armv8.S
sha256-armv4.S sha512-armv4.S sha512-armv8.S vpaes-armv8.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/arm/aes-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghashv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha256-armv4.S
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-mont.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv4-large.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv4.S
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm64cpuid.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv4.S 
\
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv8.S 
\
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/vpaes-armv8.S
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv8-mont.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv8.S
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.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/arm/aes-armv4.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S:1.4	Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S	Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
 @ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved.
 @
 @ Licensed under the OpenSSL license (the "License").  You may not use
@@ -708,7 +709,7 @@ _armv4_AES_set_encrypt_key:
 	ldmia	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
 .Labrt:
 #if __ARM_ARCH__>=5
-	bx	lr@ .word	0xe12fff1e
+	RET@ .word	0xe12fff1e
 #else
 	tst	lr,#1
 	moveq	pc,lr			@ be binary compatible with V4, yet
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S:1.4	Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S	Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
 #include "arm_arch.h"
 
 .text
@@ -20,7 +21,7 @@ OPENSSL_atomic_add:
 	cmp	r2,#0
 	bne	.Ladd
 	mov	r0,r3
-	bx	lr
+	RET
 #else
 	stmdb	sp!,{r4,r5,r6,lr}
 	ldr	r2,.Lspinlock
@@ -42,7 +43,7 @@ OPENSSL_atomic_add:
 	ldmia	sp!,{r4,r5,r6,lr}
 	tst	lr,#1
 	moveq	pc,lr
-.word	0xe12fff1e	@ bx	lr
+.word	0xe12fff1e	@ RET
 #endif
 .size	OPENSSL_atomic_add,.-OPENSSL_atomic_add
 
@@ -77,11 +78,11 @@ OPENSSL_cleanse:
 	bne	.Little
 .Lcleanse_done:
 #if __ARM_ARCH__>=5
-	bx	lr
+	RET
 #else
 	tst	lr,#1
 	moveq	pc,lr
-.word	0xe12fff1e	@ bx	lr
+.word	0xe12fff1e	@ RET
 #endif
 .size	OPENSSL_cleanse,.-OPENSSL_cleanse
 
@@ -107,11 +108,11 @@ CRYPTO_memcmp:
 	rsb	r0,ip,#0
 	mov	r0,r0,lsr#31
 #if __ARM_ARCH__>=5
-	bx	lr
+	RET
 #else
 	tst	lr,#1
 	moveq	pc,lr
-.word	0xe12fff1e	@ bx	lr
+.word	0xe12fff1e	@ RET
 #endif
 .size	CRYPTO_memcmp,.-CRYPTO_memcmp
 
@@ -124,7 +125,7 @@ CRYPTO_memcmp:
 .type	_armv7_neon_probe,%function
 

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

2018-09-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Sep 29 19:44:58 UTC 2018

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

Log Message:
Upstream does not support armv4 any more - but it is trivial to add
add regen time. Make the "regen" target here do it.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/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/arm/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/Makefile:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/Makefile:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/Makefile:1.2	Sun Mar  4 00:24:21 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/Makefile	Sat Sep 29 19:44:57 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2018/03/04 00:24:21 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2018/09/29 19:44:57 martin Exp $
 
 .include "bsd.own.mk"
 
@@ -9,8 +9,10 @@ regen:
 	for i in $$(find ${OPENSSLSRC} -name \*arm\*.pl); do \
 		case $$i in \
 		(*/charmap.pl|*/arm-xlate.pl);; \
-		(*) perl -I${OPENSSLSRC}/crypto/perlasm \
+		(*) printf '#include "arm_asm.h"\n' > $$(basename $$i .pl).S; \
+		perl -I${OPENSSLSRC}/crypto/perlasm \
 		-I${OPENSSLSRC}/crypto/bn/asm $$i linux /dev/stdout \
-		> $$(basename $$i .pl).S;; \
+		| sed -E 's/bx[[:space:]]+lr/RET/' \
+		>> $$(basename $$i .pl).S;; \
 		esac; \
 	done



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

2018-09-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Sep 29 19:44:58 UTC 2018

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

Log Message:
Upstream does not support armv4 any more - but it is trivial to add
add regen time. Make the "regen" target here do it.


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

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



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

2018-09-23 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Sep 23 21:44:01 UTC 2018

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

Log Message:
we provide memcmp and rdtsc


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.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/arm/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.9 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.10
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.9	Wed Mar  7 15:38:39 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc	Sun Sep 23 17:44:01 2018
@@ -3,6 +3,7 @@
 CPUID_SRCS += armv4cpuid.S armcap.c armv4-mont.S armv4-gf2m.S
 CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
+CRYPTOCPPFLAGS += -DOPENSSL_CPUID_OBJ
 
 .include "../../crypto.inc"
 



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

2018-09-23 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Sep 23 21:44:01 UTC 2018

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

Log Message:
we provide memcmp and rdtsc


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc

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



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

2018-03-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Mar  9 01:34:30 UTC 2018

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

Log Message:
Add the rest of the earm flavors; madness.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm.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/arm/arm.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm.inc:1.1	Thu Mar  8 08:38:02 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm.inc	Thu Mar  8 20:34:30 2018
@@ -4,7 +4,10 @@
 	${MACHINE_ARCH} == "armeb" || \
 	${MACHINE_ARCH} == "arm"
 ARM_MAX_ARCH=4
-.	elif ${MACHINE_ARCH} == "earmeb" || ${MACHINE_ARCH} == "earmhfeb"
+.	elif ${MACHINE_ARCH} == "earm" || \
+	${MACHINE_ARCH} == "earmhf" || \
+	${MACHINE_ARCH} == "earmeb" || \
+	${MACHINE_ARCH} == "earmhfeb"
 ARM_MAX_ARCH=5
 .	elif !empty(MACHINE_ARCH:Mearmv6*)
 ARM_MAX_ARCH=6



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

2018-03-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Mar  9 01:34:30 UTC 2018

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

Log Message:
Add the rest of the earm flavors; madness.


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

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



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

2018-03-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Mar  8 13:38:02 UTC 2018

Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: arm.inc

Log Message:
oops forgot to commit this.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm.inc

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

Added files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm.inc:1.1
--- /dev/null	Thu Mar  8 08:38:02 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm.inc	Thu Mar  8 08:38:02 2018
@@ -0,0 +1,17 @@
+
+.if !defined(ARM_MAX_ARCH)
+.	if !empty(MACHINE_ARCH:Mearmv4*) || \
+	${MACHINE_ARCH} == "armeb" || \
+	${MACHINE_ARCH} == "arm"
+ARM_MAX_ARCH=4
+.	elif ${MACHINE_ARCH} == "earmeb" || ${MACHINE_ARCH} == "earmhfeb"
+ARM_MAX_ARCH=5
+.	elif !empty(MACHINE_ARCH:Mearmv6*)
+ARM_MAX_ARCH=6
+.	elif !empty(MACHINE_ARCH:Mearmv7*)
+ARM_MAX_ARCH=7
+.	else
+ARM_MAX_ARCH=8
+.	endif
+CPPFLAGS += -D__ARM_MAX_ARCH__=${ARM_MAX_ARCH}
+.endif



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

2018-03-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Mar  8 13:38:02 UTC 2018

Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: arm.inc

Log Message:
oops forgot to commit this.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm.inc

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



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

2018-03-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Mar  7 20:38:39 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes.inc
crypto.inc modes.inc

Log Message:
fix build on non-earm


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc

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



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

2018-03-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Mar  7 20:38:39 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes.inc
crypto.inc modes.inc

Log Message:
fix build on non-earm


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.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/arm/aes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.4	Sun Mar 29 19:35:08 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc	Wed Mar  7 15:38:39 2018
@@ -1,4 +1,13 @@
+.include "arm.inc"
+
 .PATH.S: ${.PARSEDIR}
-AES_SRCS = aes-armv4.S aesv8-armx.S bsaes-armv7.S aes_cbc.c
+AES_SRCS += aes-armv4.S aes_cbc.c
+
+.if ${ARM_MAX_ARCH} >= 7
+AES_SRCS+=bsaes-armv7.S
+.elif ${ARM_MAX_ARCH} >= 8
+AES_SRCS+=aesv8-armx.S
+.endif
+
 AESCPPFLAGS = -DAES_ASM -DBSAES_ASM
 .include "../../aes.inc"

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.8 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.9
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.8	Tue Mar  6 08:37:43 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc	Wed Mar  7 15:38:39 2018
@@ -1,18 +1,8 @@
 .PATH.S: ${.PARSEDIR}
+
 CPUID_SRCS += armv4cpuid.S armcap.c armv4-mont.S armv4-gf2m.S
 CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
-.if !empty(MACHINE_ARCH:Mearmv4*) || ${MACHINE_ARCH} == "armeb"
-ARM_MAX_ARCH=4
-.elif ${MACHINE_ARCH} == "earmeb" || ${MACHINE_ARCH} == "earmhfeb"
-ARM_MAX_ARCH=5
-.elif !empty(MACHINE_ARCH:Mearmv6*)
-ARM_MAX_ARCH=6
-.elif !empty(MACHINE_ARCH:Mearmv7*)
-ARM_MAX_ARCH=7
-.else
-ARM_MAX_ARCH=8
-.endif
-CPPFLAGS += -D__ARM_MAX_ARCH__=${ARM_MAX_ARCH}
+
 .include "../../crypto.inc"
 

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc:1.3	Fri Mar  2 19:20:57 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc	Wed Mar  7 15:38:39 2018
@@ -1,7 +1,11 @@
+.include "arm.inc"
+
 .PATH.S: ${.PARSEDIR}
 MODES_SRCS += ghash-armv4.S
+
 .if ${ARM_MAX_ARCH} >= 8
 MODES_SRCS += ghashv8-armx.S
 .endif
+
 MODESCPPFLAGS = -DGHASH_ASM
 .include "../../modes.inc"



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

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

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

Log Message:
Add a case for 7, remove arm64crypto.S


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc

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



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

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

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

Log Message:
Add a case for 7, remove arm64crypto.S


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.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/arm/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.7 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.8
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.7	Fri Mar  2 19:20:57 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc	Tue Mar  6 08:37:43 2018
@@ -8,9 +8,10 @@ ARM_MAX_ARCH=4
 ARM_MAX_ARCH=5
 .elif !empty(MACHINE_ARCH:Mearmv6*)
 ARM_MAX_ARCH=6
+.elif !empty(MACHINE_ARCH:Mearmv7*)
+ARM_MAX_ARCH=7
 .else
 ARM_MAX_ARCH=8
-CPUID_SRCS += arm64cpuid.S
 .endif
 CPPFLAGS += -D__ARM_MAX_ARCH__=${ARM_MAX_ARCH}
 .include "../../crypto.inc"



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

2018-03-03 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Mar  4 00:24:21 UTC 2018

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

Log Message:
remove useless grep


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/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/arm/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/Makefile:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/Makefile:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/Makefile:1.1	Fri Mar  2 19:20:57 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/Makefile	Sat Mar  3 19:24:21 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2018/03/03 00:20:57 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2018/03/04 00:24:21 christos Exp $
 
 .include "bsd.own.mk"
 
@@ -6,8 +6,7 @@ CRYPTODIST=${NETBSDSRCDIR}/crypto
 .include "${NETBSDSRCDIR}/crypto/Makefile.openssl"
 
 regen:
-	for i in $$(find ${OPENSSLSRC} -name \*arm\*.pl | grep -v charmap.pl); \
-	do \
+	for i in $$(find ${OPENSSLSRC} -name \*arm\*.pl); do \
 		case $$i in \
 		(*/charmap.pl|*/arm-xlate.pl);; \
 		(*) perl -I${OPENSSLSRC}/crypto/perlasm \



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

2018-03-03 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Mar  4 00:24:21 UTC 2018

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

Log Message:
remove useless grep


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

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



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

2018-03-02 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Mar  3 00:20:57 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes-armv4.S
aesv8-armx.S armv4-gf2m.S armv4-mont.S armv4cpuid.S bsaes-armv7.S
crypto.inc ghash-armv4.S ghashv8-armx.S modes.inc rc4.inc
sha1-armv4-large.S sha256-armv4.S sha512-armv4.S
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: Makefile
arm64cpuid.S armv8-mont.S chacha-armv4.S chacha-armv8.S
ecp_nistz256-armv4.S ecp_nistz256-armv8.S poly1305-armv4.S
poly1305-armv8.S sha1-armv8.S sha512-armv8.S vpaes-armv8.S

Log Message:
Regen for OpenSSL-1.1
XXX: we could add the new assembly files to speed-up things but now we
are only using the assembly stubs that 1.0 used.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/Makefile \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm64cpuid.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv8-mont.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv4.S 
\
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv8.S 
\
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/vpaes-armv8.S
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghashv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv4-large.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha256-armv4.S
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-mont.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/rc4.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv4.S
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S

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



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

2018-03-02 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Mar  3 00:20:57 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes-armv4.S
aesv8-armx.S armv4-gf2m.S armv4-mont.S armv4cpuid.S bsaes-armv7.S
crypto.inc ghash-armv4.S ghashv8-armx.S modes.inc rc4.inc
sha1-armv4-large.S sha256-armv4.S sha512-armv4.S
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: Makefile
arm64cpuid.S armv8-mont.S chacha-armv4.S chacha-armv8.S
ecp_nistz256-armv4.S ecp_nistz256-armv8.S poly1305-armv4.S
poly1305-armv8.S sha1-armv8.S sha512-armv8.S vpaes-armv8.S

Log Message:
Regen for OpenSSL-1.1
XXX: we could add the new assembly files to speed-up things but now we
are only using the assembly stubs that 1.0 used.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/Makefile \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm64cpuid.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv8-mont.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv4.S 
\
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv8.S 
\
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/vpaes-armv8.S
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghashv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv4-large.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha256-armv4.S
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-mont.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/rc4.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv4.S
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S

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

diffs are larger than 1MB and have been omitted


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

2015-05-27 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Wed May 27 21:27:03 UTC 2015

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

Log Message:
Rework setting of __ARM_MAX_ARCH__ to better deal with BE arm MACHINE_ARCHes


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.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/arm/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.5	Mon Mar 16 20:32:08 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc	Wed May 27 21:27:03 2015
@@ -2,14 +2,14 @@
 CPUID_SRCS = armv4cpuid.S armcap.c armv4-mont.S armv4-gf2m.S
 CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
-.if ${MACHINE_ARCH:M*armv4*} == 
-.	if ${MACHINE_ARCH} == earmeb || ${MACHINE_ARCH} == earmhfeb
+.if !empty(MACHINE_ARCH:Mearmv4*) || ${MACHINE_ARCH} == armeb
+CPPFLAGS += -D__ARM_MAX_ARCH__=4
+.elif ${MACHINE_ARCH} == earmeb || ${MACHINE_ARCH} == earmhfeb
 CPPFLAGS += -D__ARM_MAX_ARCH__=5
-.	else
-CPPFLAGS += -D__ARM_MAX_ARCH__=8
-.endif
+.elif !empty(MACHINE_ARCH:Mearmv6*eb)
+CPPFLAGS += -D__ARM_MAX_ARCH__=6
 .else
-CPPFLAGS += -D__ARM_MAX_ARCH__=4
+CPPFLAGS += -D__ARM_MAX_ARCH__=8
 .endif
 .include ../../crypto.inc
 



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

2015-05-27 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Wed May 27 21:27:03 UTC 2015

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

Log Message:
Rework setting of __ARM_MAX_ARCH__ to better deal with BE arm MACHINE_ARCHes


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

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



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

2015-05-16 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Sat May 16 17:26:51 UTC 2015

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

Log Message:
Don't list gcm128.c twice.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.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/arm/modes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc:1.1	Tue Mar 10 13:28:47 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc	Sat May 16 17:26:51 2015
@@ -1,4 +1,4 @@
 .PATH.S: ${.PARSEDIR}
-MODES_SRCS = ghash-armv4.S ghashv8-armx.S gcm128.c
+MODES_SRCS = ghash-armv4.S ghashv8-armx.S
 MODESCPPFLAGS = -DGHASH_ASM
 .include ../../modes.inc



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

2015-05-16 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Sat May 16 17:26:51 UTC 2015

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

Log Message:
Don't list gcm128.c twice.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc

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



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

2015-03-29 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Mon Mar 30 05:26:47 UTC 2015

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes-armv4.S

Log Message:
Add workaround/hack for clang integrated arm assembler bug.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S

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



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

2015-03-29 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Mon Mar 30 05:26:47 UTC 2015

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes-armv4.S

Log Message:
Add workaround/hack for clang integrated arm assembler bug.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.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/arm/aes-armv4.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S:1.1	Tue Mar 10 13:28:47 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S	Mon Mar 30 05:26:47 2015
@@ -170,7 +170,13 @@ AES_encrypt:
 	stmdb   sp!,{r1,r4-r12,lr}
 	mov	r12,r0		@ inp
 	mov	r11,r2
+#ifdef __clang__
+	@ workaround for clang integrated assembler bug
+	ldr	r0,=(AES_encrypt-AES_Te)
+	sub	r10,r3,r0
+#else
 	sub	r10,r3,#AES_encrypt-AES_Te	@ Te
+#endif
 #if __ARM_ARCH__7
 	ldrb	r0,[r12,#3]	@ load input data in endian-neutral
 	ldrb	r4,[r12,#2]	@ manner...



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

2015-03-29 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sun Mar 29 23:35:08 UTC 2015

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

Log Message:
No need to use -fno-integrated-assembler with clang


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.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/arm/aes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.3	Fri Mar 20 08:32:27 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc	Sun Mar 29 23:35:08 2015
@@ -1,7 +1,4 @@
 .PATH.S: ${.PARSEDIR}
 AES_SRCS = aes-armv4.S aesv8-armx.S bsaes-armv7.S aes_cbc.c
 AESCPPFLAGS = -DAES_ASM -DBSAES_ASM
-.if ${ACTIVE_CC} == clang
-AFLAGS.aes-armv4.S= -fno-integrated-as
-.endif
 .include ../../aes.inc



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

2015-03-29 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sun Mar 29 23:35:08 UTC 2015

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

Log Message:
No need to use -fno-integrated-assembler with clang


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc

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



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

2015-03-21 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Mar 21 15:56:54 UTC 2015

Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: bf.inc bn.inc
des.inc rc4.inc

Log Message:
Make more compile time options the same as the pkgsrc version


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bf.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bn.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/rc4.inc
cvs rdiff -u -r0 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/des.inc

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

Added files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bf.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bf.inc:1.1
--- /dev/null	Sat Mar 21 15:56:54 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bf.inc	Sat Mar 21 15:56:54 2015
@@ -0,0 +1,5 @@
+#	$NetBSD: bf.inc,v 1.1 2015/03/21 15:56:54 martin Exp $
+
+CPPFLAGS+=	-DBF_PTR
+
+.include ${.CURDIR}/bf.inc
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bn.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bn.inc:1.1
--- /dev/null	Sat Mar 21 15:56:54 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bn.inc	Sat Mar 21 15:56:54 2015
@@ -0,0 +1,3 @@
+.PATH.S: ${.PARSEDIR}
+CPPFLAGS+=	-DBN_LLONG=long long
+.include ../../bn.inc
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/rc4.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/rc4.inc:1.1
--- /dev/null	Sat Mar 21 15:56:54 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/rc4.inc	Sat Mar 21 15:56:54 2015
@@ -0,0 +1,3 @@
+.PATH.S: ${.PARSEDIR}
+CPPFLAGS+=	-DRC4_CHUNK=unsigned long -DRC4_INT=unsigned char
+.include ../../rc4.inc

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/des.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/des.inc:1.3
--- /dev/null	Sat Mar 21 15:56:54 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/des.inc	Sat Mar 21 15:56:54 2015
@@ -0,0 +1,5 @@
+#	$NetBSD: des.inc,v 1.3 2015/03/21 15:56:54 martin Exp $
+
+.PATH.S: ${.PARSEDIR}
+CPPFLAGS+=	-DDES_INT -DDES_UNROLL
+.include ${.CURDIR}/des.inc



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

2015-03-21 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Mar 21 15:56:54 UTC 2015

Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: bf.inc bn.inc
des.inc rc4.inc

Log Message:
Make more compile time options the same as the pkgsrc version


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bf.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bn.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/rc4.inc
cvs rdiff -u -r0 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/des.inc

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



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

2015-03-20 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri Mar 20 08:32:27 UTC 2015

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

Log Message:
Only use -fno-integrated-as for clang


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

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



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

2015-03-20 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri Mar 20 08:32:27 UTC 2015

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

Log Message:
Only use -fno-integrated-as for clang


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.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/arm/aes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.2	Thu Mar 19 19:27:14 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc	Fri Mar 20 08:32:27 2015
@@ -1,5 +1,7 @@
 .PATH.S: ${.PARSEDIR}
 AES_SRCS = aes-armv4.S aesv8-armx.S bsaes-armv7.S aes_cbc.c
 AESCPPFLAGS = -DAES_ASM -DBSAES_ASM
+.if ${ACTIVE_CC} == clang
 AFLAGS.aes-armv4.S= -fno-integrated-as
+.endif
 .include ../../aes.inc



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

2015-03-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Mar 17 19:41:43 UTC 2015

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aesv8-armx.S
armv4cpuid.S ghashv8-armx.S sha1-armv4-large.S sha256-armv4.S

Log Message:
Use .inst for hard coded instructions (instead of .byte and endian dependend
represenation)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghashv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv4-large.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha256-armv4.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/arm/aesv8-armx.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S:1.1	Tue Mar 10 13:28:47 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S	Tue Mar 17 19:41:42 2015
@@ -48,7 +48,7 @@ aes_v8_set_encrypt_key:
 	vtbl.8	d21,{q3},d5
 	vext.8	q9,q0,q3,#12
 	vst1.32	{q3},[r2]!
-	.byte	0x00,0x43,0xf0,0xf3	@ aese q10,q0
+	.inst	0xf3f04300		@ aese q10,q0
 	subs	r1,r1,#1
 
 	veor	q3,q3,q9
@@ -67,7 +67,7 @@ aes_v8_set_encrypt_key:
 	vtbl.8	d21,{q3},d5
 	vext.8	q9,q0,q3,#12
 	vst1.32	{q3},[r2]!
-	.byte	0x00,0x43,0xf0,0xf3	@ aese q10,q0
+	.inst	0xf3f04300	@ aese q10,q0
 
 	veor	q3,q3,q9
 	vext.8	q9,q0,q9,#12
@@ -82,7 +82,7 @@ aes_v8_set_encrypt_key:
 	vtbl.8	d21,{q3},d5
 	vext.8	q9,q0,q3,#12
 	vst1.32	{q3},[r2]!
-	.byte	0x00,0x43,0xf0,0xf3	@ aese q10,q0
+	.inst	0xf3f04300	@ aese q10,q0
 
 	veor	q3,q3,q9
 	vext.8	q9,q0,q9,#12
@@ -109,7 +109,7 @@ aes_v8_set_encrypt_key:
 	vtbl.8	d21,{q8},d5
 	vext.8	q9,q0,q3,#12
 	vst1.32	{d16},[r2]!
-	.byte	0x00,0x43,0xf0,0xf3	@ aese q10,q0
+	.inst	0xf3f04300	@ aese q10,q0
 	subs	r1,r1,#1
 
 	veor	q3,q3,q9
@@ -145,7 +145,7 @@ aes_v8_set_encrypt_key:
 	vtbl.8	d21,{q8},d5
 	vext.8	q9,q0,q3,#12
 	vst1.32	{q8},[r2]!
-	.byte	0x00,0x43,0xf0,0xf3	@ aese q10,q0
+	.inst	0xf3f04300	@ aese q10,q0
 	subs	r1,r1,#1
 
 	veor	q3,q3,q9
@@ -161,7 +161,7 @@ aes_v8_set_encrypt_key:
 
 	vdup.32	q10,d7[1]
 	vext.8	q9,q0,q8,#12
-	.byte	0x00,0x43,0xf0,0xf3	@ aese q10,q0
+	.inst	0xf3f04300	@ aese q10,q0
 
 	veor	q8,q8,q9
 	vext.8	q9,q0,q9,#12
@@ -204,15 +204,15 @@ aes_v8_set_decrypt_key:
 .Loop_imc:
 	vld1.32	{q0},[r2]
 	vld1.32	{q1},[r0]
-	.byte	0xc0,0x03,0xb0,0xf3	@ aesimc q0,q0
-	.byte	0xc2,0x23,0xb0,0xf3	@ aesimc q1,q1
+	.inst	0xf3b003c0	@ aesimc q0,q0
+	.inst	0xf3b023c2	@ aesimc q1,q1
 	vst1.32	{q0},[r0],r4
 	vst1.32	{q1},[r2]!
 	cmp	r0,r2
 	bhi	.Loop_imc
 
 	vld1.32	{q0},[r2]
-	.byte	0xc0,0x03,0xb0,0xf3	@ aesimc q0,q0
+	.inst	0xf3b003c0	@ aesimc q0,q0
 	vst1.32	{q0},[r0]
 
 	eor	r0,r0,r0		@ return value
@@ -230,19 +230,19 @@ aes_v8_encrypt:
 	vld1.32	{q1},[r2]!
 
 .Loop_enc:
-	.byte	0x00,0x43,0xb0,0xf3	@ aese q2,q0
+	.inst	0xf3b04300	@ aese q2,q0
 	vld1.32	{q0},[r2]!
-	.byte	0x84,0x43,0xb0,0xf3	@ aesmc q2,q2
+	.inst	0xf3b04384	@ aesmc q2,q2
 	subs	r3,r3,#2
-	.byte	0x02,0x43,0xb0,0xf3	@ aese q2,q1
+	.inst	0xf3b04302	@ aese q2,q1
 	vld1.32	{q1},[r2]!
-	.byte	0x84,0x43,0xb0,0xf3	@ aesmc q2,q2
+	.inst	0xf3b04384	@ aesmc q2,q2
 	bgt	.Loop_enc
 
-	.byte	0x00,0x43,0xb0,0xf3	@ aese q2,q0
+	.inst	0xf3b04300	@ aese q2,q0
 	vld1.32	{q0},[r2]
-	.byte	0x84,0x43,0xb0,0xf3	@ aesmc q2,q2
-	.byte	0x02,0x43,0xb0,0xf3	@ aese q2,q1
+	.inst	0xf3b04384	@ aesmc q2,q2
+	.inst	0xf3b04302	@ aese q2,q1
 	veor	q2,q2,q0
 
 	vst1.8	{q2},[r1]
@@ -259,19 +259,19 @@ aes_v8_decrypt:
 	vld1.32	{q1},[r2]!
 
 .Loop_dec:
-	.byte	0x40,0x43,0xb0,0xf3	@ aesd q2,q0
+	.inst	0xf3b04340	@ aesd q2,q0
 	vld1.32	{q0},[r2]!
-	.byte	0xc4,0x43,0xb0,0xf3	@ aesimc q2,q2
+	.inst	0xf3b043c4	@ aesimc q2,q2
 	subs	r3,r3,#2
-	.byte	0x42,0x43,0xb0,0xf3	@ aesd q2,q1
+	.inst	0xf3b04342	@ aesd q2,q1
 	vld1.32	{q1},[r2]!
-	.byte	0xc4,0x43,0xb0,0xf3	@ aesimc q2,q2
+	.inst	0xf3b043c4	@ aesimc q2,q2
 	bgt	.Loop_dec
 
-	.byte	0x40,0x43,0xb0,0xf3	@ aesd q2,q0
+	.inst	0xf3b04340	@ aesd q2,q0
 	vld1.32	{q0},[r2]
-	.byte	0xc4,0x43,0xb0,0xf3	@ aesimc q2,q2
-	.byte	0x42,0x43,0xb0,0xf3	@ aesd q2,q1
+	.inst	0xf3b043c4	@ aesimc q2,q2
+	.inst	0xf3b04342	@ aesd q2,q1
 	veor	q2,q2,q0
 
 	vst1.8	{q2},[r1]
@@ -315,36 +315,36 @@ aes_v8_cbc_encrypt:
 	beq	.Lcbc_enc128
 
 .Loop_cbc_enc:
-	.byte	0x20,0x03,0xb0,0xf3	@ aese q0,q8
+	.inst	0xf3b00320	@ aese q0,q8
 	vld1.32	{q8},[r7]!
-	.byte	0x80,0x03,0xb0,0xf3	@ aesmc q0,q0
+	.inst	0xf3b00380	@ aesmc q0,q0
 	subs	r6,r6,#2
-	.byte	0x22,0x03,0xb0,0xf3	@ aese q0,q9
+	.inst	0xf3b00322	@ aese q0,q9
 	vld1.32	{q9},[r7]!
-	.byte	0x80,0x03,0xb0,0xf3	@ aesmc q0,q0
+	.inst	

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

2015-03-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Mar 17 19:41:43 UTC 2015

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aesv8-armx.S
armv4cpuid.S ghashv8-armx.S sha1-armv4-large.S sha256-armv4.S

Log Message:
Use .inst for hard coded instructions (instead of .byte and endian dependend
represenation)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghashv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv4-large.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha256-armv4.S

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



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

2015-03-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Mar 16 20:32:08 UTC 2015

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

Log Message:
one more strike to the whack-a-mole game of arm flavors.


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

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



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

2015-03-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Mar 16 20:32:08 UTC 2015

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

Log Message:
one more strike to the whack-a-mole game of arm flavors.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.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/arm/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.4	Sun Mar 15 14:58:09 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc	Mon Mar 16 16:32:08 2015
@@ -3,7 +3,7 @@ CPUID_SRCS = armv4cpuid.S armcap.c armv4
 CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
 .if ${MACHINE_ARCH:M*armv4*} == 
-.	if ${MACHINE_ARCH} == earmeb
+.	if ${MACHINE_ARCH} == earmeb || ${MACHINE_ARCH} == earmhfeb
 CPPFLAGS += -D__ARM_MAX_ARCH__=5
 .	else
 CPPFLAGS += -D__ARM_MAX_ARCH__=8



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

2015-03-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Mar 15 18:58:09 UTC 2015

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

Log Message:
fix the big endian builds. Perhaps just remove the MAX define for everyone?


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.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/arm/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.3	Tue Mar 10 09:28:47 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc	Sun Mar 15 14:58:09 2015
@@ -3,8 +3,13 @@ CPUID_SRCS = armv4cpuid.S armcap.c armv4
 CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
 .if ${MACHINE_ARCH:M*armv4*} == 
+.	if ${MACHINE_ARCH} == earmeb
+CPPFLAGS += -D__ARM_MAX_ARCH__=5
+.	else
 CPPFLAGS += -D__ARM_MAX_ARCH__=8
+.endif
 .else
 CPPFLAGS += -D__ARM_MAX_ARCH__=4
 .endif
 .include ../../crypto.inc
+



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

2015-03-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Mar 15 18:58:09 UTC 2015

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

Log Message:
fix the big endian builds. Perhaps just remove the MAX define for everyone?


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

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



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

2015-03-12 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Thu Mar 12 12:46:15 UTC 2015

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: ghash-armv4.S

Log Message:
Use unified ARM syntax.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S

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



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

2015-03-12 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Thu Mar 12 12:46:15 UTC 2015

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: ghash-armv4.S

Log Message:
Use unified ARM syntax.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.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/arm/ghash-armv4.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S:1.1	Tue Mar 10 13:28:47 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S	Thu Mar 12 12:46:15 2015
@@ -74,7 +74,7 @@ gcm_ghash_4bit:
 	eor	r5,r5,r6,lsl#28
 	ldrh	r8,[sp,r12]		@ rem_4bit[rem]
 	eor	r6,r10,r6,lsr#4
-	ldrplb	r12,[r2,r3]
+	ldrbpl	r12,[r2,r3]
 	eor	r6,r6,r7,lsl#28
 	eor	r7,r11,r7,lsr#4
 
@@ -84,7 +84,7 @@ gcm_ghash_4bit:
 	add	r14,r14,r14
 	ldmia	r11,{r8-r11}	@ load Htbl[nhi]
 	eor	r4,r8,r4,lsr#4
-	ldrplb	r8,[r0,r3]
+	ldrbpl	r8,[r0,r3]
 	eor	r4,r4,r5,lsl#28
 	eor	r5,r9,r5,lsr#4
 	ldrh	r9,[sp,r14]
@@ -130,7 +130,7 @@ gcm_ghash_4bit:
 	strb	r10,[r0,#8+1]
 	strb	r11,[r0,#8]
 #endif
-	ldrneb	r12,[r2,#15]
+	ldrbne	r12,[r2,#15]
 #if __ARM_ARCH__=7  defined(__ARMEL__)
 	rev	r6,r6
 	str	r6,[r0,#4]
@@ -217,7 +217,7 @@ gcm_gmult_4bit:
 	eor	r5,r5,r6,lsl#28
 	ldrh	r8,[r2,r12]	@ rem_4bit[rem]
 	eor	r6,r10,r6,lsr#4
-	ldrplb	r12,[r0,r3]
+	ldrbpl	r12,[r0,r3]
 	eor	r6,r6,r7,lsl#28
 	eor	r7,r11,r7,lsr#4
 



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

2015-03-12 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Thu Mar 12 12:46:41 UTC 2015

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: armv4-gf2m.S

Log Message:
Drop redundant modifier to allow build with LLVM IAS.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.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/arm/armv4-gf2m.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S:1.1	Tue Mar 10 13:28:47 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S	Thu Mar 12 12:46:41 2015
@@ -143,8 +143,8 @@ bn_GF2m_mul_2x2:
 .align	5
 .LNEON:
 	ldr		r12, [sp]		@ 5th argument
-	vmov.32		d26, r2, r1
-	vmov.32		d27, r12, r3
+	vmov		d26, r2, r1
+	vmov		d27, r12, r3
 	vmov.i64	d28, #0x
 	vmov.i64	d29, #0x
 	vmov.i64	d30, #0x



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

2015-03-12 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Thu Mar 12 12:46:41 UTC 2015

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: armv4-gf2m.S

Log Message:
Drop redundant modifier to allow build with LLVM IAS.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S

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



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

2015-03-12 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri Mar 13 05:29:26 UTC 2015

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: ghash-armv4.S

Log Message:
Explicitly mark as using unified syntax


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.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/arm/ghash-armv4.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S:1.2	Thu Mar 12 12:46:15 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S	Fri Mar 13 05:29:26 2015
@@ -1,6 +1,7 @@
 #include arm_arch.h
 #include arm_asm.h
 
+.syntax	unified
 .text
 .code	32
 



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

2015-03-12 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri Mar 13 05:29:26 UTC 2015

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: ghash-armv4.S

Log Message:
Explicitly mark as using unified syntax


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

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



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

2015-03-10 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Mar 10 13:28:47 UTC 2015

Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes-armv4.S
aes.inc aesv8-armx.S arm_asm.h armv4-gf2m.S armv4-mont.S
armv4cpuid.S bsaes-armv7.S crypto.inc ghash-armv4.S ghashv8-armx.S
modes.inc sha.inc sha1-armv4-large.S sha256-armv4.S sha512-armv4.S
Removed Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: des.inc

Log Message:
Update the ARM asm support code from version 1.0.2 with some local
modifications to make it compile and work on armv4.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm_asm.h \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-mont.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghashv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/modes.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv4-large.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha256-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv4.S
cvs rdiff -u -r0 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/des.inc

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



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

2012-07-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Jul 27 21:28:24 UTC 2012

Removed Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: crypto.inc

Log Message:
This cannot be used because we are compiling with __ARM_ARCH_3__ and it needs
a minimum of 4


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc

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




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

2012-07-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Jul 27 21:28:24 UTC 2012

Removed Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: crypto.inc

Log Message:
This cannot be used because we are compiling with __ARM_ARCH_3__ and it needs
a minimum of 4


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc

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