external/boringssl: Sync to e34bcc91.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/0e9138d295cd556e830dc8b3be735e808680f4bd..e34bcc91c07c0bf65ecc53a814d51f5246007150
This also removes BORINGSSL_ENABLE_RC4_TLS and android_compat_hacks.c as
they are no longer needed.
Test: Built tree, phone boots. Ran cts-tradefed run cts -m CtsLibcoreTestCases
Change-Id: I86df196e1856c338bbf72c60e2e47dd1b74ae537
diff --git a/src/crypto/cipher/e_aes.c b/src/crypto/cipher/e_aes.c
index 24c4d8a..6e9ea9f 100644
--- a/src/crypto/cipher/e_aes.c
+++ b/src/crypto/cipher/e_aes.c
@@ -353,14 +353,14 @@
static int aes_ecb_cipher(EVP_CIPHER_CTX *ctx, uint8_t *out, const uint8_t *in,
size_t len) {
size_t bl = ctx->cipher->block_size;
- size_t i;
EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
if (len < bl) {
return 1;
}
- for (i = 0, len -= bl; i <= len; i += bl) {
+ len -= bl;
+ for (size_t i = 0; i <= len; i += bl) {
(*dat->block)(in + i, out + i, &dat->ks);
}
@@ -1150,7 +1150,6 @@
aead_aes_gcm_cleanup,
aead_aes_gcm_seal,
aead_aes_gcm_open,
- NULL, /* get_rc4_state */
NULL, /* get_iv */
};
@@ -1164,7 +1163,6 @@
aead_aes_gcm_cleanup,
aead_aes_gcm_seal,
aead_aes_gcm_open,
- NULL, /* get_rc4_state */
NULL, /* get_iv */
};
@@ -1412,7 +1410,6 @@
aead_aes_key_wrap_cleanup,
aead_aes_key_wrap_seal,
aead_aes_key_wrap_open,
- NULL, /* get_rc4_state */
NULL, /* get_iv */
};
@@ -1426,7 +1423,6 @@
aead_aes_key_wrap_cleanup,
aead_aes_key_wrap_seal,
aead_aes_key_wrap_open,
- NULL, /* get_rc4_state */
NULL, /* get_iv */
};
@@ -1677,7 +1673,6 @@
aead_aes_ctr_hmac_sha256_cleanup,
aead_aes_ctr_hmac_sha256_seal,
aead_aes_ctr_hmac_sha256_open,
- NULL /* get_rc4_state */,
NULL /* get_iv */,
};
@@ -1692,7 +1687,6 @@
aead_aes_ctr_hmac_sha256_cleanup,
aead_aes_ctr_hmac_sha256_seal,
aead_aes_ctr_hmac_sha256_open,
- NULL /* get_rc4_state */,
NULL /* get_iv */,
};