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

show verbose output for failed test

Browse Source
This commit is contained in:
Valient Gough 2014-10-26 14:50:43 -07:00
parent 264f3735d9
commit 8d515fda07
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
encfs/test.cpp
View File

@ -363,6 +363,30 @@ bool runTests(const shared_ptr<Cipher> &cipher, bool verbose) {
return true; return true;
} }
static bool testCipherSize(const string &name, int keySize, int blockSize,
bool verbose) {
cerr << name << ", key length " << keySize << ", block size " << blockSize << ": ";
shared_ptr<Cipher> cipher = Cipher::New(name, keySize);
if (!cipher) {
cerr << "FAILED TO CREATE\n";
return false;
} else {
try {
if (runTests(cipher, verbose)) {
cerr << "OK\n";
} else {
cerr << "FAILED\n";
return false;
}
} catch (rlog::Error &er) {
cerr << "Error: " << er.what() << "\n";
return false;
}
}
return true;
}
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
RLogInit(argc, argv); RLogInit(argc, argv);
@ -406,26 +430,10 @@ int main(int argc, char *argv[]) {
int blockSize = it->blockSize.closest(256); int blockSize = it->blockSize.closest(256);
for (int keySize = it->keyLength.min(); keySize <= it->keyLength.max(); for (int keySize = it->keyLength.min(); keySize <= it->keyLength.max();
keySize += it->keyLength.inc()) { keySize += it->keyLength.inc()) {
cerr << it->name << ", key length " << keySize << ", block size " if (!testCipherSize(it->name, keySize, blockSize, false)) {
<< blockSize << ": "; // Run again in verbose mode, then exit with error.
testCipherSize(it->name, keySize, blockSize, true);
shared_ptr<Cipher> cipher = Cipher::New(it->name, keySize);
if (!cipher) {
cerr << "FAILED TO CREATE\n";
return 1; return 1;
} else {
try {
if (runTests(cipher, false)) {
cerr << "OK\n";
} else {
cerr << "FAILED\n";
return 1;
}
}
catch (rlog::Error &er) {
cerr << "Error: " << er.what() << "\n";
return 1;
}
} }
} }
} }