aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch '186-meson-cleanup'Szczepan Zalega2020-08-24
|\ | | | | | | | | | | | | Remove Meson v0.44 backward compatibility Version update Fixes #186
| * meson: Trivial cleanupsIgor Raits2020-08-23
|/ | | | Signed-off-by: Igor Raits <i.gnatenko.brain@gmail.com>
* Merge branch '185-feat-adapt-hidapi-dependency-in-pkgconfig'pre-v3.6Szczepan Zalega2020-08-20
|\ | | | | | | | | | | Fix libnitrokey-1.pc generation on FreeBSD Fixes #185
| * Configure libnitrokey-1.pc with hidapi on FreeBSD and with hidapi-libusb on ↵Thibault Payet2020-08-19
|/ | | | other platform
* Merge branch '183-feat-add-freebsd-build-support'Szczepan Zalega2020-08-17
|\ | | | | | | | | | | Add support for building on FreeBSD Fixes #183
| * When building on FreeBSD, use the correct name for hidapi, for the meson ↵Thibault Payet2020-07-19
| | | | | | | | script use the correct libudev name
* | Add missing macro for the NO_LOG feature switch, and cut other strings expl.Szczepan Zalega2020-07-28
|/
* Merge branch 'CI-cleanup-2'Szczepan Zalega2020-06-15
|\ | | | | | | CI: correct Meson builds
| * Merge Meson build job with another GCC10 instanceSzczepan Zalega2020-06-15
| |
| * CI: correct ninja package for Meson buildSzczepan Zalega2020-06-15
|/
* Merge branch 'meson'Szczepan Zalega2020-06-13
|\ | | | | | | | | | | | | Update Meson build script Add CI job to test build Fixes #165
| * CI: build with MesonSzczepan Zalega2020-06-13
| |
| * Meson: add new testSzczepan Zalega2020-06-13
| |
| * Merge branch 'master' into mesonSzczepan Zalega2020-06-13
| |\ | |/ |/| | | Update to latest
* | Merge branch 'read-config-struct'Szczepan Zalega2020-06-13
|\ \ | | | | | | | | | | | | | | | Add NK_config struct and read/write functions Fixes #176
| * | Add NK_config struct and read/write functionsRobin Krahl2020-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the NK_config struct to the C API that stores the general configuration of a Nitrokey device. It also adds the NK_read_config_struct and NK_write_config_struct functions to make the API easier to use. While NK_write_config_struct is only a convenience method, NK_read_config_struct makes the API more safe as the user no longer has to read the data from a pointer to an array. This patch also extends the test_read_write_config test case with the two new functions.
* | | Merge branch 'free'Szczepan Zalega2020-06-13
|\ \ \ | | | | | | | | | | | | | | | | | | | | Add functions for freeing memory of some C API results Fixes #175
| * | | Add missing free functions to C APIRobin Krahl2020-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds two missing free functions, NK_free_config and NK_free_password_safe_slot_status, to enable memory-safe use of the C API. Fixes #173.
| * | | Add test_memory test caseRobin Krahl2020-04-02
| |/ / | | | | | | | | | | | | | | | This patch adds a test_memory test case that demonstrates new[]/free mismatches with the NK_read_config and NK_get_password_safe_slot_status functions if run with valgrind, see #173.
* | | Merge branch 'enumerate'Szczepan Zalega2020-06-13
|\ \ \ | | | | | | | | | | | | | | | | | | | | Check for null pointer in the provided data Fixes #168
| * | | Invert if condition for readabilitySzczepan Zalega2020-06-13
| | | |
| * | | device: Check for nullptr in Device::enumerateRobin Krahl2020-01-06
| | | | | | | | | | | | | | | | | | | | | | | | While the fields of the hid_device_info struct should not be null, it is better to perform an explicit check before trying to construct strings from them.
* | | | Merge branch 'serial-number-u32'Szczepan Zalega2020-06-13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Return serial number as uint32_t Fixes #174
| * | | | Return serial number as uint32_t from C APIRobin Krahl2020-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the function NK_device_serial_number_as_u32 to the C API. It is similar to NK_device_serial_number but returns the raw unsigned integer instead of a formatted string. This patch also adds a simple test case that ensures that the number is not zero. Fixes #172.
| * | | | NitrokeyManager: Refactor get_serial_numberRobin Krahl2020-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid duplicate code, this patch refactors the get_serial_number method to use get_serial_number_as_u32 internally. It does not change get_serial_number’s behavior.
| * | | | NitrokeyManager: Also return serial number as u32Robin Krahl2020-04-02
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the get_serial_number_as_u32 method to NitrokeyManager. It returns the serial number as a 32-bit unsigned integer. Previously, we only returned it as a string generated from the integer value, get_serial_number. While get_serial_number returns an empty string if no device is connected and "NA" if an unknown model is connected, the new method throws a DeviceNotConnected exception in the first case and returns zero in the second case as we cannot express the three states in one integer return value.
* | | | Merge branch 'CI-cleanup'Szczepan Zalega2020-06-13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update CI settings Add new compilers and use Ubuntu 18.04
| * | | | Make proper call to install pip packageSzczepan Zalega2020-06-13
| | | | |
| * | | | Move offline Python tests call to newer UbuntuSzczepan Zalega2020-06-13
| | | | |
| * | | | Update build configurationsSzczepan Zalega2020-06-13
|/ / / /
* | | | Merge branch 'purism_device'Szczepan Zalega2020-06-13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Support Librem Key Fixes #163
| * | | | Revert API changeSzczepan Zalega2020-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | Remove the change to keep binary compatibility. Use the vendor_id field from the dev description.
| * | | | Identify Librem Key, behaving like Nitrokey Pro deviceAmit Aronovitch2019-10-03
| | | | |
* | | | | Merge branch 'esven/master'Szczepan Zalega2020-06-13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct Python 2 and 3 examples Fixes #178
| * | | | | Add Python3 Example in README.mdSven Ebenfeld2020-04-28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Ebenfeld <sven.ebenfeld@gmail.com>
| * | | | | add python_bindings_example for python3Sven Ebenfeld2020-04-28
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Sven Ebenfeld <sven.ebenfeld@gmail.com>
* | / / / Fix build warning - possibly uninitialized valueSzczepan Zalega2020-04-16
| |/ / / |/| | |
* | | | Merge branch 'pro-bootloader'Szczepan Zalega2020-02-26
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Add tests for the Nitrokey Pro bootloader support. Allow to reconnect to the device during the test execution (e.g. for a reinsertion). Connected: https://github.com/Nitrokey/nitrokey-pro-firmware/issues/69
| * | | Add missing skip for lower firmware versionSzczepan Zalega2020-02-26
| | | |
| * | | Data retention test. Refactoring. Helper functions.Szczepan Zalega2020-02-26
| | | |
| * | | Refactor. Allow device reconnection.Szczepan Zalega2020-02-26
| | | |
| * | | Refactor move 2Szczepan Zalega2020-02-26
| | | |
| * | | Refactor moveSzczepan Zalega2020-02-26
| | | |
| * | | Refactor renameSzczepan Zalega2020-02-26
| | | |
| * | | Bootloader data retention testSzczepan Zalega2020-02-26
| | | |
| * | | Skip bootloader activation unless specified by the switchSzczepan Zalega2020-02-26
| | | |
| * | | Rename the actual bootloader switching test to a distinct nameSzczepan Zalega2020-02-26
| | | |
| * | | Change too short password to default, but short of 1 letterSzczepan Zalega2020-02-26
| | | |
| * | | Correct result of successful execution for bootloader to DISCONNECTEDSzczepan Zalega2020-02-26
| | | |
| * | | Add tests for Pro`s bootloaderSzczepan Zalega2020-02-26
|/ / /
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-09 01:13:50 +0000