From f13e38c3f71b061bdb2c2014d0f6442b7237fe81 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 22 Mar 2021 12:22:24 -0400 Subject: [PATCH 1/1] Correct license header in zbase32 to match original work The original work is licensed dual MIT+Apache-2 just like us, so the license header should not only mention MIT. --- lightning/src/util/zbase32.rs | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/lightning/src/util/zbase32.rs b/lightning/src/util/zbase32.rs index 83b9f076..e17ac3e7 100644 --- a/lightning/src/util/zbase32.rs +++ b/lightning/src/util/zbase32.rs @@ -1,26 +1,11 @@ // This is a modification of base32 encoding to support the zbase32 alphabet. // The original piece of software can be found at https://github.com/andreasots/base32 +// The original portions of this software are Copyright (c) 2015 The base32 Developers -/* -Copyright (c) 2015 The base32 Developers - -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. +/* This file is licensed under either of + * Apache License, Version 2.0, (LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0) or + * MIT license (LICENSE-MIT or http://opensource.org/licenses/MIT) + * at your option. */ const ALPHABET: &'static [u8] = b"ybndrfg8ejkmcpqxot1uwisza345h769"; -- 2.30.2