summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* Merge branch '98-release_3.3'Szczepan Zalega2018-04-10
|\
| * Update version to 3.3Szczepan Zalega2018-04-10
|/
* 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
|/
* Merge branch '102-get_status_invalid'Szczepan Zalega2018-04-10
|\
| * Name magic numbers in validation functionsSzczepan Zalega2018-04-10
| * Correct validation functions for GetStatus and WriteGeneralConfig structsSzczepan Zalega2018-04-10
| * Correct C API documentationSzczepan Zalega2018-04-10
| * Precise value for p.enable_user_password field to 1 on true, as in firmwareSzczepan Zalega2018-04-10
* | Merge branch 'pr_105'Szczepan Zalega2018-04-10
|\ \
| * | Add NK_login_enum to the C APIRobin Krahl2018-04-10
| * | Add a NitrokeyManager::connect overload for enumRobin Krahl2018-04-10
|/ /
* | Merge branch 'pr_103'Szczepan Zalega2018-04-10
|\ \
| * | Fix suggested CMake options in readmeRobin Krahl2018-04-10
|/ /
* | Merge branch 'pr_104'Szczepan Zalega2018-04-10
|\ \ | |/ |/|
| * Null-terminate the argument for strtoulRobin Krahl2018-04-10
|/
* Merge branch 'pr_101'Szczepan Zalega2018-03-13
|\
| * Update include paths for QMake as wellSzczepan Zalega2018-03-13
* | Merge branch 'pr_101'Szczepan Zalega2018-03-13
|\|
| * 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
|/
* Merge branch 'unencrypted_volume_pin_type'Szczepan Zalega2018-03-09
|\
| * C API wrapper for NK_set_unencrypted_volume_rorw_pin_type_userSzczepan Zalega2018-03-09
|/
* Merge branch 'compilation_warnings'Szczepan Zalega2018-03-03
|\
| * Fix compilation warningSzczepan Zalega2018-03-03
|/
* Merge branch 'wip-multiple_devices'Szczepan Zalega2018-03-02
|\
| * Correct firmware version getting in Pro testsSzczepan Zalega2018-03-02
| * Minor cleanupSzczepan Zalega2018-03-01
| * Increase buffer size for listing connected devices IDsSzczepan Zalega2018-03-01
| * Add documentation for C API / multiple devicesSzczepan Zalega2018-03-01
| * Clean headersSzczepan Zalega2018-03-01
| * Add test's scenario descriptionsSzczepan Zalega2018-02-28
| * Add to device's ID USB path. Convert ID to hex.Szczepan Zalega2018-02-28
| * Log current device IDSzczepan Zalega2018-02-28
| * Python test running commands on all connected devicesSzczepan Zalega2018-02-28
| * Return USB path as id, when device is running long operationSzczepan Zalega2018-02-28
| * Add tests for refreshed devices list and not refreshed in the loopSzczepan Zalega2018-02-28
| * Disconnect all devices before enumerating and discovering ids. Add log.Szczepan Zalega2018-02-28
| * Show connection success/failure on DEBUG_L1Szczepan Zalega2018-02-28
| * Add LOGD1 macroSzczepan Zalega2018-02-28
| * Do not disconnect device on getting status failureSzczepan Zalega2018-02-28
| * List devices by unique SC:SD idSzczepan Zalega2018-02-28
| * Initial support for multiple devices with C++ and testSzczepan Zalega2018-02-28
|/
* Merge branch 'wip-support_storage_v0.51'Szczepan Zalega2018-02-23
|\
| * Handle getting firmware version internallySzczepan Zalega2018-02-23
| * Tests: make sure encrypted volume is enabled before unlocking hidden volumeSzczepan Zalega2018-02-23
| * Tests: rename _admin related and skip not supported encrypted volume ro/rw testsSzczepan Zalega2018-02-23
| * Divide unencrypted volume ro/rw commands for backward compatibilitySzczepan Zalega2018-02-23