provider record encryption #3
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| package dht | ||
|
|
||
| import ( | ||
| "crypto/aes" | ||
| "crypto/cipher" | ||
| "crypto/rand" | ||
| "crypto/sha256" | ||
| "errors" | ||
|
|
||
| "github.com/multiformats/go-multihash" | ||
| ) | ||
|
|
||
| const ( | ||
| keySize = 32 | ||
| encryptedPeerIDLength = 66 | ||
| ) | ||
|
|
||
| var errInvalidKeySize = errors.New("key size must be 32 bytes") | ||
|
|
||
| func encryptAES(plaintext, key []byte) ([]byte, error) { | ||
| aesgcm, err := newAESGCM(key) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| nonce := make([]byte, aesgcm.NonceSize()) | ||
| _, err = rand.Read(nonce) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| ct := aesgcm.Seal(nil, nonce, plaintext, nil) | ||
| return append(nonce, ct...), nil | ||
|
There was a problem hiding this comment. We probably need to append encryption algorithm here too so that the encryption function rotation doesn't require coordinated client update. I.e. for example There was a problem hiding this comment. This is going to add 6 bytes to every encrypted value. Can we use a varint as code for AESGSM, then update the spec to document it? There was a problem hiding this comment. @masih do you have a pointer to the AESGCM varint? There was a problem hiding this comment. I believe we will have to define this mask ourselves and then document in the spec what that number means There was a problem hiding this comment. Right. We'd need to define those in the spec ourselves. This can also be a new multicodec. I recommend picking a varint that's not reserved already to have the option of adding it to the multicodec table later on. |
||
| } | ||
|
|
||
| func decryptAES(nonceAndCT, key []byte) ([]byte, error) { | ||
| aesgcm, err := newAESGCM(key) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| nonce := nonceAndCT[:aesgcm.NonceSize()] | ||
| ciphertext := nonceAndCT[aesgcm.NonceSize():] | ||
| plaintext, err := aesgcm.Open(nil, nonce, ciphertext, nil) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return plaintext, nil | ||
| } | ||
|
|
||
| func newAESGCM(key []byte) (cipher.AEAD, error) { | ||
| if len(key) != keySize { | ||
| return nil, errInvalidKeySize | ||
| } | ||
|
|
||
| block, err := aes.NewCipher(key[:]) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| aesgcm, err := cipher.NewGCM(block) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return aesgcm, nil | ||
| } | ||
|
|
||
| func multihashToKey(mh multihash.Multihash) []byte { | ||
| const prefix = "AESGCM" | ||
| h := sha256.Sum256(append([]byte(prefix), mh...)) | ||
| return h[:] | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package dht | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| var testKey = []byte("AES256Key-32Characters1234567890") | ||
|
|
||
| func TestAES(t *testing.T) { | ||
| plaintext := []byte("nootwashere") | ||
| ciphertext, err := encryptAES(plaintext, testKey) | ||
| require.NoError(t, err) | ||
| plaintextRes, err := decryptAES(ciphertext, testKey) | ||
| require.NoError(t, err) | ||
| require.Equal(t, plaintext, plaintextRes) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,5 +10,4 @@ build: | |
| protoc --proto_path=$(GOPATH)/src:. --gogofast_out=. $< | ||
|
|
||
| clean: | ||
| rm -f *.pb.go | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Would it be possible to get these constants from somewhere where they are already defined instead of defining them again? This would help with code maintainability :)
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.
unfortunately the Go AES package doesn't define these :/ I'll try looking somewhere for them!
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.
We should be able to get Nonce size from
cipher.AEADinterface.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.
updated