argon2 1.1.1 → 1.1.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +7 -4
- data/Changelog.md +3 -0
- data/README.md +2 -0
- data/argon2.gemspec +1 -1
- data/ext/argon2_wrap/Makefile +6 -0
- data/ext/argon2_wrap/argon_wrap.c +1 -7
- data/ext/phc-winner-argon2/.gitignore +1 -0
- data/ext/phc-winner-argon2/Argon2.sln +64 -2
- data/ext/phc-winner-argon2/CHANGELOG.md +8 -1
- data/ext/phc-winner-argon2/LICENSE +301 -18
- data/ext/phc-winner-argon2/Makefile +85 -20
- data/ext/phc-winner-argon2/README.md +73 -30
- data/ext/phc-winner-argon2/argon2-specs.pdf +0 -0
- data/ext/phc-winner-argon2/include/argon2.h +73 -10
- data/ext/phc-winner-argon2/kats/argon2id +12304 -0
- data/ext/phc-winner-argon2/kats/argon2id.shasum +1 -0
- data/ext/phc-winner-argon2/kats/argon2id_v16 +12304 -0
- data/ext/phc-winner-argon2/kats/argon2id_v16.shasum +1 -0
- data/ext/phc-winner-argon2/kats/test.ps1 +1 -1
- data/ext/phc-winner-argon2/kats/test.sh +1 -1
- data/ext/phc-winner-argon2/latex/IEEEtran.cls +6347 -0
- data/ext/phc-winner-argon2/latex/argon2-spec.tex +920 -0
- data/ext/phc-winner-argon2/latex/pics/argon2-par.pdf +0 -0
- data/ext/phc-winner-argon2/latex/pics/compression.pdf +0 -0
- data/ext/phc-winner-argon2/latex/pics/generic.pdf +0 -0
- data/ext/phc-winner-argon2/latex/pics/power-distribution.jpg +0 -0
- data/ext/phc-winner-argon2/latex/tradeoff.bib +822 -0
- data/ext/phc-winner-argon2/libargon2.pc +16 -0
- data/ext/phc-winner-argon2/man/argon2.1 +13 -3
- data/ext/phc-winner-argon2/src/argon2.c +112 -68
- data/ext/phc-winner-argon2/src/bench.c +44 -27
- data/ext/phc-winner-argon2/src/blake2/blake2-impl.h +18 -5
- data/ext/phc-winner-argon2/src/blake2/blake2.h +17 -0
- data/ext/phc-winner-argon2/src/blake2/blake2b.c +25 -7
- data/ext/phc-winner-argon2/src/blake2/blamka-round-opt.h +17 -0
- data/ext/phc-winner-argon2/src/blake2/blamka-round-ref.h +17 -0
- data/ext/phc-winner-argon2/src/core.c +138 -110
- data/ext/phc-winner-argon2/src/core.h +41 -26
- data/ext/phc-winner-argon2/src/encoding.c +79 -55
- data/ext/phc-winner-argon2/src/encoding.h +25 -8
- data/ext/phc-winner-argon2/src/genkat.c +35 -39
- data/ext/phc-winner-argon2/src/genkat.h +11 -7
- data/ext/phc-winner-argon2/src/opt.c +65 -99
- data/ext/phc-winner-argon2/src/opt.h +15 -32
- data/ext/phc-winner-argon2/src/ref.c +50 -93
- data/ext/phc-winner-argon2/src/ref.h +15 -31
- data/ext/phc-winner-argon2/src/run.c +73 -30
- data/ext/phc-winner-argon2/src/test.c +33 -2
- data/ext/phc-winner-argon2/src/thread.c +21 -0
- data/ext/phc-winner-argon2/src/thread.h +21 -0
- data/ext/phc-winner-argon2/vs2015/Argon2Opt/Argon2Opt.vcxproj +69 -1
- data/ext/phc-winner-argon2/vs2015/Argon2OptBench/Argon2OptBench.vcxproj +69 -1
- data/ext/phc-winner-argon2/vs2015/Argon2OptDll/Argon2OptDll.vcxproj +225 -0
- data/ext/phc-winner-argon2/vs2015/Argon2OptDll/Argon2OptDll.vcxproj.filters +66 -0
- data/ext/phc-winner-argon2/vs2015/Argon2OptGenKAT/Argon2OptGenKAT.vcxproj +73 -1
- data/ext/phc-winner-argon2/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj +69 -1
- data/ext/phc-winner-argon2/vs2015/Argon2Ref/Argon2Ref.vcxproj +69 -1
- data/ext/phc-winner-argon2/vs2015/Argon2RefBench/Argon2RefBench.vcxproj +69 -1
- data/ext/phc-winner-argon2/vs2015/Argon2RefDll/Argon2RefDll.vcxproj +225 -0
- data/ext/phc-winner-argon2/vs2015/Argon2RefDll/Argon2RefDll.vcxproj.filters +66 -0
- data/ext/phc-winner-argon2/vs2015/Argon2RefGenKAT/Argon2RefGenKAT.vcxproj +69 -1
- data/ext/phc-winner-argon2/vs2015/Argon2RefTestCI/Argon2RefTestCI.vcxproj +69 -1
- data/lib/argon2.rb +3 -3
- data/lib/argon2/ffi_engine.rb +3 -3
- data/lib/argon2/version.rb +1 -1
- metadata +21 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 32024a89ef551d5e36ea1f33be4d8c9be3dd37bd
|
|
4
|
+
data.tar.gz: f1ea4e67f60ad84df06ddd60662b25a594537bda
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 15e9b77c5fd46fa4dfe2a81c5bb5272971167f41ff6a2091e0a619606e63e0ba9d6a55ff39efc6e7ca5f6bb2ead09f7d1965a1095c88cb0b1d25c814b8cea582
|
|
7
|
+
data.tar.gz: af39dbc7405bcaf1d9860a3f4b4cd111ecf27e39575c61de757cc668e1eb000d874a17d66d7fa361077676f1212908e6db11270f68c259012a03ce4000ec9bdd
|
data/.travis.yml
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
language: ruby
|
|
2
2
|
rvm:
|
|
3
|
-
- 2.
|
|
4
|
-
- 2.3.
|
|
3
|
+
- 2.4.0
|
|
4
|
+
- 2.3.3
|
|
5
5
|
- jruby-9000
|
|
6
|
-
before_install:
|
|
6
|
+
before_install:
|
|
7
|
+
- gem install bundler
|
|
8
|
+
- gem update --system
|
|
7
9
|
install: bin/setup
|
|
8
10
|
script:
|
|
9
11
|
- cd ext/argon2_wrap/ && make test && cd ../..
|
|
10
|
-
-
|
|
12
|
+
- bundle exec rake test
|
|
13
|
+
- CODECLIMATE_REPO_TOKEN=2b619b81040453ecbcf1cf0869e1238c4bbaab666a42e7dd94d762c747c0f51a bundle exec codeclimate-test-reporter
|
data/Changelog.md
CHANGED
data/README.md
CHANGED
|
@@ -80,6 +80,8 @@ The default installation workflow has caused issues with a number of gems under
|
|
|
80
80
|
|
|
81
81
|
Windows is not. Nobody anywhere has the resources to support Ruby FFI code on Windows.
|
|
82
82
|
|
|
83
|
+
grsec introduces certain challenges. Please see [documentation here](https://github.com/technion/ruby-argon2/issues/15).
|
|
84
|
+
|
|
83
85
|
## RubyDocs documentation
|
|
84
86
|
|
|
85
87
|
[The usual URL](http://www.rubydoc.info/gems/argon2) will provide detailed documentation.
|
data/argon2.gemspec
CHANGED
|
@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
|
|
|
27
27
|
spec.add_development_dependency "rake", '~> 10.4', '>= 10.4.2'
|
|
28
28
|
spec.add_development_dependency "minitest", '~> 5.8'
|
|
29
29
|
spec.add_development_dependency "rubocop", '~> 0.35'
|
|
30
|
-
spec.add_development_dependency "codeclimate-test-reporter", '~> 0
|
|
30
|
+
spec.add_development_dependency "codeclimate-test-reporter", '~> 1.0'
|
|
31
31
|
spec.extensions << 'ext/argon2_wrap/extconf.rb'
|
|
32
32
|
end
|
data/ext/argon2_wrap/Makefile
CHANGED
|
@@ -48,6 +48,12 @@ ifeq ($(KERNEL_NAME), $(filter $(KERNEL_NAME),OpenBSD FreeBSD))
|
|
|
48
48
|
LIB_EXT := so
|
|
49
49
|
LIB_CFLAGS := -shared -fPIC
|
|
50
50
|
endif
|
|
51
|
+
ifeq ($(KERNEL_NAME), SunOS)
|
|
52
|
+
CC := gcc
|
|
53
|
+
CFLAGS += -D_REENTRANT
|
|
54
|
+
LIB_EXT := so
|
|
55
|
+
LIB_CFLAGS := -shared -fPIC
|
|
56
|
+
endif
|
|
51
57
|
|
|
52
58
|
LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
|
|
53
59
|
|
|
@@ -87,22 +87,18 @@ int wrap_argon2_verify(const char *encoded, const char *pwd,
|
|
|
87
87
|
|
|
88
88
|
encoded_len = strlen(encoded);
|
|
89
89
|
/* larger than max possible values */
|
|
90
|
-
ctx.adlen = encoded_len;
|
|
91
90
|
ctx.saltlen = encoded_len;
|
|
92
91
|
ctx.outlen = encoded_len;
|
|
93
92
|
|
|
94
|
-
ctx.ad = malloc(ctx.adlen);
|
|
95
93
|
ctx.salt = malloc(ctx.saltlen);
|
|
96
94
|
ctx.out = malloc(ctx.outlen);
|
|
97
|
-
if (!ctx.out || !ctx.salt
|
|
98
|
-
free(ctx.ad);
|
|
95
|
+
if (!ctx.out || !ctx.salt) {
|
|
99
96
|
free(ctx.salt);
|
|
100
97
|
free(ctx.out);
|
|
101
98
|
return ARGON2_MEMORY_ALLOCATION_ERROR;
|
|
102
99
|
}
|
|
103
100
|
|
|
104
101
|
if(decode_string(&ctx, encoded, Argon2_i) != ARGON2_OK) {
|
|
105
|
-
free(ctx.ad);
|
|
106
102
|
free(ctx.salt);
|
|
107
103
|
free(ctx.out);
|
|
108
104
|
return ARGON2_DECODING_FAIL;
|
|
@@ -110,7 +106,6 @@ int wrap_argon2_verify(const char *encoded, const char *pwd,
|
|
|
110
106
|
|
|
111
107
|
out = malloc(ENCODE_LEN + ctx.saltlen);
|
|
112
108
|
if(!out) {
|
|
113
|
-
free(ctx.ad);
|
|
114
109
|
free(ctx.salt);
|
|
115
110
|
free(ctx.out);
|
|
116
111
|
return ARGON2_DECODING_FAIL;
|
|
@@ -119,7 +114,6 @@ int wrap_argon2_verify(const char *encoded, const char *pwd,
|
|
|
119
114
|
ret = argon2_wrap(out, pwd, pwdlen, ctx.salt, ctx.saltlen, ctx.t_cost,
|
|
120
115
|
ctx.m_cost, ctx.lanes, secret, secretlen);
|
|
121
116
|
|
|
122
|
-
free(ctx.ad);
|
|
123
117
|
free(ctx.salt);
|
|
124
118
|
|
|
125
119
|
if (ret != ARGON2_OK || wrap_compare((uint8_t*)out, (uint8_t*)encoded,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
|
|
2
2
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
|
3
|
-
# Visual Studio
|
|
4
|
-
VisualStudioVersion = 14.0.
|
|
3
|
+
# Visual Studio 14
|
|
4
|
+
VisualStudioVersion = 14.0.25420.1
|
|
5
5
|
MinimumVisualStudioVersion = 10.0.40219.1
|
|
6
6
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Argon2OptTestCI", "vs2015\Argon2OptTestCI\Argon2OptTestCI.vcxproj", "{12956597-5E42-433A-93F3-D4EFF50AA207}"
|
|
7
7
|
EndProject
|
|
@@ -19,12 +19,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Argon2OptBench", "vs2015\Ar
|
|
|
19
19
|
EndProject
|
|
20
20
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Argon2RefBench", "vs2015\Argon2RefBench\Argon2RefBench.vcxproj", "{99203F6A-6E8C-42FC-8C7C-C07E8913D539}"
|
|
21
21
|
EndProject
|
|
22
|
+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Argon2OptDll", "vs2015\Argon2OptDll\Argon2OptDll.vcxproj", "{3A898DD8-ACAE-4269-ADFE-EB7260D71583}"
|
|
23
|
+
EndProject
|
|
24
|
+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Argon2RefDll", "vs2015\Argon2RefDll\Argon2RefDll.vcxproj", "{19D911A1-533C-4475-B313-F372481A35D4}"
|
|
25
|
+
EndProject
|
|
22
26
|
Global
|
|
23
27
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
|
24
28
|
Debug|x64 = Debug|x64
|
|
25
29
|
Debug|x86 = Debug|x86
|
|
26
30
|
Release|x64 = Release|x64
|
|
27
31
|
Release|x86 = Release|x86
|
|
32
|
+
ReleaseStatic|x64 = ReleaseStatic|x64
|
|
33
|
+
ReleaseStatic|x86 = ReleaseStatic|x86
|
|
28
34
|
EndGlobalSection
|
|
29
35
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
|
30
36
|
{12956597-5E42-433A-93F3-D4EFF50AA207}.Debug|x64.ActiveCfg = Debug|x64
|
|
@@ -35,6 +41,10 @@ Global
|
|
|
35
41
|
{12956597-5E42-433A-93F3-D4EFF50AA207}.Release|x64.Build.0 = Release|x64
|
|
36
42
|
{12956597-5E42-433A-93F3-D4EFF50AA207}.Release|x86.ActiveCfg = Release|Win32
|
|
37
43
|
{12956597-5E42-433A-93F3-D4EFF50AA207}.Release|x86.Build.0 = Release|Win32
|
|
44
|
+
{12956597-5E42-433A-93F3-D4EFF50AA207}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
|
|
45
|
+
{12956597-5E42-433A-93F3-D4EFF50AA207}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
|
|
46
|
+
{12956597-5E42-433A-93F3-D4EFF50AA207}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
|
|
47
|
+
{12956597-5E42-433A-93F3-D4EFF50AA207}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
|
|
38
48
|
{8A1F7F84-34AF-4DB2-9D58-D4823DFE79E9}.Debug|x64.ActiveCfg = Debug|x64
|
|
39
49
|
{8A1F7F84-34AF-4DB2-9D58-D4823DFE79E9}.Debug|x64.Build.0 = Debug|x64
|
|
40
50
|
{8A1F7F84-34AF-4DB2-9D58-D4823DFE79E9}.Debug|x86.ActiveCfg = Debug|Win32
|
|
@@ -43,6 +53,10 @@ Global
|
|
|
43
53
|
{8A1F7F84-34AF-4DB2-9D58-D4823DFE79E9}.Release|x64.Build.0 = Release|x64
|
|
44
54
|
{8A1F7F84-34AF-4DB2-9D58-D4823DFE79E9}.Release|x86.ActiveCfg = Release|Win32
|
|
45
55
|
{8A1F7F84-34AF-4DB2-9D58-D4823DFE79E9}.Release|x86.Build.0 = Release|Win32
|
|
56
|
+
{8A1F7F84-34AF-4DB2-9D58-D4823DFE79E9}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
|
|
57
|
+
{8A1F7F84-34AF-4DB2-9D58-D4823DFE79E9}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
|
|
58
|
+
{8A1F7F84-34AF-4DB2-9D58-D4823DFE79E9}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
|
|
59
|
+
{8A1F7F84-34AF-4DB2-9D58-D4823DFE79E9}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
|
|
46
60
|
{DBBAAAE6-4560-4D11-8280-30A6650A82EF}.Debug|x64.ActiveCfg = Debug|x64
|
|
47
61
|
{DBBAAAE6-4560-4D11-8280-30A6650A82EF}.Debug|x64.Build.0 = Debug|x64
|
|
48
62
|
{DBBAAAE6-4560-4D11-8280-30A6650A82EF}.Debug|x86.ActiveCfg = Debug|Win32
|
|
@@ -51,6 +65,10 @@ Global
|
|
|
51
65
|
{DBBAAAE6-4560-4D11-8280-30A6650A82EF}.Release|x64.Build.0 = Release|x64
|
|
52
66
|
{DBBAAAE6-4560-4D11-8280-30A6650A82EF}.Release|x86.ActiveCfg = Release|Win32
|
|
53
67
|
{DBBAAAE6-4560-4D11-8280-30A6650A82EF}.Release|x86.Build.0 = Release|Win32
|
|
68
|
+
{DBBAAAE6-4560-4D11-8280-30A6650A82EF}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
|
|
69
|
+
{DBBAAAE6-4560-4D11-8280-30A6650A82EF}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
|
|
70
|
+
{DBBAAAE6-4560-4D11-8280-30A6650A82EF}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
|
|
71
|
+
{DBBAAAE6-4560-4D11-8280-30A6650A82EF}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
|
|
54
72
|
{71921B4C-A795-4A37-95A3-99D600E01211}.Debug|x64.ActiveCfg = Debug|x64
|
|
55
73
|
{71921B4C-A795-4A37-95A3-99D600E01211}.Debug|x64.Build.0 = Debug|x64
|
|
56
74
|
{71921B4C-A795-4A37-95A3-99D600E01211}.Debug|x86.ActiveCfg = Debug|Win32
|
|
@@ -59,6 +77,10 @@ Global
|
|
|
59
77
|
{71921B4C-A795-4A37-95A3-99D600E01211}.Release|x64.Build.0 = Release|x64
|
|
60
78
|
{71921B4C-A795-4A37-95A3-99D600E01211}.Release|x86.ActiveCfg = Release|Win32
|
|
61
79
|
{71921B4C-A795-4A37-95A3-99D600E01211}.Release|x86.Build.0 = Release|Win32
|
|
80
|
+
{71921B4C-A795-4A37-95A3-99D600E01211}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
|
|
81
|
+
{71921B4C-A795-4A37-95A3-99D600E01211}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
|
|
82
|
+
{71921B4C-A795-4A37-95A3-99D600E01211}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
|
|
83
|
+
{71921B4C-A795-4A37-95A3-99D600E01211}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
|
|
62
84
|
{CAA75C57-998C-494E-B8A5-5894EF0FC528}.Debug|x64.ActiveCfg = Debug|x64
|
|
63
85
|
{CAA75C57-998C-494E-B8A5-5894EF0FC528}.Debug|x64.Build.0 = Debug|x64
|
|
64
86
|
{CAA75C57-998C-494E-B8A5-5894EF0FC528}.Debug|x86.ActiveCfg = Debug|Win32
|
|
@@ -67,6 +89,10 @@ Global
|
|
|
67
89
|
{CAA75C57-998C-494E-B8A5-5894EF0FC528}.Release|x64.Build.0 = Release|x64
|
|
68
90
|
{CAA75C57-998C-494E-B8A5-5894EF0FC528}.Release|x86.ActiveCfg = Release|Win32
|
|
69
91
|
{CAA75C57-998C-494E-B8A5-5894EF0FC528}.Release|x86.Build.0 = Release|Win32
|
|
92
|
+
{CAA75C57-998C-494E-B8A5-5894EF0FC528}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
|
|
93
|
+
{CAA75C57-998C-494E-B8A5-5894EF0FC528}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
|
|
94
|
+
{CAA75C57-998C-494E-B8A5-5894EF0FC528}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
|
|
95
|
+
{CAA75C57-998C-494E-B8A5-5894EF0FC528}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
|
|
70
96
|
{B9CAC9CE-9F0D-4F52-8D67-FDBBAFCD0DE2}.Debug|x64.ActiveCfg = Debug|x64
|
|
71
97
|
{B9CAC9CE-9F0D-4F52-8D67-FDBBAFCD0DE2}.Debug|x64.Build.0 = Debug|x64
|
|
72
98
|
{B9CAC9CE-9F0D-4F52-8D67-FDBBAFCD0DE2}.Debug|x86.ActiveCfg = Debug|Win32
|
|
@@ -75,6 +101,10 @@ Global
|
|
|
75
101
|
{B9CAC9CE-9F0D-4F52-8D67-FDBBAFCD0DE2}.Release|x64.Build.0 = Release|x64
|
|
76
102
|
{B9CAC9CE-9F0D-4F52-8D67-FDBBAFCD0DE2}.Release|x86.ActiveCfg = Release|Win32
|
|
77
103
|
{B9CAC9CE-9F0D-4F52-8D67-FDBBAFCD0DE2}.Release|x86.Build.0 = Release|Win32
|
|
104
|
+
{B9CAC9CE-9F0D-4F52-8D67-FDBBAFCD0DE2}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
|
|
105
|
+
{B9CAC9CE-9F0D-4F52-8D67-FDBBAFCD0DE2}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
|
|
106
|
+
{B9CAC9CE-9F0D-4F52-8D67-FDBBAFCD0DE2}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
|
|
107
|
+
{B9CAC9CE-9F0D-4F52-8D67-FDBBAFCD0DE2}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
|
|
78
108
|
{B3A0FB44-0C1C-4EC3-B155-8B39371F8EE4}.Debug|x64.ActiveCfg = Debug|x64
|
|
79
109
|
{B3A0FB44-0C1C-4EC3-B155-8B39371F8EE4}.Debug|x64.Build.0 = Debug|x64
|
|
80
110
|
{B3A0FB44-0C1C-4EC3-B155-8B39371F8EE4}.Debug|x86.ActiveCfg = Debug|Win32
|
|
@@ -83,6 +113,10 @@ Global
|
|
|
83
113
|
{B3A0FB44-0C1C-4EC3-B155-8B39371F8EE4}.Release|x64.Build.0 = Release|x64
|
|
84
114
|
{B3A0FB44-0C1C-4EC3-B155-8B39371F8EE4}.Release|x86.ActiveCfg = Release|Win32
|
|
85
115
|
{B3A0FB44-0C1C-4EC3-B155-8B39371F8EE4}.Release|x86.Build.0 = Release|Win32
|
|
116
|
+
{B3A0FB44-0C1C-4EC3-B155-8B39371F8EE4}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
|
|
117
|
+
{B3A0FB44-0C1C-4EC3-B155-8B39371F8EE4}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
|
|
118
|
+
{B3A0FB44-0C1C-4EC3-B155-8B39371F8EE4}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
|
|
119
|
+
{B3A0FB44-0C1C-4EC3-B155-8B39371F8EE4}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
|
|
86
120
|
{99203F6A-6E8C-42FC-8C7C-C07E8913D539}.Debug|x64.ActiveCfg = Debug|x64
|
|
87
121
|
{99203F6A-6E8C-42FC-8C7C-C07E8913D539}.Debug|x64.Build.0 = Debug|x64
|
|
88
122
|
{99203F6A-6E8C-42FC-8C7C-C07E8913D539}.Debug|x86.ActiveCfg = Debug|Win32
|
|
@@ -91,6 +125,34 @@ Global
|
|
|
91
125
|
{99203F6A-6E8C-42FC-8C7C-C07E8913D539}.Release|x64.Build.0 = Release|x64
|
|
92
126
|
{99203F6A-6E8C-42FC-8C7C-C07E8913D539}.Release|x86.ActiveCfg = Release|Win32
|
|
93
127
|
{99203F6A-6E8C-42FC-8C7C-C07E8913D539}.Release|x86.Build.0 = Release|Win32
|
|
128
|
+
{99203F6A-6E8C-42FC-8C7C-C07E8913D539}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
|
|
129
|
+
{99203F6A-6E8C-42FC-8C7C-C07E8913D539}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
|
|
130
|
+
{99203F6A-6E8C-42FC-8C7C-C07E8913D539}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
|
|
131
|
+
{99203F6A-6E8C-42FC-8C7C-C07E8913D539}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
|
|
132
|
+
{3A898DD8-ACAE-4269-ADFE-EB7260D71583}.Debug|x64.ActiveCfg = Debug|x64
|
|
133
|
+
{3A898DD8-ACAE-4269-ADFE-EB7260D71583}.Debug|x64.Build.0 = Debug|x64
|
|
134
|
+
{3A898DD8-ACAE-4269-ADFE-EB7260D71583}.Debug|x86.ActiveCfg = Debug|Win32
|
|
135
|
+
{3A898DD8-ACAE-4269-ADFE-EB7260D71583}.Debug|x86.Build.0 = Debug|Win32
|
|
136
|
+
{3A898DD8-ACAE-4269-ADFE-EB7260D71583}.Release|x64.ActiveCfg = Release|x64
|
|
137
|
+
{3A898DD8-ACAE-4269-ADFE-EB7260D71583}.Release|x64.Build.0 = Release|x64
|
|
138
|
+
{3A898DD8-ACAE-4269-ADFE-EB7260D71583}.Release|x86.ActiveCfg = Release|Win32
|
|
139
|
+
{3A898DD8-ACAE-4269-ADFE-EB7260D71583}.Release|x86.Build.0 = Release|Win32
|
|
140
|
+
{3A898DD8-ACAE-4269-ADFE-EB7260D71583}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
|
|
141
|
+
{3A898DD8-ACAE-4269-ADFE-EB7260D71583}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
|
|
142
|
+
{3A898DD8-ACAE-4269-ADFE-EB7260D71583}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
|
|
143
|
+
{3A898DD8-ACAE-4269-ADFE-EB7260D71583}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
|
|
144
|
+
{19D911A1-533C-4475-B313-F372481A35D4}.Debug|x64.ActiveCfg = Debug|x64
|
|
145
|
+
{19D911A1-533C-4475-B313-F372481A35D4}.Debug|x64.Build.0 = Debug|x64
|
|
146
|
+
{19D911A1-533C-4475-B313-F372481A35D4}.Debug|x86.ActiveCfg = Debug|Win32
|
|
147
|
+
{19D911A1-533C-4475-B313-F372481A35D4}.Debug|x86.Build.0 = Debug|Win32
|
|
148
|
+
{19D911A1-533C-4475-B313-F372481A35D4}.Release|x64.ActiveCfg = Release|x64
|
|
149
|
+
{19D911A1-533C-4475-B313-F372481A35D4}.Release|x64.Build.0 = Release|x64
|
|
150
|
+
{19D911A1-533C-4475-B313-F372481A35D4}.Release|x86.ActiveCfg = Release|Win32
|
|
151
|
+
{19D911A1-533C-4475-B313-F372481A35D4}.Release|x86.Build.0 = Release|Win32
|
|
152
|
+
{19D911A1-533C-4475-B313-F372481A35D4}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
|
|
153
|
+
{19D911A1-533C-4475-B313-F372481A35D4}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
|
|
154
|
+
{19D911A1-533C-4475-B313-F372481A35D4}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
|
|
155
|
+
{19D911A1-533C-4475-B313-F372481A35D4}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
|
|
94
156
|
EndGlobalSection
|
|
95
157
|
GlobalSection(SolutionProperties) = preSolution
|
|
96
158
|
HideSolutionNode = FALSE
|
|
@@ -1,10 +1,17 @@
|
|
|
1
|
+
# 20161029
|
|
2
|
+
|
|
3
|
+
* Argon2id added
|
|
4
|
+
* Better documentation
|
|
5
|
+
* Dual licensing CC0 / Apache 2.0
|
|
6
|
+
* Minor bug fixes (no security issue)
|
|
7
|
+
|
|
1
8
|
# 20160406
|
|
2
9
|
|
|
3
10
|
* Version 1.3 of Argon2
|
|
4
11
|
* Version number in encoded hash
|
|
5
12
|
* Refactored low-level API
|
|
6
13
|
* Visibility control for library symbols
|
|
7
|
-
*
|
|
14
|
+
* Microsoft Visual Studio solution
|
|
8
15
|
* New bindings
|
|
9
16
|
* Minor bug and warning fixes (no security issue)
|
|
10
17
|
|
|
@@ -1,31 +1,314 @@
|
|
|
1
|
-
|
|
1
|
+
Argon2 reference source code package - reference C implementations
|
|
2
|
+
|
|
3
|
+
Copyright 2015
|
|
4
|
+
Daniel Dinu, Dmitry Khovratovich, Jean-Philippe Aumasson, and Samuel Neves
|
|
5
|
+
|
|
6
|
+
You may use this work under the terms of a Creative Commons CC0 1.0
|
|
7
|
+
License/Waiver or the Apache Public License 2.0, at your option. The terms of
|
|
8
|
+
these licenses can be found at:
|
|
9
|
+
|
|
10
|
+
- CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
|
|
11
|
+
- Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0
|
|
12
|
+
|
|
13
|
+
The terms of the licenses are reproduced below.
|
|
14
|
+
|
|
15
|
+
--------------------------------------------------------------------------------
|
|
16
|
+
|
|
17
|
+
Creative Commons Legal Code
|
|
18
|
+
|
|
19
|
+
CC0 1.0 Universal
|
|
20
|
+
|
|
21
|
+
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
|
|
22
|
+
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
|
|
23
|
+
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
|
|
24
|
+
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
|
|
25
|
+
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
|
|
26
|
+
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
|
|
27
|
+
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
|
|
28
|
+
HEREUNDER.
|
|
2
29
|
|
|
3
30
|
Statement of Purpose
|
|
4
31
|
|
|
5
|
-
The laws of most jurisdictions throughout the world automatically confer
|
|
32
|
+
The laws of most jurisdictions throughout the world automatically confer
|
|
33
|
+
exclusive Copyright and Related Rights (defined below) upon the creator
|
|
34
|
+
and subsequent owner(s) (each and all, an "owner") of an original work of
|
|
35
|
+
authorship and/or a database (each, a "Work").
|
|
6
36
|
|
|
7
|
-
Certain owners wish to permanently relinquish those rights to a Work for
|
|
37
|
+
Certain owners wish to permanently relinquish those rights to a Work for
|
|
38
|
+
the purpose of contributing to a commons of creative, cultural and
|
|
39
|
+
scientific works ("Commons") that the public can reliably and without fear
|
|
40
|
+
of later claims of infringement build upon, modify, incorporate in other
|
|
41
|
+
works, reuse and redistribute as freely as possible in any form whatsoever
|
|
42
|
+
and for any purposes, including without limitation commercial purposes.
|
|
43
|
+
These owners may contribute to the Commons to promote the ideal of a free
|
|
44
|
+
culture and the further production of creative, cultural and scientific
|
|
45
|
+
works, or to gain reputation or greater distribution for their Work in
|
|
46
|
+
part through the use and efforts of others.
|
|
8
47
|
|
|
9
|
-
For these and/or other purposes and motivations, and without any
|
|
48
|
+
For these and/or other purposes and motivations, and without any
|
|
49
|
+
expectation of additional consideration or compensation, the person
|
|
50
|
+
associating CC0 with a Work (the "Affirmer"), to the extent that he or she
|
|
51
|
+
is an owner of Copyright and Related Rights in the Work, voluntarily
|
|
52
|
+
elects to apply CC0 to the Work and publicly distribute the Work under its
|
|
53
|
+
terms, with knowledge of his or her Copyright and Related Rights in the
|
|
54
|
+
Work and the meaning and intended legal effect of CC0 on those rights.
|
|
10
55
|
|
|
11
|
-
1. Copyright and Related Rights. A Work made available under CC0 may be
|
|
56
|
+
1. Copyright and Related Rights. A Work made available under CC0 may be
|
|
57
|
+
protected by copyright and related or neighboring rights ("Copyright and
|
|
58
|
+
Related Rights"). Copyright and Related Rights include, but are not
|
|
59
|
+
limited to, the following:
|
|
12
60
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
61
|
+
i. the right to reproduce, adapt, distribute, perform, display,
|
|
62
|
+
communicate, and translate a Work;
|
|
63
|
+
ii. moral rights retained by the original author(s) and/or performer(s);
|
|
64
|
+
iii. publicity and privacy rights pertaining to a person's image or
|
|
65
|
+
likeness depicted in a Work;
|
|
66
|
+
iv. rights protecting against unfair competition in regards to a Work,
|
|
67
|
+
subject to the limitations in paragraph 4(a), below;
|
|
68
|
+
v. rights protecting the extraction, dissemination, use and reuse of data
|
|
69
|
+
in a Work;
|
|
70
|
+
vi. database rights (such as those arising under Directive 96/9/EC of the
|
|
71
|
+
European Parliament and of the Council of 11 March 1996 on the legal
|
|
72
|
+
protection of databases, and under any national implementation
|
|
73
|
+
thereof, including any amended or successor version of such
|
|
74
|
+
directive); and
|
|
75
|
+
vii. other similar, equivalent or corresponding rights throughout the
|
|
76
|
+
world based on applicable law or treaty, and any national
|
|
77
|
+
implementations thereof.
|
|
20
78
|
|
|
21
|
-
2. Waiver. To the greatest extent permitted by, but not in contravention
|
|
79
|
+
2. Waiver. To the greatest extent permitted by, but not in contravention
|
|
80
|
+
of, applicable law, Affirmer hereby overtly, fully, permanently,
|
|
81
|
+
irrevocably and unconditionally waives, abandons, and surrenders all of
|
|
82
|
+
Affirmer's Copyright and Related Rights and associated claims and causes
|
|
83
|
+
of action, whether now known or unknown (including existing as well as
|
|
84
|
+
future claims and causes of action), in the Work (i) in all territories
|
|
85
|
+
worldwide, (ii) for the maximum duration provided by applicable law or
|
|
86
|
+
treaty (including future time extensions), (iii) in any current or future
|
|
87
|
+
medium and for any number of copies, and (iv) for any purpose whatsoever,
|
|
88
|
+
including without limitation commercial, advertising or promotional
|
|
89
|
+
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
|
|
90
|
+
member of the public at large and to the detriment of Affirmer's heirs and
|
|
91
|
+
successors, fully intending that such Waiver shall not be subject to
|
|
92
|
+
revocation, rescission, cancellation, termination, or any other legal or
|
|
93
|
+
equitable action to disrupt the quiet enjoyment of the Work by the public
|
|
94
|
+
as contemplated by Affirmer's express Statement of Purpose.
|
|
22
95
|
|
|
23
|
-
3. Public License Fallback. Should any part of the Waiver for any reason
|
|
96
|
+
3. Public License Fallback. Should any part of the Waiver for any reason
|
|
97
|
+
be judged legally invalid or ineffective under applicable law, then the
|
|
98
|
+
Waiver shall be preserved to the maximum extent permitted taking into
|
|
99
|
+
account Affirmer's express Statement of Purpose. In addition, to the
|
|
100
|
+
extent the Waiver is so judged Affirmer hereby grants to each affected
|
|
101
|
+
person a royalty-free, non transferable, non sublicensable, non exclusive,
|
|
102
|
+
irrevocable and unconditional license to exercise Affirmer's Copyright and
|
|
103
|
+
Related Rights in the Work (i) in all territories worldwide, (ii) for the
|
|
104
|
+
maximum duration provided by applicable law or treaty (including future
|
|
105
|
+
time extensions), (iii) in any current or future medium and for any number
|
|
106
|
+
of copies, and (iv) for any purpose whatsoever, including without
|
|
107
|
+
limitation commercial, advertising or promotional purposes (the
|
|
108
|
+
"License"). The License shall be deemed effective as of the date CC0 was
|
|
109
|
+
applied by Affirmer to the Work. Should any part of the License for any
|
|
110
|
+
reason be judged legally invalid or ineffective under applicable law, such
|
|
111
|
+
partial invalidity or ineffectiveness shall not invalidate the remainder
|
|
112
|
+
of the License, and in such case Affirmer hereby affirms that he or she
|
|
113
|
+
will not (i) exercise any of his or her remaining Copyright and Related
|
|
114
|
+
Rights in the Work or (ii) assert any associated claims and causes of
|
|
115
|
+
action with respect to the Work, in either case contrary to Affirmer's
|
|
116
|
+
express Statement of Purpose.
|
|
24
117
|
|
|
25
118
|
4. Limitations and Disclaimers.
|
|
26
119
|
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
120
|
+
a. No trademark or patent rights held by Affirmer are waived, abandoned,
|
|
121
|
+
surrendered, licensed or otherwise affected by this document.
|
|
122
|
+
b. Affirmer offers the Work as-is and makes no representations or
|
|
123
|
+
warranties of any kind concerning the Work, express, implied,
|
|
124
|
+
statutory or otherwise, including without limitation warranties of
|
|
125
|
+
title, merchantability, fitness for a particular purpose, non
|
|
126
|
+
infringement, or the absence of latent or other defects, accuracy, or
|
|
127
|
+
the present or absence of errors, whether or not discoverable, all to
|
|
128
|
+
the greatest extent permissible under applicable law.
|
|
129
|
+
c. Affirmer disclaims responsibility for clearing rights of other persons
|
|
130
|
+
that may apply to the Work or any use thereof, including without
|
|
131
|
+
limitation any person's Copyright and Related Rights in the Work.
|
|
132
|
+
Further, Affirmer disclaims responsibility for obtaining any necessary
|
|
133
|
+
consents, permissions or other rights required for any use of the
|
|
134
|
+
Work.
|
|
135
|
+
d. Affirmer understands and acknowledges that Creative Commons is not a
|
|
136
|
+
party to this document and has no duty or obligation with respect to
|
|
137
|
+
this CC0 or use of the Work.
|
|
138
|
+
|
|
139
|
+
--------------------------------------------------------------------------------
|
|
140
|
+
|
|
141
|
+
Apache License
|
|
142
|
+
Version 2.0, January 2004
|
|
143
|
+
http://www.apache.org/licenses/
|
|
144
|
+
|
|
145
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
146
|
+
|
|
147
|
+
1. Definitions.
|
|
148
|
+
|
|
149
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
|
150
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
|
151
|
+
|
|
152
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
|
153
|
+
the copyright owner that is granting the License.
|
|
154
|
+
|
|
155
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
|
156
|
+
other entities that control, are controlled by, or are under common
|
|
157
|
+
control with that entity. For the purposes of this definition,
|
|
158
|
+
"control" means (i) the power, direct or indirect, to cause the
|
|
159
|
+
direction or management of such entity, whether by contract or
|
|
160
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
161
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
162
|
+
|
|
163
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
|
164
|
+
exercising permissions granted by this License.
|
|
165
|
+
|
|
166
|
+
"Source" form shall mean the preferred form for making modifications,
|
|
167
|
+
including but not limited to software source code, documentation
|
|
168
|
+
source, and configuration files.
|
|
169
|
+
|
|
170
|
+
"Object" form shall mean any form resulting from mechanical
|
|
171
|
+
transformation or translation of a Source form, including but
|
|
172
|
+
not limited to compiled object code, generated documentation,
|
|
173
|
+
and conversions to other media types.
|
|
174
|
+
|
|
175
|
+
"Work" shall mean the work of authorship, whether in Source or
|
|
176
|
+
Object form, made available under the License, as indicated by a
|
|
177
|
+
copyright notice that is included in or attached to the work
|
|
178
|
+
(an example is provided in the Appendix below).
|
|
179
|
+
|
|
180
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
|
181
|
+
form, that is based on (or derived from) the Work and for which the
|
|
182
|
+
editorial revisions, annotations, elaborations, or other modifications
|
|
183
|
+
represent, as a whole, an original work of authorship. For the purposes
|
|
184
|
+
of this License, Derivative Works shall not include works that remain
|
|
185
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
|
186
|
+
the Work and Derivative Works thereof.
|
|
187
|
+
|
|
188
|
+
"Contribution" shall mean any work of authorship, including
|
|
189
|
+
the original version of the Work and any modifications or additions
|
|
190
|
+
to that Work or Derivative Works thereof, that is intentionally
|
|
191
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
192
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
|
193
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
|
194
|
+
means any form of electronic, verbal, or written communication sent
|
|
195
|
+
to the Licensor or its representatives, including but not limited to
|
|
196
|
+
communication on electronic mailing lists, source code control systems,
|
|
197
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
|
198
|
+
Licensor for the purpose of discussing and improving the Work, but
|
|
199
|
+
excluding communication that is conspicuously marked or otherwise
|
|
200
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
|
201
|
+
|
|
202
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
203
|
+
on behalf of whom a Contribution has been received by Licensor and
|
|
204
|
+
subsequently incorporated within the Work.
|
|
205
|
+
|
|
206
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
207
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
208
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
209
|
+
copyright license to reproduce, prepare Derivative Works of,
|
|
210
|
+
publicly display, publicly perform, sublicense, and distribute the
|
|
211
|
+
Work and such Derivative Works in Source or Object form.
|
|
212
|
+
|
|
213
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
|
214
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
215
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
216
|
+
(except as stated in this section) patent license to make, have made,
|
|
217
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
218
|
+
where such license applies only to those patent claims licensable
|
|
219
|
+
by such Contributor that are necessarily infringed by their
|
|
220
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
|
221
|
+
with the Work to which such Contribution(s) was submitted. If You
|
|
222
|
+
institute patent litigation against any entity (including a
|
|
223
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
224
|
+
or a Contribution incorporated within the Work constitutes direct
|
|
225
|
+
or contributory patent infringement, then any patent licenses
|
|
226
|
+
granted to You under this License for that Work shall terminate
|
|
227
|
+
as of the date such litigation is filed.
|
|
228
|
+
|
|
229
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
|
230
|
+
Work or Derivative Works thereof in any medium, with or without
|
|
231
|
+
modifications, and in Source or Object form, provided that You
|
|
232
|
+
meet the following conditions:
|
|
233
|
+
|
|
234
|
+
(a) You must give any other recipients of the Work or
|
|
235
|
+
Derivative Works a copy of this License; and
|
|
236
|
+
|
|
237
|
+
(b) You must cause any modified files to carry prominent notices
|
|
238
|
+
stating that You changed the files; and
|
|
239
|
+
|
|
240
|
+
(c) You must retain, in the Source form of any Derivative Works
|
|
241
|
+
that You distribute, all copyright, patent, trademark, and
|
|
242
|
+
attribution notices from the Source form of the Work,
|
|
243
|
+
excluding those notices that do not pertain to any part of
|
|
244
|
+
the Derivative Works; and
|
|
245
|
+
|
|
246
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
|
247
|
+
distribution, then any Derivative Works that You distribute must
|
|
248
|
+
include a readable copy of the attribution notices contained
|
|
249
|
+
within such NOTICE file, excluding those notices that do not
|
|
250
|
+
pertain to any part of the Derivative Works, in at least one
|
|
251
|
+
of the following places: within a NOTICE text file distributed
|
|
252
|
+
as part of the Derivative Works; within the Source form or
|
|
253
|
+
documentation, if provided along with the Derivative Works; or,
|
|
254
|
+
within a display generated by the Derivative Works, if and
|
|
255
|
+
wherever such third-party notices normally appear. The contents
|
|
256
|
+
of the NOTICE file are for informational purposes only and
|
|
257
|
+
do not modify the License. You may add Your own attribution
|
|
258
|
+
notices within Derivative Works that You distribute, alongside
|
|
259
|
+
or as an addendum to the NOTICE text from the Work, provided
|
|
260
|
+
that such additional attribution notices cannot be construed
|
|
261
|
+
as modifying the License.
|
|
262
|
+
|
|
263
|
+
You may add Your own copyright statement to Your modifications and
|
|
264
|
+
may provide additional or different license terms and conditions
|
|
265
|
+
for use, reproduction, or distribution of Your modifications, or
|
|
266
|
+
for any such Derivative Works as a whole, provided Your use,
|
|
267
|
+
reproduction, and distribution of the Work otherwise complies with
|
|
268
|
+
the conditions stated in this License.
|
|
269
|
+
|
|
270
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
271
|
+
any Contribution intentionally submitted for inclusion in the Work
|
|
272
|
+
by You to the Licensor shall be under the terms and conditions of
|
|
273
|
+
this License, without any additional terms or conditions.
|
|
274
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
|
275
|
+
the terms of any separate license agreement you may have executed
|
|
276
|
+
with Licensor regarding such Contributions.
|
|
277
|
+
|
|
278
|
+
6. Trademarks. This License does not grant permission to use the trade
|
|
279
|
+
names, trademarks, service marks, or product names of the Licensor,
|
|
280
|
+
except as required for reasonable and customary use in describing the
|
|
281
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
|
282
|
+
|
|
283
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
284
|
+
agreed to in writing, Licensor provides the Work (and each
|
|
285
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
286
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
287
|
+
implied, including, without limitation, any warranties or conditions
|
|
288
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
289
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
290
|
+
appropriateness of using or redistributing the Work and assume any
|
|
291
|
+
risks associated with Your exercise of permissions under this License.
|
|
292
|
+
|
|
293
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
|
294
|
+
whether in tort (including negligence), contract, or otherwise,
|
|
295
|
+
unless required by applicable law (such as deliberate and grossly
|
|
296
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
|
297
|
+
liable to You for damages, including any direct, indirect, special,
|
|
298
|
+
incidental, or consequential damages of any character arising as a
|
|
299
|
+
result of this License or out of the use or inability to use the
|
|
300
|
+
Work (including but not limited to damages for loss of goodwill,
|
|
301
|
+
work stoppage, computer failure or malfunction, or any and all
|
|
302
|
+
other commercial damages or losses), even if such Contributor
|
|
303
|
+
has been advised of the possibility of such damages.
|
|
31
304
|
|
|
305
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
|
306
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
|
307
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
308
|
+
or other liability obligations and/or rights consistent with this
|
|
309
|
+
License. However, in accepting such obligations, You may act only
|
|
310
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
|
311
|
+
of any other Contributor, and only if You agree to indemnify,
|
|
312
|
+
defend, and hold each Contributor harmless for any liability
|
|
313
|
+
incurred by, or claims asserted against, such Contributor by reason
|
|
314
|
+
of your accepting any such warranty or additional liability.
|