diff options
author | Bill Cox <waywardgeek@google.com> | 2016-02-29 07:42:23 +0300 |
---|---|---|
committer | Bill Cox <waywardgeek@google.com> | 2016-02-29 07:42:23 +0300 |
commit | 58eab9690e7c8dba0886c69de79d5343c338ec6a (patch) | |
tree | c3b6ed77fff1f163a47352c139c834b8fd0084d3 /ref | |
parent | 90cf5d00c312235c2297d0d582eed0efc01e5c31 (diff) |
Changed copyright of Samuel's code to 3-license version suggested by Zooko
Diffstat (limited to 'ref')
-rw-r--r-- | ref/blake2-impl.h | 20 | ||||
-rw-r--r-- | ref/blake2-kat.h | 20 | ||||
-rw-r--r-- | ref/blake2.h | 20 | ||||
-rw-r--r-- | ref/blake2b-ref.c | 20 | ||||
-rw-r--r-- | ref/blake2bp-ref.c | 20 | ||||
-rw-r--r-- | ref/blake2s-ref.c | 20 | ||||
-rw-r--r-- | ref/blake2sp-ref.c | 20 | ||||
-rw-r--r-- | ref/genkat.c | 22 |
8 files changed, 89 insertions, 73 deletions
diff --git a/ref/blake2-impl.h b/ref/blake2-impl.h index ae582a5..01ea2de 100644 --- a/ref/blake2-impl.h +++ b/ref/blake2-impl.h @@ -1,14 +1,16 @@ /* BLAKE2 reference source code package - reference C implementations - - Written in 2012 by Samuel Neves <sneves@dei.uc.pt> - - To the extent possible under law, the author(s) have dedicated all copyright - and related and neighboring rights to this software to the public domain - worldwide. This software is distributed without any warranty. - - You should have received a copy of the CC0 Public Domain Dedication along with - this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. + + Copyright 2012, Samuel Neves <sneves@dei.uc.pt>. You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. */ #pragma once #ifndef __BLAKE2_IMPL_H__ diff --git a/ref/blake2-kat.h b/ref/blake2-kat.h index 1823f00..19355a9 100644 --- a/ref/blake2-kat.h +++ b/ref/blake2-kat.h @@ -1,14 +1,16 @@ /* BLAKE2 reference source code package - reference C implementations - - Written in 2012 by Samuel Neves <sneves@dei.uc.pt> - - To the extent possible under law, the author(s) have dedicated all copyright - and related and neighboring rights to this software to the public domain - worldwide. This software is distributed without any warranty. - - You should have received a copy of the CC0 Public Domain Dedication along with - this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. + + Copyright 2012, Samuel Neves <sneves@dei.uc.pt>. You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. */ #pragma once #ifndef __BLAKE2_KAT_H__ diff --git a/ref/blake2.h b/ref/blake2.h index abd1f35..bdc0797 100644 --- a/ref/blake2.h +++ b/ref/blake2.h @@ -1,14 +1,16 @@ /* BLAKE2 reference source code package - reference C implementations - - Written in 2012 by Samuel Neves <sneves@dei.uc.pt> - - To the extent possible under law, the author(s) have dedicated all copyright - and related and neighboring rights to this software to the public domain - worldwide. This software is distributed without any warranty. - - You should have received a copy of the CC0 Public Domain Dedication along with - this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. + + Copyright 2012, Samuel Neves <sneves@dei.uc.pt>. You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. */ #pragma once #ifndef __BLAKE2_H__ diff --git a/ref/blake2b-ref.c b/ref/blake2b-ref.c index 6400826..dd728bc 100644 --- a/ref/blake2b-ref.c +++ b/ref/blake2b-ref.c @@ -1,14 +1,16 @@ /* BLAKE2 reference source code package - reference C implementations - - Written in 2012 by Samuel Neves <sneves@dei.uc.pt> - - To the extent possible under law, the author(s) have dedicated all copyright - and related and neighboring rights to this software to the public domain - worldwide. This software is distributed without any warranty. - - You should have received a copy of the CC0 Public Domain Dedication along with - this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. + + Copyright 2012, Samuel Neves <sneves@dei.uc.pt>. You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. */ #include <stdint.h> diff --git a/ref/blake2bp-ref.c b/ref/blake2bp-ref.c index d265549..100bfe0 100644 --- a/ref/blake2bp-ref.c +++ b/ref/blake2bp-ref.c @@ -1,14 +1,16 @@ /* BLAKE2 reference source code package - reference C implementations - - Written in 2012 by Samuel Neves <sneves@dei.uc.pt> - - To the extent possible under law, the author(s) have dedicated all copyright - and related and neighboring rights to this software to the public domain - worldwide. This software is distributed without any warranty. - - You should have received a copy of the CC0 Public Domain Dedication along with - this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. + + Copyright 2012, Samuel Neves <sneves@dei.uc.pt>. You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. */ #include <stdio.h> diff --git a/ref/blake2s-ref.c b/ref/blake2s-ref.c index 124af8f..2bab23f 100644 --- a/ref/blake2s-ref.c +++ b/ref/blake2s-ref.c @@ -1,14 +1,16 @@ /* BLAKE2 reference source code package - reference C implementations - - Written in 2012 by Samuel Neves <sneves@dei.uc.pt> - - To the extent possible under law, the author(s) have dedicated all copyright - and related and neighboring rights to this software to the public domain - worldwide. This software is distributed without any warranty. - - You should have received a copy of the CC0 Public Domain Dedication along with - this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. + + Copyright 2012, Samuel Neves <sneves@dei.uc.pt>. You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. */ #include <stdint.h> diff --git a/ref/blake2sp-ref.c b/ref/blake2sp-ref.c index 1ddb5b1..03957a9 100644 --- a/ref/blake2sp-ref.c +++ b/ref/blake2sp-ref.c @@ -1,14 +1,16 @@ /* BLAKE2 reference source code package - reference C implementations - - Written in 2012 by Samuel Neves <sneves@dei.uc.pt> - - To the extent possible under law, the author(s) have dedicated all copyright - and related and neighboring rights to this software to the public domain - worldwide. This software is distributed without any warranty. - - You should have received a copy of the CC0 Public Domain Dedication along with - this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. + + Copyright 2012, Samuel Neves <sneves@dei.uc.pt>. You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. */ #include <stdlib.h> diff --git a/ref/genkat.c b/ref/genkat.c index 4f6e63a..a30ddf3 100644 --- a/ref/genkat.c +++ b/ref/genkat.c @@ -1,14 +1,16 @@ /* BLAKE2 reference source code package - reference C implementations - - Written in 2012 by Samuel Neves <sneves@dei.uc.pt> - - To the extent possible under law, the author(s) have dedicated all copyright - and related and neighboring rights to this software to the public domain - worldwide. This software is distributed without any warranty. - - You should have received a copy of the CC0 Public Domain Dedication along with - this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. + + Copyright 2012, Samuel Neves <sneves@dei.uc.pt>. You may use this under the + terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at + your option. The terms of these licenses can be found at: + + - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 + - OpenSSL license : https://www.openssl.org/source/license.html + - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 + + More information about the BLAKE2 hash function can be found at + https://blake2.net. */ #include <stdint.h> @@ -207,4 +209,4 @@ int main( int argc, char **argv ) printf( "};\n\n\n\n\n" );*/ puts( "#endif\n\n\n" ); return 0; -}
\ No newline at end of file +} |