aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'c41cb82ea7499c132546c1ab6f798deda6a9d7af' as 'hidapi'Szczepan Zalega2017-12-22
|\
| * Squashed 'hidapi/' content from commit b767b43fSzczepan Zalega2017-12-22
| | | | | git-subtree-dir: hidapi git-subtree-split: b767b43f3e6f9c5b92ea7d738331deb8e03c4baf
* Removed hidapi submodule at commit b767b43f3e6f9c5b92ea7d738331deb8e03c4bafSzczepan Zalega2017-12-22
|
* Merge commit '48b3d82ffe1ed19db9ba3cf7e6536ecf92e27391' as 'unittest/Catch'Szczepan Zalega2017-12-22
|\
| * Squashed 'unittest/Catch/' content from commit ae5ee2cfSzczepan Zalega2017-12-22
| | | | | git-subtree-dir: unittest/Catch git-subtree-split: ae5ee2cf63d6d67bd1369b512d2a7b60b571c907
* Removed unittest/Catch submodule at commit ↵Szczepan Zalega2017-12-22
| | | | ae5ee2cf63d6d67bd1369b512d2a7b60b571c907
* Merge branch 'pr_80'Szczepan Zalega2017-12-11
|\ | | | | | | | | | | Closes #80 Tested on Ubuntu 17.10, CMake 3.9.1, pkg-config 0.29.1, GCC 7.2.0.
| * Only enable `-Werror` for Travis CIDavid Seifert2017-12-11
| |
| * Add support for pkg-configDavid Seifert2017-12-11
| |
| * Modernise CMakeDavid Seifert2017-12-11
|/ | | | | | | | | | | | | | | | * Make indentation uniform * Find libhid via pkg-config on Unix * Use `BUILD_SHARED_LIBS`, which is the idiomatic way to switch between static and shared libraries in CMake. https://cmake.org/cmake/help/v3.0/variable/BUILD_SHARED_LIBS.html * Remove Clang option. To use Clang, pass `CXX=clang++` as an environmental parameter to the CMake call. * Do not enable `-Werror` by default. This just causes unnecessary issues with new compiler releases. https://blog.flameeyes.eu/2009/02/future-proof-your-code-dont-use-werror/
* Merge branch 'fix_warnings'Szczepan Zalega2017-10-21
|\
| * Fix compilation warningSzczepan Zalega2017-10-21
|/ | | | | | Moved const to proper place Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'general-fixes'v3.1Szczepan Zalega2017-10-11
|\
| * Allow to use library path in tests from environment variableSzczepan Zalega2017-10-11
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Show proper device status codeSzczepan Zalega2017-10-11
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Switch logging volatile dataSzczepan Zalega2017-10-11
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Make Debug build by default on MacOSSzczepan Zalega2017-10-11
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'travis_update'Szczepan Zalega2017-10-11
|\ | | | | | | Use new xcode and GCC 7
| * Add GCC 7Szczepan Zalega2017-10-11
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Test installation procedureSzczepan Zalega2017-10-11
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Use latest xcode. Compile offline tests for fast check.Szczepan Zalega2017-10-11
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'cleanup'Szczepan Zalega2017-10-10
|\
| * Allow to enable compilation of general and offline tests separatelySzczepan Zalega2017-10-10
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Remove -log library leftoversSzczepan Zalega2017-10-10
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Bump version to 3.1Szczepan Zalega2017-10-10
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'test_organize'Szczepan Zalega2017-10-10
|\ | | | | | | | | | | Improve test organization Disable CRC check Improve log
| * Do not set debug level in testsSzczepan Zalega2017-10-10
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Log updateSzczepan Zalega2017-10-10
| | | | | | | | | | | | | | | | Show progress on busy retries as dots (.) Show warning when expected CRC is different than of received response Show busy retry stats only on delay change Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Translate properly Storage error on AES decoding failSzczepan Zalega2017-10-10
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Update device propertiesSzczepan Zalega2017-10-10
| | | | | | | | | | | | | | Increase device delays Increase retry count Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Add DEBUG_L1 log messagesSzczepan Zalega2017-10-10
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Add DEBUG_L1 level and set it as default for Python testsSzczepan Zalega2017-10-10
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Return exception type when DeviceCommunicationException is encounteredSzczepan Zalega2017-10-10
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Number exceptions for easy return codeSzczepan Zalega2017-10-10
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Code reformatSzczepan Zalega2017-10-10
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Skip checking packet's CRCSzczepan Zalega2017-10-10
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Make additional retries for longer running commandsSzczepan Zalega2017-10-10
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Increase maximum duplicated string lengthSzczepan Zalega2017-10-10
| | | | | | | | | | | | To cover Storage's status string getter Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Make sure hidden volumes are created before unlocking themSzczepan Zalega2017-10-10
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Move library unit tests to Python3Szczepan Zalega2017-10-10
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Remove libnitrokey-log and add a switch to choose version insteadSzczepan Zalega2017-10-04
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Organize tests into categoriesSzczepan Zalega2017-10-04
| | | | | | | | | | | | ... by adding pytest marks. Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* | Merge branch '71-failing_tests'v3.0Szczepan Zalega2017-10-07
|\ \ | | | | | | | | | Closes #71
| * | Travis: do not compile all tests by defaultSzczepan Zalega2017-10-07
| | | | | | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * | Enter bytes directly instead of using stringSzczepan Zalega2017-10-07
| | | | | | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * | Make CTest verboseSzczepan Zalega2017-10-07
| | | | | | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * | Enable offline test on all instancesSzczepan Zalega2017-10-07
| | | | | | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * | Enable tests on CISzczepan Zalega2017-10-07
| | | | | | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * | Add C++ offline tests and set them defaultSzczepan Zalega2017-10-07
| | | | | | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * | Correct exception typeSzczepan Zalega2017-10-07
|/ / | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>