Roll chromium_revision 52f78b1683..bfb0b77f2c (561464:562200)

Change log: 52f78b1683..bfb0b77f2c
Full diff: 52f78b1683..bfb0b77f2c

Roll chromium third_party 008fb7071c..0d2b36d3cf
Change log: 008fb7071c..0d2b36d3cf

Changed dependencies:
* src/base: 40343e3fbc..52cd03ae2f
* src/build: bd04ef7233..39cffdabab
* src/buildtools: 94288c26d2..893eb86b02
* src/ios: de97874e25..862c941a16
* src/testing: b4c21a01c2..8133f73370
* src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/69271b5d4f..5601bdac1a
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/1986f5a957..0043a4a254
* src/third_party/depot_tools: 4e9b50ab86..f16fdf3165
* src/third_party/libvpx/source/libvpx: e27a331778..36825590ba
* src/tools: c923d1173c..99de29398b
* src/tools/swarming_client: 833f5ebf89..3543e21830
DEPS diff: 52f78b1683..bfb0b77f2c/DEPS

No update to Clang.

TBR=buildbot@webrtc.org,marpan@webrtc.org,
BUG=None
CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal
NO_AUTOIMPORT_DEPS_CHECK=true

Change-Id: I4baa7a38623823759606c90813a4bf535245f390
Reviewed-on: https://webrtc-review.googlesource.com/79191
Reviewed-by: WebRTC Buildbot <buildbot@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23405}
This commit is contained in:
Autoroller 2018-05-28 00:43:41 -07:00 committed by Commit Bot
parent 0c2e8ce212
commit 123ab64bc5
23 changed files with 1002 additions and 894 deletions

26
DEPS
View File

@ -10,16 +10,16 @@ vars = {
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'webrtc_git': 'https://webrtc.googlesource.com',
'chromium_revision': '52f78b1683a099f282aa06aea703d5e2c5ee59c0',
'chromium_revision': 'bfb0b77f2cf970397d9ed0a4344d838b6adfa091',
'boringssl_git': 'https://boringssl.googlesource.com',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
# and whatever else without interference from each other.
'swarming_revision': '833f5ebf894be1e3e6d13678d5de8479bf12ff28',
'swarming_revision': '3543e21830b9549e5b70c8c49482c8c28da2ba94',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other.
'boringssl_revision': '69271b5d4fed328eb61b86b013937ce22549fee5',
'boringssl_revision': '5601bdac1ae594169e56515fe34956ec89bbffbf',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling lss
# and whatever else without interference from each other.
@ -27,7 +27,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other.
'catapult_revision': '1986f5a957da5e610ede36e73263e361b672e7a9',
'catapult_revision': '0043a4a254625989ff29785bda17ec83b5bde51a',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling libFuzzer
# and whatever else without interference from each other.
@ -43,17 +43,17 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Chromium third_party
# and whatever else without interference from each other.
'chromium_third_party_revision': '008fb7071ceda627d6917b925776a7a411b660ec',
'chromium_third_party_revision': '0d2b36d3cf2d5f64ceb0b309946fc2d8262c90a9',
}
deps = {
# TODO(kjellander): Move this to be Android-only once the libevent dependency
# in base/third_party/libevent is solved.
'src/base':
Var('chromium_git') + '/chromium/src/base' + '@' + '40343e3fbc1e4835145f125adedcf15a2eb4542f',
Var('chromium_git') + '/chromium/src/base' + '@' + '52cd03ae2f1b08b99564e403bc6ff8008ad7fb35',
'src/build':
Var('chromium_git') + '/chromium/src/build' + '@' + 'bd04ef72331a12d57056e95fd13d186739893d37',
Var('chromium_git') + '/chromium/src/build' + '@' + '39cffdabab587544c4bb01f3618ea3f7ae65a889',
'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '94288c26d2ffe3aec9848c147839afee597acefd',
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '893eb86b02b2571894e328f05551112b96df1cce',
# Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC.
'src/examples/androidtests/third_party/gradle': {
'url': Var('chromium_git') + '/external/github.com/gradle/gradle.git' + '@' +
@ -61,11 +61,11 @@ deps = {
'condition': 'checkout_android',
},
'src/ios': {
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'de97874e2535ead371aa55350919daddd16ca1b2',
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '862c941a16f2cdaa961cf60a986c164e20d089c2',
'condition': 'checkout_ios',
},
'src/testing':
Var('chromium_git') + '/chromium/src/testing' + '@' + 'b4c21a01c2e3d2a21deb39a13b75927cc9cd52e3',
Var('chromium_git') + '/chromium/src/testing' + '@' + '8133f733704e0a584555e608e7f1244960a8c581',
# This entry is used for chromium third_party rolling into webrtc third_party only.
'src/third_party_chromium': {
'url': Var('chromium_git') + '/chromium/src/third_party' + '@' + Var('chromium_third_party_revision'),
@ -94,7 +94,7 @@ deps = {
'src/third_party/colorama/src':
Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
'src/third_party/depot_tools':
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '4e9b50ab86b9b9f8ebf0b9ba6bd4954217ebeff9',
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'f16fdf3165b8b86d10386d18a6b6075169c10e15',
'src/third_party/errorprone/lib': {
'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '980d49e839aa4984015efed34b0134d4b2c9b6d7',
'condition': 'checkout_android',
@ -135,7 +135,7 @@ deps = {
'src/third_party/libsrtp':
Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + 'fc2345089a6b3c5aca9ecd2e1941871a78a13e9c',
'src/third_party/libvpx/source/libvpx':
Var('chromium_git') + '/webm/libvpx.git' + '@' + 'e27a331778c4c99ec37262ea786a3b4cc2a491ac',
Var('chromium_git') + '/webm/libvpx.git' + '@' + '36825590ba676d54765c6c31482cacb4fe661b43',
'src/third_party/libyuv':
Var('chromium_git') + '/libyuv/libyuv.git' + '@' + 'a9626b9daf62a9b260737e9c2de821ad087b19a1',
'src/third_party/lss': {
@ -175,7 +175,7 @@ deps = {
'src/third_party/yasm/source/patched-yasm':
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'b98114e18d8b9b84586b10d24353ab8616d4c5fc',
'src/tools':
Var('chromium_git') + '/chromium/src/tools' + '@' + 'c923d1173c6773018f6e68dfe64542e8c10780f2',
Var('chromium_git') + '/chromium/src/tools' + '@' + '99de29398b546c057accc23fd794820dfc982ddd',
'src/tools/gyp':
Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
'src/tools/swarming_client':

View File

@ -168,6 +168,7 @@ crypto_sources = [
"src/crypto/refcount_c11.c",
"src/crypto/refcount_lock.c",
"src/crypto/rsa_extra/rsa_asn1.c",
"src/crypto/rsa_extra/rsa_print.c",
"src/crypto/stack/stack.c",
"src/crypto/thread.c",
"src/crypto/thread_none.c",
@ -249,6 +250,7 @@ crypto_sources = [
"src/crypto/x509v3/v3_int.c",
"src/crypto/x509v3/v3_lib.c",
"src/crypto/x509v3/v3_ncons.c",
"src/crypto/x509v3/v3_ocsp.c",
"src/crypto/x509v3/v3_pci.c",
"src/crypto/x509v3/v3_pcia.c",
"src/crypto/x509v3/v3_pcons.c",
@ -553,6 +555,7 @@ fuzzers = [
"client",
"dtls_client",
"dtls_server",
"pkcs12",
"pkcs8",
"privkey",
"read_pem",

File diff suppressed because one or more lines are too long

View File

@ -82,46 +82,47 @@ const uint32_t kOpenSSLReasonValues[] = {
0x10348efe,
0x10350c60,
0x103595a9,
0x103615be,
0x103695d1,
0x103715f0,
0x10379609,
0x1038161e,
0x1038963c,
0x1039164b,
0x10399667,
0x103a1682,
0x103a9691,
0x103b16ad,
0x103b96c8,
0x103c16ee,
0x103615d3,
0x103695e6,
0x10371605,
0x1037961e,
0x10381633,
0x10389651,
0x10391660,
0x1039967c,
0x103a1697,
0x103a96a6,
0x103b16c2,
0x103b96dd,
0x103c1703,
0x103c80ea,
0x103d16ff,
0x103d9713,
0x103e1732,
0x103e9741,
0x103f1758,
0x103f976b,
0x103d1714,
0x103d9728,
0x103e1747,
0x103e9756,
0x103f176d,
0x103f9780,
0x10400c24,
0x1040977e,
0x1041179c,
0x104197af,
0x104217c9,
0x104297d9,
0x104317ed,
0x10439803,
0x1044181b,
0x10449830,
0x10451844,
0x10459856,
0x10409793,
0x104117b1,
0x104197c4,
0x104217de,
0x104297ee,
0x10431802,
0x10439818,
0x10441830,
0x10449845,
0x10451859,
0x1045986b,
0x104605fd,
0x1046894f,
0x1047186b,
0x10479882,
0x10481897,
0x104898a5,
0x10471880,
0x10479897,
0x104818ac,
0x104898ba,
0x10490e60,
0x104996df,
0x104996f4,
0x104a15be,
0x14320c07,
0x14328c15,
0x14330c24,
@ -186,43 +187,43 @@ const uint32_t kOpenSSLReasonValues[] = {
0x28340c60,
0x283480ac,
0x283500ea,
0x2c322d61,
0x2c322d76,
0x2c3292a7,
0x2c332d6f,
0x2c33ad81,
0x2c342d95,
0x2c34ada7,
0x2c352dc2,
0x2c35add4,
0x2c362de7,
0x2c332d84,
0x2c33ad96,
0x2c342daa,
0x2c34adbc,
0x2c352dd7,
0x2c35ade9,
0x2c362dfc,
0x2c36832d,
0x2c372df4,
0x2c37ae06,
0x2c382e2b,
0x2c38ae42,
0x2c392e50,
0x2c39ae60,
0x2c3a2e72,
0x2c3aae86,
0x2c3b2e97,
0x2c3baeb6,
0x2c372e09,
0x2c37ae1b,
0x2c382e40,
0x2c38ae57,
0x2c392e65,
0x2c39ae75,
0x2c3a2e87,
0x2c3aae9b,
0x2c3b2eac,
0x2c3baecb,
0x2c3c12b9,
0x2c3c92cf,
0x2c3d2eca,
0x2c3d2edf,
0x2c3d92e8,
0x2c3e2ee7,
0x2c3eaef5,
0x2c3f2f0d,
0x2c3faf25,
0x2c402f32,
0x2c3e2efc,
0x2c3eaf0a,
0x2c3f2f22,
0x2c3faf3a,
0x2c402f47,
0x2c4091ba,
0x2c412f43,
0x2c41af56,
0x2c412f58,
0x2c41af6b,
0x2c421180,
0x2c42af67,
0x2c42af7c,
0x2c430722,
0x2c43aea8,
0x2c442e19,
0x2c43aebd,
0x2c442e2e,
0x30320000,
0x30328015,
0x3033001f,
@ -357,228 +358,228 @@ const uint32_t kOpenSSLReasonValues[] = {
0x3c418d54,
0x3c420e60,
0x3c428dea,
0x403218fe,
0x40329914,
0x40331942,
0x4033994c,
0x40341963,
0x40349981,
0x40351991,
0x403599a3,
0x403619b0,
0x403699bc,
0x403719d1,
0x403799e3,
0x403819ee,
0x40389a00,
0x40321913,
0x40329929,
0x40331957,
0x40339961,
0x40341978,
0x40349996,
0x403519a6,
0x403599b8,
0x403619c5,
0x403699d1,
0x403719e6,
0x403799f8,
0x40381a03,
0x40389a15,
0x40390efe,
0x40399a10,
0x403a1a23,
0x403a9a44,
0x403b1a55,
0x403b9a65,
0x40399a25,
0x403a1a38,
0x403a9a59,
0x403b1a6a,
0x403b9a7a,
0x403c0064,
0x403c8083,
0x403d1ae9,
0x403d9aff,
0x403e1b0e,
0x403e9b46,
0x403f1b60,
0x403f9b6e,
0x40401b83,
0x40409b97,
0x40411bb4,
0x40419bcf,
0x40421be8,
0x40429bfb,
0x40431c0f,
0x40439c27,
0x40441c3e,
0x403d1afe,
0x403d9b14,
0x403e1b23,
0x403e9b5b,
0x403f1b75,
0x403f9b83,
0x40401b98,
0x40409bac,
0x40411bc9,
0x40419be4,
0x40421bfd,
0x40429c10,
0x40431c24,
0x40439c3c,
0x40441c53,
0x404480ac,
0x40451c53,
0x40459c65,
0x40461c89,
0x40469ca9,
0x40471cb7,
0x40479cde,
0x40481d31,
0x40489d64,
0x40491d7b,
0x40499d95,
0x404a1dac,
0x404a9dca,
0x404b1de2,
0x404b9df9,
0x404c1e0f,
0x404c9e21,
0x404d1e42,
0x404d9e7b,
0x404e1e8f,
0x404e9e9c,
0x404f1ec9,
0x404f9ef2,
0x40501f2d,
0x40509f41,
0x40511f5c,
0x40521f6c,
0x40529f90,
0x40531fa8,
0x40539fbb,
0x40541fd0,
0x40549ff3,
0x40552001,
0x4055a03e,
0x4056204b,
0x4056a064,
0x4057207c,
0x4057a08f,
0x405820a4,
0x4058a0cb,
0x405920fa,
0x4059a127,
0x405a213b,
0x405aa14b,
0x405b2163,
0x405ba174,
0x405c2187,
0x405ca1c6,
0x405d21d3,
0x405da1f8,
0x405e2236,
0x40451c68,
0x40459c7a,
0x40461c9e,
0x40469cbe,
0x40471ccc,
0x40479cf3,
0x40481d46,
0x40489d79,
0x40491d90,
0x40499daa,
0x404a1dc1,
0x404a9ddf,
0x404b1df7,
0x404b9e0e,
0x404c1e24,
0x404c9e36,
0x404d1e57,
0x404d9e90,
0x404e1ea4,
0x404e9eb1,
0x404f1ede,
0x404f9f07,
0x40501f42,
0x40509f56,
0x40511f71,
0x40521f81,
0x40529fa5,
0x40531fbd,
0x40539fd0,
0x40541fe5,
0x4054a008,
0x40552016,
0x4055a053,
0x40562060,
0x4056a079,
0x40572091,
0x4057a0a4,
0x405820b9,
0x4058a0e0,
0x4059210f,
0x4059a13c,
0x405a2150,
0x405aa160,
0x405b2178,
0x405ba189,
0x405c219c,
0x405ca1db,
0x405d21e8,
0x405da20d,
0x405e224b,
0x405e8ab3,
0x405f2257,
0x405fa264,
0x40602272,
0x4060a294,
0x406122f5,
0x4061a32d,
0x40622344,
0x4062a355,
0x40632366,
0x4063a37b,
0x40642392,
0x4064a3be,
0x406523d9,
0x4065a3f0,
0x40662408,
0x4066a432,
0x4067245d,
0x4067a4a2,
0x406824ea,
0x4068a50b,
0x4069253d,
0x4069a56b,
0x406a258c,
0x406aa5ac,
0x406b2734,
0x406ba757,
0x406c276d,
0x406ca9e8,
0x406d2a17,
0x406daa3f,
0x406e2a6d,
0x406eaaba,
0x406f2ad9,
0x406fab11,
0x40702b24,
0x4070ab41,
0x405f226c,
0x405fa279,
0x40602287,
0x4060a2a9,
0x4061230a,
0x4061a342,
0x40622359,
0x4062a36a,
0x4063237b,
0x4063a390,
0x406423a7,
0x4064a3d3,
0x406523ee,
0x4065a405,
0x4066241d,
0x4066a447,
0x40672472,
0x4067a4b7,
0x406824ff,
0x4068a520,
0x40692552,
0x4069a580,
0x406a25a1,
0x406aa5c1,
0x406b2749,
0x406ba76c,
0x406c2782,
0x406ca9fd,
0x406d2a2c,
0x406daa54,
0x406e2a82,
0x406eaacf,
0x406f2aee,
0x406fab26,
0x40702b39,
0x4070ab56,
0x40710802,
0x4071ab53,
0x40722b66,
0x4072ab7f,
0x40732b97,
0x4071ab68,
0x40722b7b,
0x4072ab94,
0x40732bac,
0x407394b9,
0x40742bab,
0x4074abc5,
0x40752bd6,
0x4075abea,
0x40762bf8,
0x40742bc0,
0x4074abda,
0x40752beb,
0x4075abff,
0x40762c0d,
0x4076927d,
0x40772c1d,
0x4077ac3f,
0x40782c5a,
0x4078ac93,
0x40792caa,
0x4079acc0,
0x407a2ccc,
0x407aacdf,
0x407b2cf4,
0x407bad06,
0x407c2d37,
0x407cad40,
0x407d2526,
0x407d9f02,
0x407e2c6f,
0x407ea0db,
0x407f1ccb,
0x407f9a8b,
0x40801ed9,
0x40809cf3,
0x40811f7e,
0x40819eb3,
0x40822a58,
0x40829a71,
0x408320b6,
0x4083a3a3,
0x40841d07,
0x4084a113,
0x40852198,
0x4085a2bc,
0x40862218,
0x40869f1c,
0x40872a9e,
0x4087a30a,
0x40881ad2,
0x4088a4b5,
0x40891b21,
0x40899aae,
0x408a278d,
0x408a98bc,
0x408b2d1b,
0x408baaee,
0x408c21a8,
0x408c98d8,
0x408d1d4a,
0x408d9d1b,
0x408e1e64,
0x408ea01e,
0x408f24c9,
0x408fa2d8,
0x4090247e,
0x4090a1ea,
0x41f4265f,
0x41f926f1,
0x41fe25e4,
0x41fea7d9,
0x41ff28ca,
0x42032678,
0x4208269a,
0x4208a6d6,
0x420925c8,
0x4209a710,
0x420a261f,
0x420aa5ff,
0x420b263f,
0x420ba6b8,
0x420c28e6,
0x420ca7a6,
0x420d27c0,
0x420da7f7,
0x42122811,
0x421728ad,
0x4217a853,
0x421c2875,
0x421f2830,
0x422128fd,
0x42262890,
0x422b29cc,
0x422ba97a,
0x422c29b4,
0x422ca939,
0x422d2918,
0x422da999,
0x422e295f,
0x422eaa85,
0x40772c32,
0x4077ac54,
0x40782c6f,
0x4078aca8,
0x40792cbf,
0x4079acd5,
0x407a2ce1,
0x407aacf4,
0x407b2d09,
0x407bad1b,
0x407c2d4c,
0x407cad55,
0x407d253b,
0x407d9f17,
0x407e2c84,
0x407ea0f0,
0x407f1ce0,
0x407f9aa0,
0x40801eee,
0x40809d08,
0x40811f93,
0x40819ec8,
0x40822a6d,
0x40829a86,
0x408320cb,
0x4083a3b8,
0x40841d1c,
0x4084a128,
0x408521ad,
0x4085a2d1,
0x4086222d,
0x40869f31,
0x40872ab3,
0x4087a31f,
0x40881ae7,
0x4088a4ca,
0x40891b36,
0x40899ac3,
0x408a27a2,
0x408a98d1,
0x408b2d30,
0x408bab03,
0x408c21bd,
0x408c98ed,
0x408d1d5f,
0x408d9d30,
0x408e1e79,
0x408ea033,
0x408f24de,
0x408fa2ed,
0x40902493,
0x4090a1ff,
0x41f42674,
0x41f92706,
0x41fe25f9,
0x41fea7ee,
0x41ff28df,
0x4203268d,
0x420826af,
0x4208a6eb,
0x420925dd,
0x4209a725,
0x420a2634,
0x420aa614,
0x420b2654,
0x420ba6cd,
0x420c28fb,
0x420ca7bb,
0x420d27d5,
0x420da80c,
0x42122826,
0x421728c2,
0x4217a868,
0x421c288a,
0x421f2845,
0x42212912,
0x422628a5,
0x422b29e1,
0x422ba98f,
0x422c29c9,
0x422ca94e,
0x422d292d,
0x422da9ae,
0x422e2974,
0x422eaa9a,
0x4432072d,
0x4432873c,
0x44330748,
@ -633,69 +634,69 @@ const uint32_t kOpenSSLReasonValues[] = {
0x4c411516,
0x4c419399,
0x4c421502,
0x50322f79,
0x5032af88,
0x50332f93,
0x5033afa3,
0x50342fbc,
0x5034afd6,
0x50352fe4,
0x5035affa,
0x5036300c,
0x5036b022,
0x5037303b,
0x5037b04e,
0x50383066,
0x5038b077,
0x5039308c,
0x5039b0a0,
0x503a30c0,
0x503ab0d6,
0x503b30ee,
0x503bb100,
0x503c311c,
0x503cb133,
0x503d314c,
0x503db162,
0x503e316f,
0x503eb185,
0x503f3197,
0x50322f8e,
0x5032af9d,
0x50332fa8,
0x5033afb8,
0x50342fd1,
0x5034afeb,
0x50352ff9,
0x5035b00f,
0x50363021,
0x5036b037,
0x50373050,
0x5037b063,
0x5038307b,
0x5038b08c,
0x503930a1,
0x5039b0b5,
0x503a30d5,
0x503ab0eb,
0x503b3103,
0x503bb115,
0x503c3131,
0x503cb148,
0x503d3161,
0x503db177,
0x503e3184,
0x503eb19a,
0x503f31ac,
0x503f837b,
0x504031aa,
0x5040b1ba,
0x504131d4,
0x5041b1e3,
0x504231fd,
0x5042b21a,
0x5043322a,
0x5043b23a,
0x50443249,
0x504031bf,
0x5040b1cf,
0x504131e9,
0x5041b1f8,
0x50423212,
0x5042b22f,
0x5043323f,
0x5043b24f,
0x5044325e,
0x50448431,
0x5045325d,
0x5045b27b,
0x5046328e,
0x5046b2a4,
0x504732b6,
0x5047b2cb,
0x504832f1,
0x5048b2ff,
0x50493312,
0x5049b327,
0x504a333d,
0x504ab34d,
0x504b336d,
0x504bb380,
0x504c33a3,
0x504cb3d1,
0x504d33e3,
0x504db400,
0x504e341b,
0x504eb437,
0x504f3449,
0x504fb460,
0x5050346f,
0x50453272,
0x5045b290,
0x504632a3,
0x5046b2b9,
0x504732cb,
0x5047b2e0,
0x50483306,
0x5048b314,
0x50493327,
0x5049b33c,
0x504a3352,
0x504ab362,
0x504b3382,
0x504bb395,
0x504c33b8,
0x504cb3e6,
0x504d33f8,
0x504db415,
0x504e3430,
0x504eb44c,
0x504f345e,
0x504fb475,
0x50503484,
0x505086f1,
0x50513482,
0x50513497,
0x58320f3c,
0x68320efe,
0x68328c6c,
@ -1028,6 +1029,7 @@ const char kOpenSSLReasonStringData[] =
"BAD_PAD_BYTE_COUNT\0"
"BAD_RSA_PARAMETERS\0"
"BLOCK_TYPE_IS_NOT_01\0"
"BLOCK_TYPE_IS_NOT_02\0"
"BN_NOT_INITIALIZED\0"
"CANNOT_RECOVER_MULTI_PRIME_KEY\0"
"CRT_PARAMS_ALREADY_GIVEN\0"

View File

@ -164,17 +164,17 @@ AES_Te:
.word 0x1B000000, 0x36000000, 0, 0, 0, 0, 0, 0
@ void asm_AES_encrypt(const unsigned char *in, unsigned char *out,
@ const AES_KEY *key) {
.globl _asm_AES_encrypt
.private_extern _asm_AES_encrypt
@ void aes_nohw_encrypt(const unsigned char *in, unsigned char *out,
@ const AES_KEY *key) {
.globl _aes_nohw_encrypt
.private_extern _aes_nohw_encrypt
#ifdef __thumb2__
.thumb_func _asm_AES_encrypt
.thumb_func _aes_nohw_encrypt
#endif
.align 5
_asm_AES_encrypt:
_aes_nohw_encrypt:
#ifndef __thumb2__
sub r3,pc,#8 @ _asm_AES_encrypt
sub r3,pc,#8 @ _aes_nohw_encrypt
#else
adr r3,.
#endif
@ -182,7 +182,7 @@ _asm_AES_encrypt:
#if defined(__thumb2__) || defined(__APPLE__)
adr r10,AES_Te
#else
sub r10,r3,#_asm_AES_encrypt-AES_Te @ Te
sub r10,r3,#_aes_nohw_encrypt-AES_Te @ Te
#endif
mov r12,r0 @ inp
mov r11,r2
@ -420,16 +420,16 @@ Lenc_loop:
ldr pc,[sp],#4 @ pop and return
.globl _asm_AES_set_encrypt_key
.private_extern _asm_AES_set_encrypt_key
.globl _aes_nohw_set_encrypt_key
.private_extern _aes_nohw_set_encrypt_key
#ifdef __thumb2__
.thumb_func _asm_AES_set_encrypt_key
.thumb_func _aes_nohw_set_encrypt_key
#endif
.align 5
_asm_AES_set_encrypt_key:
_aes_nohw_set_encrypt_key:
_armv4_AES_set_encrypt_key:
#ifndef __thumb2__
sub r3,pc,#8 @ _asm_AES_set_encrypt_key
sub r3,pc,#8 @ _aes_nohw_set_encrypt_key
#else
adr r3,.
#endif
@ -729,20 +729,20 @@ Labrt:
#endif
.globl _asm_AES_set_decrypt_key
.private_extern _asm_AES_set_decrypt_key
.globl _aes_nohw_set_decrypt_key
.private_extern _aes_nohw_set_decrypt_key
#ifdef __thumb2__
.thumb_func _asm_AES_set_decrypt_key
.thumb_func _aes_nohw_set_decrypt_key
#endif
.align 5
_asm_AES_set_decrypt_key:
_aes_nohw_set_decrypt_key:
str lr,[sp,#-4]! @ push lr
bl _armv4_AES_set_encrypt_key
teq r0,#0
ldr lr,[sp],#4 @ pop lr
bne Labrt
mov r0,r2 @ _asm_AES_set_encrypt_key preserves r2,
mov r0,r2 @ _aes_nohw_set_encrypt_key preserves r2,
mov r1,r2 @ which is AES_KEY *key
b _armv4_AES_set_enc2dec_key
@ -949,17 +949,17 @@ AES_Td:
.byte 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d
@ void asm_AES_decrypt(const unsigned char *in, unsigned char *out,
@ const AES_KEY *key) {
.globl _asm_AES_decrypt
.private_extern _asm_AES_decrypt
@ void aes_nohw_decrypt(const unsigned char *in, unsigned char *out,
@ const AES_KEY *key) {
.globl _aes_nohw_decrypt
.private_extern _aes_nohw_decrypt
#ifdef __thumb2__
.thumb_func _asm_AES_decrypt
.thumb_func _aes_nohw_decrypt
#endif
.align 5
_asm_AES_decrypt:
_aes_nohw_decrypt:
#ifndef __thumb2__
sub r3,pc,#8 @ _asm_AES_decrypt
sub r3,pc,#8 @ _aes_nohw_decrypt
#else
adr r3,.
#endif
@ -967,7 +967,7 @@ _asm_AES_decrypt:
#if defined(__thumb2__) || defined(__APPLE__)
adr r10,AES_Td
#else
sub r10,r3,#_asm_AES_decrypt-AES_Td @ Td
sub r10,r3,#_aes_nohw_decrypt-AES_Td @ Td
#endif
mov r12,r0 @ inp
mov r11,r2

View File

@ -165,15 +165,15 @@ AES_Te:
.word 0x1B000000, 0x36000000, 0, 0, 0, 0, 0, 0
.size AES_Te,.-AES_Te
@ void asm_AES_encrypt(const unsigned char *in, unsigned char *out,
@ const AES_KEY *key) {
.globl asm_AES_encrypt
.hidden asm_AES_encrypt
.type asm_AES_encrypt,%function
@ void aes_nohw_encrypt(const unsigned char *in, unsigned char *out,
@ const AES_KEY *key) {
.globl aes_nohw_encrypt
.hidden aes_nohw_encrypt
.type aes_nohw_encrypt,%function
.align 5
asm_AES_encrypt:
aes_nohw_encrypt:
#ifndef __thumb2__
sub r3,pc,#8 @ asm_AES_encrypt
sub r3,pc,#8 @ aes_nohw_encrypt
#else
adr r3,.
#endif
@ -181,7 +181,7 @@ asm_AES_encrypt:
#if defined(__thumb2__) || defined(__APPLE__)
adr r10,AES_Te
#else
sub r10,r3,#asm_AES_encrypt-AES_Te @ Te
sub r10,r3,#aes_nohw_encrypt-AES_Te @ Te
#endif
mov r12,r0 @ inp
mov r11,r2
@ -278,7 +278,7 @@ asm_AES_encrypt:
moveq pc,lr @ be binary compatible with V4, yet
.word 0xe12fff1e @ interoperable with Thumb ISA:-)
#endif
.size asm_AES_encrypt,.-asm_AES_encrypt
.size aes_nohw_encrypt,.-aes_nohw_encrypt
.type _armv4_AES_encrypt,%function
.align 2
@ -417,14 +417,14 @@ _armv4_AES_encrypt:
ldr pc,[sp],#4 @ pop and return
.size _armv4_AES_encrypt,.-_armv4_AES_encrypt
.globl asm_AES_set_encrypt_key
.hidden asm_AES_set_encrypt_key
.type asm_AES_set_encrypt_key,%function
.globl aes_nohw_set_encrypt_key
.hidden aes_nohw_set_encrypt_key
.type aes_nohw_set_encrypt_key,%function
.align 5
asm_AES_set_encrypt_key:
aes_nohw_set_encrypt_key:
_armv4_AES_set_encrypt_key:
#ifndef __thumb2__
sub r3,pc,#8 @ asm_AES_set_encrypt_key
sub r3,pc,#8 @ aes_nohw_set_encrypt_key
#else
adr r3,.
#endif
@ -722,23 +722,23 @@ _armv4_AES_set_encrypt_key:
moveq pc,lr @ be binary compatible with V4, yet
.word 0xe12fff1e @ interoperable with Thumb ISA:-)
#endif
.size asm_AES_set_encrypt_key,.-asm_AES_set_encrypt_key
.size aes_nohw_set_encrypt_key,.-aes_nohw_set_encrypt_key
.globl asm_AES_set_decrypt_key
.hidden asm_AES_set_decrypt_key
.type asm_AES_set_decrypt_key,%function
.globl aes_nohw_set_decrypt_key
.hidden aes_nohw_set_decrypt_key
.type aes_nohw_set_decrypt_key,%function
.align 5
asm_AES_set_decrypt_key:
aes_nohw_set_decrypt_key:
str lr,[sp,#-4]! @ push lr
bl _armv4_AES_set_encrypt_key
teq r0,#0
ldr lr,[sp],#4 @ pop lr
bne .Labrt
mov r0,r2 @ asm_AES_set_encrypt_key preserves r2,
mov r0,r2 @ aes_nohw_set_encrypt_key preserves r2,
mov r1,r2 @ which is AES_KEY *key
b _armv4_AES_set_enc2dec_key
.size asm_AES_set_decrypt_key,.-asm_AES_set_decrypt_key
.size aes_nohw_set_decrypt_key,.-aes_nohw_set_decrypt_key
@ void AES_set_enc2dec_key(const AES_KEY *inp,AES_KEY *out)
.globl AES_set_enc2dec_key
@ -940,15 +940,15 @@ AES_Td:
.byte 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d
.size AES_Td,.-AES_Td
@ void asm_AES_decrypt(const unsigned char *in, unsigned char *out,
@ const AES_KEY *key) {
.globl asm_AES_decrypt
.hidden asm_AES_decrypt
.type asm_AES_decrypt,%function
@ void aes_nohw_decrypt(const unsigned char *in, unsigned char *out,
@ const AES_KEY *key) {
.globl aes_nohw_decrypt
.hidden aes_nohw_decrypt
.type aes_nohw_decrypt,%function
.align 5
asm_AES_decrypt:
aes_nohw_decrypt:
#ifndef __thumb2__
sub r3,pc,#8 @ asm_AES_decrypt
sub r3,pc,#8 @ aes_nohw_decrypt
#else
adr r3,.
#endif
@ -956,7 +956,7 @@ asm_AES_decrypt:
#if defined(__thumb2__) || defined(__APPLE__)
adr r10,AES_Td
#else
sub r10,r3,#asm_AES_decrypt-AES_Td @ Td
sub r10,r3,#aes_nohw_decrypt-AES_Td @ Td
#endif
mov r12,r0 @ inp
mov r11,r2
@ -1053,7 +1053,7 @@ asm_AES_decrypt:
moveq pc,lr @ be binary compatible with V4, yet
.word 0xe12fff1e @ interoperable with Thumb ISA:-)
#endif
.size asm_AES_decrypt,.-asm_AES_decrypt
.size aes_nohw_decrypt,.-aes_nohw_decrypt
.type _armv4_AES_decrypt,%function
.align 2

View File

@ -979,12 +979,12 @@ _x86_AES_encrypt:
.long 27,54,0,0
.long 0,0,0,0
.size _x86_AES_encrypt,.-_x86_AES_encrypt
.globl asm_AES_encrypt
.hidden asm_AES_encrypt
.type asm_AES_encrypt,@function
.globl aes_nohw_encrypt
.hidden aes_nohw_encrypt
.type aes_nohw_encrypt,@function
.align 16
asm_AES_encrypt:
.L_asm_AES_encrypt_begin:
aes_nohw_encrypt:
.L_aes_nohw_encrypt_begin:
pushl %ebp
pushl %ebx
pushl %esi
@ -1044,7 +1044,7 @@ asm_AES_encrypt:
popl %ebx
popl %ebp
ret
.size asm_AES_encrypt,.-.L_asm_AES_encrypt_begin
.size aes_nohw_encrypt,.-.L_aes_nohw_encrypt_begin
.hidden _x86_AES_decrypt_compact
.type _x86_AES_decrypt_compact,@function
.align 16
@ -2175,12 +2175,12 @@ _x86_AES_decrypt:
.byte 23,43,4,126,186,119,214,38
.byte 225,105,20,99,85,33,12,125
.size _x86_AES_decrypt,.-_x86_AES_decrypt
.globl asm_AES_decrypt
.hidden asm_AES_decrypt
.type asm_AES_decrypt,@function
.globl aes_nohw_decrypt
.hidden aes_nohw_decrypt
.type aes_nohw_decrypt,@function
.align 16
asm_AES_decrypt:
.L_asm_AES_decrypt_begin:
aes_nohw_decrypt:
.L_aes_nohw_decrypt_begin:
pushl %ebp
pushl %ebx
pushl %esi
@ -2240,13 +2240,13 @@ asm_AES_decrypt:
popl %ebx
popl %ebp
ret
.size asm_AES_decrypt,.-.L_asm_AES_decrypt_begin
.globl asm_AES_cbc_encrypt
.hidden asm_AES_cbc_encrypt
.type asm_AES_cbc_encrypt,@function
.size aes_nohw_decrypt,.-.L_aes_nohw_decrypt_begin
.globl aes_nohw_cbc_encrypt
.hidden aes_nohw_cbc_encrypt
.type aes_nohw_cbc_encrypt,@function
.align 16
asm_AES_cbc_encrypt:
.L_asm_AES_cbc_encrypt_begin:
aes_nohw_cbc_encrypt:
.L_aes_nohw_cbc_encrypt_begin:
pushl %ebp
pushl %ebx
pushl %esi
@ -2774,7 +2774,7 @@ asm_AES_cbc_encrypt:
popl %ebx
popl %ebp
ret
.size asm_AES_cbc_encrypt,.-.L_asm_AES_cbc_encrypt_begin
.size aes_nohw_cbc_encrypt,.-.L_aes_nohw_cbc_encrypt_begin
.hidden _x86_AES_set_encrypt_key
.type _x86_AES_set_encrypt_key,@function
.align 16
@ -3006,21 +3006,21 @@ _x86_AES_set_encrypt_key:
popl %ebp
ret
.size _x86_AES_set_encrypt_key,.-_x86_AES_set_encrypt_key
.globl asm_AES_set_encrypt_key
.hidden asm_AES_set_encrypt_key
.type asm_AES_set_encrypt_key,@function
.globl aes_nohw_set_encrypt_key
.hidden aes_nohw_set_encrypt_key
.type aes_nohw_set_encrypt_key,@function
.align 16
asm_AES_set_encrypt_key:
.L_asm_AES_set_encrypt_key_begin:
aes_nohw_set_encrypt_key:
.L_aes_nohw_set_encrypt_key_begin:
call _x86_AES_set_encrypt_key
ret
.size asm_AES_set_encrypt_key,.-.L_asm_AES_set_encrypt_key_begin
.globl asm_AES_set_decrypt_key
.hidden asm_AES_set_decrypt_key
.type asm_AES_set_decrypt_key,@function
.size aes_nohw_set_encrypt_key,.-.L_aes_nohw_set_encrypt_key_begin
.globl aes_nohw_set_decrypt_key
.hidden aes_nohw_set_decrypt_key
.type aes_nohw_set_decrypt_key,@function
.align 16
asm_AES_set_decrypt_key:
.L_asm_AES_set_decrypt_key_begin:
aes_nohw_set_decrypt_key:
.L_aes_nohw_set_decrypt_key_begin:
call _x86_AES_set_encrypt_key
cmpl $0,%eax
je .L054proceed
@ -3249,7 +3249,7 @@ asm_AES_set_decrypt_key:
popl %ebx
popl %ebp
ret
.size asm_AES_set_decrypt_key,.-.L_asm_AES_set_decrypt_key_begin
.size aes_nohw_set_decrypt_key,.-.L_aes_nohw_set_decrypt_key_begin
.byte 65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89
.byte 80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114
.byte 111,64,111,112,101,110,115,115,108,46,111,114,103,62,0

View File

@ -327,11 +327,11 @@ _x86_64_AES_encrypt_compact:
.byte 0xf3,0xc3
.size _x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact
.align 16
.globl asm_AES_encrypt
.hidden asm_AES_encrypt
.type asm_AES_encrypt,@function
.hidden asm_AES_encrypt
asm_AES_encrypt:
.globl aes_nohw_encrypt
.hidden aes_nohw_encrypt
.type aes_nohw_encrypt,@function
.hidden aes_nohw_encrypt
aes_nohw_encrypt:
.cfi_startproc
movq %rsp,%rax
.cfi_def_cfa_register %rax
@ -409,7 +409,7 @@ asm_AES_encrypt:
.Lenc_epilogue:
.byte 0xf3,0xc3
.cfi_endproc
.size asm_AES_encrypt,.-asm_AES_encrypt
.size aes_nohw_encrypt,.-aes_nohw_encrypt
.type _x86_64_AES_decrypt,@function
.align 16
_x86_64_AES_decrypt:
@ -791,11 +791,11 @@ _x86_64_AES_decrypt_compact:
.byte 0xf3,0xc3
.size _x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact
.align 16
.globl asm_AES_decrypt
.hidden asm_AES_decrypt
.type asm_AES_decrypt,@function
.hidden asm_AES_decrypt
asm_AES_decrypt:
.globl aes_nohw_decrypt
.hidden aes_nohw_decrypt
.type aes_nohw_decrypt,@function
.hidden aes_nohw_decrypt
aes_nohw_decrypt:
.cfi_startproc
movq %rsp,%rax
.cfi_def_cfa_register %rax
@ -875,12 +875,12 @@ asm_AES_decrypt:
.Ldec_epilogue:
.byte 0xf3,0xc3
.cfi_endproc
.size asm_AES_decrypt,.-asm_AES_decrypt
.size aes_nohw_decrypt,.-aes_nohw_decrypt
.align 16
.globl asm_AES_set_encrypt_key
.hidden asm_AES_set_encrypt_key
.type asm_AES_set_encrypt_key,@function
asm_AES_set_encrypt_key:
.globl aes_nohw_set_encrypt_key
.hidden aes_nohw_set_encrypt_key
.type aes_nohw_set_encrypt_key,@function
aes_nohw_set_encrypt_key:
.cfi_startproc
pushq %rbx
.cfi_adjust_cfa_offset 8
@ -915,7 +915,7 @@ asm_AES_set_encrypt_key:
.Lenc_key_epilogue:
.byte 0xf3,0xc3
.cfi_endproc
.size asm_AES_set_encrypt_key,.-asm_AES_set_encrypt_key
.size aes_nohw_set_encrypt_key,.-aes_nohw_set_encrypt_key
.type _x86_64_AES_set_encrypt_key,@function
.align 16
@ -1157,10 +1157,10 @@ _x86_64_AES_set_encrypt_key:
.byte 0xf3,0xc3
.size _x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key
.align 16
.globl asm_AES_set_decrypt_key
.hidden asm_AES_set_decrypt_key
.type asm_AES_set_decrypt_key,@function
asm_AES_set_decrypt_key:
.globl aes_nohw_set_decrypt_key
.hidden aes_nohw_set_decrypt_key
.type aes_nohw_set_decrypt_key,@function
aes_nohw_set_decrypt_key:
.cfi_startproc
pushq %rbx
.cfi_adjust_cfa_offset 8
@ -1365,15 +1365,15 @@ asm_AES_set_decrypt_key:
.Ldec_key_epilogue:
.byte 0xf3,0xc3
.cfi_endproc
.size asm_AES_set_decrypt_key,.-asm_AES_set_decrypt_key
.size aes_nohw_set_decrypt_key,.-aes_nohw_set_decrypt_key
.align 16
.globl asm_AES_cbc_encrypt
.hidden asm_AES_cbc_encrypt
.type asm_AES_cbc_encrypt,@function
.globl aes_nohw_cbc_encrypt
.hidden aes_nohw_cbc_encrypt
.type aes_nohw_cbc_encrypt,@function
.extern OPENSSL_ia32cap_P
.hidden OPENSSL_ia32cap_P
.hidden asm_AES_cbc_encrypt
asm_AES_cbc_encrypt:
.hidden aes_nohw_cbc_encrypt
aes_nohw_cbc_encrypt:
.cfi_startproc
cmpq $0,%rdx
je .Lcbc_epilogue
@ -1850,7 +1850,7 @@ asm_AES_cbc_encrypt:
.Lcbc_epilogue:
.byte 0xf3,0xc3
.cfi_endproc
.size asm_AES_cbc_encrypt,.-asm_AES_cbc_encrypt
.size aes_nohw_cbc_encrypt,.-aes_nohw_cbc_encrypt
.align 64
.LAES_Te:
.long 0xa56363c6,0xa56363c6

View File

@ -2,11 +2,11 @@
.text
.extern OPENSSL_ia32cap_P
.hidden OPENSSL_ia32cap_P
.globl aesni_encrypt
.hidden aesni_encrypt
.type aesni_encrypt,@function
.globl aes_hw_encrypt
.hidden aes_hw_encrypt
.type aes_hw_encrypt,@function
.align 16
aesni_encrypt:
aes_hw_encrypt:
movups (%rdi),%xmm2
movl 240(%rdx),%eax
movups (%rdx),%xmm0
@ -25,13 +25,13 @@ aesni_encrypt:
movups %xmm2,(%rsi)
pxor %xmm2,%xmm2
.byte 0xf3,0xc3
.size aesni_encrypt,.-aesni_encrypt
.size aes_hw_encrypt,.-aes_hw_encrypt
.globl aesni_decrypt
.hidden aesni_decrypt
.type aesni_decrypt,@function
.globl aes_hw_decrypt
.hidden aes_hw_decrypt
.type aes_hw_decrypt,@function
.align 16
aesni_decrypt:
aes_hw_decrypt:
movups (%rdi),%xmm2
movl 240(%rdx),%eax
movups (%rdx),%xmm0
@ -50,7 +50,7 @@ aesni_decrypt:
movups %xmm2,(%rsi)
pxor %xmm2,%xmm2
.byte 0xf3,0xc3
.size aesni_decrypt, .-aesni_decrypt
.size aes_hw_decrypt, .-aes_hw_decrypt
.type _aesni_encrypt2,@function
.align 16
_aesni_encrypt2:
@ -493,11 +493,11 @@ _aesni_decrypt8:
.byte 102,68,15,56,223,200
.byte 0xf3,0xc3
.size _aesni_decrypt8,.-_aesni_decrypt8
.globl aesni_ecb_encrypt
.hidden aesni_ecb_encrypt
.type aesni_ecb_encrypt,@function
.globl aes_hw_ecb_encrypt
.hidden aes_hw_ecb_encrypt
.type aes_hw_ecb_encrypt,@function
.align 16
aesni_ecb_encrypt:
aes_hw_ecb_encrypt:
andq $-16,%rdx
jz .Lecb_ret
@ -835,12 +835,12 @@ aesni_ecb_encrypt:
xorps %xmm0,%xmm0
pxor %xmm1,%xmm1
.byte 0xf3,0xc3
.size aesni_ecb_encrypt,.-aesni_ecb_encrypt
.globl aesni_ccm64_encrypt_blocks
.hidden aesni_ccm64_encrypt_blocks
.type aesni_ccm64_encrypt_blocks,@function
.size aes_hw_ecb_encrypt,.-aes_hw_ecb_encrypt
.globl aes_hw_ccm64_encrypt_blocks
.hidden aes_hw_ccm64_encrypt_blocks
.type aes_hw_ccm64_encrypt_blocks,@function
.align 16
aesni_ccm64_encrypt_blocks:
aes_hw_ccm64_encrypt_blocks:
movl 240(%rcx),%eax
movdqu (%r8),%xmm6
movdqa .Lincrement64(%rip),%xmm9
@ -899,12 +899,12 @@ aesni_ccm64_encrypt_blocks:
pxor %xmm8,%xmm8
pxor %xmm6,%xmm6
.byte 0xf3,0xc3
.size aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks
.globl aesni_ccm64_decrypt_blocks
.hidden aesni_ccm64_decrypt_blocks
.type aesni_ccm64_decrypt_blocks,@function
.size aes_hw_ccm64_encrypt_blocks,.-aes_hw_ccm64_encrypt_blocks
.globl aes_hw_ccm64_decrypt_blocks
.hidden aes_hw_ccm64_decrypt_blocks
.type aes_hw_ccm64_decrypt_blocks,@function
.align 16
aesni_ccm64_decrypt_blocks:
aes_hw_ccm64_decrypt_blocks:
movl 240(%rcx),%eax
movups (%r8),%xmm6
movdqu (%r9),%xmm3
@ -997,12 +997,12 @@ aesni_ccm64_decrypt_blocks:
pxor %xmm8,%xmm8
pxor %xmm6,%xmm6
.byte 0xf3,0xc3
.size aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks
.globl aesni_ctr32_encrypt_blocks
.hidden aesni_ctr32_encrypt_blocks
.type aesni_ctr32_encrypt_blocks,@function
.size aes_hw_ccm64_decrypt_blocks,.-aes_hw_ccm64_decrypt_blocks
.globl aes_hw_ctr32_encrypt_blocks
.hidden aes_hw_ctr32_encrypt_blocks
.type aes_hw_ctr32_encrypt_blocks,@function
.align 16
aesni_ctr32_encrypt_blocks:
aes_hw_ctr32_encrypt_blocks:
.cfi_startproc
cmpq $1,%rdx
jne .Lctr32_bulk
@ -1577,12 +1577,12 @@ aesni_ctr32_encrypt_blocks:
.Lctr32_epilogue:
.byte 0xf3,0xc3
.cfi_endproc
.size aesni_ctr32_encrypt_blocks,.-aesni_ctr32_encrypt_blocks
.globl aesni_xts_encrypt
.hidden aesni_xts_encrypt
.type aesni_xts_encrypt,@function
.size aes_hw_ctr32_encrypt_blocks,.-aes_hw_ctr32_encrypt_blocks
.globl aes_hw_xts_encrypt
.hidden aes_hw_xts_encrypt
.type aes_hw_xts_encrypt,@function
.align 16
aesni_xts_encrypt:
aes_hw_xts_encrypt:
.cfi_startproc
leaq (%rsp),%r11
.cfi_def_cfa_register %r11
@ -2048,12 +2048,12 @@ aesni_xts_encrypt:
.Lxts_enc_epilogue:
.byte 0xf3,0xc3
.cfi_endproc
.size aesni_xts_encrypt,.-aesni_xts_encrypt
.globl aesni_xts_decrypt
.hidden aesni_xts_decrypt
.type aesni_xts_decrypt,@function
.size aes_hw_xts_encrypt,.-aes_hw_xts_encrypt
.globl aes_hw_xts_decrypt
.hidden aes_hw_xts_decrypt
.type aes_hw_xts_decrypt,@function
.align 16
aesni_xts_decrypt:
aes_hw_xts_decrypt:
.cfi_startproc
leaq (%rsp),%r11
.cfi_def_cfa_register %r11
@ -2556,12 +2556,12 @@ aesni_xts_decrypt:
.Lxts_dec_epilogue:
.byte 0xf3,0xc3
.cfi_endproc
.size aesni_xts_decrypt,.-aesni_xts_decrypt
.globl aesni_ocb_encrypt
.hidden aesni_ocb_encrypt
.type aesni_ocb_encrypt,@function
.size aes_hw_xts_decrypt,.-aes_hw_xts_decrypt
.globl aes_hw_ocb_encrypt
.hidden aes_hw_ocb_encrypt
.type aes_hw_ocb_encrypt,@function
.align 32
aesni_ocb_encrypt:
aes_hw_ocb_encrypt:
.cfi_startproc
leaq (%rsp),%rax
pushq %rbx
@ -2771,7 +2771,7 @@ aesni_ocb_encrypt:
.Locb_enc_epilogue:
.byte 0xf3,0xc3
.cfi_endproc
.size aesni_ocb_encrypt,.-aesni_ocb_encrypt
.size aes_hw_ocb_encrypt,.-aes_hw_ocb_encrypt
.type __ocb_encrypt6,@function
.align 32
@ -2979,11 +2979,11 @@ __ocb_encrypt1:
.byte 0xf3,0xc3
.size __ocb_encrypt1,.-__ocb_encrypt1
.globl aesni_ocb_decrypt
.hidden aesni_ocb_decrypt
.type aesni_ocb_decrypt,@function
.globl aes_hw_ocb_decrypt
.hidden aes_hw_ocb_decrypt
.type aes_hw_ocb_decrypt,@function
.align 32
aesni_ocb_decrypt:
aes_hw_ocb_decrypt:
.cfi_startproc
leaq (%rsp),%rax
pushq %rbx
@ -3215,7 +3215,7 @@ aesni_ocb_decrypt:
.Locb_dec_epilogue:
.byte 0xf3,0xc3
.cfi_endproc
.size aesni_ocb_decrypt,.-aesni_ocb_decrypt
.size aes_hw_ocb_decrypt,.-aes_hw_ocb_decrypt
.type __ocb_decrypt6,@function
.align 32
@ -3411,11 +3411,11 @@ __ocb_decrypt1:
.byte 102,15,56,223,215
.byte 0xf3,0xc3
.size __ocb_decrypt1,.-__ocb_decrypt1
.globl aesni_cbc_encrypt
.hidden aesni_cbc_encrypt
.type aesni_cbc_encrypt,@function
.globl aes_hw_cbc_encrypt
.hidden aes_hw_cbc_encrypt
.type aes_hw_cbc_encrypt,@function
.align 16
aesni_cbc_encrypt:
aes_hw_cbc_encrypt:
.cfi_startproc
testq %rdx,%rdx
jz .Lcbc_ret
@ -4003,12 +4003,12 @@ aesni_cbc_encrypt:
.Lcbc_ret:
.byte 0xf3,0xc3
.cfi_endproc
.size aesni_cbc_encrypt,.-aesni_cbc_encrypt
.globl aesni_set_decrypt_key
.hidden aesni_set_decrypt_key
.type aesni_set_decrypt_key,@function
.size aes_hw_cbc_encrypt,.-aes_hw_cbc_encrypt
.globl aes_hw_set_decrypt_key
.hidden aes_hw_set_decrypt_key
.type aes_hw_set_decrypt_key,@function
.align 16
aesni_set_decrypt_key:
aes_hw_set_decrypt_key:
.cfi_startproc
.byte 0x48,0x83,0xEC,0x08
.cfi_adjust_cfa_offset 8
@ -4048,12 +4048,12 @@ aesni_set_decrypt_key:
.byte 0xf3,0xc3
.cfi_endproc
.LSEH_end_set_decrypt_key:
.size aesni_set_decrypt_key,.-aesni_set_decrypt_key
.globl aesni_set_encrypt_key
.hidden aesni_set_encrypt_key
.type aesni_set_encrypt_key,@function
.size aes_hw_set_decrypt_key,.-aes_hw_set_decrypt_key
.globl aes_hw_set_encrypt_key
.hidden aes_hw_set_encrypt_key
.type aes_hw_set_encrypt_key,@function
.align 16
aesni_set_encrypt_key:
aes_hw_set_encrypt_key:
__aesni_set_encrypt_key:
.cfi_startproc
.byte 0x48,0x83,0xEC,0x08
@ -4424,7 +4424,7 @@ __aesni_set_encrypt_key:
shufps $170,%xmm1,%xmm1
xorps %xmm1,%xmm2
.byte 0xf3,0xc3
.size aesni_set_encrypt_key,.-aesni_set_encrypt_key
.size aes_hw_set_encrypt_key,.-aes_hw_set_encrypt_key
.size __aesni_set_encrypt_key,.-__aesni_set_encrypt_key
.align 64
.Lbswap_mask:

View File

@ -1,10 +1,10 @@
#if defined(__x86_64__) && !defined(OPENSSL_NO_ASM)
.text
.extern asm_AES_encrypt
.hidden asm_AES_encrypt
.extern asm_AES_decrypt
.hidden asm_AES_decrypt
.extern aes_nohw_encrypt
.hidden aes_nohw_encrypt
.extern aes_nohw_decrypt
.hidden aes_nohw_decrypt
.type _bsaes_encrypt8,@function
.align 64
@ -1065,8 +1065,8 @@ _bsaes_key_convert:
.byte 0xf3,0xc3
.size _bsaes_key_convert,.-_bsaes_key_convert
.extern asm_AES_cbc_encrypt
.hidden asm_AES_cbc_encrypt
.extern aes_nohw_cbc_encrypt
.hidden aes_nohw_cbc_encrypt
.globl bsaes_cbc_encrypt
.hidden bsaes_cbc_encrypt
.type bsaes_cbc_encrypt,@function
@ -1074,9 +1074,9 @@ _bsaes_key_convert:
bsaes_cbc_encrypt:
.cfi_startproc
cmpl $0,%r9d
jne asm_AES_cbc_encrypt
jne aes_nohw_cbc_encrypt
cmpq $128,%rdx
jb asm_AES_cbc_encrypt
jb aes_nohw_cbc_encrypt
movq %rsp,%rax
.Lcbc_dec_prologue:
@ -1304,7 +1304,7 @@ bsaes_cbc_encrypt:
leaq (%r12),%rdi
leaq 32(%rbp),%rsi
leaq (%r15),%rdx
call asm_AES_decrypt
call aes_nohw_decrypt
pxor 32(%rbp),%xmm14
movdqu %xmm14,(%r13)
movdqa %xmm15,%xmm14
@ -1520,7 +1520,7 @@ bsaes_ctr32_encrypt_blocks:
leaq 32(%rbp),%rdi
leaq 48(%rbp),%rsi
leaq (%r15),%rdx
call asm_AES_encrypt
call aes_nohw_encrypt
movdqu (%r12),%xmm0
leaq 16(%r12),%r12
movl 44(%rbp),%eax
@ -1602,7 +1602,7 @@ bsaes_xts_encrypt:
leaq (%r9),%rdi
leaq 32(%rbp),%rsi
leaq (%r8),%rdx
call asm_AES_encrypt
call aes_nohw_encrypt
movl 240(%r15),%eax
movq %r14,%rbx
@ -1972,7 +1972,7 @@ bsaes_xts_encrypt:
leaq 32(%rbp),%rdi
leaq 32(%rbp),%rsi
leaq (%r15),%rdx
call asm_AES_encrypt
call aes_nohw_encrypt
pxor 32(%rbp),%xmm15
@ -2005,7 +2005,7 @@ bsaes_xts_encrypt:
leaq 32(%rbp),%rsi
movdqa %xmm15,32(%rbp)
leaq (%r15),%rdx
call asm_AES_encrypt
call aes_nohw_encrypt
pxor 32(%rbp),%xmm6
movdqu %xmm6,-16(%r13)
@ -2077,7 +2077,7 @@ bsaes_xts_decrypt:
leaq (%r9),%rdi
leaq 32(%rbp),%rsi
leaq (%r8),%rdx
call asm_AES_encrypt
call aes_nohw_encrypt
movl 240(%r15),%eax
movq %r14,%rbx
@ -2454,7 +2454,7 @@ bsaes_xts_decrypt:
leaq 32(%rbp),%rdi
leaq 32(%rbp),%rsi
leaq (%r15),%rdx
call asm_AES_decrypt
call aes_nohw_decrypt
pxor 32(%rbp),%xmm15
@ -2485,7 +2485,7 @@ bsaes_xts_decrypt:
leaq 32(%rbp),%rsi
movdqa %xmm15,32(%rbp)
leaq (%r15),%rdx
call asm_AES_decrypt
call aes_nohw_decrypt
pxor 32(%rbp),%xmm6
movq %r13,%rdx
movdqu %xmm6,(%r13)
@ -2506,7 +2506,7 @@ bsaes_xts_decrypt:
leaq 32(%rbp),%rsi
movdqa %xmm15,32(%rbp)
leaq (%r15),%rdx
call asm_AES_decrypt
call aes_nohw_decrypt
pxor 32(%rbp),%xmm5
movdqu %xmm5,(%r13)

View File

@ -961,11 +961,11 @@ LAES_Te:
.long 16,32,64,128
.long 27,54,0,0
.long 0,0,0,0
.globl _asm_AES_encrypt
.private_extern _asm_AES_encrypt
.globl _aes_nohw_encrypt
.private_extern _aes_nohw_encrypt
.align 4
_asm_AES_encrypt:
L_asm_AES_encrypt_begin:
_aes_nohw_encrypt:
L_aes_nohw_encrypt_begin:
pushl %ebp
pushl %ebx
pushl %esi
@ -2145,11 +2145,11 @@ LAES_Td:
.byte 200,235,187,60,131,83,153,97
.byte 23,43,4,126,186,119,214,38
.byte 225,105,20,99,85,33,12,125
.globl _asm_AES_decrypt
.private_extern _asm_AES_decrypt
.globl _aes_nohw_decrypt
.private_extern _aes_nohw_decrypt
.align 4
_asm_AES_decrypt:
L_asm_AES_decrypt_begin:
_aes_nohw_decrypt:
L_aes_nohw_decrypt_begin:
pushl %ebp
pushl %ebx
pushl %esi
@ -2209,11 +2209,11 @@ L011x86:
popl %ebx
popl %ebp
ret
.globl _asm_AES_cbc_encrypt
.private_extern _asm_AES_cbc_encrypt
.globl _aes_nohw_cbc_encrypt
.private_extern _aes_nohw_cbc_encrypt
.align 4
_asm_AES_cbc_encrypt:
L_asm_AES_cbc_encrypt_begin:
_aes_nohw_cbc_encrypt:
L_aes_nohw_cbc_encrypt_begin:
pushl %ebp
pushl %ebx
pushl %esi
@ -2970,18 +2970,18 @@ L045exit:
popl %ebx
popl %ebp
ret
.globl _asm_AES_set_encrypt_key
.private_extern _asm_AES_set_encrypt_key
.globl _aes_nohw_set_encrypt_key
.private_extern _aes_nohw_set_encrypt_key
.align 4
_asm_AES_set_encrypt_key:
L_asm_AES_set_encrypt_key_begin:
_aes_nohw_set_encrypt_key:
L_aes_nohw_set_encrypt_key_begin:
call __x86_AES_set_encrypt_key
ret
.globl _asm_AES_set_decrypt_key
.private_extern _asm_AES_set_decrypt_key
.globl _aes_nohw_set_decrypt_key
.private_extern _aes_nohw_set_decrypt_key
.align 4
_asm_AES_set_decrypt_key:
L_asm_AES_set_decrypt_key_begin:
_aes_nohw_set_decrypt_key:
L_aes_nohw_set_decrypt_key_begin:
call __x86_AES_set_encrypt_key
cmpl $0,%eax
je L054proceed

View File

@ -327,11 +327,11 @@ L$enc_compact_done:
.byte 0xf3,0xc3
.p2align 4
.globl _asm_AES_encrypt
.private_extern _asm_AES_encrypt
.globl _aes_nohw_encrypt
.private_extern _aes_nohw_encrypt
.private_extern _asm_AES_encrypt
_asm_AES_encrypt:
.private_extern _aes_nohw_encrypt
_aes_nohw_encrypt:
movq %rsp,%rax
@ -791,11 +791,11 @@ L$dec_compact_done:
.byte 0xf3,0xc3
.p2align 4
.globl _asm_AES_decrypt
.private_extern _asm_AES_decrypt
.globl _aes_nohw_decrypt
.private_extern _aes_nohw_decrypt
.private_extern _asm_AES_decrypt
_asm_AES_decrypt:
.private_extern _aes_nohw_decrypt
_aes_nohw_decrypt:
movq %rsp,%rax
@ -877,10 +877,10 @@ L$dec_epilogue:
.p2align 4
.globl _asm_AES_set_encrypt_key
.private_extern _asm_AES_set_encrypt_key
.globl _aes_nohw_set_encrypt_key
.private_extern _aes_nohw_set_encrypt_key
_asm_AES_set_encrypt_key:
_aes_nohw_set_encrypt_key:
pushq %rbx
@ -1151,10 +1151,10 @@ L$exit:
.byte 0xf3,0xc3
.p2align 4
.globl _asm_AES_set_decrypt_key
.private_extern _asm_AES_set_decrypt_key
.globl _aes_nohw_set_decrypt_key
.private_extern _aes_nohw_set_decrypt_key
_asm_AES_set_decrypt_key:
_aes_nohw_set_decrypt_key:
pushq %rbx
@ -1355,12 +1355,12 @@ L$dec_key_epilogue:
.p2align 4
.globl _asm_AES_cbc_encrypt
.private_extern _asm_AES_cbc_encrypt
.globl _aes_nohw_cbc_encrypt
.private_extern _aes_nohw_cbc_encrypt
.private_extern _asm_AES_cbc_encrypt
_asm_AES_cbc_encrypt:
.private_extern _aes_nohw_cbc_encrypt
_aes_nohw_cbc_encrypt:
cmpq $0,%rdx
je L$cbc_epilogue

View File

@ -1,11 +1,11 @@
#if defined(__x86_64__) && !defined(OPENSSL_NO_ASM)
.text
.globl _aesni_encrypt
.private_extern _aesni_encrypt
.globl _aes_hw_encrypt
.private_extern _aes_hw_encrypt
.p2align 4
_aesni_encrypt:
_aes_hw_encrypt:
movups (%rdi),%xmm2
movl 240(%rdx),%eax
movups (%rdx),%xmm0
@ -26,11 +26,11 @@ L$oop_enc1_1:
.byte 0xf3,0xc3
.globl _aesni_decrypt
.private_extern _aesni_decrypt
.globl _aes_hw_decrypt
.private_extern _aes_hw_decrypt
.p2align 4
_aesni_decrypt:
_aes_hw_decrypt:
movups (%rdi),%xmm2
movl 240(%rdx),%eax
movups (%rdx),%xmm0
@ -492,11 +492,11 @@ L$dec_loop8_enter:
.byte 102,68,15,56,223,200
.byte 0xf3,0xc3
.globl _aesni_ecb_encrypt
.private_extern _aesni_ecb_encrypt
.globl _aes_hw_ecb_encrypt
.private_extern _aes_hw_ecb_encrypt
.p2align 4
_aesni_ecb_encrypt:
_aes_hw_ecb_encrypt:
andq $-16,%rdx
jz L$ecb_ret
@ -835,11 +835,11 @@ L$ecb_ret:
pxor %xmm1,%xmm1
.byte 0xf3,0xc3
.globl _aesni_ccm64_encrypt_blocks
.private_extern _aesni_ccm64_encrypt_blocks
.globl _aes_hw_ccm64_encrypt_blocks
.private_extern _aes_hw_ccm64_encrypt_blocks
.p2align 4
_aesni_ccm64_encrypt_blocks:
_aes_hw_ccm64_encrypt_blocks:
movl 240(%rcx),%eax
movdqu (%r8),%xmm6
movdqa L$increment64(%rip),%xmm9
@ -899,11 +899,11 @@ L$ccm64_enc2_loop:
pxor %xmm6,%xmm6
.byte 0xf3,0xc3
.globl _aesni_ccm64_decrypt_blocks
.private_extern _aesni_ccm64_decrypt_blocks
.globl _aes_hw_ccm64_decrypt_blocks
.private_extern _aes_hw_ccm64_decrypt_blocks
.p2align 4
_aesni_ccm64_decrypt_blocks:
_aes_hw_ccm64_decrypt_blocks:
movl 240(%rcx),%eax
movups (%r8),%xmm6
movdqu (%r9),%xmm3
@ -997,11 +997,11 @@ L$oop_enc1_6:
pxor %xmm6,%xmm6
.byte 0xf3,0xc3
.globl _aesni_ctr32_encrypt_blocks
.private_extern _aesni_ctr32_encrypt_blocks
.globl _aes_hw_ctr32_encrypt_blocks
.private_extern _aes_hw_ctr32_encrypt_blocks
.p2align 4
_aesni_ctr32_encrypt_blocks:
_aes_hw_ctr32_encrypt_blocks:
cmpq $1,%rdx
jne L$ctr32_bulk
@ -1577,11 +1577,11 @@ L$ctr32_epilogue:
.byte 0xf3,0xc3
.globl _aesni_xts_encrypt
.private_extern _aesni_xts_encrypt
.globl _aes_hw_xts_encrypt
.private_extern _aes_hw_xts_encrypt
.p2align 4
_aesni_xts_encrypt:
_aes_hw_xts_encrypt:
leaq (%rsp),%r11
@ -2048,11 +2048,11 @@ L$xts_enc_epilogue:
.byte 0xf3,0xc3
.globl _aesni_xts_decrypt
.private_extern _aesni_xts_decrypt
.globl _aes_hw_xts_decrypt
.private_extern _aes_hw_xts_decrypt
.p2align 4
_aesni_xts_decrypt:
_aes_hw_xts_decrypt:
leaq (%rsp),%r11
@ -2556,11 +2556,11 @@ L$xts_dec_epilogue:
.byte 0xf3,0xc3
.globl _aesni_ocb_encrypt
.private_extern _aesni_ocb_encrypt
.globl _aes_hw_ocb_encrypt
.private_extern _aes_hw_ocb_encrypt
.p2align 5
_aesni_ocb_encrypt:
_aes_hw_ocb_encrypt:
leaq (%rsp),%rax
pushq %rbx
@ -2973,11 +2973,11 @@ L$ocb_enc_loop1:
.byte 0xf3,0xc3
.globl _aesni_ocb_decrypt
.private_extern _aesni_ocb_decrypt
.globl _aes_hw_ocb_decrypt
.private_extern _aes_hw_ocb_decrypt
.p2align 5
_aesni_ocb_decrypt:
_aes_hw_ocb_decrypt:
leaq (%rsp),%rax
pushq %rbx
@ -3400,11 +3400,11 @@ L$ocb_dec_loop1:
.byte 102,15,56,223,215
.byte 0xf3,0xc3
.globl _aesni_cbc_encrypt
.private_extern _aesni_cbc_encrypt
.globl _aes_hw_cbc_encrypt
.private_extern _aes_hw_cbc_encrypt
.p2align 4
_aesni_cbc_encrypt:
_aes_hw_cbc_encrypt:
testq %rdx,%rdx
jz L$cbc_ret
@ -3993,11 +3993,11 @@ L$cbc_ret:
.byte 0xf3,0xc3
.globl _aesni_set_decrypt_key
.private_extern _aesni_set_decrypt_key
.globl _aes_hw_set_decrypt_key
.private_extern _aes_hw_set_decrypt_key
.p2align 4
_aesni_set_decrypt_key:
_aes_hw_set_decrypt_key:
.byte 0x48,0x83,0xEC,0x08
@ -4038,11 +4038,11 @@ L$dec_key_ret:
L$SEH_end_set_decrypt_key:
.globl _aesni_set_encrypt_key
.private_extern _aesni_set_encrypt_key
.globl _aes_hw_set_encrypt_key
.private_extern _aes_hw_set_encrypt_key
.p2align 4
_aesni_set_encrypt_key:
_aes_hw_set_encrypt_key:
__aesni_set_encrypt_key:
.byte 0x48,0x83,0xEC,0x08

View File

@ -1071,9 +1071,9 @@ L$key_loop:
_bsaes_cbc_encrypt:
cmpl $0,%r9d
jne _asm_AES_cbc_encrypt
jne _aes_nohw_cbc_encrypt
cmpq $128,%rdx
jb _asm_AES_cbc_encrypt
jb _aes_nohw_cbc_encrypt
movq %rsp,%rax
L$cbc_dec_prologue:
@ -1295,7 +1295,7 @@ L$cbc_dec_one:
leaq (%r12),%rdi
leaq 32(%rbp),%rsi
leaq (%r15),%rdx
call _asm_AES_decrypt
call _aes_nohw_decrypt
pxor 32(%rbp),%xmm14
movdqu %xmm14,(%r13)
movdqa %xmm15,%xmm14
@ -1505,7 +1505,7 @@ L$ctr_enc_short:
leaq 32(%rbp),%rdi
leaq 48(%rbp),%rsi
leaq (%r15),%rdx
call _asm_AES_encrypt
call _aes_nohw_encrypt
movdqu (%r12),%xmm0
leaq 16(%r12),%r12
movl 44(%rbp),%eax
@ -1581,7 +1581,7 @@ L$xts_enc_prologue:
leaq (%r9),%rdi
leaq 32(%rbp),%rsi
leaq (%r8),%rdx
call _asm_AES_encrypt
call _aes_nohw_encrypt
movl 240(%r15),%eax
movq %r14,%rbx
@ -1951,7 +1951,7 @@ L$xts_enc_1:
leaq 32(%rbp),%rdi
leaq 32(%rbp),%rsi
leaq (%r15),%rdx
call _asm_AES_encrypt
call _aes_nohw_encrypt
pxor 32(%rbp),%xmm15
@ -1984,7 +1984,7 @@ L$xts_enc_steal:
leaq 32(%rbp),%rsi
movdqa %xmm15,32(%rbp)
leaq (%r15),%rdx
call _asm_AES_encrypt
call _aes_nohw_encrypt
pxor 32(%rbp),%xmm6
movdqu %xmm6,-16(%r13)
@ -2050,7 +2050,7 @@ L$xts_dec_prologue:
leaq (%r9),%rdi
leaq 32(%rbp),%rsi
leaq (%r8),%rdx
call _asm_AES_encrypt
call _aes_nohw_encrypt
movl 240(%r15),%eax
movq %r14,%rbx
@ -2427,7 +2427,7 @@ L$xts_dec_1:
leaq 32(%rbp),%rdi
leaq 32(%rbp),%rsi
leaq (%r15),%rdx
call _asm_AES_decrypt
call _aes_nohw_decrypt
pxor 32(%rbp),%xmm15
@ -2458,7 +2458,7 @@ L$xts_dec_done:
leaq 32(%rbp),%rsi
movdqa %xmm15,32(%rbp)
leaq (%r15),%rdx
call _asm_AES_decrypt
call _aes_nohw_decrypt
pxor 32(%rbp),%xmm6
movq %r13,%rdx
movdqu %xmm6,(%r13)
@ -2479,7 +2479,7 @@ L$xts_dec_steal:
leaq 32(%rbp),%rsi
movdqa %xmm15,32(%rbp)
leaq (%r15),%rdx
call _asm_AES_decrypt
call _aes_nohw_decrypt
pxor 32(%rbp),%xmm5
movdqu %xmm5,(%r13)

View File

@ -972,10 +972,10 @@ dd 1,2,4,8
dd 16,32,64,128
dd 27,54,0,0
dd 0,0,0,0
global _asm_AES_encrypt
global _aes_nohw_encrypt
align 16
_asm_AES_encrypt:
L$_asm_AES_encrypt_begin:
_aes_nohw_encrypt:
L$_aes_nohw_encrypt_begin:
push ebp
push ebx
push esi
@ -2152,10 +2152,10 @@ db 160,224,59,77,174,42,245,176
db 200,235,187,60,131,83,153,97
db 23,43,4,126,186,119,214,38
db 225,105,20,99,85,33,12,125
global _asm_AES_decrypt
global _aes_nohw_decrypt
align 16
_asm_AES_decrypt:
L$_asm_AES_decrypt_begin:
_aes_nohw_decrypt:
L$_aes_nohw_decrypt_begin:
push ebp
push ebx
push esi
@ -2215,10 +2215,10 @@ L$011x86:
pop ebx
pop ebp
ret
global _asm_AES_cbc_encrypt
global _aes_nohw_cbc_encrypt
align 16
_asm_AES_cbc_encrypt:
L$_asm_AES_cbc_encrypt_begin:
_aes_nohw_cbc_encrypt:
L$_aes_nohw_cbc_encrypt_begin:
push ebp
push ebx
push esi
@ -2974,16 +2974,16 @@ L$045exit:
pop ebx
pop ebp
ret
global _asm_AES_set_encrypt_key
global _aes_nohw_set_encrypt_key
align 16
_asm_AES_set_encrypt_key:
L$_asm_AES_set_encrypt_key_begin:
_aes_nohw_set_encrypt_key:
L$_aes_nohw_set_encrypt_key_begin:
call __x86_AES_set_encrypt_key
ret
global _asm_AES_set_decrypt_key
global _aes_nohw_set_decrypt_key
align 16
_asm_AES_set_decrypt_key:
L$_asm_AES_set_decrypt_key_begin:
_aes_nohw_set_decrypt_key:
L$_aes_nohw_set_decrypt_key_begin:
call __x86_AES_set_encrypt_key
cmp eax,0
je NEAR L$054proceed

View File

@ -331,14 +331,14 @@ $L$enc_compact_done:
DB 0xf3,0xc3
ALIGN 16
global asm_AES_encrypt
global aes_nohw_encrypt
asm_AES_encrypt:
aes_nohw_encrypt:
mov QWORD[8+rsp],rdi ;WIN64 prologue
mov QWORD[16+rsp],rsi
mov rax,rsp
$L$SEH_begin_asm_AES_encrypt:
$L$SEH_begin_aes_nohw_encrypt:
mov rdi,rcx
mov rsi,rdx
mov rdx,r8
@ -423,7 +423,7 @@ $L$enc_epilogue:
mov rsi,QWORD[16+rsp]
DB 0F3h,0C3h ;repret
$L$SEH_end_asm_AES_encrypt:
$L$SEH_end_aes_nohw_encrypt:
ALIGN 16
_x86_64_AES_decrypt:
@ -805,14 +805,14 @@ $L$dec_compact_done:
DB 0xf3,0xc3
ALIGN 16
global asm_AES_decrypt
global aes_nohw_decrypt
asm_AES_decrypt:
aes_nohw_decrypt:
mov QWORD[8+rsp],rdi ;WIN64 prologue
mov QWORD[16+rsp],rsi
mov rax,rsp
$L$SEH_begin_asm_AES_decrypt:
$L$SEH_begin_aes_nohw_decrypt:
mov rdi,rcx
mov rsi,rdx
mov rdx,r8
@ -899,15 +899,15 @@ $L$dec_epilogue:
mov rsi,QWORD[16+rsp]
DB 0F3h,0C3h ;repret
$L$SEH_end_asm_AES_decrypt:
$L$SEH_end_aes_nohw_decrypt:
ALIGN 16
global asm_AES_set_encrypt_key
global aes_nohw_set_encrypt_key
asm_AES_set_encrypt_key:
aes_nohw_set_encrypt_key:
mov QWORD[8+rsp],rdi ;WIN64 prologue
mov QWORD[16+rsp],rsi
mov rax,rsp
$L$SEH_begin_asm_AES_set_encrypt_key:
$L$SEH_begin_aes_nohw_set_encrypt_key:
mov rdi,rcx
mov rsi,rdx
mov rdx,r8
@ -943,7 +943,7 @@ $L$enc_key_epilogue:
mov rsi,QWORD[16+rsp]
DB 0F3h,0C3h ;repret
$L$SEH_end_asm_AES_set_encrypt_key:
$L$SEH_end_aes_nohw_set_encrypt_key:
ALIGN 16
@ -1185,13 +1185,13 @@ $L$exit:
DB 0xf3,0xc3
ALIGN 16
global asm_AES_set_decrypt_key
global aes_nohw_set_decrypt_key
asm_AES_set_decrypt_key:
aes_nohw_set_decrypt_key:
mov QWORD[8+rsp],rdi ;WIN64 prologue
mov QWORD[16+rsp],rsi
mov rax,rsp
$L$SEH_begin_asm_AES_set_decrypt_key:
$L$SEH_begin_aes_nohw_set_decrypt_key:
mov rdi,rcx
mov rsi,rdx
mov rdx,r8
@ -1397,17 +1397,17 @@ $L$dec_key_epilogue:
mov rsi,QWORD[16+rsp]
DB 0F3h,0C3h ;repret
$L$SEH_end_asm_AES_set_decrypt_key:
$L$SEH_end_aes_nohw_set_decrypt_key:
ALIGN 16
global asm_AES_cbc_encrypt
global aes_nohw_cbc_encrypt
EXTERN OPENSSL_ia32cap_P
asm_AES_cbc_encrypt:
aes_nohw_cbc_encrypt:
mov QWORD[8+rsp],rdi ;WIN64 prologue
mov QWORD[16+rsp],rsi
mov rax,rsp
$L$SEH_begin_asm_AES_cbc_encrypt:
$L$SEH_begin_aes_nohw_cbc_encrypt:
mov rdi,rcx
mov rsi,rdx
mov rdx,r8
@ -1886,7 +1886,7 @@ $L$cbc_epilogue:
mov rsi,QWORD[16+rsp]
DB 0F3h,0C3h ;repret
$L$SEH_end_asm_AES_cbc_encrypt:
$L$SEH_end_aes_nohw_cbc_encrypt:
ALIGN 64
$L$AES_Te:
DD 0xa56363c6,0xa56363c6
@ -2898,44 +2898,44 @@ $L$common_seh_exit:
section .pdata rdata align=4
ALIGN 4
DD $L$SEH_begin_asm_AES_encrypt wrt ..imagebase
DD $L$SEH_end_asm_AES_encrypt wrt ..imagebase
DD $L$SEH_info_asm_AES_encrypt wrt ..imagebase
DD $L$SEH_begin_aes_nohw_encrypt wrt ..imagebase
DD $L$SEH_end_aes_nohw_encrypt wrt ..imagebase
DD $L$SEH_info_aes_nohw_encrypt wrt ..imagebase
DD $L$SEH_begin_asm_AES_decrypt wrt ..imagebase
DD $L$SEH_end_asm_AES_decrypt wrt ..imagebase
DD $L$SEH_info_asm_AES_decrypt wrt ..imagebase
DD $L$SEH_begin_aes_nohw_decrypt wrt ..imagebase
DD $L$SEH_end_aes_nohw_decrypt wrt ..imagebase
DD $L$SEH_info_aes_nohw_decrypt wrt ..imagebase
DD $L$SEH_begin_asm_AES_set_encrypt_key wrt ..imagebase
DD $L$SEH_end_asm_AES_set_encrypt_key wrt ..imagebase
DD $L$SEH_info_asm_AES_set_encrypt_key wrt ..imagebase
DD $L$SEH_begin_aes_nohw_set_encrypt_key wrt ..imagebase
DD $L$SEH_end_aes_nohw_set_encrypt_key wrt ..imagebase
DD $L$SEH_info_aes_nohw_set_encrypt_key wrt ..imagebase
DD $L$SEH_begin_asm_AES_set_decrypt_key wrt ..imagebase
DD $L$SEH_end_asm_AES_set_decrypt_key wrt ..imagebase
DD $L$SEH_info_asm_AES_set_decrypt_key wrt ..imagebase
DD $L$SEH_begin_aes_nohw_set_decrypt_key wrt ..imagebase
DD $L$SEH_end_aes_nohw_set_decrypt_key wrt ..imagebase
DD $L$SEH_info_aes_nohw_set_decrypt_key wrt ..imagebase
DD $L$SEH_begin_asm_AES_cbc_encrypt wrt ..imagebase
DD $L$SEH_end_asm_AES_cbc_encrypt wrt ..imagebase
DD $L$SEH_info_asm_AES_cbc_encrypt wrt ..imagebase
DD $L$SEH_begin_aes_nohw_cbc_encrypt wrt ..imagebase
DD $L$SEH_end_aes_nohw_cbc_encrypt wrt ..imagebase
DD $L$SEH_info_aes_nohw_cbc_encrypt wrt ..imagebase
section .xdata rdata align=8
ALIGN 8
$L$SEH_info_asm_AES_encrypt:
$L$SEH_info_aes_nohw_encrypt:
DB 9,0,0,0
DD block_se_handler wrt ..imagebase
DD $L$enc_prologue wrt ..imagebase,$L$enc_epilogue wrt ..imagebase
$L$SEH_info_asm_AES_decrypt:
$L$SEH_info_aes_nohw_decrypt:
DB 9,0,0,0
DD block_se_handler wrt ..imagebase
DD $L$dec_prologue wrt ..imagebase,$L$dec_epilogue wrt ..imagebase
$L$SEH_info_asm_AES_set_encrypt_key:
$L$SEH_info_aes_nohw_set_encrypt_key:
DB 9,0,0,0
DD key_se_handler wrt ..imagebase
DD $L$enc_key_prologue wrt ..imagebase,$L$enc_key_epilogue wrt ..imagebase
$L$SEH_info_asm_AES_set_decrypt_key:
$L$SEH_info_aes_nohw_set_decrypt_key:
DB 9,0,0,0
DD key_se_handler wrt ..imagebase
DD $L$dec_key_prologue wrt ..imagebase,$L$dec_key_epilogue wrt ..imagebase
$L$SEH_info_asm_AES_cbc_encrypt:
$L$SEH_info_aes_nohw_cbc_encrypt:
DB 9,0,0,0
DD cbc_se_handler wrt ..imagebase

View File

@ -5,10 +5,10 @@ default rel
section .text code align=64
EXTERN OPENSSL_ia32cap_P
global aesni_encrypt
global aes_hw_encrypt
ALIGN 16
aesni_encrypt:
aes_hw_encrypt:
movups xmm2,XMMWORD[rcx]
mov eax,DWORD[240+r8]
movups xmm0,XMMWORD[r8]
@ -29,10 +29,10 @@ DB 102,15,56,221,209
DB 0F3h,0C3h ;repret
global aesni_decrypt
global aes_hw_decrypt
ALIGN 16
aesni_decrypt:
aes_hw_decrypt:
movups xmm2,XMMWORD[rcx]
mov eax,DWORD[240+r8]
movups xmm0,XMMWORD[r8]
@ -494,14 +494,14 @@ DB 102,68,15,56,223,192
DB 102,68,15,56,223,200
DB 0F3h,0C3h ;repret
global aesni_ecb_encrypt
global aes_hw_ecb_encrypt
ALIGN 16
aesni_ecb_encrypt:
aes_hw_ecb_encrypt:
mov QWORD[8+rsp],rdi ;WIN64 prologue
mov QWORD[16+rsp],rsi
mov rax,rsp
$L$SEH_begin_aesni_ecb_encrypt:
$L$SEH_begin_aes_hw_ecb_encrypt:
mov rdi,rcx
mov rsi,rdx
mov rdx,r8
@ -864,15 +864,15 @@ $L$ecb_enc_ret:
mov rdi,QWORD[8+rsp] ;WIN64 epilogue
mov rsi,QWORD[16+rsp]
DB 0F3h,0C3h ;repret
$L$SEH_end_aesni_ecb_encrypt:
global aesni_ccm64_encrypt_blocks
$L$SEH_end_aes_hw_ecb_encrypt:
global aes_hw_ccm64_encrypt_blocks
ALIGN 16
aesni_ccm64_encrypt_blocks:
aes_hw_ccm64_encrypt_blocks:
mov QWORD[8+rsp],rdi ;WIN64 prologue
mov QWORD[16+rsp],rsi
mov rax,rsp
$L$SEH_begin_aesni_ccm64_encrypt_blocks:
$L$SEH_begin_aes_hw_ccm64_encrypt_blocks:
mov rdi,rcx
mov rsi,rdx
mov rdx,r8
@ -957,15 +957,15 @@ $L$ccm64_enc_ret:
mov rdi,QWORD[8+rsp] ;WIN64 epilogue
mov rsi,QWORD[16+rsp]
DB 0F3h,0C3h ;repret
$L$SEH_end_aesni_ccm64_encrypt_blocks:
global aesni_ccm64_decrypt_blocks
$L$SEH_end_aes_hw_ccm64_encrypt_blocks:
global aes_hw_ccm64_decrypt_blocks
ALIGN 16
aesni_ccm64_decrypt_blocks:
aes_hw_ccm64_decrypt_blocks:
mov QWORD[8+rsp],rdi ;WIN64 prologue
mov QWORD[16+rsp],rsi
mov rax,rsp
$L$SEH_begin_aesni_ccm64_decrypt_blocks:
$L$SEH_begin_aes_hw_ccm64_decrypt_blocks:
mov rdi,rcx
mov rsi,rdx
mov rdx,r8
@ -1084,15 +1084,15 @@ $L$ccm64_dec_ret:
mov rdi,QWORD[8+rsp] ;WIN64 epilogue
mov rsi,QWORD[16+rsp]
DB 0F3h,0C3h ;repret
$L$SEH_end_aesni_ccm64_decrypt_blocks:
global aesni_ctr32_encrypt_blocks
$L$SEH_end_aes_hw_ccm64_decrypt_blocks:
global aes_hw_ctr32_encrypt_blocks
ALIGN 16
aesni_ctr32_encrypt_blocks:
aes_hw_ctr32_encrypt_blocks:
mov QWORD[8+rsp],rdi ;WIN64 prologue
mov QWORD[16+rsp],rsi
mov rax,rsp
$L$SEH_begin_aesni_ctr32_encrypt_blocks:
$L$SEH_begin_aes_hw_ctr32_encrypt_blocks:
mov rdi,rcx
mov rsi,rdx
mov rdx,r8
@ -1697,15 +1697,15 @@ $L$ctr32_epilogue:
mov rsi,QWORD[16+rsp]
DB 0F3h,0C3h ;repret
$L$SEH_end_aesni_ctr32_encrypt_blocks:
global aesni_xts_encrypt
$L$SEH_end_aes_hw_ctr32_encrypt_blocks:
global aes_hw_xts_encrypt
ALIGN 16
aesni_xts_encrypt:
aes_hw_xts_encrypt:
mov QWORD[8+rsp],rdi ;WIN64 prologue
mov QWORD[16+rsp],rsi
mov rax,rsp
$L$SEH_begin_aesni_xts_encrypt:
$L$SEH_begin_aes_hw_xts_encrypt:
mov rdi,rcx
mov rsi,rdx
mov rdx,r8
@ -2202,15 +2202,15 @@ $L$xts_enc_epilogue:
mov rsi,QWORD[16+rsp]
DB 0F3h,0C3h ;repret
$L$SEH_end_aesni_xts_encrypt:
global aesni_xts_decrypt
$L$SEH_end_aes_hw_xts_encrypt:
global aes_hw_xts_decrypt
ALIGN 16
aesni_xts_decrypt:
aes_hw_xts_decrypt:
mov QWORD[8+rsp],rdi ;WIN64 prologue
mov QWORD[16+rsp],rsi
mov rax,rsp
$L$SEH_begin_aesni_xts_decrypt:
$L$SEH_begin_aes_hw_xts_decrypt:
mov rdi,rcx
mov rsi,rdx
mov rdx,r8
@ -2744,15 +2744,15 @@ $L$xts_dec_epilogue:
mov rsi,QWORD[16+rsp]
DB 0F3h,0C3h ;repret
$L$SEH_end_aesni_xts_decrypt:
global aesni_ocb_encrypt
$L$SEH_end_aes_hw_xts_decrypt:
global aes_hw_ocb_encrypt
ALIGN 32
aesni_ocb_encrypt:
aes_hw_ocb_encrypt:
mov QWORD[8+rsp],rdi ;WIN64 prologue
mov QWORD[16+rsp],rsi
mov rax,rsp
$L$SEH_begin_aesni_ocb_encrypt:
$L$SEH_begin_aes_hw_ocb_encrypt:
mov rdi,rcx
mov rsi,rdx
mov rdx,r8
@ -2989,7 +2989,7 @@ $L$ocb_enc_epilogue:
mov rsi,QWORD[16+rsp]
DB 0F3h,0C3h ;repret
$L$SEH_end_aesni_ocb_encrypt:
$L$SEH_end_aes_hw_ocb_encrypt:
ALIGN 32
@ -3197,14 +3197,14 @@ DB 102,15,56,221,215
DB 0F3h,0C3h ;repret
global aesni_ocb_decrypt
global aes_hw_ocb_decrypt
ALIGN 32
aesni_ocb_decrypt:
aes_hw_ocb_decrypt:
mov QWORD[8+rsp],rdi ;WIN64 prologue
mov QWORD[16+rsp],rsi
mov rax,rsp
$L$SEH_begin_aesni_ocb_decrypt:
$L$SEH_begin_aes_hw_ocb_decrypt:
mov rdi,rcx
mov rsi,rdx
mov rdx,r8
@ -3463,7 +3463,7 @@ $L$ocb_dec_epilogue:
mov rsi,QWORD[16+rsp]
DB 0F3h,0C3h ;repret
$L$SEH_end_aesni_ocb_decrypt:
$L$SEH_end_aes_hw_ocb_decrypt:
ALIGN 32
@ -3659,14 +3659,14 @@ DB 102,15,56,222,209
DB 102,15,56,223,215
DB 0F3h,0C3h ;repret
global aesni_cbc_encrypt
global aes_hw_cbc_encrypt
ALIGN 16
aesni_cbc_encrypt:
aes_hw_cbc_encrypt:
mov QWORD[8+rsp],rdi ;WIN64 prologue
mov QWORD[16+rsp],rsi
mov rax,rsp
$L$SEH_begin_aesni_cbc_encrypt:
$L$SEH_begin_aes_hw_cbc_encrypt:
mov rdi,rcx
mov rsi,rdx
mov rdx,r8
@ -4291,11 +4291,11 @@ $L$cbc_ret:
mov rsi,QWORD[16+rsp]
DB 0F3h,0C3h ;repret
$L$SEH_end_aesni_cbc_encrypt:
global aesni_set_decrypt_key
$L$SEH_end_aes_hw_cbc_encrypt:
global aes_hw_set_decrypt_key
ALIGN 16
aesni_set_decrypt_key:
aes_hw_set_decrypt_key:
DB 0x48,0x83,0xEC,0x08
@ -4336,10 +4336,10 @@ $L$dec_key_ret:
$L$SEH_end_set_decrypt_key:
global aesni_set_encrypt_key
global aes_hw_set_encrypt_key
ALIGN 16
aesni_set_encrypt_key:
aes_hw_set_encrypt_key:
__aesni_set_encrypt_key:
DB 0x48,0x83,0xEC,0x08
@ -4966,46 +4966,46 @@ $L$common_seh_tail:
section .pdata rdata align=4
ALIGN 4
DD $L$SEH_begin_aesni_ecb_encrypt wrt ..imagebase
DD $L$SEH_end_aesni_ecb_encrypt wrt ..imagebase
DD $L$SEH_begin_aes_hw_ecb_encrypt wrt ..imagebase
DD $L$SEH_end_aes_hw_ecb_encrypt wrt ..imagebase
DD $L$SEH_info_ecb wrt ..imagebase
DD $L$SEH_begin_aesni_ccm64_encrypt_blocks wrt ..imagebase
DD $L$SEH_end_aesni_ccm64_encrypt_blocks wrt ..imagebase
DD $L$SEH_begin_aes_hw_ccm64_encrypt_blocks wrt ..imagebase
DD $L$SEH_end_aes_hw_ccm64_encrypt_blocks wrt ..imagebase
DD $L$SEH_info_ccm64_enc wrt ..imagebase
DD $L$SEH_begin_aesni_ccm64_decrypt_blocks wrt ..imagebase
DD $L$SEH_end_aesni_ccm64_decrypt_blocks wrt ..imagebase
DD $L$SEH_begin_aes_hw_ccm64_decrypt_blocks wrt ..imagebase
DD $L$SEH_end_aes_hw_ccm64_decrypt_blocks wrt ..imagebase
DD $L$SEH_info_ccm64_dec wrt ..imagebase
DD $L$SEH_begin_aesni_ctr32_encrypt_blocks wrt ..imagebase
DD $L$SEH_end_aesni_ctr32_encrypt_blocks wrt ..imagebase
DD $L$SEH_begin_aes_hw_ctr32_encrypt_blocks wrt ..imagebase
DD $L$SEH_end_aes_hw_ctr32_encrypt_blocks wrt ..imagebase
DD $L$SEH_info_ctr32 wrt ..imagebase
DD $L$SEH_begin_aesni_xts_encrypt wrt ..imagebase
DD $L$SEH_end_aesni_xts_encrypt wrt ..imagebase
DD $L$SEH_begin_aes_hw_xts_encrypt wrt ..imagebase
DD $L$SEH_end_aes_hw_xts_encrypt wrt ..imagebase
DD $L$SEH_info_xts_enc wrt ..imagebase
DD $L$SEH_begin_aesni_xts_decrypt wrt ..imagebase
DD $L$SEH_end_aesni_xts_decrypt wrt ..imagebase
DD $L$SEH_begin_aes_hw_xts_decrypt wrt ..imagebase
DD $L$SEH_end_aes_hw_xts_decrypt wrt ..imagebase
DD $L$SEH_info_xts_dec wrt ..imagebase
DD $L$SEH_begin_aesni_ocb_encrypt wrt ..imagebase
DD $L$SEH_end_aesni_ocb_encrypt wrt ..imagebase
DD $L$SEH_begin_aes_hw_ocb_encrypt wrt ..imagebase
DD $L$SEH_end_aes_hw_ocb_encrypt wrt ..imagebase
DD $L$SEH_info_ocb_enc wrt ..imagebase
DD $L$SEH_begin_aesni_ocb_decrypt wrt ..imagebase
DD $L$SEH_end_aesni_ocb_decrypt wrt ..imagebase
DD $L$SEH_begin_aes_hw_ocb_decrypt wrt ..imagebase
DD $L$SEH_end_aes_hw_ocb_decrypt wrt ..imagebase
DD $L$SEH_info_ocb_dec wrt ..imagebase
DD $L$SEH_begin_aesni_cbc_encrypt wrt ..imagebase
DD $L$SEH_end_aesni_cbc_encrypt wrt ..imagebase
DD $L$SEH_begin_aes_hw_cbc_encrypt wrt ..imagebase
DD $L$SEH_end_aes_hw_cbc_encrypt wrt ..imagebase
DD $L$SEH_info_cbc wrt ..imagebase
DD aesni_set_decrypt_key wrt ..imagebase
DD aes_hw_set_decrypt_key wrt ..imagebase
DD $L$SEH_end_set_decrypt_key wrt ..imagebase
DD $L$SEH_info_key wrt ..imagebase
DD aesni_set_encrypt_key wrt ..imagebase
DD aes_hw_set_encrypt_key wrt ..imagebase
DD $L$SEH_end_set_encrypt_key wrt ..imagebase
DD $L$SEH_info_key wrt ..imagebase
section .xdata rdata align=8

View File

@ -5,8 +5,8 @@ default rel
section .text code align=64
EXTERN asm_AES_encrypt
EXTERN asm_AES_decrypt
EXTERN aes_nohw_encrypt
EXTERN aes_nohw_decrypt
ALIGN 64
@ -1067,7 +1067,7 @@ DB 102,15,56,0,244
DB 0F3h,0C3h ;repret
EXTERN asm_AES_cbc_encrypt
EXTERN aes_nohw_cbc_encrypt
global bsaes_cbc_encrypt
ALIGN 16
@ -1075,9 +1075,9 @@ bsaes_cbc_encrypt:
mov r11d,DWORD[48+rsp]
cmp r11d,0
jne NEAR asm_AES_cbc_encrypt
jne NEAR aes_nohw_cbc_encrypt
cmp r8,128
jb NEAR asm_AES_cbc_encrypt
jb NEAR aes_nohw_cbc_encrypt
mov rax,rsp
$L$cbc_dec_prologue:
@ -1312,7 +1312,7 @@ $L$cbc_dec_one:
lea rcx,[r12]
lea rdx,[32+rbp]
lea r8,[r15]
call asm_AES_decrypt
call aes_nohw_decrypt
pxor xmm14,XMMWORD[32+rbp]
movdqu XMMWORD[r13],xmm14
movdqa xmm14,xmm15
@ -1546,7 +1546,7 @@ $L$ctr_enc_short:
lea rcx,[32+rbp]
lea rdx,[48+rbp]
lea r8,[r15]
call asm_AES_encrypt
call aes_nohw_encrypt
movdqu xmm0,XMMWORD[r12]
lea r12,[16+r12]
mov eax,DWORD[44+rbp]
@ -1647,7 +1647,7 @@ $L$xts_enc_body:
lea rcx,[r11]
lea rdx,[32+rbp]
lea r8,[r10]
call asm_AES_encrypt
call aes_nohw_encrypt
mov eax,DWORD[240+r15]
mov rbx,r14
@ -2017,7 +2017,7 @@ $L$xts_enc_1:
lea rcx,[32+rbp]
lea rdx,[32+rbp]
lea r8,[r15]
call asm_AES_encrypt
call aes_nohw_encrypt
pxor xmm15,XMMWORD[32+rbp]
@ -2050,7 +2050,7 @@ $L$xts_enc_steal:
lea rdx,[32+rbp]
movdqa XMMWORD[32+rbp],xmm15
lea r8,[r15]
call asm_AES_encrypt
call aes_nohw_encrypt
pxor xmm6,XMMWORD[32+rbp]
movdqu XMMWORD[(-16)+r13],xmm6
@ -2141,7 +2141,7 @@ $L$xts_dec_body:
lea rcx,[r11]
lea rdx,[32+rbp]
lea r8,[r10]
call asm_AES_encrypt
call aes_nohw_encrypt
mov eax,DWORD[240+r15]
mov rbx,r14
@ -2518,7 +2518,7 @@ $L$xts_dec_1:
lea rcx,[32+rbp]
lea rdx,[32+rbp]
lea r8,[r15]
call asm_AES_decrypt
call aes_nohw_decrypt
pxor xmm15,XMMWORD[32+rbp]
@ -2549,7 +2549,7 @@ $L$xts_dec_done:
lea rdx,[32+rbp]
movdqa XMMWORD[32+rbp],xmm15
lea r8,[r15]
call asm_AES_decrypt
call aes_nohw_decrypt
pxor xmm6,XMMWORD[32+rbp]
mov rdx,r13
movdqu XMMWORD[r13],xmm6
@ -2570,7 +2570,7 @@ $L$xts_dec_steal:
lea rdx,[32+rbp]
movdqa XMMWORD[32+rbp],xmm15
lea r8,[r15]
call asm_AES_decrypt
call aes_nohw_decrypt
pxor xmm5,XMMWORD[32+rbp]
movdqu XMMWORD[r13],xmm5

View File

@ -101,6 +101,8 @@ chrome.automation.RoleType = {
COMBO_BOX_GROUPING: 'comboBoxGrouping',
COMBO_BOX_MENU_BUTTON: 'comboBoxMenuButton',
COMPLEMENTARY: 'complementary',
CONTENT_DELETION: 'contentDeletion',
CONTENT_INSERTION: 'contentInsertion',
CONTENT_INFO: 'contentInfo',
DATE: 'date',
DATE_TIME: 'dateTime',
@ -1198,6 +1200,20 @@ chrome.automation.AutomationNode.prototype.backgroundColor;
*/
chrome.automation.AutomationNode.prototype.colorValue;
/**
* Indicates node text is subscript.
* @type {boolean}
* @see https://developer.chrome.com/extensions/automation#type-subscript
*/
chrome.automation.AutomationNode.prototype.subscript;
/**
* Indicates node text is superscript.
* @type {boolean}
* @see https://developer.chrome.com/extensions/automation#type-superscript
*/
chrome.automation.AutomationNode.prototype.superscript;
/**
* Indicates node text is bold.
* @type {boolean}
@ -1537,6 +1553,14 @@ chrome.automation.AutomationNode.prototype.findAll = function(params) {};
*/
chrome.automation.AutomationNode.prototype.matches = function(params) {};
/**
* @param {string} searchStr
* @param {boolean} backward
* @return {!chrome.automation.AutomationNode}
* @see https://developer.chrome.com/extensions/automation#method-getNextTextMatch
*/
chrome.automation.AutomationNode.prototype.getNextTextMatch = function(searchStr, backward) {};
/**
* Get the automation tree for the tab with the given tabId, or the current tab

View File

@ -5,9 +5,9 @@ License: BSD
License File: source/libvpx/LICENSE
Security Critical: yes
Date: Monday May 21 2018
Date: Friday May 25 2018
Branch: master
Commit: e27a331778c4c99ec37262ea786a3b4cc2a491ac
Commit: 36825590ba676d54765c6c31482cacb4fe661b43
Description:
Contains the sources used to compile libvpx binaries used by Google Chrome and

View File

@ -2,7 +2,7 @@
#define VERSION_MAJOR 1
#define VERSION_MINOR 7
#define VERSION_PATCH 0
#define VERSION_EXTRA "387-ge27a33177"
#define VERSION_EXTRA "400-g36825590b"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
#define VERSION_STRING_NOSP "v1.7.0-387-ge27a33177"
#define VERSION_STRING " v1.7.0-387-ge27a33177"
#define VERSION_STRING_NOSP "v1.7.0-400-g36825590b"
#define VERSION_STRING " v1.7.0-400-g36825590b"

View File

@ -18,3 +18,5 @@ Local changes:
* Apply https://github.com/xiph/opus/pull/73
* Apply https://github.com/xiph/opus/pull/87
* Make sure HB_gain is not NaN in an attempt to fix chromium:826914
* Saturate add to avoid int overflow to fix chromium:842528. This should be
reverted when updating to v1.3

View File

@ -394,7 +394,7 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec(
/* Long-term shaping */
if( lag > 0 ) {
/* Symmetric, packed FIR coefficients */
n_LTP_Q14 = silk_SMULWB( silk_ADD32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 );
n_LTP_Q14 = silk_SMULWB( silk_ADD_SAT32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 );
n_LTP_Q14 = silk_SMLAWT( n_LTP_Q14, shp_lag_ptr[ -1 ], HarmShapeFIRPacked_Q14 );
n_LTP_Q14 = silk_SUB_LSHIFT32( LTP_pred_Q14, n_LTP_Q14, 2 ); /* Q12 -> Q14 */
shp_lag_ptr++;