From 50810d713996499490a3ecf23aa377a16893c8f0 Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Mon, 17 Apr 2017 17:01:49 -0700
Subject: [PATCH 1/2] Revert a change in BoringSSL 8.1

---
 src/objective-c/BoringSSL.podspec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/objective-c/BoringSSL.podspec b/src/objective-c/BoringSSL.podspec
index 7880aad10ba..7403f3288c6 100644
--- a/src/objective-c/BoringSSL.podspec
+++ b/src/objective-c/BoringSSL.podspec
@@ -31,7 +31,7 @@
 
 Pod::Spec.new do |s|
   s.name     = 'BoringSSL'
-  version = '8.1'
+  version = '8.2'
   s.version  = version
   s.summary  = 'BoringSSL is a fork of OpenSSL that is designed to meet Google’s needs.'
   # Adapted from the homepage:
@@ -113,7 +113,6 @@ Pod::Spec.new do |s|
   s.subspec 'Interface' do |ss|
     ss.header_mappings_dir = 'include/openssl'
     ss.source_files = 'include/openssl/*.h'
-    ss.exclude_files = 'include/openssl/arm_arch.h'
   end
   s.subspec 'Implementation' do |ss|
     ss.header_mappings_dir = '.'

From d28078869a0b0890aa1532f5ff85f1127286abcd Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Tue, 18 Apr 2017 10:49:17 -0700
Subject: [PATCH 2/2] Revert umbrella header too

---
 src/objective-c/BoringSSL.podspec | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/objective-c/BoringSSL.podspec b/src/objective-c/BoringSSL.podspec
index 7403f3288c6..651bd4977d8 100644
--- a/src/objective-c/BoringSSL.podspec
+++ b/src/objective-c/BoringSSL.podspec
@@ -149,6 +149,11 @@ Pod::Spec.new do |s|
       #include "ssl.h"
       #include "crypto.h"
       #include "aes.h"
+      /* The following macros are defined by base.h. The latter is the first file included by the    
+         other headers. */    
+      #if defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)    
+      #  include "arm_arch.h"   
+      #endif
       #include "asn1.h"
       #include "asn1_mac.h"
       #include "asn1t.h"