From 19e7bf9744c1396087046f01bc4d0f2668ae2373 Mon Sep 17 00:00:00 2001
From: Keith Winstein <keithw@mit.edu>
Date: Fri, 20 Jul 2012 16:53:47 -0400
Subject: [PATCH] Add iOS waiver and new OCB license

---
 COPYING.iOS      | 11 +++++++++++
 ocb-license.html |  9 +++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 COPYING.iOS

diff --git a/COPYING.iOS b/COPYING.iOS
new file mode 100644
index 0000000..e63e356
--- /dev/null
+++ b/COPYING.iOS
@@ -0,0 +1,11 @@
+The Mosh developers are aware that the terms of service that apply to
+apps distributed via Apple's App Store services may conflict with
+rights granted under Mosh's license, the GNU General Public License,
+version 3. The Mosh copyright holders do not wish this conflict to
+prevent the otherwise-compliant distribution of Mosh-derived apps via
+the App Store. Therefore, we have committed not to pursue any license
+violation that results solely from the conflict between the GPLv3 and
+the Apple App Store terms of service. In other words, as long as you
+comply with the GPL in all other respects, including its requirements
+to provide users with source code and the text of the license, we will
+not object to your distribution of Mosh through the App Store.
diff --git a/ocb-license.html b/ocb-license.html
index 707d968..64249f0 100644
--- a/ocb-license.html
+++ b/ocb-license.html
@@ -35,4 +35,13 @@ <h4>The patents:</h4>
 Pseudorandom Function. 
 </ul>
 
+<hr>
 
+<p><b>June 12, 2012</b>: Phillip Rogaway licensed the distribution of OCB
+in Mosh under the GPL with the OpenSSL linking exception and iOS
+waiver contained in the <code>COPYING.iOS</code> file.</p>
+
+<blockquote>
+  "Mosh with the two GPL exemptions you specify in the attached note
+  is freely licensed to use for any OCB-related IP that I own."
+</blockquote>