aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Return firmware version parts as uint8_t instead of intfix/get-firmware-versionRobin Krahl2019-01-17
| | | | | | | | The firmware version parts returned by the Nitrokey devices are uint8_t values. This is part of the public API as part of the NK_storage_status struct. For consistency with this API, this patch changes the functions NK_get_major_firmware_version and NK_get_minor_firmware_version to return uint8_t instead of int.
* Merge branch 'pr_146'Szczepan Zalega2019-01-15
|\ | | | | | | | | | | Correct README - links to header files Fixes #146
| * Correct other links as wellSzczepan Zalega2019-01-15
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Fix links to header files in READMEMartin Müller2019-01-15
|/
* Merge branch 'contributions'Szczepan Zalega2019-01-15
|\ | | | | | | | | | | | | | | | | | | Multiple PR's merged and tested as a whole Platform: Pro v0.7 Storage v0.53 Fedora 29 Run Python tests
| * Merge branch 'pr_138' into contributionsSzczepan Zalega2019-01-15
| |\ | | | | | | | | | | | | | | | Improve support for multiple devices Fixes #138
| | * Add test for NK_list_devices to test_multiple_deviceswip/multiple-devicesRobin Krahl2019-01-13
| | | | | | | | | | | | | | | As we cannot test this function properly in Python (due to missing struct definitions), we test it in the C++ test suite.
| | * Add test for NK_connect_with_pathRobin Krahl2019-01-13
| | | | | | | | | | | | | | | As we cannot read the output of NK_list_devices in the Python tests at the moment, this test case uses NK_list_devices_by_cpuID instead.
| | * Add simple test for NK_list_devicesRobin Krahl2019-01-13
| | | | | | | | | | | | | | | | | | | | | Unfortunately, I cannot test more as the current ffi implementation does not allow me to import struct definitions. Without the definition for the NK_device_info struct, I cannot inspect the result of the NK_list_devices function.
| | * Add NK_device_info, NK_list_devices and NK_free_device_infoRobin Krahl2019-01-13
| | | | | | | | | | | | | | | | | | NK_list_devices corresponds to NitrokeyManager::list_devices. It returns a linked list of NK_device_info, which has to be freed using the NK_free_device_info function.
| | * Change std::wstring to std::string in DeviceInfoRobin Krahl2019-01-13
| | | | | | | | | | | | | | | | | | | | | For easier handling, we should use a std::string instead of std::wstring for the serial number in DeviceInfo. For the conversion, I assume that the serial number is valid UTF-8. As it should be alphanumeric and ASCII only, this should be true.
| | * Add NK_connect_with_path to C APIRobin Krahl2019-01-13
| | | | | | | | | | | | NK_connect_with_path corresponds to NitrokeyManager::connect_with_path.
| | * Add test case for NitrokeyManager::connect_with_path to test_multiple_devicesRobin Krahl2019-01-13
| | | | | | | | | | | | | | | | | | The current test case is renamed to “Use Storage API” as it queries the storage status. The new test case, “Use API”, lists all connected devices and prints their model, path and serial number.
| | * Change NitrokeyManager::connect_with_path to also work with ProRobin Krahl2019-01-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, Stick20 was hardcoded in connect_with_path. Now we first use hid_enumerate to find out the model on that path, then we connect to that model. We also could have added the model as a parameter to connect_with_path. Yet we cannot directly check the model after connecting, so this would be error-prone.
| | * Add test case for Device::enumerate to test_multiple_devicesRobin Krahl2019-01-13
| | | | | | | | | | | | | | | | | | The current test case is renamed to “List Storage devices” as it also displays the SD card ID. The new test case, “List devices”, lists all connected devices and prints their model, path and serial number.
| | * Implement operator<< for DeviceModelRobin Krahl2019-01-13
| | |
| | * Add Device::create static methodRobin Krahl2019-01-13
| | | | | | | | | | | | | | | The method makes it easier to create a std::shared_ptr<Device> from a model enum instance.
| | * Make Device::enumerate staticRobin Krahl2019-01-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Device::enumerate does not need any instance data, therefore it is made static. Note that this not only changes the public API by making the method static. We also return all connected Nitrokey devices instead of only Storage devices. The NitrokeyManager method list_devices_by_cpuID is changed to check the device type so that they still only return Storage devices. The list_device method now returns both Storage and Pro devices.
| | * Add product_id_to_model functionRobin Krahl2019-01-13
| | |
| | * Add misc::Option<T> classRobin Krahl2019-01-13
| | | | | | | | | | | | | | | Option<T> is a simple replacement for std::optional, which was introduced in C++17. It stores a value that can be present or absent.
| | * Extract vendor and product IDs into constantsRobin Krahl2019-01-13
| | |
| | * Change Nitrokey::list_devices return type to use DeviceInfoRobin Krahl2019-01-13
| | | | | | | | | | | | | | | | | | In the previous commit, we changed the return value of Device::enumerate to std::vector<DeviceInfo>. Now we change Nitrokey::list_devices to also return DeviceInfo instances.
| | * Change Device::enumerate return type to use DeviceInfoRobin Krahl2019-01-13
| | | | | | | | | | | | | | | | | | The return type of Device::enumerate is changed from std::vector<std::string> to std::vector<DeviceInfo> to expose the additional information contained in the DeviceInfo struct.
| | * Add DeviceInfo struct for enumerationRobin Krahl2019-01-13
| | | | | | | | | | | | | | | | | | This is a preparation for a future patch that will change the enumerate method to return a vector of DeviceInfo instances instead of a vector of strings.
| * | Merge branch 'pr_145' into contributionsSzczepan Zalega2019-01-15
| |\ \ | | | | | | | | | | | | | | | | | | | | Add NK_get_SD_usage_data function to C API Fixes #145
| | * | Add NK_get_SD_usage_data function to C APIfeature/sd-usage-data-structRobin Krahl2019-01-14
| | |/ | | | | | | | | | | | | | | | The NK_get_SD_usage_data function returns the minimum and maximum write level for the SD card. This function cannot be tested due to the missing struct support in the Python tests.
| * | Merge branch 'pr_143' into contributionsSzczepan Zalega2019-01-15
| |\ \ | | | | | | | | | | | | | | | | | | | | Return -2 if an error occured in NK_get_progress_bar_value Fixes #143
| | * | Return -2 if an error occured in NK_get_progress_bar_valuefix/progress-bar-errorRobin Krahl2019-01-14
| | |/ | | | | | | | | | | | | | | | | | | | | | NK_get_progress_bar_value returns the progress value from 0 to 100 or -1 if there is no pending operation. In the previous implementation, it also returned zero if an error occurred, making it impossible to distinguish progress zero and an error. Therefore, we change the return value to -2 if an error occured.
| * | Merge branch 'pr_139' into contributionsSzczepan Zalega2019-01-15
| |\ \ |/ / / | | | | | | | | | | | | Add tqdm to Python's tests requirements Fixes #139
| * | Add tqdm to unittest/requirements.txtfix/python-requirementsRobin Krahl2019-01-13
| |/ | | | | | | | | | | The test_mulitple.py unit test requires tqdm, which is not a dependency of any of the requirements and was not included in the requirements list.
* | Merge branch '144-python_multiline'Szczepan Zalega2019-01-15
|\ \ | |/ |/| | | | | | | | | | | | | Add Python support for multiline declarations in NK_C_API.h Add test for reading a structure, which uses multiline declaration Add offline test for Python CI: execute offline test for Python (GCC5 build only) Fixes #144
| * CI: add pip-required requests packageSzczepan Zalega2019-01-15
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Print used Git version for the librarySzczepan Zalega2019-01-15
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * CI: install git to get the library version on buildSzczepan Zalega2019-01-15
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * CI: run Python offline testsSzczepan Zalega2019-01-15
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Add Python offline testsSzczepan Zalega2019-01-15
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Use logger instead of bare printingSzczepan Zalega2019-01-15
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Add proxy object for logging libnitrokey callsSzczepan Zalega2019-01-15
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Add support for multiline C definitions in NK_C_API + testSzczepan Zalega2019-01-15
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'cpp_tests_update'Szczepan Zalega2019-01-02
|\ | | | | | | | | | | | | | | | | Update C++ tests Add safe C++ test for simple connection test, device agnostic. Better describe the use case of C++ tests in the Readme. Related: https://github.com/d-e-s-o/nitrocli/issues/39
| * Update Readme, mostly test sectionSzczepan Zalega2019-01-02
| | | | | | | | | | | | | | Describe better C++ tests Related: https://github.com/d-e-s-o/nitrocli/issues/39 Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Mention potential test failure cause, when no git version is providedSzczepan Zalega2019-01-02
| | | | | | | | | | | | Related to #133 Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Add test_safe target for buildSzczepan Zalega2019-01-02
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Add safe to user data C++ tests - test_safe.cppSzczepan Zalega2019-01-02
|/ | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'tests_update'Szczepan Zalega2018-11-22
|\ | | | | | | Adding corrections found while testing Storage v0.53 RC1.
| * Run enabling firmware update mode, but with wrong password onlySzczepan Zalega2018-11-22
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| * Handle UNKNOWN_ERROR return codeSzczepan Zalega2018-11-22
|/ | | | | | | | Handle UNKNOWN_ERROR code (introduced in Storage v0.51, firmware commit 687d4aca31ce405db41231be73864ee2f91b3714) and is returned, when device fails to retrieve the AES key. Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'pr_131'Szczepan Zalega2018-07-24
|\ | | | | | | | | | | | | | | Add virtual destructor to logger classes. Fixes compilation warning Fixes #131 Fixes #129
| * log: define default virtual destructor for LogHandlerIgor Gnatenko2018-07-18
| | | | | | | | | | Fixes: https://github.com/Nitrokey/libnitrokey/issues/129 Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
* | Merge branch 'pr_132'Szczepan Zalega2018-07-24
|\ \ | | | | | | | | | | | | | | | | | | Update Catch to 2.3.0 Both CMake and Meson build files updated. Tests compile (with both) and run with a Storage device. Fixes #132
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-24 23:26:48 +0000