Skip to content

prevent IV collisions for awskms #128

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.

Sign up for GitHub

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

Open
takeyourhatoff wants to merge 1 commit into
base: master
Choose a base branch
from
Open

prevent IV collisions for awskms #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions providers/awskms/kms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"encoding/binary"
"fmt"
"io"
"sync/atomic"
"time"

"github.com/aws/aws-sdk-go-v2/aws"
Expand All @@ -33,6 +34,9 @@ type KMSCrypter struct {
// encryptedKeyLength is the length of the DEK.
encryptedKeyLength uint8

// encryptedKeyEncryptionCount is the number of encryptions performed with the current key
encryptedKeyEncryptionCount atomic.Uint64

// cipherBlock is the 256-bit AES GCM block cipher.
aesgcm cipher.AEAD

Expand Down Expand Up @@ -105,10 +109,8 @@ func (k *KMSCrypter) Encrypt(w io.Writer, r io.Reader) error {
return errors.Wrap(err, "failed to read from io.Reader")
}

nonce, err := sqlcrypter.GenerateBytes(k.aesgcm.NonceSize())
if err != nil {
return errors.Wrap(err, "failed to generate 12-byte random nonce")
}
nonce := make([]byte, 12)
binary.LittleEndian.PutUint64(nonce[4:], k.encryptedKeyEncryptionCount.Add(1))

ciphertext := k.aesgcm.Seal(nil, nonce, src.Bytes(), nil)

Expand Down