diff options
Diffstat (limited to 'cryptfs')
| -rw-r--r-- | cryptfs/cryptfile.go | 30 | ||||
| -rw-r--r-- | cryptfs/cryptfs.go | 30 |
2 files changed, 35 insertions, 25 deletions
diff --git a/cryptfs/cryptfile.go b/cryptfs/cryptfile.go index 98b6d12..e5e9462 100644 --- a/cryptfs/cryptfile.go +++ b/cryptfs/cryptfile.go @@ -1,9 +1,9 @@ package cryptfs import ( - "fmt" + //"fmt" "os" - "io" + //"io" "errors" "crypto/cipher" ) @@ -11,8 +11,6 @@ import ( type CryptFile struct { file *os.File gcm cipher.AEAD - plainBS int64 - cipherBS int64 } // decryptBlock - Verify and decrypt GCM block @@ -59,6 +57,7 @@ func (be *CryptFS) EncryptBlock(plaintext []byte) []byte { return ciphertext } +/* // readCipherBlock - Read ciphertext block number "blockNo", decrypt, // return plaintext func (be *CryptFile) readCipherBlock(blockNo int64) ([]byte, error) { @@ -98,12 +97,13 @@ func (be *CryptFile) readCipherBlock(blockNo int64) ([]byte, error) { return plainBuf, nil } +*/ // intraBlock identifies a part of a file block type intraBlock struct { - BlockNo int64 // Block number in file - Offset int64 // Offset into block plaintext - Length int64 // Length of data from this block + BlockNo uint64 // Block number in file + Offset uint64 // Offset into block plaintext + Length uint64 // Length of data from this block fs *CryptFS } @@ -117,13 +117,13 @@ func (ib *intraBlock) IsPartial() bool { // CiphertextRange - get byte range in ciphertext file corresponding to BlockNo // (complete block) -func (ib *intraBlock) CiphertextRange() (offset int64, length int64) { +func (ib *intraBlock) CiphertextRange() (offset uint64, length uint64) { return ib.BlockNo * ib.fs.cipherBS, ib.fs.cipherBS } // PlaintextRange - get byte range in plaintext corresponding to BlockNo // (complete block) -func (ib *intraBlock) PlaintextRange() (offset int64, length int64) { +func (ib *intraBlock) PlaintextRange() (offset uint64, length uint64) { return ib.BlockNo * ib.fs.plainBS, ib.fs.plainBS } @@ -138,7 +138,7 @@ func (ib *intraBlock) CropBlock(d []byte) []byte{ } // Split a plaintext byte range into (possible partial) blocks -func (be *CryptFS) SplitRange(offset int64, length int64) []intraBlock { +func (be *CryptFS) SplitRange(offset uint64, length uint64) []intraBlock { var b intraBlock var parts []intraBlock @@ -147,7 +147,7 @@ func (be *CryptFS) SplitRange(offset int64, length int64) []intraBlock { for length > 0 { b.BlockNo = offset / be.plainBS b.Offset = offset % be.plainBS - b.Length = be.min64(length, be.plainBS - b.Offset) + b.Length = be.minu64(length, be.plainBS - b.Offset) parts = append(parts, b) offset += b.Length length -= b.Length @@ -155,13 +155,14 @@ func (be *CryptFS) SplitRange(offset int64, length int64) []intraBlock { return parts } -func (be *CryptFS) min64(x int64, y int64) int64 { +func (be *CryptFS) minu64(x uint64, y uint64) uint64 { if x < y { return x } return y } +/* // writeCipherBlock - Encrypt plaintext and write it to file block "blockNo" func (be *CryptFile) writeCipherBlock(blockNo int64, plain []byte) error { @@ -186,7 +187,7 @@ func (be *CryptFile) writeCipherBlock(blockNo int64, plain []byte) error { // Perform RMW cycle on block // Write "data" into file location specified in "b" func (be *CryptFile) rmwWrite(b intraBlock, data []byte, f *os.File) error { - if b.Length != int64(len(data)) { + if b.Length != uint64(len(data)) { panic("Length mismatch") } @@ -200,7 +201,7 @@ func (be *CryptFile) rmwWrite(b intraBlock, data []byte, f *os.File) error { // Write goes beyond the old block and grows the file? // Must create a bigger newBlock - if newBlockLen > int64(len(oldBlock)) { + if newBlockLen > uint64(len(oldBlock)) { newBlock = make([]byte, newBlockLen) } else { newBlock = make([]byte, len(oldBlock)) @@ -222,3 +223,4 @@ func (be *CryptFile) rmwWrite(b intraBlock, data []byte, f *os.File) error { return err } +*/ diff --git a/cryptfs/cryptfs.go b/cryptfs/cryptfs.go index 72eea61..d385a77 100644 --- a/cryptfs/cryptfs.go +++ b/cryptfs/cryptfs.go @@ -7,7 +7,6 @@ import ( "strings" "encoding/base64" "errors" - "os" ) const ( @@ -22,8 +21,8 @@ const ( type CryptFS struct { blockCipher cipher.Block gcm cipher.AEAD - plainBS int64 - cipherBS int64 + plainBS uint64 + cipherBS uint64 } func NewCryptFS(key [16]byte) *CryptFS { @@ -46,6 +45,7 @@ func NewCryptFS(key [16]byte) *CryptFS { } } +/* func (fs *CryptFS) NewFile(f *os.File) *CryptFile { return &CryptFile { file: f, @@ -54,8 +54,9 @@ func (fs *CryptFS) NewFile(f *os.File) *CryptFile { cipherBS: fs.cipherBS, } } +*/ -func (be *CryptFS) PlainBS() int64 { +func (be *CryptFS) PlainBS() uint64 { return be.plainBS } @@ -139,18 +140,25 @@ func (be *CryptFS) DecryptPath(path string) (string, error) { return be.translatePath(path, DECRYPT) } -// plainSize - calculate plaintext size from ciphertext size -func (be *CryptFS) PlainSize(s int64) int64 { +// PlainSize - calculate plaintext size from ciphertext size +func (be *CryptFS) PlainSize(size uint64) uint64 { // Zero sized files stay zero-sized - if s > 0 { - // Number of blocks - n := s / be.cipherBS + 1 + if size > 0 { overhead := be.cipherBS - be.plainBS - s -= n * overhead + nBlocks := (size + be.cipherBS - 1) / be.cipherBS + size -= nBlocks * overhead } - return s + return size } + +// plainSizeFromCipherSize - calculate plaintext size from ciphertext size +func (be *CryptFS) plainSizeFromCipherSize(size int64) int64 { + if size > 0 { + + } + return size +} // pad16 - pad filename to 16 byte blocks using standard PKCS#7 padding // https://tools.ietf.org/html/rfc5652#section-6.3 func (be *CryptFS) pad16(orig []byte) (padded []byte) { |