Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ func (group *dhGroup) keygenHKDFSHA256AES128(theirPublic, myPrivate *big.Int) ([
return nil, err
}
sharedSecretBytes := sharedSecret.Bytes()
defer clear(sharedSecretBytes)

r := hkdf.New(sha256.New, sharedSecretBytes, nil, nil)

Expand All @@ -81,6 +82,7 @@ func (group *dhGroup) keygenHKDFSHA256AES128(theirPublic, myPrivate *big.Int) ([

func unauthenticatedAESCBCEncrypt(unpaddedPlaintext, key []byte) (iv, ciphertext []byte, err error) {
paddedPlaintext := padPKCS7(unpaddedPlaintext, aes.BlockSize)
defer clear(paddedPlaintext)
block, err := aes.NewCipher(key)
if err != nil {
return nil, nil, err
Expand Down
6 changes: 6 additions & 0 deletions store/keychain/keychain_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ func (k *keychainStore[T]) Get(ctx context.Context, id store.ID) (store.Secret,
if err != nil {
return nil, err
}
defer clear(value)

secret := k.factory(ctx, id)
if err := secret.SetMetadata(attributes); err != nil {
return nil, err
Expand Down Expand Up @@ -317,6 +319,7 @@ func (k *keychainStore[T]) Save(_ context.Context, id store.ID, secret store.Sec
if err != nil {
return err
}
defer clear(value)

sessSecret, err := session.NewSecret(value)
if err != nil {
Expand Down Expand Up @@ -422,11 +425,14 @@ func (k *keychainStore[T]) Filter(ctx context.Context, pattern store.Pattern) (m

secret := k.factory(ctx, secretID)
if err := secret.SetMetadata(attributes); err != nil {
clear(value)
return nil, err
}
if err := secret.Unmarshal(value); err != nil {
clear(value)
return nil, err
}
clear(value)

credentials[secretID] = secret
}
Expand Down
5 changes: 5 additions & 0 deletions store/keychain/keychain_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ func encodeSecret(secret store.Secret) ([]byte, error) {
if err != nil {
return nil, err
}
defer clear(data)

encoder := unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM).NewEncoder()
blob, _, err := transform.Bytes(encoder, data)
Expand All @@ -77,6 +78,7 @@ func decodeSecret(blob []byte, secret store.Secret) error {
if err != nil {
return err
}
defer clear(val)

return secret.Unmarshal(val)
}
Expand Down Expand Up @@ -292,6 +294,7 @@ func (k *keychainStore[T]) Save(_ context.Context, id store.ID, secret store.Sec
if err != nil {
return err
}
defer clear(blob)

attributes := make(map[string]string)
maps.Copy(attributes, secret.Metadata())
Expand Down Expand Up @@ -405,8 +408,10 @@ func (k *keychainStore[T]) Filter(ctx context.Context, pattern store.Pattern) (m
}

if err := secret.Unmarshal(blob); err != nil {
clear(blob)
return nil, err
}
clear(blob)
secrets[id] = secret
}

Expand Down
Loading