-
Notifications
You must be signed in to change notification settings - Fork 20.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
KeyStore (Low level key functionality) #259
Changes from 5 commits
945798f
a1c2749
47d3b3d
9caf32b
3cf038f
d48140c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,3 +10,8 @@ | |
.DS_Store | ||
*/**/.DS_Store | ||
.ethtest | ||
|
||
#* | ||
.#* | ||
*# | ||
*~ |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,107 @@ | ||
/* | ||
This file is part of go-ethereum | ||
|
||
go-ethereum is free software: you can redistribute it and/or modify | ||
it under the terms of the GNU Lesser General Public License as published by | ||
the Free Software Foundation, either version 3 of the License, or | ||
(at your option) any later version. | ||
|
||
go-ethereum is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU General Public License for more details. | ||
|
||
You should have received a copy of the GNU Lesser General Public License | ||
along with go-ethereum. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
/** | ||
* @authors | ||
* Gustav Simonsson <[email protected]> | ||
* @date 2015 | ||
* | ||
*/ | ||
|
||
package crypto | ||
|
||
import ( | ||
"bytes" | ||
"code.google.com/p/go-uuid/uuid" | ||
"crypto/ecdsa" | ||
"crypto/elliptic" | ||
"encoding/json" | ||
"io" | ||
) | ||
|
||
type Key struct { | ||
Id *uuid.UUID // Version 4 "random" for unique id not derived from key data | ||
// we only store privkey as pubkey/address can be derived from it | ||
// privkey in this struct is always in plaintext | ||
PrivateKey *ecdsa.PrivateKey | ||
} | ||
|
||
type plainKeyJSON struct { | ||
Id []byte | ||
PrivateKey []byte | ||
} | ||
|
||
type cipherJSON struct { | ||
Salt []byte | ||
IV []byte | ||
CipherText []byte | ||
} | ||
|
||
type encryptedKeyJSON struct { | ||
Id []byte | ||
Crypto cipherJSON | ||
} | ||
|
||
func (k *Key) Address() []byte { | ||
pubBytes := FromECDSAPub(&k.PrivateKey.PublicKey) | ||
return Sha3(pubBytes)[12:] | ||
} | ||
|
||
func (k *Key) MarshalJSON() (j []byte, err error) { | ||
jStruct := plainKeyJSON{ | ||
*k.Id, | ||
FromECDSA(k.PrivateKey), | ||
} | ||
j, err = json.Marshal(jStruct) | ||
return j, err | ||
} | ||
|
||
func (k *Key) UnmarshalJSON(j []byte) (err error) { | ||
keyJSON := new(plainKeyJSON) | ||
err = json.Unmarshal(j, &keyJSON) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
u := new(uuid.UUID) | ||
*u = keyJSON.Id | ||
k.Id = u | ||
|
||
k.PrivateKey = ToECDSA(keyJSON.PrivateKey) | ||
|
||
return err | ||
} | ||
|
||
func NewKey(rand io.Reader) *Key { | ||
randBytes := make([]byte, 32) | ||
_, err := rand.Read(randBytes) | ||
if err != nil { | ||
panic("key generation: could not read from random source: " + err.Error()) | ||
} | ||
reader := bytes.NewReader(randBytes) | ||
_, x, y, err := elliptic.GenerateKey(S256(), reader) | ||
if err != nil { | ||
panic("key generation: elliptic.GenerateKey failed: " + err.Error()) | ||
} | ||
privateKeyMarshalled := elliptic.Marshal(S256(), x, y) | ||
privateKeyECDSA := ToECDSA(privateKeyMarshalled) | ||
|
||
key := new(Key) | ||
id := uuid.NewRandom() | ||
key.Id = &id | ||
key.PrivateKey = privateKeyECDSA | ||
return key | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,248 @@ | ||
/* | ||
This file is part of go-ethereum | ||
|
||
go-ethereum is free software: you can redistribute it and/or modify | ||
it under the terms of the GNU Lesser General Public License as published by | ||
the Free Software Foundation, either version 3 of the License, or | ||
(at your option) any later version. | ||
|
||
go-ethereum is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU General Public License for more details. | ||
|
||
You should have received a copy of the GNU Lesser General Public License | ||
along with go-ethereum. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
/** | ||
* @authors | ||
* Gustav Simonsson <[email protected]> | ||
* @date 2015 | ||
* | ||
*/ | ||
/* | ||
|
||
This key store behaves as KeyStorePlain with the difference that | ||
the private key is encrypted and on disk uses another JSON encoding. | ||
|
||
Cryptography: | ||
|
||
1. Encryption key is scrypt derived key from user passphrase. Scrypt parameters | ||
(work factors) [1][2] are defined as constants below. | ||
2. Scrypt salt is 32 random bytes from CSPRNG. It is appended to ciphertext. | ||
3. Checksum is SHA3 of the private key bytes. | ||
4. Plaintext is concatenation of private key bytes and checksum. | ||
5. Encryption algo is AES 256 CBC [3][4] | ||
6. CBC IV is 16 random bytes from CSPRNG. It is appended to ciphertext. | ||
7. Plaintext padding is PKCS #7 [5][6] | ||
|
||
Encoding: | ||
|
||
1. On disk, ciphertext, salt and IV are encoded in a nested JSON object. | ||
cat a key file to see the structure. | ||
2. byte arrays are base64 JSON strings. | ||
3. The EC private key bytes are in uncompressed form [7]. | ||
They are a big-endian byte slice of the absolute value of D [8][9]. | ||
4. The checksum is the last 32 bytes of the plaintext byte array and the | ||
private key is the preceeding bytes. | ||
|
||
References: | ||
|
||
1. http://www.tarsnap.com/scrypt/scrypt-slides.pdf | ||
2. http://stackoverflow.com/questions/11126315/what-are-optimal-scrypt-work-factors | ||
3. http://en.wikipedia.org/wiki/Advanced_Encryption_Standard | ||
4. http://en.wikipedia.org/wiki/Block_cipher_mode_of_operation#Cipher-block_chaining_.28CBC.29 | ||
5. https://leanpub.com/gocrypto/read#leanpub-auto-block-cipher-modes | ||
6. http://tools.ietf.org/html/rfc2315 | ||
7. http://bitcoin.stackexchange.com/questions/3059/what-is-a-compressed-bitcoin-key | ||
8. http://golang.org/pkg/crypto/ecdsa/#PrivateKey | ||
9. https://golang.org/pkg/math/big/#Int.Bytes | ||
|
||
*/ | ||
|
||
package crypto | ||
|
||
import ( | ||
"bytes" | ||
"code.google.com/p/go-uuid/uuid" | ||
"code.google.com/p/go.crypto/scrypt" | ||
"crypto/aes" | ||
"crypto/cipher" | ||
crand "crypto/rand" | ||
"encoding/json" | ||
"errors" | ||
"io" | ||
"os" | ||
"path" | ||
) | ||
|
||
const ( | ||
// 2^18 / 8 / 1 uses 256MB memory and approx 1s CPU time on a modern CPU. | ||
scryptN = 1 << 18 | ||
scryptr = 8 | ||
scryptp = 1 | ||
scryptdkLen = 32 | ||
) | ||
|
||
type keyStorePassphrase struct { | ||
keysDirPath string | ||
} | ||
|
||
func NewKeyStorePassphrase(path string) KeyStore2 { | ||
ks := &keyStorePassphrase{ | ||
keysDirPath : path, | ||
} | ||
return ks | ||
} | ||
|
||
func (ks keyStorePassphrase) GenerateNewKey(rand io.Reader, auth string) (key *Key, err error) { | ||
return GenerateNewKeyDefault(ks, rand, auth) | ||
} | ||
|
||
func (ks keyStorePassphrase) GetKey(keyId *uuid.UUID, auth string) (key *Key, err error) { | ||
keyBytes, err := DecryptKey(ks, keyId, auth) | ||
if err != nil { | ||
return nil, err | ||
} | ||
key = &Key{ | ||
Id : keyId, | ||
PrivateKey : ToECDSA(keyBytes), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please configure your awesome editor to run
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. <3 done! |
||
} | ||
return key, err | ||
} | ||
|
||
func (ks keyStorePassphrase) StoreKey(key *Key, auth string) (err error) { | ||
authArray := []byte(auth) | ||
salt := getEntropyCSPRNG(32) | ||
derivedKey, err := scrypt.Key(authArray, salt, scryptN, scryptr, scryptp, scryptdkLen) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
keyBytes := FromECDSA(key.PrivateKey) | ||
keyBytesHash := Sha3(keyBytes) | ||
toEncrypt := PKCS7Pad(append(keyBytes, keyBytesHash...)) | ||
|
||
AES256Block, err := aes.NewCipher(derivedKey) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
iv := getEntropyCSPRNG(aes.BlockSize) // 16 | ||
AES256CBCEncrypter := cipher.NewCBCEncrypter(AES256Block, iv) | ||
cipherText := make([]byte, len(toEncrypt)) | ||
AES256CBCEncrypter.CryptBlocks(cipherText, toEncrypt) | ||
|
||
cipherStruct := cipherJSON{ | ||
salt, | ||
iv, | ||
cipherText, | ||
} | ||
keyStruct := encryptedKeyJSON{ | ||
*key.Id, | ||
cipherStruct, | ||
} | ||
keyJSON, err := json.Marshal(keyStruct) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
return WriteKeyFile(key.Id.String(), ks.keysDirPath, keyJSON) | ||
} | ||
|
||
func (ks keyStorePassphrase) DeleteKey(keyId *uuid.UUID, auth string) (err error) { | ||
// only delete if correct passphrase is given | ||
_, err = DecryptKey(ks, keyId, auth) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
keyDirPath := path.Join(ks.keysDirPath, keyId.String()) | ||
return os.RemoveAll(keyDirPath) | ||
} | ||
|
||
func DecryptKey(ks keyStorePassphrase, keyId *uuid.UUID, auth string) (keyBytes []byte, err error) { | ||
fileContent, err := GetKeyFile(ks.keysDirPath, keyId) | ||
if err != nil { | ||
return nil, err | ||
} | ||
|
||
keyProtected := new(encryptedKeyJSON) | ||
err = json.Unmarshal(fileContent, keyProtected) | ||
|
||
salt := keyProtected.Crypto.Salt | ||
|
||
iv := keyProtected.Crypto.IV | ||
|
||
cipherText := keyProtected.Crypto.CipherText | ||
|
||
authArray := []byte(auth) | ||
derivedKey, err := scrypt.Key(authArray, salt, scryptN, scryptr, scryptp, scryptdkLen) | ||
if err != nil { | ||
return nil, err | ||
} | ||
|
||
AES256Block, err := aes.NewCipher(derivedKey) | ||
if err != nil { | ||
return nil, err | ||
} | ||
|
||
AES256CBCDecrypter := cipher.NewCBCDecrypter(AES256Block, iv) | ||
paddedPlainText := make([]byte, len(cipherText)) | ||
AES256CBCDecrypter.CryptBlocks(paddedPlainText, cipherText) | ||
|
||
plainText := PKCS7Unpad(paddedPlainText) | ||
if plainText == nil { | ||
err = errors.New("Decryption failed: PKCS7Unpad failed after decryption") | ||
return nil, err | ||
} | ||
|
||
keyBytes = plainText[:len(plainText)-32] | ||
keyBytesHash := plainText[len(plainText)-32:] | ||
if !bytes.Equal(Sha3(keyBytes), keyBytesHash) { | ||
err = errors.New("Decryption failed: checksum mismatch") | ||
return nil, err | ||
} | ||
return keyBytes, err | ||
} | ||
|
||
func getEntropyCSPRNG(n int) []byte { | ||
mainBuff := make([]byte, n) | ||
_, err := io.ReadFull(crand.Reader, mainBuff) | ||
if err != nil { | ||
panic("key generation: reading from crypto/rand failed: " + err.Error()) | ||
} | ||
return mainBuff | ||
} | ||
|
||
// From https://leanpub.com/gocrypto/read#leanpub-auto-block-cipher-modes | ||
func PKCS7Pad(in []byte) []byte { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Replace with https://github.com/ethereum/go-ethereum/blob/develop/ethutil/bytes.go#L170 (right padding bytes). Please be aware that "aliasing" the method is fine to make it clear what it's used for. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. From what I can see, RightPadBytes pads with zeroed bytes to get the desired length. If this is used, then the number of pad bytes padded onto the original byte array is not encoded as information in the padded binary. This means we would have to encode this information separately, in e.g. a new field next to the binary. This seems unnecessary as PKCS#7 padding already encodes this information. Also, the size of the binary being padded here is relatively small (~ 100 bytes) that performance of the padding function likely is insignificant compared to the scrypt execution to get the derived key. Morever, should the check in RightPadBytes of slice length not be |
||
padding := 16 - (len(in) % 16) | ||
if padding == 0 { | ||
padding = 16 | ||
} | ||
for i := 0; i < padding; i++ { | ||
in = append(in, byte(padding)) | ||
} | ||
return in | ||
} | ||
|
||
func PKCS7Unpad(in []byte) []byte { | ||
if len(in) == 0 { | ||
return nil | ||
} | ||
|
||
padding := in[len(in)-1] | ||
if int(padding) > len(in) || padding > aes.BlockSize { | ||
return nil | ||
} else if padding == 0 { | ||
return nil | ||
} | ||
|
||
for i := len(in) - 1; i > len(in)-int(padding)-1; i-- { | ||
if in[i] != padding { | ||
return nil | ||
} | ||
} | ||
return in[:len(in)-int(padding)] | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You could write this without a variable:
Just so you know.