Update patch files to reflect previous changes.
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@234276 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
diff --git a/openssl/Crypto-config.mk b/openssl/Crypto-config.mk
index fcda886..35f8365 100644
--- a/openssl/Crypto-config.mk
+++ b/openssl/Crypto-config.mk
@@ -558,10 +558,10 @@
crypto/aes/asm/aes-armv4.S \
crypto/bn/asm/armv4-gf2m.S \
crypto/bn/asm/armv4-mont.S \
- crypto/chacha/chacha_vec_arm.s \
+ crypto/chacha/chacha_vec_arm.S \
crypto/modes/asm/ghash-armv4.S \
crypto/poly1305/poly1305_arm.c \
- crypto/poly1305/poly1305_arm_asm.s \
+ crypto/poly1305/poly1305_arm_asm.S \
crypto/sha/asm/sha1-armv4-large.S \
crypto/sha/asm/sha256-armv4.S \
crypto/sha/asm/sha512-armv4.S \
diff --git a/openssl/openssl.config b/openssl/openssl.config
index e634a6a..1976321 100644
--- a/openssl/openssl.config
+++ b/openssl/openssl.config
@@ -793,10 +793,10 @@
crypto/aes/asm/aes-armv4.S \
crypto/bn/asm/armv4-gf2m.S \
crypto/bn/asm/armv4-mont.S \
-crypto/chacha/chacha_vec_arm.s \
+crypto/chacha/chacha_vec_arm.S \
crypto/modes/asm/ghash-armv4.S \
crypto/poly1305/poly1305_arm.c \
-crypto/poly1305/poly1305_arm_asm.s \
+crypto/poly1305/poly1305_arm_asm.S \
crypto/sha/asm/sha1-armv4-large.S \
crypto/sha/asm/sha256-armv4.S \
crypto/sha/asm/sha512-armv4.S \
diff --git a/openssl/patches/chacha20poly1305.patch b/openssl/patches/chacha20poly1305.patch
index ab0c56c..ce5ca60 100644
--- a/openssl/patches/chacha20poly1305.patch
+++ b/openssl/patches/chacha20poly1305.patch
@@ -1619,7 +1619,7 @@
index 0000000..2e5621d
--- /dev/null
+++ b/crypto/poly1305/poly1305.c
-@@ -0,0 +1,320 @@
+@@ -0,0 +1,321 @@
+/* ====================================================================
+ * Copyright (c) 2011-2013 The OpenSSL Project. All rights reserved.
+ *
@@ -1680,6 +1680,7 @@
+#if !defined(OPENSSL_NO_POLY1305)
+
+#include <openssl/poly1305.h>
++#include <openssl/crypto.h>
+
+#if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
+/* We can assume little-endian. */
@@ -2375,11 +2376,11 @@
+ }
+
+#endif /* !OPENSSL_NO_POLY1305 */
-diff --git a/crypto/poly1305/poly1305_arm_asm.s b/crypto/poly1305/poly1305_arm_asm.s
+diff --git a/crypto/poly1305/poly1305_arm_asm.S b/crypto/poly1305/poly1305_arm_asm.S
new file mode 100644
index 0000000..449d16f
--- /dev/null
-+++ b/crypto/poly1305/poly1305_arm_asm.s
++++ b/crypto/poly1305/poly1305_arm_asm.S
@@ -0,0 +1,2009 @@
+# This implementation was taken from the public domain, neon2 version in
+# SUPERCOP by D. J. Bernstein and Peter Schwabe.
@@ -5723,4 +5724,3 @@
--
1.8.4.1
-
diff --git a/openssl/patches/neon_runtime.patch b/openssl/patches/neon_runtime.patch
index da63a43..ba540b7 100644
--- a/openssl/patches/neon_runtime.patch
+++ b/openssl/patches/neon_runtime.patch
@@ -95,16 +95,28 @@
unsigned char *out,
const unsigned char *in,
size_t inlen,
-diff --git a/crypto/chacha/chacha_vec_arm.s b/crypto/chacha/chacha_vec_arm.s
+diff --git a/crypto/chacha/chacha_vec_arm.S b/crypto/chacha/chacha_vec_arm.S
new file mode 100644
index 0000000..24a5050
--- /dev/null
-+++ b/crypto/chacha/chacha_vec_arm.s
-@@ -0,0 +1,846 @@
++++ b/crypto/chacha/chacha_vec_arm.S
+@@ -0,0 +1,860 @@
++# This file contains a pre-compiled version of chacha_vec.c for ARM. This is
++# needed to support switching on NEON code at runtime. If the whole of OpenSSL
++# were to be compiled with the needed flags to build chacha_vec.c, then it
++# wouldn't be possible to run on non-NEON systems.
++#
++# This file was generated by:
++#
++# /opt/gcc-linaro-arm-linux-gnueabihf-4.7-2012.10-20121022_linux/bin/arm-linux-gnueabihf-gcc -O3 -mcpu=cortex-a8 -mfpu=neon -S chacha_vec.c -I ../../include -fpic
++#
++# And then EABI attribute 28 was set to zero to allow linking with soft-float
++# code.
++
+ .syntax unified
+ .cpu cortex-a8
+ .eabi_attribute 27, 3
-+ .eabi_attribute 28, 1
++ .eabi_attribute 28, 0
+ .fpu neon
+ .eabi_attribute 20, 1
+ .eabi_attribute 21, 1
@@ -141,12 +153,14 @@
+ umull r4, ip, ip, r4
+ ldr r6, [r6, #0]
+ ldr r8, [r7, #392]
++.LPIC24:
++ add r2, pc
+ add r4, sp, #15
+ str r3, [r7, #236]
-+ bic r4, r4, #15
+ str r6, [r7, #172]
-+ str r4, [r7, #196]
++ bic r4, r4, #15
+ str r0, [r7, #184]
++ str r4, [r7, #196]
+ lsrs ip, ip, #7
+ str r1, [r7, #180]
+ ldmia r2, {r0, r1, r2, r3}
@@ -254,7 +268,7 @@
+ .word 0
+ .word 0
+ .word 0
-+ .word .LANCHOR0
++ .word .LANCHOR0-(.LPIC24+4)
+.L39:
+.L3:
+ vadd.i32 q4, q4, q0
diff --git a/patches.chromium/0007-chacha.patch b/patches.chromium/0007-chacha.patch
index 6a94bcb..dbfa73d 100644
--- a/patches.chromium/0007-chacha.patch
+++ b/patches.chromium/0007-chacha.patch
@@ -37,10 +37,10 @@
crypto/aes/asm/aes-armv4.S \
crypto/bn/asm/armv4-gf2m.S \
crypto/bn/asm/armv4-mont.S \
-+crypto/chacha/chacha_vec_arm.s \
++crypto/chacha/chacha_vec_arm.S \
crypto/modes/asm/ghash-armv4.S \
+crypto/poly1305/poly1305_arm.c \
-+crypto/poly1305/poly1305_arm_asm.s \
++crypto/poly1305/poly1305_arm_asm.S \
crypto/sha/asm/sha1-armv4-large.S \
crypto/sha/asm/sha256-armv4.S \
crypto/sha/asm/sha512-armv4.S \
@@ -3242,7 +3242,7 @@
+index 0000000..2e5621d
+--- /dev/null
++++ b/crypto/poly1305/poly1305.c
-+@@ -0,0 +1,320 @@
++@@ -0,0 +1,321 @@
++/* ====================================================================
++ * Copyright (c) 2011-2013 The OpenSSL Project. All rights reserved.
++ *
@@ -3303,6 +3303,7 @@
++#if !defined(OPENSSL_NO_POLY1305)
++
++#include <openssl/poly1305.h>
+++#include <openssl/crypto.h>
++
++#if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
++/* We can assume little-endian. */
@@ -3998,11 +3999,11 @@
++ }
++
++#endif /* !OPENSSL_NO_POLY1305 */
-+diff --git a/crypto/poly1305/poly1305_arm_asm.s b/crypto/poly1305/poly1305_arm_asm.s
++diff --git a/crypto/poly1305/poly1305_arm_asm.S b/crypto/poly1305/poly1305_arm_asm.S
+new file mode 100644
+index 0000000..449d16f
+--- /dev/null
-++++ b/crypto/poly1305/poly1305_arm_asm.s
+++++ b/crypto/poly1305/poly1305_arm_asm.S
+@@ -0,0 +1,2009 @@
++# This implementation was taken from the public domain, neon2 version in
++# SUPERCOP by D. J. Bernstein and Peter Schwabe.
@@ -7350,7 +7351,7 @@
diff -burN android-openssl-lhash2/patches/neon_runtime.patch android-openssl/patches/neon_runtime.patch
--- android-openssl-lhash2/patches/neon_runtime.patch 1969-12-31 19:00:00.000000000 -0500
+++ android-openssl/patches/neon_runtime.patch 2013-11-05 16:51:28.668287449 -0500
-@@ -0,0 +1,1104 @@
+@@ -0,0 +1,1118 @@
+From aea47606333cfd3e7a09cab3e42e488c79a416af Mon Sep 17 00:00:00 2001
+From: Adam Langley <agl@chromium.org>
+Date: Tue, 5 Nov 2013 13:10:11 -0500
@@ -7448,16 +7449,28 @@
+ unsigned char *out,
+ const unsigned char *in,
+ size_t inlen,
-+diff --git a/crypto/chacha/chacha_vec_arm.s b/crypto/chacha/chacha_vec_arm.s
++diff --git a/crypto/chacha/chacha_vec_arm.S b/crypto/chacha/chacha_vec_arm.S
+new file mode 100644
+index 0000000..24a5050
+--- /dev/null
-++++ b/crypto/chacha/chacha_vec_arm.s
-+@@ -0,0 +1,846 @@
+++++ b/crypto/chacha/chacha_vec_arm.S
++@@ -0,0 +1,860 @@
+++# This file contains a pre-compiled version of chacha_vec.c for ARM. This is
+++# needed to support switching on NEON code at runtime. If the whole of OpenSSL
+++# were to be compiled with the needed flags to build chacha_vec.c, then it
+++# wouldn't be possible to run on non-NEON systems.
+++#
+++# This file was generated by:
+++#
+++# /opt/gcc-linaro-arm-linux-gnueabihf-4.7-2012.10-20121022_linux/bin/arm-linux-gnueabihf-gcc -O3 -mcpu=cortex-a8 -mfpu=neon -S chacha_vec.c -I ../../include -fpic
+++#
+++# And then EABI attribute 28 was set to zero to allow linking with soft-float
+++# code.
+++
++ .syntax unified
++ .cpu cortex-a8
++ .eabi_attribute 27, 3
-++ .eabi_attribute 28, 1
+++ .eabi_attribute 28, 0
++ .fpu neon
++ .eabi_attribute 20, 1
++ .eabi_attribute 21, 1
@@ -7494,12 +7507,14 @@
++ umull r4, ip, ip, r4
++ ldr r6, [r6, #0]
++ ldr r8, [r7, #392]
+++.LPIC24:
+++ add r2, pc
++ add r4, sp, #15
++ str r3, [r7, #236]
-++ bic r4, r4, #15
++ str r6, [r7, #172]
-++ str r4, [r7, #196]
+++ bic r4, r4, #15
++ str r0, [r7, #184]
+++ str r4, [r7, #196]
++ lsrs ip, ip, #7
++ str r1, [r7, #180]
++ ldmia r2, {r0, r1, r2, r3}
@@ -7607,7 +7622,7 @@
++ .word 0
++ .word 0
++ .word 0
-++ .word .LANCHOR0
+++ .word .LANCHOR0-(.LPIC24+4)
++.L39:
++.L3:
++ vadd.i32 q4, q4, q0
