Revert "Upgrade keys to use bcrypt with salts (#38)"

This reverts commit 8e7f0e7701.
This commit is contained in:
Ethan Buchman
2017-10-27 22:02:44 -04:00
parent 87badb090f
commit 6405618220
11 changed files with 112 additions and 191 deletions

View File

@ -20,22 +20,22 @@ func TestNoopEncoder(t *testing.T) {
key2, err := cryptostore.GenSecp256k1.Generate(cmn.RandBytes(16))
require.NoError(err)
_, b, err := noop.Encrypt(key, "encode")
b, err := noop.Encrypt(key, "encode")
require.Nil(err)
assert.NotEmpty(b)
_, b2, err := noop.Encrypt(key2, "encode")
b2, err := noop.Encrypt(key2, "encode")
require.Nil(err)
assert.NotEmpty(b2)
assert.NotEqual(b, b2)
// note the decode with a different password works - not secure!
pk, err := noop.Decrypt(nil, b, "decode")
pk, err := noop.Decrypt(b, "decode")
require.Nil(err)
require.NotNil(pk)
assert.Equal(key, pk)
pk2, err := noop.Decrypt(nil, b2, "kggugougp")
pk2, err := noop.Decrypt(b2, "kggugougp")
require.Nil(err)
require.NotNil(pk2)
assert.Equal(key2, pk2)
@ -49,17 +49,17 @@ func TestSecretBox(t *testing.T) {
require.NoError(err)
pass := "some-special-secret"
s, b, err := enc.Encrypt(key, pass)
b, err := enc.Encrypt(key, pass)
require.Nil(err)
assert.NotEmpty(b)
// decoding with a different pass is an error
pk, err := enc.Decrypt(s, b, "decode")
pk, err := enc.Decrypt(b, "decode")
require.NotNil(err)
require.True(pk.Empty())
// but decoding with the same passphrase gets us our key
pk, err = enc.Decrypt(s, b, pass)
pk, err = enc.Decrypt(b, pass)
require.Nil(err)
assert.Equal(key, pk)
}
@ -84,11 +84,11 @@ func TestSecretBoxNoPass(t *testing.T) {
}
for i, tc := range cases {
s, b, err := enc.Encrypt(key, tc.encode)
b, err := enc.Encrypt(key, tc.encode)
require.Nil(err, "%d: %+v", i, err)
assert.NotEmpty(b, "%d", i)
pk, err := enc.Decrypt(s, b, tc.decode)
pk, err := enc.Decrypt(b, tc.decode)
if tc.valid {
require.Nil(err, "%d: %+v", i, err)
assert.Equal(key, pk, "%d", i)
@ -99,7 +99,7 @@ func TestSecretBoxNoPass(t *testing.T) {
// now let's make sure raw bytes also work...
b := key.Bytes()
pk, rerr := enc.Decrypt(nil, b, "")
require.NoError(rerr)
pk, err := enc.Decrypt(b, "")
require.Nil(err, "%+v", err)
assert.Equal(key, pk)
}