summaryrefslogtreecommitdiff
path: root/deps/openssl/config/archs/linux64-s390x/asm/crypto
diff options
context:
space:
mode:
authorShigeki Ohtsu <ohtsu@ohtsu.org>2018-08-14 23:14:19 +0900
committerRod Vagg <rod@vagg.org>2018-08-16 11:52:38 +1000
commiteaa0ad97872ac1becf437c14909afe7a01b77364 (patch)
tree00403152ff5b9186061f99e0e4635706a2ce1dcf /deps/openssl/config/archs/linux64-s390x/asm/crypto
parent45b9f5df6ff1548f01ed646ebee75e3f0873cefd (diff)
downloadandroid-node-v8-eaa0ad97872ac1becf437c14909afe7a01b77364.tar.gz
android-node-v8-eaa0ad97872ac1becf437c14909afe7a01b77364.tar.bz2
android-node-v8-eaa0ad97872ac1becf437c14909afe7a01b77364.zip
deps: update archs files for OpenSSL-1.1.0i
`cd deps/openssl/config; make` updates all archs dependant files. PR-URL: https://github.com/nodejs/node/pull/22318 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'deps/openssl/config/archs/linux64-s390x/asm/crypto')
-rw-r--r--deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S16
-rw-r--r--deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-gf2m.s2
-rw-r--r--deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S40
-rw-r--r--deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h2
-rw-r--r--deps/openssl/config/archs/linux64-s390x/asm/crypto/modes/ghash-s390x.S2
-rw-r--r--deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha256-s390x.S2
-rw-r--r--deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha512-s390x.S2
7 files changed, 33 insertions, 33 deletions
diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S b/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S
index 1a1e4c224d..a44e72d047 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S
+++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S
@@ -458,7 +458,7 @@ _s390x_AES_encrypt:
or %r9,%r1
or %r2,%r6
or %r3,%r7
-
+
srlg %r5,%r10,5 # i0
srlg %r6,%r10,13 # i1
nr %r5,%r0
@@ -511,7 +511,7 @@ _s390x_AES_encrypt:
x %r10,24(%r4)
x %r11,28(%r4)
- br %r14
+ br %r14
.size _s390x_AES_encrypt,.-_s390x_AES_encrypt
.type AES_Td,@object
.align 256
@@ -1015,7 +1015,7 @@ _s390x_AES_decrypt:
x %r10,24(%r4)
x %r11,28(%r4)
- br %r14
+ br %r14
.size _s390x_AES_decrypt,.-_s390x_AES_decrypt
# void AES_set_encrypt_key(const unsigned char *in, int bits,
# AES_KEY *key) {
@@ -1496,7 +1496,7 @@ AES_cbc_encrypt:
.Lcbc_enc_done:
lg %r6,6*8(%r15)
st %r8,0(%r6)
- st %r9,4(%r6)
+ st %r9,4(%r6)
st %r10,8(%r6)
st %r11,12(%r6)
@@ -1744,7 +1744,7 @@ _s390x_xts_km:
llgc %r3,2*8-1(%r15)
nill %r3,0x0f # %r3%=16
br %r14
-
+
.align 16
.Lxts_km_vanilla:
# prepare and allocate stack frame at the top of 4K page
@@ -1960,7 +1960,7 @@ AES_xts_encrypt:
xgr %r9,%r1
lrvgr %r9,%r9 # flip byte order
lrvgr %r11,%r11
- srlg %r8,%r9,32 # smash the tweak to 4x32-bits
+ srlg %r8,%r9,32 # smash the tweak to 4x32-bits
stg %r9,144+0(%r15) # save the tweak
llgfr %r9,%r9
srlg %r10,%r11,32
@@ -2011,7 +2011,7 @@ AES_xts_encrypt:
xgr %r9,%r1
lrvgr %r9,%r9 # flip byte order
lrvgr %r11,%r11
- srlg %r8,%r9,32 # smash the tweak to 4x32-bits
+ srlg %r8,%r9,32 # smash the tweak to 4x32-bits
stg %r9,144+0(%r15) # save the tweak
llgfr %r9,%r9
srlg %r10,%r11,32
@@ -2188,7 +2188,7 @@ AES_xts_decrypt:
xgr %r9,%r1
lrvgr %r9,%r9 # flip byte order
lrvgr %r11,%r11
- srlg %r8,%r9,32 # smash the tweak to 4x32-bits
+ srlg %r8,%r9,32 # smash the tweak to 4x32-bits
stg %r9,144+0(%r15) # save the tweak
llgfr %r9,%r9
srlg %r10,%r11,32
diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-gf2m.s b/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-gf2m.s
index e0b0822cae..1b90426659 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-gf2m.s
+++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-gf2m.s
@@ -206,7 +206,7 @@ bn_GF2m_mul_2x2:
xgr %r4,%r7
xgr %r3,%r6
xgr %r4,%r8
- xgr %r3,%r9
+ xgr %r3,%r9
xgr %r4,%r9
xgr %r3,%r4
stg %r4,16(%r2)
diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S b/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S
index c4ee541906..b8dea0a66f 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S
+++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S
@@ -26,12 +26,12 @@ bn_mul_mont:
la %r4,0(%r7,%r4) # restore %r4
ahi %r1,-1 # adjust %r1 for inner loop
lg %r6,0(%r6) # pull n0
-
+
lg %r2,0(%r4)
-
+
lg %r9,0(%r3)
-
+
mlgr %r8,%r2 # ap[0]*bp[0]
lgr %r12,%r8
@@ -39,7 +39,7 @@ bn_mul_mont:
msgr %r0,%r6
lg %r11,0(%r5) #
-
+
mlgr %r10,%r0 # np[0]*m1
algr %r11,%r9 # +="tp[0]"
lghi %r13,0
@@ -51,14 +51,14 @@ bn_mul_mont:
.align 16
.L1st:
lg %r9,0(%r7,%r3)
-
+
mlgr %r8,%r2 # ap[j]*bp[0]
algr %r9,%r12
lghi %r12,0
alcgr %r12,%r8
lg %r11,0(%r7,%r5)
-
+
mlgr %r10,%r0 # np[j]*m1
algr %r11,%r13
lghi %r13,0
@@ -79,9 +79,9 @@ bn_mul_mont:
.Louter:
lg %r2,0(%r4) # bp[i]
-
+
lg %r9,0(%r3)
-
+
mlgr %r8,%r2 # ap[0]*bp[i]
alg %r9,160(%r15) # +=tp[0]
lghi %r12,0
@@ -91,7 +91,7 @@ bn_mul_mont:
msgr %r0,%r6 # tp[0]*n0
lg %r11,0(%r5) # np[0]
-
+
mlgr %r10,%r0 # np[0]*m1
algr %r11,%r9 # +="tp[0]"
lghi %r13,0
@@ -103,7 +103,7 @@ bn_mul_mont:
.align 16
.Linner:
lg %r9,0(%r7,%r3)
-
+
mlgr %r8,%r2 # ap[j]*bp[i]
algr %r9,%r12
lghi %r12,0
@@ -112,7 +112,7 @@ bn_mul_mont:
alcgr %r12,%r8
lg %r11,0(%r7,%r5)
-
+
mlgr %r10,%r0 # np[j]*m1
algr %r11,%r13
lghi %r13,0
@@ -145,24 +145,24 @@ bn_mul_mont:
lr %r14,%r1
.Lsub: lg %r9,0(%r7,%r3)
lg %r11,0(%r7,%r5)
-
+
slbgr %r9,%r11
stg %r9,0(%r7,%r2)
la %r7,8(%r7)
brct %r14,.Lsub
lghi %r8,0
slbgr %r12,%r8 # handle upmost carry
-
- ngr %r3,%r12
- lghi %r5,-1
- xgr %r5,%r12
- ngr %r5,%r2
- ogr %r3,%r5 # ap=borrow?tp:rp
+ lghi %r13,-1
+ xgr %r13,%r12
la %r7,0(%r0)
lgr %r14,%r1
-.Lcopy: lg %r9,0(%r7,%r3) # copy or in-place refresh
-
+.Lcopy: lg %r8,160(%r7,%r15) # conditional copy
+ lg %r9,0(%r7,%r2)
+ ngr %r8,%r12
+ ngr %r9,%r13
+ ogr %r9,%r8
+
stg %r7,160(%r7,%r15) # zap tp
stg %r9,0(%r7,%r2)
la %r7,8(%r7)
diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h
index 0539055a2c..6358018f98 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h
@@ -30,4 +30,4 @@ static const char cflags[] = {
'e','s','-','1','.','1','\\','"','"',' ','\0'
};
#define PLATFORM "platform: linux64-s390x"
-#define DATE "built on: Tue Apr 3 00:38:46 2018"
+#define DATE "built on: Tue Aug 14 23:13:34 2018"
diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/modes/ghash-s390x.S b/deps/openssl/config/archs/linux64-s390x/asm/crypto/modes/ghash-s390x.S
index a1c0217590..6dfaa76c35 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/modes/ghash-s390x.S
+++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/modes/ghash-s390x.S
@@ -40,7 +40,7 @@ gcm_ghash_4bit:
lg %r0,0+1(%r2)
lghi %r12,0
.Louter:
- xg %r0,0(%r4) # Xi ^= inp
+ xg %r0,0(%r4) # Xi ^= inp
xg %r1,8(%r4)
xgr %r0,%r12
stg %r1,8+1(%r2)
diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha256-s390x.S b/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha256-s390x.S
index 28cbb63752..e66c672764 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha256-s390x.S
+++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha256-s390x.S
@@ -1234,7 +1234,7 @@ sha256_block_data_order:
clg %r3,256(%r15)
jne .Lloop
- lmg %r6,%r15,272(%r15)
+ lmg %r6,%r15,272(%r15)
br %r14
.size sha256_block_data_order,.-sha256_block_data_order
.string "SHA256 block transform for s390x, CRYPTOGAMS by <appro@openssl.org>"
diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha512-s390x.S b/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha512-s390x.S
index 77c99e416b..5ff5c6bf9f 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha512-s390x.S
+++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/sha/sha512-s390x.S
@@ -1258,7 +1258,7 @@ sha512_block_data_order:
clg %r3,320(%r15)
jne .Lloop
- lmg %r6,%r15,336(%r15)
+ lmg %r6,%r15,336(%r15)
br %r14
.size sha512_block_data_order,.-sha512_block_data_order
.string "SHA512 block transform for s390x, CRYPTOGAMS by <appro@openssl.org>"