summaryrefslogtreecommitdiff
path: root/deps/openssl/config/archs/linux-ppc64/asm
diff options
context:
space:
mode:
Diffstat (limited to 'deps/openssl/config/archs/linux-ppc64/asm')
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/configdata.pm111
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aes-ppc.s20
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aesp8-ppc.s64
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/vpaes-ppc.s34
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/bn-ppc.s22
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc-mont.s13
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s18
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h2
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/crypto/chacha/chacha-ppc.s14
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/crypto/modes/ghashp8-ppc.s8
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppc.s6
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppcfp.s8
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/crypto/ppccpuid.s26
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha1-ppc.s4
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256-ppc.s6
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256p8-ppc.s4
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512-ppc.s6
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512p8-ppc.s4
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h18
-rw-r--r--deps/openssl/config/archs/linux-ppc64/asm/openssl.gypi2
20 files changed, 254 insertions, 136 deletions
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm
index 09ca2343e7..37f6baf4c6 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm
@@ -56,8 +56,8 @@ our %config = (
shlib_version_number => "1.1",
sourcedir => ".",
target => "linux-ppc64",
- 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",
@@ -3964,6 +3980,12 @@ our %unified_info = (
"crypto/include",
"include",
],
+ "crypto/conf/conf_ssl.o" =>
+ [
+ ".",
+ "crypto/include",
+ "include",
+ ],
"crypto/cpt_err.o" =>
[
".",
@@ -6296,6 +6318,12 @@ our %unified_info = (
"crypto/include",
"include",
],
+ "crypto/x509/x509_meth.o" =>
+ [
+ ".",
+ "crypto/include",
+ "include",
+ ],
"crypto/x509/x509_obj.o" =>
[
".",
@@ -7283,6 +7311,10 @@ our %unified_info = (
[
"include",
],
+ "test/errtest.o" =>
+ [
+ "include",
+ ],
"test/evp_extra_test.o" =>
[
"include",
@@ -7455,8 +7487,8 @@ our %unified_info = (
],
"test/testutil.o" =>
[
- "crypto/include",
"test",
+ "crypto/include",
"include",
".",
],
@@ -7477,10 +7509,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",
@@ -7636,6 +7681,7 @@ our %unified_info = (
"test/ecdsatest",
"test/ectest",
"test/enginetest",
+ "test/errtest",
"test/evp_extra_test",
"test/evp_test",
"test/exdatatest",
@@ -7676,7 +7722,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" =>
@@ -8058,6 +8107,9 @@ our %unified_info = (
"test/enginetest" =>
[
],
+ "test/errtest" =>
+ [
+ ],
"test/evp_extra_test" =>
[
],
@@ -8178,9 +8230,18 @@ our %unified_info = (
"test/verify_extra_test" =>
[
],
+ "test/versions" =>
+ [
+ ],
"test/wp_test" =>
[
],
+ "test/x509_dup_cert_test" =>
+ [
+ ],
+ "test/x509_time_test" =>
+ [
+ ],
"test/x509aux" =>
[
],
@@ -9189,6 +9250,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",
@@ -10665,6 +10730,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",
@@ -11189,6 +11258,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",
@@ -11558,6 +11628,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",
@@ -12561,6 +12632,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",
@@ -12910,6 +12990,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",
@@ -12918,6 +13006,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/linux-ppc64/asm/crypto/aes/aes-ppc.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aes-ppc.s
index b46c8c82a2..95c8377dc1 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aes-ppc.s
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aes-ppc.s
@@ -8,7 +8,7 @@
mflr 3
addi 3,3,120
mtlr 0
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.space 28
@@ -18,7 +18,7 @@
mflr 3
addi 3,3,2360
mtlr 0
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.space 28
@@ -746,7 +746,7 @@ AES_encrypt:
ld 31,248(1)
mtlr 0
addi 1,1,256
- blr
+ blr
.long 0
.byte 0,12,4,1,0x80,18,3,0
.long 0
@@ -826,7 +826,7 @@ AES_encrypt:
bdnz .Lenc_loop
addi 7,3,2048
- nop
+ nop
lwz 12,0(5)
rlwinm 16,8,8,24,31
lwz 0,4(5)
@@ -891,7 +891,7 @@ AES_encrypt:
xor 9,9,0
xor 10,10,14
xor 11,11,15
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
@@ -1036,7 +1036,7 @@ AES_encrypt:
xor 9,9,0
xor 10,10,14
xor 11,11,15
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.size AES_encrypt,.-.AES_encrypt
@@ -1188,7 +1188,7 @@ AES_decrypt:
ld 31,248(1)
mtlr 0
addi 1,1,256
- blr
+ blr
.long 0
.byte 0,12,4,1,0x80,18,3,0
.long 0
@@ -1268,7 +1268,7 @@ AES_decrypt:
bdnz .Ldec_loop
addi 7,3,2048
- nop
+ nop
lwz 12,0(5)
rlwinm 16,8,8,24,31
lwz 0,4(5)
@@ -1333,7 +1333,7 @@ AES_decrypt:
xor 9,9,0
xor 10,10,14
xor 11,11,15
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
@@ -1530,7 +1530,7 @@ AES_decrypt:
xor 9,9,0
xor 10,10,14
xor 11,11,15
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.size AES_decrypt,.-.AES_decrypt
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aesp8-ppc.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aesp8-ppc.s
index 36fa7e356d..52a195558d 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aesp8-ppc.s
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/aesp8-ppc.s
@@ -14,7 +14,7 @@ rcon:
mflr 6
addi 6,6,-0x48
mtlr 0
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.byte 65,69,83,32,102,111,114,32,80,111,119,101,114,73,83,65,32,50,46,48,55,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
@@ -284,7 +284,7 @@ aes_p8_set_encrypt_key:
.Lenc_key_abort:
mr 3,6
- blr
+ blr
.long 0
.byte 0,12,0x14,1,0,0,3,0
.long 0
@@ -340,7 +340,7 @@ aes_p8_set_decrypt_key:
xor 3,3,3
.Ldec_key_abort:
addi 1,1,64
- blr
+ blr
.long 0
.byte 0,12,4,1,0x80,0,3,0
.long 0
@@ -415,7 +415,7 @@ aes_p8_encrypt:
stvx 0,7,4
mtspr 256,12
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,3,0
.long 0
@@ -490,7 +490,7 @@ aes_p8_decrypt:
stvx 0,7,4
mtspr 256,12
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,3,0
.long 0
@@ -659,7 +659,7 @@ aes_p8_cbc_encrypt:
stvx 2,10,7
mtspr 256,12
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,6,0
.long 0
@@ -949,8 +949,8 @@ _aesp8_cbc_decrypt8x:
addic. 5,5,128
beq .Lcbc_dec8x_done
- nop
- nop
+ nop
+ nop
.Loop_cbc_dec8x_tail:
.long 0x11EFC548
@@ -1038,15 +1038,15 @@ _aesp8_cbc_decrypt8x:
cmplwi 5,32
blt .Lcbc_dec8x_one
- nop
+ nop
beq .Lcbc_dec8x_two
cmplwi 5,64
blt .Lcbc_dec8x_three
- nop
+ nop
beq .Lcbc_dec8x_four
cmplwi 5,96
blt .Lcbc_dec8x_five
- nop
+ nop
beq .Lcbc_dec8x_six
.Lcbc_dec8x_seven:
@@ -1233,7 +1233,7 @@ _aesp8_cbc_decrypt8x:
ld 30,432(1)
ld 31,440(1)
addi 1,1,448
- blr
+ blr
.long 0
.byte 0,12,0x04,0,0x80,6,6,0
.long 0
@@ -1348,7 +1348,7 @@ aes_p8_ctr32_encrypt_blocks:
stvx 2,0,4
mtspr 256,12
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,6,0
.long 0
@@ -1651,15 +1651,15 @@ _aesp8_ctr32_encrypt8x:
.Lctr32_enc8x_break:
cmpwi 5,-0x60
blt .Lctr32_enc8x_one
- nop
+ nop
beq .Lctr32_enc8x_two
cmpwi 5,-0x40
blt .Lctr32_enc8x_three
- nop
+ nop
beq .Lctr32_enc8x_four
cmpwi 5,-0x20
blt .Lctr32_enc8x_five
- nop
+ nop
beq .Lctr32_enc8x_six
cmpwi 5,0x00
blt .Lctr32_enc8x_seven
@@ -1868,7 +1868,7 @@ _aesp8_ctr32_encrypt8x:
ld 30,432(1)
ld 31,440(1)
addi 1,1,448
- blr
+ blr
.long 0
.byte 0,12,0x04,0,0x80,6,6,0
.long 0
@@ -2013,7 +2013,7 @@ aes_p8_xts_encrypt:
.long 0x10620509
- nop
+ nop
.long 0x7C602799
addi 4,4,16
@@ -2086,7 +2086,7 @@ aes_p8_xts_encrypt:
.Lxts_enc_ret:
mtspr 256,12
li 3,0
- blr
+ blr
.long 0
.byte 0,12,0x04,0,0x80,6,6,0
.long 0
@@ -2234,7 +2234,7 @@ aes_p8_xts_decrypt:
.long 0x10620549
- nop
+ nop
.long 0x7C602799
addi 4,4,16
@@ -2299,7 +2299,7 @@ aes_p8_xts_decrypt:
.long 0x10620549
- nop
+ nop
.long 0x7C602799
@@ -2350,7 +2350,7 @@ aes_p8_xts_decrypt:
.Lxts_dec_ret:
mtspr 256,12
li 3,0
- blr
+ blr
.long 0
.byte 0,12,0x04,0,0x80,6,6,0
.long 0
@@ -2682,11 +2682,11 @@ _aesp8_xts_encrypt6x:
beq .Lxts_enc6x_zero
cmpwi 5,0x20
blt .Lxts_enc6x_one
- nop
+ nop
beq .Lxts_enc6x_two
cmpwi 5,0x40
blt .Lxts_enc6x_three
- nop
+ nop
beq .Lxts_enc6x_four
.Lxts_enc6x_five:
@@ -2783,7 +2783,7 @@ _aesp8_xts_encrypt6x:
.align 4
.Lxts_enc6x_one:
vxor 7,5,17
- nop
+ nop
.Loop_xts_enc1x:
.long 0x10E7C508
lvx 24,26,7
@@ -2919,7 +2919,7 @@ _aesp8_xts_encrypt6x:
ld 30,432(1)
ld 31,440(1)
addi 1,1,448
- blr
+ blr
.long 0
.byte 0,12,0x04,1,0x80,6,6,0
.long 0
@@ -3004,7 +3004,7 @@ _aesp8_xts_enc5x:
.long 0x11AD1509
.long 0x11CE1D09
.long 0x11EF2509
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
@@ -3332,11 +3332,11 @@ _aesp8_xts_decrypt6x:
beq .Lxts_dec6x_zero
cmpwi 5,0x20
blt .Lxts_dec6x_one
- nop
+ nop
beq .Lxts_dec6x_two
cmpwi 5,0x40
blt .Lxts_dec6x_three
- nop
+ nop
beq .Lxts_dec6x_four
.Lxts_dec6x_five:
@@ -3437,7 +3437,7 @@ _aesp8_xts_decrypt6x:
.align 4
.Lxts_dec6x_one:
vxor 7,5,17
- nop
+ nop
.Loop_xts_dec1x:
.long 0x10E7C548
lvx 24,26,7
@@ -3607,7 +3607,7 @@ _aesp8_xts_decrypt6x:
ld 30,432(1)
ld 31,440(1)
addi 1,1,448
- blr
+ blr
.long 0
.byte 0,12,0x04,1,0x80,6,6,0
.long 0
@@ -3692,6 +3692,6 @@ _aesp8_xts_dec5x:
.long 0x11CE1D49
.long 0x11EF2549
mtctr 9
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/vpaes-ppc.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/vpaes-ppc.s
index 1168f546f0..c5f074f37f 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/vpaes-ppc.s
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/aes/vpaes-ppc.s
@@ -95,7 +95,7 @@ _vpaes_consts:
mflr 12
addi 12,12,-0x308
mtlr 0
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.byte 86,101,99,116,111,114,32,80,101,114,109,117,116,97,116,105,111,110,32,65,69,83,32,102,111,114,32,65,108,116,105,86,101,99,44,32,77,105,107,101,32,72,97,109,98,117,114,103,32,40,83,116,97,110,102,111,114,100,32,85,110,105,118,101,114,115,105,116,121,41,0
@@ -135,7 +135,7 @@ _vpaes_encrypt_preheat:
lvx 17, 12, 8
lvx 18, 12, 11
lvx 19, 12, 10
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
@@ -223,7 +223,7 @@ _vpaes_encrypt_core:
vxor 4, 4, 5
vxor 0, 0, 4
vperm 0, 0, 7, 1
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
@@ -325,7 +325,7 @@ vpaes_encrypt:
lvx 30,10,1
lvx 31,11,1
addi 1,1,256
- blr
+ blr
.long 0
.byte 0,12,0x04,1,0x80,0,3,0
.long 0
@@ -368,7 +368,7 @@ _vpaes_decrypt_preheat:
lvx 21, 12, 8
lvx 22, 12, 11
lvx 23, 12, 10
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
@@ -463,7 +463,7 @@ _vpaes_decrypt_core:
vxor 4, 4, 5
vxor 0, 1, 4
vperm 0, 0, 7, 2
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
@@ -565,7 +565,7 @@ vpaes_decrypt:
lvx 30,10,1
lvx 31,11,1
addi 1,1,256
- blr
+ blr
.long 0
.byte 0,12,0x04,1,0x80,0,3,0
.long 0
@@ -800,7 +800,7 @@ vpaes_cbc_encrypt:
ld 31,264(1)
mtlr 0
addi 1,1,272
- blr
+ blr
.long 0
.byte 0,12,0x04,1,0x80,2,6,0
.long 0
@@ -855,7 +855,7 @@ _vpaes_key_preheat:
lvx 24, 12, 9
lvx 25, 0, 12
lvx 26, 12, 8
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
@@ -1101,7 +1101,7 @@ _vpaes_schedule_core:
vxor 6, 6, 6
vxor 7, 7, 7
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
@@ -1129,7 +1129,7 @@ _vpaes_schedule_192_smear:
vor 0, 6, 6
vsldoi 6, 6, 9, 8
vsldoi 6, 9, 6, 8
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
@@ -1195,7 +1195,7 @@ _vpaes_schedule_low_round:
vxor 0, 1, 7
vxor 7, 1, 7
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
@@ -1217,7 +1217,7 @@ _vpaes_schedule_transform:
vperm 2, 13, 13, 2
vxor 0, 0, 2
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
@@ -1269,7 +1269,7 @@ _vpaes_schedule_mangle:
vsel 2, 28, 1, 30
vor 28, 1, 1
stvx 2, 0, 5
- blr
+ blr
.align 4
.Lschedule_mangle_dec:
@@ -1320,7 +1320,7 @@ _vpaes_schedule_mangle:
vsel 2, 28, 1, 30
vor 28, 1, 1
stvx 2, 0, 5
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
@@ -1403,7 +1403,7 @@ vpaes_set_encrypt_key:
lvx 30,10,1
lvx 31,11,1
addi 1,1,256
- blr
+ blr
.long 0
.byte 0,12,0x04,1,0x80,0,3,0
.long 0
@@ -1494,7 +1494,7 @@ vpaes_set_decrypt_key:
lvx 30,10,1
lvx 31,11,1
addi 1,1,256
- blr
+ blr
.long 0
.byte 0,12,0x04,1,0x80,0,3,0
.long 0
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/bn-ppc.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/bn-ppc.s
index 0a3a2a76f5..60dd49f863 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/bn-ppc.s
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/bn-ppc.s
@@ -297,7 +297,7 @@ bn_mul_add_words:
std 9,48(3)
std 10,56(3)
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,2,0
.long 0
@@ -726,7 +726,7 @@ bn_mul_add_words:
std 9, 120(3)
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,2,0
.long 0
@@ -881,7 +881,7 @@ bn_mul_add_words:
std 10,48(3)
std 11,56(3)
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,3,0
.long 0
@@ -1421,7 +1421,7 @@ bn_mul_add_words:
adde 10,10,9
std 12,112(3)
std 10,120(3)
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,3,0
.long 0
@@ -1473,7 +1473,7 @@ bn_mul_add_words:
.Lppcasm_sub_adios:
subfze 3,0
andi. 3,3,1
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,4,0
.long 0
@@ -1520,7 +1520,7 @@ bn_mul_add_words:
bdnz .Lppcasm_add_mainloop
.Lppcasm_add_adios:
addze 3,0
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,4,0
.long 0
@@ -1550,7 +1550,7 @@ bn_mul_add_words:
cmpldi 0,5,0
bne .Lppcasm_div1
li 3,-1
- blr
+ blr
.Lppcasm_div1:
xor 0,0,0
li 8,64
@@ -1637,7 +1637,7 @@ bn_mul_add_words:
b .Lppcasm_divouterloop
.Lppcasm_div9:
or 3,8,0
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,3,0
.long 0
@@ -1680,7 +1680,7 @@ bn_mul_add_words:
stdu 8,8(3)
bdnz .Lppcasm_sqr_mainloop
.Lppcasm_sqr_adios:
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,3,0
.long 0
@@ -1787,7 +1787,7 @@ bn_mul_add_words:
.Lppcasm_mw_OVER:
addi 3,12,0
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,4,0
.long 0
@@ -1914,7 +1914,7 @@ bn_mul_add_words:
.Lppcasm_maw_adios:
addi 3,12,0
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,4,0
.long 0
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc-mont.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc-mont.s
index ac8653f240..353c449244 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc-mont.s
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc-mont.s
@@ -187,15 +187,16 @@ bn_mul_mont_int:
li 21,0
mtctr 8
subfe 3,21,3
- and 4,22,3
- andc 6,9,3
- or 4,4,6
.align 4
.Lcopy:
- ldx 12,4,21
- stdx 12,9,21
+ ldx 12,22,21
+ ldx 10,9,21
+ and 12,12,3
+ andc 10,10,3
stdx 21,22,21
+ or 10,10,12
+ stdx 10,9,21
addi 21,21,8
bdnz .Lcopy
@@ -214,7 +215,7 @@ bn_mul_mont_int:
ld 30,-16(12)
ld 31,-8(12)
mr 1,12
- blr
+ blr
.long 0
.byte 0,12,4,0,0x80,12,6,0
.long 0
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s
index 8450d9a939..c8a045698b 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s
@@ -686,16 +686,14 @@ bn_mul_mont_fpu64:
li 12,0
subfe 3,12,3
- and 4,10,3
- andc 6,9,3
- or 4,4,6
- addi 31,4,8
mtctr 11
.align 4
.Lcopy:
- ldx 24,4,12
- ldx 25,31,12
+ ldx 24,10,12
+ ldx 25,28,12
+ ldx 26,9,12
+ ldx 27,30,12
std 12,8(22)
std 12,16(22)
std 12,24(22)
@@ -704,6 +702,12 @@ bn_mul_mont_fpu64:
std 12,48(22)
std 12,56(22)
stdu 12,64(22)
+ and 24,24,3
+ and 25,25,3
+ andc 26,26,3
+ andc 27,27,3
+ or 24,24,26
+ or 25,25,27
stdx 24,9,12
stdx 25,30,12
stdx 12,10,12
@@ -738,7 +742,7 @@ bn_mul_mont_fpu64:
lfd 30,-16(12)
lfd 31,-8(12)
mr 1,12
- blr
+ blr
.long 0
.byte 0,12,4,0,0x8c,13,6,0
.long 0
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h
index 12830ce399..6c21f2f5e7 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h
@@ -26,4 +26,4 @@ static const char cflags[] = {
'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0'
};
#define PLATFORM "platform: linux-ppc64"
-#define DATE "built on: Tue Apr 3 00:38:40 2018"
+#define DATE "built on: Tue Aug 14 23:13:29 2018"
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/chacha/chacha-ppc.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/chacha/chacha-ppc.s
index 93efe4d9b5..b69868c41f 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/chacha/chacha-ppc.s
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/chacha/chacha-ppc.s
@@ -66,7 +66,7 @@ __ChaCha20_ctr32_int:
ld 31,248(1)
mtlr 0
addi 1,1,256
- blr
+ blr
.long 0
.byte 0,12,4,1,0x80,18,5,0
.long 0
@@ -353,7 +353,7 @@ __ChaCha20_1x:
bne .Loop_outer
- blr
+ blr
.align 4
.Ltail:
@@ -404,7 +404,7 @@ __ChaCha20_1x:
stw 1,104(1)
stw 1,108(1)
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
@@ -569,7 +569,7 @@ ChaCha20_ctr32_vmx:
vspltisw 27,7
mtctr 0
- nop
+ nop
.Loop_vmx:
vadduwm 0,0,1
add 16,16,20
@@ -1062,7 +1062,7 @@ ChaCha20_ctr32_vmx:
cmpldi 5,255
bgt .Loop_outer_vmx
- nop
+ nop
.Ldone_vmx:
cmpldi 5,0
@@ -1115,7 +1115,7 @@ ChaCha20_ctr32_vmx:
ld 31,456(1)
mtlr 0
addi 1,1,464
- blr
+ blr
.long 0
.byte 0,12,0x04,1,0x80,18,5,0
.long 0
@@ -1129,7 +1129,7 @@ ChaCha20_ctr32_vmx:
mflr 12
addi 12,12,56
mtlr 0
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.space 28
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/modes/ghashp8-ppc.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/modes/ghashp8-ppc.s
index 5ca8640eda..8294ab9b95 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/modes/ghashp8-ppc.s
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/modes/ghashp8-ppc.s
@@ -129,7 +129,7 @@ gcm_init_p8:
.long 0x7E4A1F99
mtspr 256,12
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,2,0
.long 0
@@ -186,7 +186,7 @@ gcm_gmult_p8:
.long 0x7C001F99
mtspr 256,12
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,2,0
.long 0
@@ -310,7 +310,7 @@ gcm_ghash_p8:
.long 0x7C001F99
mtspr 256,12
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,4,0
.long 0
@@ -577,7 +577,7 @@ gcm_ghash_p8:
lvx 30,10,1
lvx 31,11,1
addi 1,1,256
- blr
+ blr
.long 0
.byte 0,12,0x04,0,0x80,0,4,0
.long 0
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppc.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppc.s
index 0907f4ae20..4006308ab2 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppc.s
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppc.s
@@ -39,7 +39,7 @@ poly1305_init_int:
.Lno_key:
xor 3,3,3
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,2,0
.size poly1305_init_int,.-.poly1305_init_int
@@ -141,7 +141,7 @@ poly1305_blocks:
ld 31,184(1)
addi 1,1,192
.Labort:
- blr
+ blr
.long 0
.byte 0,12,4,1,0x80,5,4,0
.size poly1305_blocks,.-.poly1305_blocks
@@ -189,7 +189,7 @@ poly1305_emit:
li 12,12
stwbrx 8,11,4
stwbrx 7,12,4
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,3,0
.size poly1305_emit,.-.poly1305_emit
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppcfp.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppcfp.s
index a26ff5adba..a5a6dfd505 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppcfp.s
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/poly1305/poly1305-ppcfp.s
@@ -152,7 +152,7 @@ poly1305_init_fpu:
.Lno_key:
xor 3,3,3
addi 1,1,48
- blr
+ blr
.long 0
.byte 0,12,4,1,0x80,0,2,0
.size poly1305_init_fpu,.-.poly1305_init_fpu
@@ -475,7 +475,7 @@ poly1305_blocks_fpu:
lfd 31,232(1)
addi 1,1,240
.Labort:
- blr
+ blr
.long 0
.byte 0,12,4,1,0x80,0,4,0
.size poly1305_blocks_fpu,.-.poly1305_blocks_fpu
@@ -570,7 +570,7 @@ poly1305_emit_fpu:
ld 30,64(1)
ld 31,72(1)
addi 1,1,80
- blr
+ blr
.long 0
.byte 0,12,4,1,0x80,4,3,0
.size poly1305_emit_fpu,.-.poly1305_emit_fpu
@@ -582,7 +582,7 @@ poly1305_emit_fpu:
mflr 5
addi 5,5,56
mtlr 0
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.space 28
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/ppccpuid.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/ppccpuid.s
index adc9731bb6..55fa667f64 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/ppccpuid.s
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/ppccpuid.s
@@ -12,7 +12,7 @@ OPENSSL_fpu_probe:
.align 4
.OPENSSL_fpu_probe:
fmr 0,0
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.size OPENSSL_fpu_probe,.-.OPENSSL_fpu_probe
@@ -29,7 +29,7 @@ OPENSSL_ppc64_probe:
.OPENSSL_ppc64_probe:
fcfid 1,1
rldicl 0,0,32,32
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.size OPENSSL_ppc64_probe,.-.OPENSSL_ppc64_probe
@@ -46,7 +46,7 @@ OPENSSL_altivec_probe:
.align 4
.OPENSSL_altivec_probe:
.long 0x10000484
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.size OPENSSL_altivec_probe,.-.OPENSSL_altivec_probe
@@ -64,7 +64,7 @@ OPENSSL_crypto207_probe:
.OPENSSL_crypto207_probe:
.long 0x7C000E99
.long 0x10000508
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.size OPENSSL_crypto207_probe,.-.OPENSSL_crypto207_probe
@@ -83,7 +83,7 @@ OPENSSL_madd300_probe:
xor 0,0,0
.long 0x10600033
.long 0x10600031
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
@@ -122,7 +122,7 @@ OPENSSL_wipe_cpu:
xor 12,12,12
fmr 12,31
fmr 13,31
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.size OPENSSL_wipe_cpu,.-.OPENSSL_wipe_cpu
@@ -143,7 +143,7 @@ OPENSSL_atomic_add:
stwcx. 0,0,3
bne- .Ladd
extsw 3,0
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,2,0
.long 0
@@ -161,7 +161,7 @@ OPENSSL_rdtsc:
.align 4
.OPENSSL_rdtsc:
mftb 3
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.size OPENSSL_rdtsc,.-.OPENSSL_rdtsc
@@ -186,7 +186,7 @@ OPENSSL_cleanse:
stb 0,0(3)
addi 3,3,1
bdnz $-8
- blr
+ blr
.Lot: andi. 5,3,3
beq .Laligned
stb 0,0(3)
@@ -201,7 +201,7 @@ OPENSSL_cleanse:
bdnz $-8
andi. 4,4,3
bne .Little
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,2,0
.long 0
@@ -235,7 +235,7 @@ CRYPTO_memcmp:
li 3,0
sub 3,3,0
extrwi 3,3,1,0
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,3,0
.long 0
@@ -274,7 +274,7 @@ OPENSSL_instrument_bus:
bdnz .Loop
mr 3,4
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,2,0
.long 0
@@ -334,7 +334,7 @@ OPENSSL_instrument_bus2:
.Ldone2:
srwi 4,4,2
sub 3,0,4
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,3,0
.long 0
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha1-ppc.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha1-ppc.s
index aa47944d37..e332225e3b 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha1-ppc.s
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha1-ppc.s
@@ -107,7 +107,7 @@ sha1_block_data_order:
ld 31,248(1)
mtlr 0
addi 1,1,256
- blr
+ blr
.long 0
.byte 0,12,4,1,0x80,18,3,0
.long 0
@@ -1115,7 +1115,7 @@ sha1_block_data_order:
mr 11,20
addi 4,4,64
bdnz .Lsha1_block_private
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.size sha1_block_data_order,.-.sha1_block_data_order
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256-ppc.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256-ppc.s
index 8bc52879f4..8a55a49ed3 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256-ppc.s
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256-ppc.s
@@ -127,7 +127,7 @@ sha256_block_ppc:
ld 31,312(1)
mtlr 0
addi 1,1,320
- blr
+ blr
.long 0
.byte 0,12,4,1,0x80,18,3,0
.long 0
@@ -1293,7 +1293,7 @@ sha256_block_ppc:
cmpld 31,5
stw 15,28(3)
bne .Lsha2_block_private
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.size sha256_block_ppc,.-.sha256_block_ppc
@@ -1305,7 +1305,7 @@ sha256_block_ppc:
mflr 7
addi 7,7,56
mtlr 0
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.space 28
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256p8-ppc.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256p8-ppc.s
index cfa6282d6d..23db0265f5 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256p8-ppc.s
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha256p8-ppc.s
@@ -779,7 +779,7 @@ sha256_block_p8:
ld 30,432(1)
ld 31,440(1)
addi 1,1,448
- blr
+ blr
.long 0
.byte 0,12,4,1,0x80,6,3,0
.long 0
@@ -792,7 +792,7 @@ sha256_block_p8:
mflr 6
addi 6,6,56
mtlr 0
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.space 28
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512-ppc.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512-ppc.s
index 9c699a4f32..775b64d0fb 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512-ppc.s
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512-ppc.s
@@ -127,7 +127,7 @@ sha512_block_ppc:
ld 31,376(1)
mtlr 0
addi 1,1,384
- blr
+ blr
.long 0
.byte 0,12,4,1,0x80,18,3,0
.long 0
@@ -1325,7 +1325,7 @@ sha512_block_ppc:
cmpld 31,5
std 15,56(3)
bne .Lsha2_block_private
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.size sha512_block_ppc,.-.sha512_block_ppc
@@ -1337,7 +1337,7 @@ sha512_block_ppc:
mflr 7
addi 7,7,56
mtlr 0
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.space 28
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512p8-ppc.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512p8-ppc.s
index 03c09abfe1..6526b53ff0 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512p8-ppc.s
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/sha/sha512p8-ppc.s
@@ -780,7 +780,7 @@ sha512_block_p8:
ld 30,432(1)
ld 31,440(1)
addi 1,1,448
- blr
+ blr
.long 0
.byte 0,12,4,1,0x80,6,3,0
.long 0
@@ -793,7 +793,7 @@ sha512_block_p8:
mflr 6
addi 6,6,56
mtlr 0
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
.space 28
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h
index 3976dadb19..8bd973e750 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-ppc64/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/linux-ppc64/asm/openssl.gypi b/deps/openssl/config/archs/linux-ppc64/asm/openssl.gypi
index b99768aed0..840000dcbe 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/openssl.gypi
+++ b/deps/openssl/config/archs/linux-ppc64/asm/openssl.gypi
@@ -217,6 +217,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',
@@ -577,6 +578,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',