Commit 96c6ac35 authored by davidben's avatar davidben Committed by Commit bot

Roll src/third_party/boringssl/src d04ca9535..a0ba400c3

https://boringssl.googlesource.com/boringssl/+log/d04ca95356c5b79e9ad80f3e8d1bd9784213dc93..a0ba400c33c5919fb0c25f165133446cb6dec5c0

BUG=none

Review-Url: https://codereview.chromium.org/2783923002
Cr-Commit-Position: refs/heads/master@{#460483}
parent 2e7a430d
......@@ -72,7 +72,7 @@ vars = {
# 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': 'd04ca95356c5b79e9ad80f3e8d1bd9784213dc93',
'boringssl_revision': 'a0ba400c33c5919fb0c25f165133446cb6dec5c0',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling google-toolbox-for-mac
# and whatever else without interference from each other.
......
......@@ -42,8 +42,6 @@ crypto_sources = [
"src/crypto/asn1/tasn_typ.c",
"src/crypto/asn1/tasn_utl.c",
"src/crypto/asn1/time_support.c",
"src/crypto/asn1/x_bignum.c",
"src/crypto/asn1/x_long.c",
"src/crypto/base64/base64.c",
"src/crypto/bio/bio.c",
"src/crypto/bio/bio_mem.c",
......@@ -184,8 +182,8 @@ crypto_sources = [
"src/crypto/pem/pem_xaux.c",
"src/crypto/pkcs8/internal.h",
"src/crypto/pkcs8/p5_pbev2.c",
"src/crypto/pkcs8/p8_pkey.c",
"src/crypto/pkcs8/pkcs8.c",
"src/crypto/pkcs8/pkcs8_x509.c",
"src/crypto/poly1305/internal.h",
"src/crypto/poly1305/poly1305.c",
"src/crypto/poly1305/poly1305_arm.c",
......
......@@ -16,7 +16,10 @@ test_support_sources = [
]
crypto_test_sources = [
"src/crypto/asn1/asn1_test.cc",
"src/crypto/bio/bio_test.cc",
"src/crypto/chacha/chacha_test.cc",
"src/crypto/constant_time_test.cc",
"src/crypto/curve25519/x25519_test.cc",
"src/crypto/dh/dh_test.cc",
"src/crypto/dsa/dsa_test.cc",
......@@ -45,18 +48,6 @@ template("create_tests") {
deps = invoker.deps
}
executable("boringssl_asn1_test") {
sources = [
"src/crypto/asn1/asn1_test.cc",
]
sources += test_support_sources
if (defined(invoker.configs_exclude)) {
configs -= invoker.configs_exclude
}
configs += invoker.configs
deps = invoker.deps
}
executable("boringssl_base64_test") {
sources = [
"src/crypto/base64/base64_test.cc",
......@@ -69,18 +60,6 @@ template("create_tests") {
deps = invoker.deps
}
executable("boringssl_bio_test") {
sources = [
"src/crypto/bio/bio_test.cc",
]
sources += test_support_sources
if (defined(invoker.configs_exclude)) {
configs -= invoker.configs_exclude
}
configs += invoker.configs
deps = invoker.deps
}
executable("boringssl_bn_test") {
sources = [
"src/crypto/bn/bn_test.cc",
......@@ -141,18 +120,6 @@ template("create_tests") {
deps = invoker.deps
}
executable("boringssl_constant_time_test") {
sources = [
"src/crypto/constant_time_test.cc",
]
sources += test_support_sources
if (defined(invoker.configs_exclude)) {
configs -= invoker.configs_exclude
}
configs += invoker.configs
deps = invoker.deps
}
executable("boringssl_ed25519_test") {
sources = [
"src/crypto/curve25519/ed25519_test.cc",
......@@ -469,14 +436,11 @@ template("create_tests") {
deps = [
":boringssl_aead_test",
":boringssl_aes_test",
":boringssl_asn1_test",
":boringssl_base64_test",
":boringssl_bio_test",
":boringssl_bn_test",
":boringssl_bytestring_test",
":boringssl_cipher_test",
":boringssl_cmac_test",
":boringssl_constant_time_test",
":boringssl_digest_test",
":boringssl_ecdh_test",
":boringssl_ecdsa_sign_test",
......
This diff is collapsed.
#if defined(__arm__)
@ Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved.
@
@ Licensed under the OpenSSL license (the "License"). You may not use
@ this file except in compliance with the License. You can obtain a copy
@ in the file LICENSE in the source distribution or at
@ https://www.openssl.org/source/license.html
@ ====================================================================
@ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
......@@ -77,6 +84,7 @@
.thumb
#else
.code 32
# undef __thumb2__
#endif
.type _bsaes_decrypt8,%function
......@@ -1313,7 +1321,7 @@ bsaes_cbc_encrypt:
vmov q4,q15 @ just in case ensure that IV
vmov q5,q0 @ and input are preserved
bl AES_decrypt
vld1.8 {q0}, [r9,:64] @ load result
vld1.8 {q0}, [r9] @ load result
veor q0, q0, q4 @ ^= IV
vmov q15, q5 @ q5 holds input
vst1.8 {q0}, [r10] @ write output
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment