diff options
Diffstat (limited to 'weed/s3api/s3_sse_kms.go')
| -rw-r--r-- | weed/s3api/s3_sse_kms.go | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/weed/s3api/s3_sse_kms.go b/weed/s3api/s3_sse_kms.go index 3b721aa26..fa9451a8f 100644 --- a/weed/s3api/s3_sse_kms.go +++ b/weed/s3api/s3_sse_kms.go @@ -164,7 +164,8 @@ func CreateSSEKMSEncryptedReaderWithBaseIVAndOffset(r io.Reader, keyID string, e defer clearKMSDataKey(dataKeyResult) // Calculate unique IV using base IV and offset to prevent IV reuse in multipart uploads - iv := calculateIVWithOffset(baseIV, offset) + // Skip is not used here because we're encrypting from the start (not reading a range) + iv, _ := calculateIVWithOffset(baseIV, offset) // Create CTR mode cipher stream stream := cipher.NewCTR(dataKeyResult.Block, iv) @@ -420,9 +421,11 @@ func CreateSSEKMSDecryptedReader(r io.Reader, sseKey *SSEKMSKey) (io.Reader, err } // Calculate the correct IV for this chunk's offset within the original part + // Note: The skip bytes must be discarded by the caller before reading from the returned reader var iv []byte if sseKey.ChunkOffset > 0 { - iv = calculateIVWithOffset(sseKey.IV, sseKey.ChunkOffset) + iv, _ = calculateIVWithOffset(sseKey.IV, sseKey.ChunkOffset) + // Skip value is ignored here; caller must handle intra-block byte skipping } else { iv = sseKey.IV } @@ -436,9 +439,18 @@ func CreateSSEKMSDecryptedReader(r io.Reader, sseKey *SSEKMSKey) (io.Reader, err // Create CTR mode cipher stream for decryption // Note: AES-CTR is used for object data decryption to match the encryption mode stream := cipher.NewCTR(block, iv) + decryptReader := &cipher.StreamReader{S: stream, R: r} + + // Wrap with closer if the underlying reader implements io.Closer + if closer, ok := r.(io.Closer); ok { + return &decryptReaderCloser{ + Reader: decryptReader, + underlyingCloser: closer, + }, nil + } // Return the decrypted reader - return &cipher.StreamReader{S: stream, R: r}, nil + return decryptReader, nil } // ParseSSEKMSHeaders parses SSE-KMS headers from an HTTP request |