1
=== modified file 'cmd/package_test.go'
2
--- cmd/package_test.go	2014-05-01 23:32:37 +0000
3
+++ cmd/package_test.go	2014-05-21 02:36:03 +0000
4
@@ -23,5 +23,5 @@
5
23
	// really be moved into "juju/osenv".
23
	// really be moved into "juju/osenv".
6
24
	c.Assert(testbase.FindJujuCoreImports(c, "launchpad.net/juju-core/cmd"),
24
	c.Assert(testbase.FindJujuCoreImports(c, "launchpad.net/juju-core/cmd"),
7
25
		gc.DeepEquals,
25
		gc.DeepEquals,
9
26
		[]string{"juju/arch", "juju/osenv", "names", "thirdparty/pbkdf2", "utils", "version"})
26
		[]string{"juju/arch", "juju/osenv", "names", "utils", "version"})
10
27
}
27
}
11
28
28
12
=== removed directory 'thirdparty'
13
=== removed directory 'thirdparty/pbkdf2'
14
=== removed file 'thirdparty/pbkdf2/pbkdf2.go'
15
--- thirdparty/pbkdf2/pbkdf2.go	2012-10-05 14:27:52 +0000
16
+++ thirdparty/pbkdf2/pbkdf2.go	1970-01-01 00:00:00 +0000
17
@@ -1,79 +0,0 @@
18
1
// Original package at code.google.com/p/go.crypto/pbkdf2
19
2
20
3
// Copyright 2012 The Go Authors. All rights reserved.
21
4
// Use of this source code is governed by a BSD-style
22
5
// license that can be found in the LICENSE file.
23
6
24
7
/*
25
8
Package pbkdf2 implements the key derivation function PBKDF2 as defined in RFC
26
9
2898 / PKCS #5 v2.0.
27
10
28
11
A key derivation function is useful when encrypting data based on a password
29
12
or any other not-fully-random data. It uses a pseudorandom function to derive
30
13
a secure encryption key based on the password.
31
14
32
15
While v2.0 of the standard defines only one pseudorandom function to use,
33
16
HMAC-SHA1, the drafted v2.1 specification allows use of all five FIPS Approved
34
17
Hash Functions SHA-1, SHA-224, SHA-256, SHA-384 and SHA-512 for HMAC. To
35
18
choose, you can pass the `New` functions from the different SHA packages to
36
19
pbkdf2.Key.
37
20
*/
38
21
package pbkdf2
39
22
40
23
import (
41
24
	"crypto/hmac"
42
25
	"hash"
43
26
)
44
27
45
28
// Key derives a key from the password, salt and iteration count, returning a
46
29
// []byte of length keylen that can be used as cryptographic key. The key is
47
30
// derived based on the method described as PBKDF2 with the HMAC variant using
48
31
// the supplied hash function.
49
32
//
50
33
// For example, to use a HMAC-SHA-1 based PBKDF2 key derivation function, you
51
34
// can get a derived key for e.g. AES-256 (which needs a 32-byte key) by
52
35
// doing:
53
36
//
54
37
// 	dk := pbkdf2.Key([]byte("some password"), salt, 4096, 32, sha1.New)
55
38
//
56
39
// Remember to get a good random salt. At least 8 bytes is recommended by the
57
40
// RFC.
58
41
//
59
42
// Using a higher iteration count will increase the cost of an exhaustive
60
43
// search but will also make derivation proportionally slower.
61
44
func Key(password, salt []byte, iter, keyLen int, h func() hash.Hash) []byte {
62
45
	prf := hmac.New(h, password)
63
46
	hashLen := prf.Size()
64
47
	numBlocks := (keyLen + hashLen - 1) / hashLen
65
48
66
49
	var buf [4]byte
67
50
	dk := make([]byte, 0, numBlocks*hashLen)
68
51
	U := make([]byte, hashLen)
69
52
	for block := 1; block <= numBlocks; block++ {
70
53
		// N.B.: || means concatenation, ^ means XOR
71
54
		// for each block T_i = U_1 ^ U_2 ^ ... ^ U_iter
72
55
		// U_1 = PRF(password, salt || uint(i))
73
56
		prf.Reset()
74
57
		prf.Write(salt)
75
58
		buf[0] = byte(block >> 24)
76
59
		buf[1] = byte(block >> 16)
77
60
		buf[2] = byte(block >> 8)
78
61
		buf[3] = byte(block)
79
62
		prf.Write(buf[:4])
80
63
		dk = prf.Sum(dk)
81
64
		T := dk[len(dk)-hashLen:]
82
65
		copy(U, T)
83
66
84
67
		// U_n = PRF(password, U_(n-1))
85
68
		for n := 2; n <= iter; n++ {
86
69
			prf.Reset()
87
70
			prf.Write(U)
88
71
			U = U[:0]
89
72
			U = prf.Sum(U)
90
73
			for x := range U {
91
74
				T[x] ^= U[x]
92
75
			}
93
76
		}
94
77
	}
95
78
	return dk[:keyLen]
96
79
}
97
80
0
98
=== removed file 'thirdparty/pbkdf2/pbkdf2_test.go'
99
--- thirdparty/pbkdf2/pbkdf2_test.go	2012-10-05 14:27:52 +0000
100
+++ thirdparty/pbkdf2/pbkdf2_test.go	1970-01-01 00:00:00 +0000
101
@@ -1,157 +0,0 @@
102
1
// Copyright 2012 The Go Authors. All rights reserved.
103
2
// Use of this source code is governed by a BSD-style
104
3
// license that can be found in the LICENSE file.
105
4
106
5
package pbkdf2
107
6
108
7
import (
109
8
	"bytes"
110
9
	"crypto/sha1"
111
10
	"crypto/sha256"
112
11
	"hash"
113
12
	"testing"
114
13
)
115
14
116
15
type testVector struct {
117
16
	password string
118
17
	salt     string
119
18
	iter     int
120
19
	output   []byte
121
20
}
122
21
123
22
// Test vectors from RFC 6070, http://tools.ietf.org/html/rfc6070
124
23
var sha1TestVectors = []testVector{
125
24
	{
126
25
		"password",
127
26
		"salt",
128
27
		1,
129
28
		[]byte{
130
29
			0x0c, 0x60, 0xc8, 0x0f, 0x96, 0x1f, 0x0e, 0x71,
131
30
			0xf3, 0xa9, 0xb5, 0x24, 0xaf, 0x60, 0x12, 0x06,
132
31
			0x2f, 0xe0, 0x37, 0xa6,
133
32
		},
134
33
	},
135
34
	{
136
35
		"password",
137
36
		"salt",
138
37
		2,
139
38
		[]byte{
140
39
			0xea, 0x6c, 0x01, 0x4d, 0xc7, 0x2d, 0x6f, 0x8c,
141
40
			0xcd, 0x1e, 0xd9, 0x2a, 0xce, 0x1d, 0x41, 0xf0,
142
41
			0xd8, 0xde, 0x89, 0x57,
143
42
		},
144
43
	},
145
44
	{
146
45
		"password",
147
46
		"salt",
148
47
		4096,
149
48
		[]byte{
150
49
			0x4b, 0x00, 0x79, 0x01, 0xb7, 0x65, 0x48, 0x9a,
151
50
			0xbe, 0xad, 0x49, 0xd9, 0x26, 0xf7, 0x21, 0xd0,
152
51
			0x65, 0xa4, 0x29, 0xc1,
153
52
		},
154
53
	},
155
54
	// // This one takes too long
156
55
	// {
157
56
	// 	"password",
158
57
	// 	"salt",
159
58
	// 	16777216,
160
59
	// 	[]byte{
161
60
	// 		0xee, 0xfe, 0x3d, 0x61, 0xcd, 0x4d, 0xa4, 0xe4,
162
61
	// 		0xe9, 0x94, 0x5b, 0x3d, 0x6b, 0xa2, 0x15, 0x8c,
163
62
	// 		0x26, 0x34, 0xe9, 0x84,
164
63
	// 	},
165
64
	// },
166
65
	{
167
66
		"passwordPASSWORDpassword",
168
67
		"saltSALTsaltSALTsaltSALTsaltSALTsalt",
169
68
		4096,
170
69
		[]byte{
171
70
			0x3d, 0x2e, 0xec, 0x4f, 0xe4, 0x1c, 0x84, 0x9b,
172
71
			0x80, 0xc8, 0xd8, 0x36, 0x62, 0xc0, 0xe4, 0x4a,
173
72
			0x8b, 0x29, 0x1a, 0x96, 0x4c, 0xf2, 0xf0, 0x70,
174
73
			0x38,
175
74
		},
176
75
	},
177
76
	{
178
77
		"pass\000word",
179
78
		"sa\000lt",
180
79
		4096,
181
80
		[]byte{
182
81
			0x56, 0xfa, 0x6a, 0xa7, 0x55, 0x48, 0x09, 0x9d,
183
82
			0xcc, 0x37, 0xd7, 0xf0, 0x34, 0x25, 0xe0, 0xc3,
184
83
		},
185
84
	},
186
85
}
187
86
188
87
// Test vectors from
189
88
// http://stackoverflow.com/questions/5130513/pbkdf2-hmac-sha2-test-vectors
190
89
var sha256TestVectors = []testVector{
191
90
	{
192
91
		"password",
193
92
		"salt",
194
93
		1,
195
94
		[]byte{
196
95
			0x12, 0x0f, 0xb6, 0xcf, 0xfc, 0xf8, 0xb3, 0x2c,
197
96
			0x43, 0xe7, 0x22, 0x52, 0x56, 0xc4, 0xf8, 0x37,
198
97
			0xa8, 0x65, 0x48, 0xc9,
199
98
		},
200
99
	},
201
100
	{
202
101
		"password",
203
102
		"salt",
204
103
		2,
205
104
		[]byte{
206
105
			0xae, 0x4d, 0x0c, 0x95, 0xaf, 0x6b, 0x46, 0xd3,
207
106
			0x2d, 0x0a, 0xdf, 0xf9, 0x28, 0xf0, 0x6d, 0xd0,
208
107
			0x2a, 0x30, 0x3f, 0x8e,
209
108
		},
210
109
	},
211
110
	{
212
111
		"password",
213
112
		"salt",
214
113
		4096,
215
114
		[]byte{
216
115
			0xc5, 0xe4, 0x78, 0xd5, 0x92, 0x88, 0xc8, 0x41,
217
116
			0xaa, 0x53, 0x0d, 0xb6, 0x84, 0x5c, 0x4c, 0x8d,
218
117
			0x96, 0x28, 0x93, 0xa0,
219
118
		},
220
119
	},
221
120
	{
222
121
		"passwordPASSWORDpassword",
223
122
		"saltSALTsaltSALTsaltSALTsaltSALTsalt",
224
123
		4096,
225
124
		[]byte{
226
125
			0x34, 0x8c, 0x89, 0xdb, 0xcb, 0xd3, 0x2b, 0x2f,
227
126
			0x32, 0xd8, 0x14, 0xb8, 0x11, 0x6e, 0x84, 0xcf,
228
127
			0x2b, 0x17, 0x34, 0x7e, 0xbc, 0x18, 0x00, 0x18,
229
128
			0x1c,
230
129
		},
231
130
	},
232
131
	{
233
132
		"pass\000word",
234
133
		"sa\000lt",
235
134
		4096,
236
135
		[]byte{
237
136
			0x89, 0xb6, 0x9d, 0x05, 0x16, 0xf8, 0x29, 0x89,
238
137
			0x3c, 0x69, 0x62, 0x26, 0x65, 0x0a, 0x86, 0x87,
239
138
		},
240
139
	},
241
140
}
242
141
243
142
func testHash(t *testing.T, h func() hash.Hash, hashName string, vectors []testVector) {
244
143
	for i, v := range vectors {
245
144
		o := Key([]byte(v.password), []byte(v.salt), v.iter, len(v.output), h)
246
145
		if !bytes.Equal(o, v.output) {
247
146
			t.Errorf("%s %d: expected %x, got %x", hashName, i, v.output, o)
248
147
		}
249
148
	}
250
149
}
251
150
252
151
func TestWithHMACSHA1(t *testing.T) {
253
152
	testHash(t, sha1.New, "SHA1", sha1TestVectors)
254
153
}
255
154
256
155
func TestWithHMACSHA256(t *testing.T) {
257
156
	testHash(t, sha256.New, "SHA256", sha256TestVectors)
258
157
}
259
158
0
260
=== modified file 'utils/fslock/package_test.go'
261
--- utils/fslock/package_test.go	2014-01-21 05:25:30 +0000
262
+++ utils/fslock/package_test.go	2014-05-21 02:36:03 +0000
263
@@ -20,5 +20,5 @@
264
20
func (*Dependencies) TestPackageDependencies(c *gc.C) {
20
func (*Dependencies) TestPackageDependencies(c *gc.C) {
265
21
	// This test is to ensure we don't bring in dependencies without thinking.
21
	// This test is to ensure we don't bring in dependencies without thinking.
266
22
	c.Assert(testbase.FindJujuCoreImports(c, "launchpad.net/juju-core/utils/fslock"),
22
	c.Assert(testbase.FindJujuCoreImports(c, "launchpad.net/juju-core/utils/fslock"),
268
23
		gc.DeepEquals, []string{"juju/osenv", "thirdparty/pbkdf2", "utils"})
23
		gc.DeepEquals, []string{"juju/osenv", "utils"})
269
24
}
24
}
270
25
25
271
=== modified file 'utils/password.go'
272
--- utils/password.go	2013-11-07 09:32:37 +0000
273
+++ utils/password.go	2014-05-21 02:36:03 +0000
274
@@ -10,7 +10,7 @@
275
10
	"fmt"
10
	"fmt"
276
11
	"io"
11
	"io"
277
12
12
279
13
	"launchpad.net/juju-core/thirdparty/pbkdf2"
13
	"code.google.com/p/go.crypto/pbkdf2"
280
14
)
14
)
281
15
15
282
16
// CompatSalt is because Juju 1.16 and older used a hard-coded salt to compute
16
// CompatSalt is because Juju 1.16 and older used a hard-coded salt to compute
Status:	Merged
Approved by:	Dave Cheney on 2014-05-21
Approved revision:	no longer in the source branch.
Merged at revision:	2758
Proposed branch:	lp:~dave-cheney/juju-core/179-remove-thirdparty-pbkdf2-dependency
Merge into:	lp:~go-bot/juju-core/trunk
Prerequisite:	lp:~dave-cheney/juju-core/178-update-errgo-and-loggo-dependencies
Diff against target:	282 lines (+3/-239) 5 files modified cmd/package_test.go (+1/-1) thirdparty/pbkdf2/pbkdf2.go (+0/-79) thirdparty/pbkdf2/pbkdf2_test.go (+0/-157) utils/fslock/package_test.go (+1/-1) utils/password.go (+1/-1)
To merge this branch:	bzr merge lp:~dave-cheney/juju-core/179-remove-thirdparty-pbkdf2-dependency
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ian Booth		2014-05-21	Approve on 2014-05-21
Review via email: mp+220341@code.launchpad.net