From de304524982a6e1d4498c123f289b31b6e4f0707 Mon Sep 17 00:00:00 2001 From: John Hood Date: Sun, 1 Nov 2015 14:44:37 -0500 Subject: [PATCH] Add .gitattributes and EOL normalization --- .gitattributes | 1 + ocb-license.html | 94 ++++++++++++++++++++++++------------------------ 2 files changed, 48 insertions(+), 47 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..e574347 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=true diff --git a/ocb-license.html b/ocb-license.html index 66b2ec7..3454717 100644 --- a/ocb-license.html +++ b/ocb-license.html @@ -1,47 +1,47 @@ -OCB - An Authenticated-Encryption Scheme - GPL Patent Grant - Rogaway - - -

OCB: - Patent Grant for GNU GPL

- -Whereas I, Phillip Rogaway (hereinafter "Inventor") have sought -patent protection for certain technology -(hereinafter "Patented Technology"), -and Inventor wishes to aid the Free Software Foundation in achieving its goals, -and Inventor wishes to increase public awareness of Patented Technology, -Inventor hereby grants a fully paid-up, nonexclusive, -royalty-free license to -practice any patents claiming priority to the -patent applications below ("the Patents") -if practiced by -software distributed -under the terms of any version of -the GNU General Public License as published by the Free Software Foundation, -59 Temple Place, Suite 330, Boston, MA 02111. -Inventor reserves all other rights, including without limitation -licensing for software not distributed under the GNU General Public License. - -

The patents:

- - - - -
- -

June 12, 2012: Phillip Rogaway licensed the distribution of OCB -in Mosh under the GPL with the OpenSSL linking exception and iOS -waiver contained in the COPYING.iOS file.

- -
- "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." -
+OCB - An Authenticated-Encryption Scheme - GPL Patent Grant - Rogaway + + +

OCB: + Patent Grant for GNU GPL

+ +Whereas I, Phillip Rogaway (hereinafter "Inventor") have sought +patent protection for certain technology +(hereinafter "Patented Technology"), +and Inventor wishes to aid the Free Software Foundation in achieving its goals, +and Inventor wishes to increase public awareness of Patented Technology, +Inventor hereby grants a fully paid-up, nonexclusive, +royalty-free license to +practice any patents claiming priority to the +patent applications below ("the Patents") +if practiced by +software distributed +under the terms of any version of +the GNU General Public License as published by the Free Software Foundation, +59 Temple Place, Suite 330, Boston, MA 02111. +Inventor reserves all other rights, including without limitation +licensing for software not distributed under the GNU General Public License. + +

The patents:

+ + + + +
+ +

June 12, 2012: Phillip Rogaway licensed the distribution of OCB +in Mosh under the GPL with the OpenSSL linking exception and iOS +waiver contained in the COPYING.iOS file.

+ +
+ "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." +