From aeabe60e01e98c27d4103e51c828bc0be1a28ad0 Mon Sep 17 00:00:00 2001 From: Chun-Hung Tseng Date: Sun, 23 Jul 2023 23:35:41 +0200 Subject: [PATCH] Fix signing of SetContentKeyPacketAndSignature --- file.go | 6 +++--- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/file.go b/file.go index b1cdde3..4a1e101 100644 --- a/file.go +++ b/file.go @@ -242,7 +242,7 @@ func (protonDrive *ProtonDrive) DownloadFile(ctx context.Context, link *proton.L return nil, 0, nil, err } - sessionKey, err := link.GetSessionKey(protonDrive.AddrKR, nodeKR) + sessionKey, err := link.GetSessionKey(nodeKR) if err != nil { return nil, 0, nil, err } @@ -438,7 +438,7 @@ func (protonDrive *ProtonDrive) createFileUploadDraft(ctx context.Context, paren return "", "", nil, nil, err } - newSessionKey, err := createFileReq.SetContentKeyPacketAndSignature(newNodeKR, protonDrive.AddrKR) + newSessionKey, err := createFileReq.SetContentKeyPacketAndSignature(newNodeKR) if err != nil { return "", "", nil, nil, err } @@ -516,7 +516,7 @@ func (protonDrive *ProtonDrive) createFileUploadDraft(ctx context.Context, paren if err != nil { return "", "", nil, nil, err } - newSessionKey, err = link.GetSessionKey(protonDrive.AddrKR, newNodeKR) + newSessionKey, err = link.GetSessionKey(newNodeKR) if err != nil { return "", "", nil, nil, err } diff --git a/go.mod b/go.mod index 7e92000..663b3bc 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/ProtonMail/gluon v0.17.0 github.com/ProtonMail/gopenpgp/v2 v2.7.2 - github.com/henrybear327/go-proton-api v0.0.0-20230723062344-776bc2954583 + github.com/henrybear327/go-proton-api v0.0.0-20230723213442-6a56030e2edc github.com/relvacode/iso8601 v1.3.0 golang.org/x/sync v0.3.0 ) diff --git a/go.sum b/go.sum index 5b955c2..483c85e 100644 --- a/go.sum +++ b/go.sum @@ -49,8 +49,8 @@ github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSM github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/henrybear327/go-proton-api v0.0.0-20230723062344-776bc2954583 h1:Bbv0iyHKIr2ZXSOKcG4Ja8Z+NxWKdOVqGSLd3/SQTLk= -github.com/henrybear327/go-proton-api v0.0.0-20230723062344-776bc2954583/go.mod h1:l42xBSOrCmkAxzWUHcoUsG/cP8m1hMhV72GoChOX3bg= +github.com/henrybear327/go-proton-api v0.0.0-20230723213442-6a56030e2edc h1:KivXKtS1s0BZiL+0CSPzT5dPcF+zEjysXXqkA/G1SH8= +github.com/henrybear327/go-proton-api v0.0.0-20230723213442-6a56030e2edc/go.mod h1:l42xBSOrCmkAxzWUHcoUsG/cP8m1hMhV72GoChOX3bg= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=