Skip to content

Commit f13e38c

Browse files
TheBlueMattsr-gi
authored andcommitted
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.
1 parent d871645 commit f13e38c

File tree

1 file changed

+5
-20
lines changed

1 file changed

+5
-20
lines changed

lightning/src/util/zbase32.rs

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,11 @@
11
// This is a modification of base32 encoding to support the zbase32 alphabet.
22
// The original piece of software can be found at https://github.com/andreasots/base32
3+
// The original portions of this software are Copyright (c) 2015 The base32 Developers
34

4-
/*
5-
Copyright (c) 2015 The base32 Developers
6-
7-
Permission is hereby granted, free of charge, to any person obtaining a copy
8-
of this software and associated documentation files (the "Software"), to deal
9-
in the Software without restriction, including without limitation the rights
10-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11-
copies of the Software, and to permit persons to whom the Software is
12-
furnished to do so, subject to the following conditions:
13-
14-
The above copyright notice and this permission notice shall be included in all
15-
copies or substantial portions of the Software.
16-
17-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
23-
SOFTWARE.
5+
/* This file is licensed under either of
6+
* Apache License, Version 2.0, (LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0) or
7+
* MIT license (LICENSE-MIT or http://opensource.org/licenses/MIT)
8+
* at your option.
249
*/
2510

2611
const ALPHABET: &'static [u8] = b"ybndrfg8ejkmcpqxot1uwisza345h769";

0 commit comments

Comments
 (0)