aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* CMake: Try to use pkg-config for hidapi on macOS141-cmake-hidapi-pkgconfigMartin Müller2020-08-20
* Merge branch '185-feat-adapt-hidapi-dependency-in-pkgconfig'pre-v3.6Szczepan Zalega2020-08-20
|\
| * Configure libnitrokey-1.pc with hidapi on FreeBSD and with hidapi-libusb on o...Thibault Payet2020-08-19
|/
* Merge branch '183-feat-add-freebsd-build-support'Szczepan Zalega2020-08-17
|\
| * When building on FreeBSD, use the correct name for hidapi, for the meson scri...Thibault Payet2020-07-19
* | 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
|\
| * 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
|\
| * CI: build with MesonSzczepan Zalega2020-06-13
| * Meson: add new testSzczepan Zalega2020-06-13
| * Merge branch 'master' into mesonSzczepan Zalega2020-06-13
| |\ | |/ |/|
* | Merge branch 'read-config-struct'Szczepan Zalega2020-06-13
|\ \
| * | Add NK_config struct and read/write functionsRobin Krahl2020-04-02
* | | Merge branch 'free'Szczepan Zalega2020-06-13
|\ \ \
| * | | Add missing free functions to C APIRobin Krahl2020-04-02
| * | | Add test_memory test caseRobin Krahl2020-04-02
| |/ /
* | | Merge branch 'enumerate'Szczepan Zalega2020-06-13
|\ \ \
| * | | Invert if condition for readabilitySzczepan Zalega2020-06-13
| * | | device: Check for nullptr in Device::enumerateRobin Krahl2020-01-06
* | | | Merge branch 'serial-number-u32'Szczepan Zalega2020-06-13
|\ \ \ \
| * | | | Return serial number as uint32_t from C APIRobin Krahl2020-04-02
| * | | | NitrokeyManager: Refactor get_serial_numberRobin Krahl2020-04-02
| * | | | NitrokeyManager: Also return serial number as u32Robin Krahl2020-04-02
| | |/ / | |/| |
* | | | Merge branch 'CI-cleanup'Szczepan Zalega2020-06-13
|\ \ \ \
| * | | | 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
|\ \ \ \
| * | | | Revert API changeSzczepan Zalega2020-06-13
| * | | | Identify Librem Key, behaving like Nitrokey Pro deviceAmit Aronovitch2019-10-03
* | | | | Merge branch 'esven/master'Szczepan Zalega2020-06-13
|\ \ \ \ \
| * | | | | Add Python3 Example in README.mdSven Ebenfeld2020-04-28
| * | | | | add python_bindings_example for python3Sven Ebenfeld2020-04-28
|/ / / / /
* | / / / Fix build warning - possibly uninitialized valueSzczepan Zalega2020-04-16
| |/ / / |/| | |
* | | | Merge branch 'pro-bootloader'Szczepan Zalega2020-02-26
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
|/ / /
| | * meson: Bring buildsystem to parity with CMakeIgor Gnatenko2019-12-19
| |/ |/|