extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2025-06-21 12:34:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make initHeader return -EBADMSG when encode fails

Browse Source 
instead of throwing an exception, as with read/write
This commit is contained in:
benrubson 2017-03-17 09:07:14 +01:00
parent 36f3505af0
commit 6f4ff008bc
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
encfs/CipherFileIO.cpp
View File

@ -109,7 +109,8 @@ bool CipherFileIO::setIV(uint64_t iv) {
return false; return false;
} }
} }
initHeader(); if (initHeader() < 0)
return false;
} }
uint64_t oldIV = externalIV; uint64_t oldIV = externalIV;
@ -170,7 +171,7 @@ off_t CipherFileIO::getSize() const {
return size; return size;
} }
void CipherFileIO::initHeader() { int CipherFileIO::initHeader() {
// check if the file has a header, and read it if it does.. Otherwise, // check if the file has a header, and read it if it does.. Otherwise,
// create one. // create one.
off_t rawSize = base->getSize(); off_t rawSize = base->getSize();
@ -196,8 +197,10 @@ void CipherFileIO::initHeader() {
unsigned char buf[8] = {0}; unsigned char buf[8] = {0};
do { do {
if (!cipher->randomize(buf, 8, false)) if (!cipher->randomize(buf, 8, false)) {
throw Error("Unable to generate a random file IV"); RLOG(ERROR) << "Unable to generate a random file IV";
return -EBADMSG;
}
fileIV = 0; fileIV = 0;
for (int i = 0; i < 8; ++i) fileIV = (fileIV << 8) | (uint64_t)buf[i]; for (int i = 0; i < 8; ++i) fileIV = (fileIV << 8) | (uint64_t)buf[i];
@ -220,6 +223,7 @@ void CipherFileIO::initHeader() {
} }
} }
VLOG(1) << "initHeader finished, fileIV = " << fileIV; VLOG(1) << "initHeader finished, fileIV = " << fileIV;
return 0;
} }
bool CipherFileIO::writeHeader() { bool CipherFileIO::writeHeader() {
@ -324,8 +328,11 @@ ssize_t CipherFileIO::readOneBlock(const IORequest &req) const {
bool ok; bool ok;
if (readSize > 0) { if (readSize > 0) {
if (haveHeader && fileIV == 0) if (haveHeader && fileIV == 0) {
const_cast<CipherFileIO *>(this)->initHeader(); int res = const_cast<CipherFileIO *>(this)->initHeader();
if (res < 0)
return res;
}
if (readSize != bs) { if (readSize != bs) {
VLOG(1) << "streamRead(data, " << readSize << ", IV)"; VLOG(1) << "streamRead(data, " << readSize << ", IV)";
@ -357,7 +364,11 @@ int CipherFileIO::writeOneBlock(const IORequest &req) {
int bs = blockSize(); int bs = blockSize();
off_t blockNum = req.offset / bs; off_t blockNum = req.offset / bs;
if (haveHeader && fileIV == 0) initHeader(); if (haveHeader && fileIV == 0) {
int res = initHeader();
if (res < 0)
return res;
}
bool ok; bool ok;
if (req.dataLen != bs) { if (req.dataLen != bs) {
@ -437,7 +448,9 @@ int CipherFileIO::truncate(off_t size) {
if (base->open(newFlags) < 0) if (base->open(newFlags) < 0)
VLOG(1) << "writeHeader failed to re-open for write"; VLOG(1) << "writeHeader failed to re-open for write";
} }
initHeader(); int res = initHeader();
if (res < 0)
return res;
} }
// can't let BlockFileIO call base->truncate(), since it would be using // can't let BlockFileIO call base->truncate(), since it would be using

2
encfs/CipherFileIO.h
View File

@ -68,7 +68,7 @@ class CipherFileIO : public BlockFileIO {
virtual int writeOneBlock(const IORequest &req); virtual int writeOneBlock(const IORequest &req);
virtual void generateReverseHeader(unsigned char *data); virtual void generateReverseHeader(unsigned char *data);
void initHeader(); int initHeader();
bool writeHeader(); bool writeHeader();
bool blockRead(unsigned char *buf, int size, uint64_t iv64) const; bool blockRead(unsigned char *buf, int size, uint64_t iv64) const;
bool streamRead(unsigned char *buf, int size, uint64_t iv64) const; bool streamRead(unsigned char *buf, int size, uint64_t iv64) const;