aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Tests: skip reading custom-type based function headerSzczepan Zalega2018-04-10
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch '98-release_3.3'Szczepan Zalega2018-04-10
|\ | | | | | | Update version to v3.3
| * Update version to 3.3Szczepan Zalega2018-04-10
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'delay_RORW_pin_type_change'Szczepan Zalega2018-04-10
|\
| * Delay RO/RW PIN type change to start from v0.52 (instead of v0.51)Szczepan Zalega2018-04-10
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch '102-get_status_invalid'Szczepan Zalega2018-04-10
|\ | | | | | | Fixes #102
| * Name magic numbers in validation functionsSzczepan Zalega2018-04-10
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Correct validation functions for GetStatus and WriteGeneralConfig structsSzczepan Zalega2018-04-10
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Correct C API documentationSzczepan Zalega2018-04-10
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Precise value for p.enable_user_password field to 1 on true, as in firmwareSzczepan Zalega2018-04-10
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* | Merge branch 'pr_105'Szczepan Zalega2018-04-10
|\ \ | | | | | | | | | Fixes #105
| * | Add NK_login_enum to the C APIRobin Krahl2018-04-10
| | | | | | | | | | | | | | | | | | | | | | | | As with the C++ API, identifying the model by the first character of a string is not intuitive. This patch adds the NK_login_enum function to the C API that accepts an enum value instead of a string. It also adds a new enum NK_device_model as device::DeviceModel is an enum class and therefore cannot be used in C.
| * | Add a NitrokeyManager::connect overload for enumRobin Krahl2018-04-10
|/ / | | | | | | | | | | | | Identifying the model to connect to by the first character of a string is not intuitive. This patch adds an overload for the connect function that accepts a device::DeviceModel enum value, providing a cleaner interface.
* | Merge branch 'pr_103'Szczepan Zalega2018-04-10
|\ \ | | | | | | | | | Fixes #103
| * | Fix suggested CMake options in readmeRobin Krahl2018-04-10
|/ / | | | | | | | | | | | | | | | | The readme suggested to use the option `-DCOMPILE_TESTS` for CMake in order to compile unit tests. Yet CMake expectes option values of the form `<var>:<type>=<value>` or `<var>=<value>` (see cmake(1)). Therefore, this patch replaces `-DCOMPILE_TESTS` with `-DCOMPILE_TESTS=ON`, matching the general build instructions in the CMake section.
* | Merge branch 'pr_104'Szczepan Zalega2018-04-10
|\ \ | |/ |/| | | Fixes #104
| * Null-terminate the argument for strtoulRobin Krahl2018-04-10
|/ | | | | | As discussed in issue #95, the buffer passed to strtoul must be null-terminated. This patch null-terminates the buffer used in hexStringToByte in the test_HOTP unit test to avoid a buffer over-read.
* Merge branch 'pr_101'Szczepan Zalega2018-03-13
|\ | | | | | | | | | | Fixup for QMake Issue #101
| * Update include paths for QMake as wellSzczepan Zalega2018-03-13
| | | | | | | | | | | | Fixup to #101 Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* | Merge branch 'pr_101'Szczepan Zalega2018-03-13
|\| | | | | | | | | | | Fixed header path. Allow to override UDEV rules. Closes #101
| * Allow overriding of udev rules dirDavid Seifert2018-03-13
| |
| * Make unbundling easierDavid Seifert2018-03-13
|/
* Merge branch 'licenses_update'Szczepan Zalega2018-03-13
|\
| * Add missing licensesSzczepan Zalega2018-03-13
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'unencrypted_volume_pin_type'Szczepan Zalega2018-03-09
|\ | | | | | | | | Update C API with new command, determining the PIN type for unencrypted volume RO/RW state change.
| * C API wrapper for NK_set_unencrypted_volume_rorw_pin_type_userSzczepan Zalega2018-03-09
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'compilation_warnings'Szczepan Zalega2018-03-03
|\ | | | | | | Fix compilation warning with missing 'break'
| * Fix compilation warningSzczepan Zalega2018-03-03
|/ | | | | | Break was indeed missing this time. Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'wip-multiple_devices'Szczepan Zalega2018-03-02
|\ | | | | | | | | Allow to use multiple devices, iteratively. Storage only.
| * Correct firmware version getting in Pro testsSzczepan Zalega2018-03-02
| | | | | | | | | | | | Done for Pro devices Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Minor cleanupSzczepan Zalega2018-03-01
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Increase buffer size for listing connected devices IDsSzczepan Zalega2018-03-01
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Add documentation for C API / multiple devicesSzczepan Zalega2018-03-01
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Clean headersSzczepan Zalega2018-03-01
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Add test's scenario descriptionsSzczepan Zalega2018-02-28
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Add to device's ID USB path. Convert ID to hex.Szczepan Zalega2018-02-28
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Log current device IDSzczepan Zalega2018-02-28
| | | | | | | | | | | | | | | | Allow logger to set global prefix Used to indicate current device Store USB path when used to connection as well Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Python test running commands on all connected devicesSzczepan Zalega2018-02-28
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Return USB path as id, when device is running long operationSzczepan Zalega2018-02-28
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Add tests for refreshed devices list and not refreshed in the loopSzczepan Zalega2018-02-28
| | | | | | | | | | | | Add it to CMake Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Disconnect all devices before enumerating and discovering ids. Add log.Szczepan Zalega2018-02-28
| | | | | | | | | | | | Disconnection allows rediscovering devices. Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Show connection success/failure on DEBUG_L1Szczepan Zalega2018-02-28
| | | | | | | | | | | | Clarify disconnection log message Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Add LOGD1 macroSzczepan Zalega2018-02-28
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Do not disconnect device on getting status failureSzczepan Zalega2018-02-28
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * List devices by unique SC:SD idSzczepan Zalega2018-02-28
| | | | | | | | | | | | | | Add C API and tests Add mutexes Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Initial support for multiple devices with C++ and testSzczepan Zalega2018-02-28
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'wip-support_storage_v0.51'Szczepan Zalega2018-02-23
|\ | | | | | | Support for functionality added in v0.49/v0.51
| * Handle getting firmware version internallySzczepan Zalega2018-02-23
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Tests: make sure encrypted volume is enabled before unlocking hidden volumeSzczepan Zalega2018-02-23
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Tests: rename _admin related and skip not supported encrypted volume ro/rw testsSzczepan Zalega2018-02-23
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>