Skip to content

fix(sdk): Removes unnecessary down-cast of int #1869

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

Merged
merged 1 commit into from
Jan 27, 2025
Merged

fix(sdk): Removes unnecessary down-cast of int #1869

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion sdk/kas_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ type kaoResult struct {

type decryptor interface {
CreateRewrapRequest(ctx context.Context) (map[string]*kas.UnsignedRewrapRequest_WithPolicyRequest, error)
Decrypt(ctx context.Context, results []kaoResult) (uint32, error)
Decrypt(ctx context.Context, results []kaoResult) (int, error)
}

func newKASClient(dialOptions []grpc.DialOption, accessTokenSource auth.AccessTokenSource, sessionKey *ocrypto.RsaKeyPair) *KASClient {
Expand Down
8 changes: 4 additions & 4 deletions sdk/nanotdf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@ func (n *NanoTDFDecryptHandler) CreateRewrapRequest(_ context.Context) (map[stri
return map[string]*kas.UnsignedRewrapRequest_WithPolicyRequest{kasURL: req}, nil
}

func (n *NanoTDFDecryptHandler) Decrypt(_ context.Context, result []kaoResult) (uint32, error) {
func (n *NanoTDFDecryptHandler) Decrypt(_ context.Context, result []kaoResult) (int, error) {
var err error
if len(result) != 1 {
return 0, fmt.Errorf("improper result from kas")
Expand Down Expand Up @@ -1013,16 +1013,16 @@ func (n *NanoTDFDecryptHandler) Decrypt(_ context.Context, result []kaoResult) (
return 0, err
}

return uint32(writeLen), nil
return writeLen, nil
}

// ReadNanoTDF - read the nano tdf and return the decrypted data from it
func (s SDK) ReadNanoTDF(writer io.Writer, reader io.ReadSeeker) (uint32, error) {
func (s SDK) ReadNanoTDF(writer io.Writer, reader io.ReadSeeker) (int, error) {
return s.ReadNanoTDFContext(context.Background(), writer, reader)
}

// ReadNanoTDFContext - allows cancelling the reader
func (s SDK) ReadNanoTDFContext(ctx context.Context, writer io.Writer, reader io.ReadSeeker) (uint32, error) {
func (s SDK) ReadNanoTDFContext(ctx context.Context, writer io.Writer, reader io.ReadSeeker) (int, error) {
handler := createNanoTDFDecryptHandler(reader, writer)

symmetricKey, err := s.getNanoRewrapKey(ctx, handler)
Expand Down
4 changes: 2 additions & 2 deletions sdk/tdf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ type tdf3DecryptHandler struct {
reader *Reader
}

func (r *tdf3DecryptHandler) Decrypt(ctx context.Context, results []kaoResult) (uint32, error) {
func (r *tdf3DecryptHandler) Decrypt(ctx context.Context, results []kaoResult) (int, error) {
err := r.reader.buildKey(ctx, results)
if err != nil {
return 0, err
Expand All @@ -92,7 +92,7 @@ func (r *tdf3DecryptHandler) Decrypt(ctx context.Context, results []kaoResult) (
}

n, err := r.writer.Write(data)
return uint32(n), err
return n, err
}

func (r *tdf3DecryptHandler) CreateRewrapRequest(ctx context.Context) (map[string]*kas.UnsignedRewrapRequest_WithPolicyRequest, error) {
Expand Down
Loading