aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge branch 'pr_68'Szczepan Zalega2017-10-07
|\ \ | | | | | | | | | Closes #68
| * | Fix install commandSzczepan Zalega2017-10-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | Install binaries Copy all headers to own directory Closes #70 Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * | Build shared library by defaultSzczepan Zalega2017-10-07
| | | | | | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * | Set SONAME and use semantic versioningSzczepan Zalega2017-10-07
| | | | | | | | | | | | | | | | | | Closes #69 Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * | build: use GNUInstallDirsIgor Gnatenko2017-10-07
| |/ | | | | | | | | | | | | This simplifies package maintainers life a lot so they don't have to patch buildsystem at all. It just works. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
* | Merge branch 'pr_72'Szczepan Zalega2017-10-07
|\ \ | |/ |/| | | Closes #72
| * test3.cc: fix syntax errorIgor Gnatenko2017-10-07
|/ | | | | Closes #72 Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
* Merge branch 'OSX_merge_cleaned'Szczepan Zalega2017-10-03
|\ | | | | | | | | | | | | | | | | | | | | | | | | This merge: - fixes issues with invalid mutex - moves tests to Python 3 - allows to compile the code natively under Visual Studio with CMake - allows to compile under QtCreator under MS Windows - fixes some issues with test suite - allows to run tests under Windows - allows to compile using QMake (and easy adding to Qt projects) - decreases delays between sending commands thus increasing 2x communication speed
| * Update hidapiSzczepan Zalega2017-09-20
| | | | | | | | | | | | Open in enumeration mode under Windows Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Merge branch 'windows_MSVC2017' into OSX_merge_cleanedSzczepan Zalega2017-09-20
| |\
| | * Qt project updateSzczepan Zalega2017-09-20
| | | | | | | | | | | | | | | | | | | | | | | | Build shared library with debug symbols Fix build for Linux Remove commented lines Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| | * Compilation documentation updateSzczepan Zalega2017-09-20
| | | | | | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| | * Guard Windows instructionsSzczepan Zalega2017-09-20
| | | | | | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| | * Skip factory reset tests for nowSzczepan Zalega2017-07-03
| | | | | | | | | | | | | | | | | | Not working due to CRC error bug Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| | * Ignore whitespace in C API headerSzczepan Zalega2017-07-03
| | | | | | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| | * Move to Python 3Szczepan Zalega2017-07-03
| | | | | | | | | | | | Tested under Windows 8.1 and MSVC 2017 RC
| | * Search for Windows DLLsSzczepan Zalega2017-07-03
| | |
| | * Export C API functionsSzczepan Zalega2017-07-03
| | | | | | | | | | | | Guard extern to only C++
| | * Compile on both MSVC and MINGW (QtCreator)Szczepan Zalega2017-07-03
| | |
| | * Run compilation using Qt CreatorSzczepan Zalega2017-06-28
| | |
| | * Adjust code to make compilation under MSVC 2017Szczepan Zalega2017-06-28
| |/ |/|
| * Merge branch 'osx-communication_issues' into OSX_merge_cleanedSzczepan Zalega2017-09-20
|/|
| * Set lower maximum between-sending delaySzczepan Zalega2017-09-20
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Decrease busy-delay countSzczepan Zalega2017-09-20
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Correct mutex placementSzczepan Zalega2017-09-20
| | | | | | | | | | | | Move mutex from template instantation to single compilation unit to make it work as desired Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Update hidapiSzczepan Zalega2017-09-20
| | | | | | | | | | | | Update to latest version with proper adjustments Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Do not make longer waiting than 500ms on iterationSzczepan Zalega2017-09-20
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Make only 10 retries on receivingSzczepan Zalega2017-09-20
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Log formatting: Enumerate from 1Szczepan Zalega2017-09-20
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Do not resend command to deviceSzczepan Zalega2017-09-20
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Tests: do additional authentication for Pro 0.7Szczepan Zalega2017-09-20
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Catch invalid CRC exception in C APISzczepan Zalega2017-09-20
| | | | | | | | | | | | To handle invalid response packets in C API Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Show warning message about invalid incoming packet's CRCSzczepan Zalega2017-09-20
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Show more detailed status in debug logSzczepan Zalega2017-09-20
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Add C++ tests for some current issuesSzczepan Zalega2017-06-27
| | | | | | | | Issues: https://github.com/Nitrokey/nitrokey-storage-firmware/issues/36 https://github.com/Nitrokey/nitrokey-storage-firmware/issues/31 Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'do_not_log_volatile_data'Szczepan Zalega2017-05-13
|\
| * Fix typo in logging macroSzczepan Zalega2017-05-13
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Log temporary password as hexdump instead of string representationSzczepan Zalega2017-05-13
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Log accepting responses with invalid CRCSzczepan Zalega2017-05-13
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Code refactoringSzczepan Zalega2017-05-13
| | | | | | | | | | | | | | Remove doubled implementation Remove clutter from DEBUG log level Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Assume slot_names are volatile dataSzczepan Zalega2017-05-13
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Do not log volatile dataSzczepan Zalega2017-05-13
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Pack structures for NK Pro v0.8 commandsSzczepan Zalega2017-05-12
| | | | | | | Apparently the GCC "packed" command is skipped while compiling for Win, VS style ones works Fixes nitrokey-app#242 Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Refactor log codeSzczepan Zalega2017-05-12
| | | | | | | Inverse log levels order. Allow to change logging level with int. Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Use bool explicitly for success variableSzczepan Zalega2017-05-12
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Detect device correctly under WindowsSzczepan Zalega2017-05-12
| | | | | | | Update hidapi Fixes nitrokey-app#243 Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Return empty value on no connectionSzczepan Zalega2017-04-26
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Fix includes in C_APISzczepan Zalega2017-04-26
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Use alternative device connection checkSzczepan Zalega2017-04-26
| | | | | | | Do not use hid_enumarate under OSX Hidapi: do not call event loop on OSX Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Rename device mutex in NitrokeyManagerSzczepan Zalega2017-04-25
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>