diff options
Diffstat (limited to 'rnp-upstream.patch')
| -rw-r--r-- | rnp-upstream.patch | 104 |
1 files changed, 104 insertions, 0 deletions
diff --git a/rnp-upstream.patch b/rnp-upstream.patch new file mode 100644 index 0000000..65bfe8c --- /dev/null +++ b/rnp-upstream.patch @@ -0,0 +1,104 @@ +From 947f8c43f588770b55a0c1d87fb2c6d6fea41a87 Mon Sep 17 00:00:00 2001 +From: Ronald Tse <ronald.tse@ribose.com> +Date: Fri, 4 Nov 2022 12:38:26 +0800 +Subject: [PATCH] feat: add MIT license for sha1 collision detection code, + fixes #1932 + +--- + LICENSE.md | 42 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 42 insertions(+) + +diff --git a/LICENSE.md b/LICENSE.md +index 745d528a7..d9f32dc44 100644 +--- a/LICENSE.md ++++ b/LICENSE.md +@@ -134,3 +134,45 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. ++ ++ ++MIT License for SHA-1 collision detection code ++---------------------------------------------- ++ ++These files are derived from ++[sha1collisiondetection-tools](https://github.com/cr-marcstevens/sha1collisiondetection-tools), ++which is distributed with this [license](https://github.com/git/sha1collisiondetection/blob/master/LICENSE.txt) ++reproduced below. ++ ++* `src/lib/crypto/sha1cd/sha1.{c,h}` ++* `src/lib/crypto/sha1cd/ubc_check.{c,h}` ++ ++Copyright (c) 2017: ++ ++ Marc Stevens ++ Cryptology Group ++ Centrum Wiskunde & Informatica ++ P.O. Box 94079, 1090 GB Amsterdam, Netherlands ++ marc@marc-stevens.nl ++ ++ Dan Shumow ++ Microsoft Research ++ danshu@microsoft.com ++ ++Permission is hereby granted, free of charge, to any person obtaining a copy ++of this software and associated documentation files (the "Software"), to deal ++in the Software without restriction, including without limitation the rights ++to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++copies of the Software, and to permit persons to whom the Software is ++furnished to do so, subject to the following conditions: ++ ++The above copyright notice and this permission notice shall be included in all ++copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++SOFTWARE. +From 28f205844e0e2883b4b5b4d09a9a6b64b860c3b4 Mon Sep 17 00:00:00 2001 +From: Ronald Tse <ronald.tse@ribose.com> +Date: Fri, 4 Nov 2022 12:55:57 +0800 +Subject: [PATCH] feat: clarify status of OCB license, fixes #1935 + +--- + LICENSE-OCB.md | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/LICENSE-OCB.md b/LICENSE-OCB.md +index 03c96df47..6293e3330 100644 +--- a/LICENSE-OCB.md ++++ b/LICENSE-OCB.md +@@ -1,11 +1,22 @@ + License for OCB Usage + ===================== + ++Last updated: November 1, 2022 ++ + This license has been graciously granted by Professor Phillip Rogaway to allow + users of [`rnp`](https://github.com/rnpgp/rnp) to utilize the patented + [OCB](http://web.cs.ucdavis.edu/~rogaway/ocb/) blockcipher mode of operation, + which simultaneously provides privacy and authenticity. + ++While the license is irrevocable and does not expire, it is no longer necessary, ++since Professor Phillip Rogaway confirmed that the OCB patents are now in the ++public domain and officially abandoned, announced at the link below: ++ ++* https://mailarchive.ietf.org/arch/msg/cfrg/qLTveWOdTJcLn4HP3ev-vrj05Vg/ ++ ++This license text remains in RNP as an acknowledgement of kindness given by ++Professor Phillip Rogaway to make OCB available for RNP users. ++ + The license text is presented below in plain text form purely for referential + purposes. The original signed license is available on request from Ribose Inc., + reachable at open.source@ribose.com. +@@ -13,6 +24,7 @@ reachable at open.source@ribose.com. + This file adheres to the formatting guidelines of + [readable-licenses](https://github.com/nevir/readable-licenses). + ++ + OCB Patent License for Ribose Inc. + ---------------------------------- + |