summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'pr_94'Szczepan Zalega2018-02-12
|\ | | | | | | | | | | C99 compatibility - bool type support Closes #94
| * Include stdbool.h in NK_C_API.hRobin Krahl2018-02-12
| | | | | | | | | | | | | | NK_C_API.h uses the type bool although it is not defined in standard C. Since C99, the header stdbool.h provides this type, so this patch includes it in NK_C_API.h to make it valid C code. (Note that the API already required C99 for the "//"-style comments.)
* | Merge branch 'pr_96'Szczepan Zalega2018-02-12
|\ \ | |/ |/| | | | | | | | | | | | | | | | | Changes in hex_string_to_byte - it could produce invalid results depending on value from byte after the buffer. Used in: write_HOTP_slot_authorize write_OTP_slot_no_authorize write_TOTP_slot_authorize Closes #96
| * Use strnlen to determine string lengthSzczepan Zalega2018-02-12
| | | | | | | | | | | | | | | | | | strnlen stops scanning after reaching big_string_size and returns last position in the searched string. If a string terminator is not found then the big_string_size is returned hence the modification of the later size-checking condition. Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Null-terminate string before calling strtoulRobin Krahl2018-02-12
|/ | | | | | | | hex_string_to_byte in misc.cc calls strtoul with a non-null-terminated string, causing a buffer over-read. This patch extends the buffer to always include a null character in the end. Fixes issue #95.
* Merge branch 'expose_firmware_update'Szczepan Zalega2018-02-01
|\
| * Add test for enabling firmware updateSzczepan Zalega2018-02-01
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Expose enabling firmware update in C APISzczepan Zalega2018-02-01
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'add_udev'Szczepan Zalega2018-01-31
|\
| * Add udev rules installation (QMake)Szczepan Zalega2018-01-30
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Add QMake installation rulesSzczepan Zalega2018-01-30
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Install udev file (CMake)Szczepan Zalega2018-01-30
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'update_catch'Szczepan Zalega2018-01-29
|\ | | | | | | Closes #91
| * Fix bug with different data readSzczepan Zalega2018-01-29
| | | | | | | | | | | | Makes occasional fails Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Do initialization of hidden volume before test (once)Szczepan Zalega2018-01-29
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Fix Capture for Catch v2.0Szczepan Zalega2018-01-29
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Update Catch to v2.1.1Szczepan Zalega2018-01-29
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'pr_90'Szczepan Zalega2018-01-29
|\ | | | | | | Adding support for Catch2 if available in system
| * Try to use system Catch2 if possibleDavid Seifert2018-01-29
|/
* Merge branch '87-release'v3.2Szczepan Zalega2018-01-16
|\ | | | | | | Closes #87
| * Add changelog fileSzczepan Zalega2018-01-16
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Add additional information to Qt project fileSzczepan Zalega2018-01-16
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Set version to 3.2Szczepan Zalega2018-01-16
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch '89-catch_exc_in_C_API'Szczepan Zalega2018-01-16
|\ | | | | | | | | Catch communication exceptions in C API to avoid crash. Fixes #89
| * Catch DeviceCommunication exceptions in C APISzczepan Zalega2018-01-16
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* | Merge branch '77-missing_C_header'Szczepan Zalega2018-01-16
|\ \ | |/ |/| | | | | Add missing header for C/CFFI access to the C API. Fixes #77
| * Install NK_C_API.h file to system's includesSzczepan Zalega2018-01-16
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Remove inttypes from build filesSzczepan Zalega2018-01-16
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'license_update'Szczepan Zalega2018-01-16
|\ | | | | | | | | Added license-headers to all source code files. Fixes #83
| * Fix typo in readme: change Lib -> libSzczepan Zalega2018-01-16
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Remove 'Created by sz'Szczepan Zalega2018-01-16
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Add license / copyright info to Python files with proper commentSzczepan Zalega2018-01-16
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Update license/copyright linesSzczepan Zalega2018-01-16
|/ | | | | | Remove redundant file Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch '88-no_detection_under_windows'Szczepan Zalega2018-01-16
|\ | | | | | | Fixes #88
| * Update hidapi for Windows connectivity issuesSzczepan Zalega2018-01-16
|/ | | | | | | Windows 7 and 10 were not detecting devices Fixes #88 Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'readme_update'Szczepan Zalega2018-01-05
|\
| * Let user know what to do when library file could not be foundSzczepan Zalega2018-01-05
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Update waffle status barSzczepan Zalega2018-01-05
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Readme updateSzczepan Zalega2018-01-05
|/ | | | | | | | | | | | | Update example Add instructions for compiling with Qt Update CMake flags (LIB_STATIC->BUILD_SHARED) Add description for more CMake flags Replace file names with their links Add information about experimental support of multiple devices Update minimal xcode used in Travis Correct information about showing Debug info in Nitrokey App 1.x Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch '82-python_example_fix'Szczepan Zalega2018-01-05
|\ | | | | | | | | | | Handle getting HOTP code properly - code is now string, not an int Additional improvements Fixes #82
| * Fix typoSzczepan Zalega2018-01-05
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Allow to choose log verbosity levelSzczepan Zalega2018-01-05
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Handle library names for all OSesSzczepan Zalega2018-01-05
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Handle getting HOTP code properlySzczepan Zalega2018-01-05
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch '82-python_example_fix'Szczepan Zalega2018-01-04
|\
| * Use correct filtering of C API symbols from C headerSzczepan Zalega2018-01-04
|/ | | | | | | | Recently the C API header was reformatted by adding more white-spaces, though the filtering function from example was not adjusted to it. Now the lines are stripped before further processing. Fixes #82 Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* 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/
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-26 02:05:36 +0000