aboutsummaryrefslogtreecommitdiff
path: root/deps/openssl/config/archs/linux32-s390x/asm
diff options
context:
space:
mode:
Diffstat (limited to 'deps/openssl/config/archs/linux32-s390x/asm')
-rw-r--r--deps/openssl/config/archs/linux32-s390x/asm/configdata.pm109
-rw-r--r--deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S16
-rw-r--r--deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S14
-rw-r--r--deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h2
-rw-r--r--deps/openssl/config/archs/linux32-s390x/asm/crypto/modes/ghash-s390x.S2
-rw-r--r--deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha256-s390x.S2
-rw-r--r--deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha512-s390x.S2
-rw-r--r--deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h18
-rw-r--r--deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi2
9 files changed, 140 insertions, 27 deletions
diff --git a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm
index 47d017c24a..24b9835113 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm
+++ b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm
@@ -56,8 +56,8 @@ our %config = (
shlib_version_number => "1.1",
sourcedir => ".",
target => "linux32-s390x",
- version => "1.1.0h",
- version_num => "0x1010008fL",
+ version => "1.1.0i",
+ version_num => "0x1010009fL",
);
our %target = (
@@ -1078,6 +1078,10 @@ our %unified_info = (
[
"libcrypto",
],
+ "test/errtest" =>
+ [
+ "libcrypto",
+ ],
"test/evp_extra_test" =>
[
"libcrypto",
@@ -1244,10 +1248,22 @@ our %unified_info = (
[
"libcrypto",
],
+ "test/versions" =>
+ [
+ "libcrypto",
+ ],
"test/wp_test" =>
[
"libcrypto",
],
+ "test/x509_dup_cert_test" =>
+ [
+ "libcrypto",
+ ],
+ "test/x509_time_test" =>
+ [
+ "libcrypto",
+ ],
"test/x509aux" =>
[
"libcrypto",
@@ -3934,6 +3950,12 @@ our %unified_info = (
"crypto/include",
"include",
],
+ "crypto/conf/conf_ssl.o" =>
+ [
+ ".",
+ "crypto/include",
+ "include",
+ ],
"crypto/cpt_err.o" =>
[
".",
@@ -6227,6 +6249,12 @@ our %unified_info = (
"crypto/include",
"include",
],
+ "crypto/x509/x509_meth.o" =>
+ [
+ ".",
+ "crypto/include",
+ "include",
+ ],
"crypto/x509/x509_obj.o" =>
[
".",
@@ -7214,6 +7242,10 @@ our %unified_info = (
[
"include",
],
+ "test/errtest.o" =>
+ [
+ "include",
+ ],
"test/evp_extra_test.o" =>
[
"include",
@@ -7408,10 +7440,23 @@ our %unified_info = (
[
"include",
],
+ "test/versions.o" =>
+ [
+ "include",
+ ],
"test/wp_test.o" =>
[
"include",
],
+ "test/x509_dup_cert_test.o" =>
+ [
+ "include",
+ ],
+ "test/x509_time_test.o" =>
+ [
+ ".",
+ "include",
+ ],
"test/x509aux.o" =>
[
"include",
@@ -7567,6 +7612,7 @@ our %unified_info = (
"test/ecdsatest",
"test/ectest",
"test/enginetest",
+ "test/errtest",
"test/evp_extra_test",
"test/evp_test",
"test/exdatatest",
@@ -7607,7 +7653,10 @@ our %unified_info = (
"test/v3ext",
"test/v3nametest",
"test/verify_extra_test",
+ "test/versions",
"test/wp_test",
+ "test/x509_dup_cert_test",
+ "test/x509_time_test",
"test/x509aux",
],
"rawlines" =>
@@ -7989,6 +8038,9 @@ our %unified_info = (
"test/enginetest" =>
[
],
+ "test/errtest" =>
+ [
+ ],
"test/evp_extra_test" =>
[
],
@@ -8109,9 +8161,18 @@ our %unified_info = (
"test/verify_extra_test" =>
[
],
+ "test/versions" =>
+ [
+ ],
"test/wp_test" =>
[
],
+ "test/x509_dup_cert_test" =>
+ [
+ ],
+ "test/x509_time_test" =>
+ [
+ ],
"test/x509aux" =>
[
],
@@ -9104,6 +9165,10 @@ our %unified_info = (
[
"crypto/conf/conf_sap.c",
],
+ "crypto/conf/conf_ssl.o" =>
+ [
+ "crypto/conf/conf_ssl.c",
+ ],
"crypto/cpt_err.o" =>
[
"crypto/cpt_err.c",
@@ -10564,6 +10629,10 @@ our %unified_info = (
[
"crypto/x509/x509_lu.c",
],
+ "crypto/x509/x509_meth.o" =>
+ [
+ "crypto/x509/x509_meth.c",
+ ],
"crypto/x509/x509_obj.o" =>
[
"crypto/x509/x509_obj.c",
@@ -11084,6 +11153,7 @@ our %unified_info = (
"crypto/conf/conf_mall.o",
"crypto/conf/conf_mod.o",
"crypto/conf/conf_sap.o",
+ "crypto/conf/conf_ssl.o",
"crypto/cpt_err.o",
"crypto/cryptlib.o",
"crypto/ct/ct_b64.o",
@@ -11449,6 +11519,7 @@ our %unified_info = (
"crypto/x509/x509_err.o",
"crypto/x509/x509_ext.o",
"crypto/x509/x509_lu.o",
+ "crypto/x509/x509_meth.o",
"crypto/x509/x509_obj.o",
"crypto/x509/x509_r2x.o",
"crypto/x509/x509_req.o",
@@ -12452,6 +12523,15 @@ our %unified_info = (
[
"test/enginetest.c",
],
+ "test/errtest" =>
+ [
+ "test/errtest.o",
+ "test/testutil.o",
+ ],
+ "test/errtest.o" =>
+ [
+ "test/errtest.c",
+ ],
"test/evp_extra_test" =>
[
"test/evp_extra_test.o",
@@ -12801,6 +12881,14 @@ our %unified_info = (
[
"test/verify_extra_test.c",
],
+ "test/versions" =>
+ [
+ "test/versions.o",
+ ],
+ "test/versions.o" =>
+ [
+ "test/versions.c",
+ ],
"test/wp_test" =>
[
"test/wp_test.o",
@@ -12809,6 +12897,23 @@ our %unified_info = (
[
"test/wp_test.c",
],
+ "test/x509_dup_cert_test" =>
+ [
+ "test/x509_dup_cert_test.o",
+ ],
+ "test/x509_dup_cert_test.o" =>
+ [
+ "test/x509_dup_cert_test.c",
+ ],
+ "test/x509_time_test" =>
+ [
+ "test/testutil.o",
+ "test/x509_time_test.o",
+ ],
+ "test/x509_time_test.o" =>
+ [
+ "test/x509_time_test.c",
+ ],
"test/x509aux" =>
[
"test/x509aux.o",
diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S b/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S
index 71138f8176..541636080c 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S
+++ b/deps/openssl/config/archs/linux32-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:
l %r6,6*4(%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*4-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
@@ -1961,7 +1961,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,80+0(%r15) # save the tweak
llgfr %r9,%r9
srlg %r10,%r11,32
@@ -2012,7 +2012,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,80+0(%r15) # save the tweak
llgfr %r9,%r9
srlg %r10,%r11,32
@@ -2190,7 +2190,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,80+0(%r15) # save the tweak
llgfr %r9,%r9
srlg %r10,%r11,32
diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S b/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S
index cb7743cfea..0a6c67545a 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S
+++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S
@@ -152,16 +152,16 @@ bn_mul_mont:
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,96(%r7,%r15) # conditional copy
+ lg %r9,0(%r7,%r2)
+ ngr %r8,%r12
+ ngr %r9,%r13
+ ogr %r9,%r8
rllg %r9,%r9,32
stg %r7,96(%r7,%r15) # zap tp
stg %r9,0(%r7,%r2)
diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h
index 64e7f072a3..a9705431d2 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h
@@ -30,4 +30,4 @@ static const char cflags[] = {
'e','s','-','1','.','1','\\','"','"',' ','\0'
};
#define PLATFORM "platform: linux32-s390x"
-#define DATE "built on: Tue Apr 3 00:38:44 2018"
+#define DATE "built on: Tue Aug 14 23:13:32 2018"
diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/modes/ghash-s390x.S b/deps/openssl/config/archs/linux32-s390x/asm/crypto/modes/ghash-s390x.S
index 88c26122cc..4a006d9c5d 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/modes/ghash-s390x.S
+++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/modes/ghash-s390x.S
@@ -41,7 +41,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/linux32-s390x/asm/crypto/sha/sha256-s390x.S b/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha256-s390x.S
index cf1b7819a1..f02c836633 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha256-s390x.S
+++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha256-s390x.S
@@ -1234,7 +1234,7 @@ sha256_block_data_order:
cl %r3,176(%r15)
jne .Lloop
- lm %r6,%r15,184(%r15)
+ lm %r6,%r15,184(%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/linux32-s390x/asm/crypto/sha/sha512-s390x.S b/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha512-s390x.S
index 6900891667..3d682e8658 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha512-s390x.S
+++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/sha/sha512-s390x.S
@@ -1258,7 +1258,7 @@ sha512_block_data_order:
cl %r3,240(%r15)
jne .Lloop
- lm %r6,%r15,248(%r15)
+ lm %r6,%r15,248(%r15)
br %r14
.size sha512_block_data_order,.-sha512_block_data_order
.string "SHA512 block transform for s390x, CRYPTOGAMS by <appro@openssl.org>"
diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h
index 2f9817e43b..21dd8cc643 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h
@@ -102,12 +102,18 @@ extern "C" {
* still won't see them if the library has been built to disable deprecated
* functions.
*/
-#if defined(OPENSSL_NO_DEPRECATED)
-# define DECLARE_DEPRECATED(f)
-#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
-# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
-#else
-# define DECLARE_DEPRECATED(f) f;
+#ifndef DECLARE_DEPRECATED
+# if defined(OPENSSL_NO_DEPRECATED)
+# define DECLARE_DEPRECATED(f)
+# else
+# define DECLARE_DEPRECATED(f) f;
+# ifdef __GNUC__
+# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
+# undef DECLARE_DEPRECATED
+# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
+# endif
+# endif
+# endif
#endif
#ifndef OPENSSL_FILE
diff --git a/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi b/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi
index ffff267d09..4aa5f86c81 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi
+++ b/deps/openssl/config/archs/linux32-s390x/asm/openssl.gypi
@@ -216,6 +216,7 @@
'openssl/crypto/conf/conf_mall.c',
'openssl/crypto/conf/conf_mod.c',
'openssl/crypto/conf/conf_sap.c',
+ 'openssl/crypto/conf/conf_ssl.c',
'openssl/crypto/cpt_err.c',
'openssl/crypto/cryptlib.c',
'openssl/crypto/ct/ct_b64.c',
@@ -575,6 +576,7 @@
'openssl/crypto/x509/x509_err.c',
'openssl/crypto/x509/x509_ext.c',
'openssl/crypto/x509/x509_lu.c',
+ 'openssl/crypto/x509/x509_meth.c',
'openssl/crypto/x509/x509_obj.c',
'openssl/crypto/x509/x509_r2x.c',
'openssl/crypto/x509/x509_req.c',
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-15 20:55:22 +0000