Default acknowledgement button to yes

Add chopstx update for ST-Dongle
How to reflash st-link
2022-07-30 13:29:09 +02:00 · 2022-07-30 13:15:50 +02:00 · 2022-07-30 12:55:04 +02:00 · 2022-07-30 12:40:24 +02:00 · 2022-07-19 10:49:50 +02:00 · 2022-07-19 10:42:06 +02:00
64 changed files with 1055 additions and 6726 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "chopstx"]
 	path = chopstx
-	url = ../../chopstx/chopstx.git
+	url = ../chopstx.git
--- a/76
+++ b/76
@@ -1,76 +0,0 @@
 Aurelien Jarno:
    Modified:
 	src/Makefile
 	src/configure
 	src/main.c
 	src/stack-def.h
 Anthony Romano:
    Modified:
 	src/call-rsa.c
 	src/main.c
 	src/mod.c
 Jeremy Drake:
    Modified:
 	regnual/regnual.c
 Kaz Kojima:
    Added STM32 Primer2 support.
 NIIBE Yutaka:
    Founder of the project.
    Wrote tools for STLink/V2:
 	tool/stlinkv2.py
    Wrote tools for DfuSe:
 	tool/dfuse.py
 	tool/dump_mem.py
 	tool/intel_hex.py
    Wrote a tool for Gnuk:
 	tool/gnuk_put_binary.py
 	tool/gnuk_put_binary_libusb.py
 	tool/gnuk_remove_keys.py
 	tool/gnuk_upgrade.py
    Wrote a tool for USB Hub:
 	tool/hub_ctrl.py
    Wrote a tool for testing card reader with pinpad:
 	tool/pinpadtest.py
    Wrote reGNUal implementation:
 	regnual/regnual.c
 	regnual/sys.c
    Wrote Gnuk implementation:
 	gnuk.svg
 	src/configure
 	src/ac.c
 	src/call-rsa.c
 	src/debug.c
 	src/flash.c
 	src/gnuk.h
 	src/main.c
 	src/neug.c
 	src/openpgp-do.c
 	src/openpgp.c
 	src/openpgp.h
 	src/pin-cir.c
 	src/pin-dial.c
 	src/pin-dnd.c
 	src/random.c
 	src/sys.c
 	src/usb-icc.c
 	src/usb-msc.c
 	src/usb-msc.h
 	src/usb_ctrl.c
 	src/usb_desc.c
 	src/usb_lld.c
 	src/usb_lld.h
 	*
 	and others.
 Peter Lebbing:
    Modified:
 	src/config.h.in
 	src/configure
 	src/main.c
 	src/Makefile
    Wrote:
 	src/stdaln-sys.ld.in
--- a/2769
+++ b/2769
--- a/2477
+++ b/2477
--- a/3
+++ b/3
@@ -1,6 +1,7 @@
 # VID:PID	bcdDev	Product_STRING	Vendor_STRING
-0000:0000	0200	Gnuk Emulation	Free Software Initiative of Japan
+0000:0000	0200	Gnuk Token	Free Software Initiative of Japan
 234b:0000	0200	Gnuk Token	Free Software Initiative of Japan
 20a0:4211	0200	Nitrokey Start	Nitrokey
 1209:2440	0200	Gnuk Token	GnuPG e.V.
 1337:0010	0200	Gnuk Token	Deon Spengler
 ##########<TAB>	##<TAB>	##########<TAB>	#################
--- a/src/COPYING
+++ b/src/COPYING
--- a/80
+++ b/80
@@ -1,6 +1,86 @@
 Gnuk NEWS - User visible changes
 * Major changes in Gnuk 1.2.20
  Released 2022-04-22, by NIIBE Yutaka
 ** Minor fixes for newer compiler
 For build with newer compiler, Gnuk and regnual are fixed for address
 calculation and access to object on memory, as well as declarations of
 function and type in standard C library.
 ** Upgrade of Chopstx
 We use Chopstx 1.21.  This includes fix to silence compiler warnings.
 * Major changes in Gnuk 1.2.19
  Released 2021-10-12, by NIIBE Yutaka
 ** KDF Data Object configuration
 KDF Data Object should be highly recommended for all configurations.
 Nevertheless, for backward compatibillity, in Gnuk 1.2, it is optional
 by default; It is up to user to configure KDF Data Object before
 importing private keys.  In this situation, it is not good to
 introduce new build-time option like --enable-always-require-kdf-do,
 because it might wrongly encourage use of Gnuk with no KDF Data Object
 setting, by confusion.  If needed, please run configure:
  kdf_do=required ./configure --enable-factory-reset --target...
 or
  kdf_do=optional ./configure --enable-factory-reset --target...
 Please note that such a use of variable by shell command line is not
 well supported by the configure script (for other variables), but
 override of kdf_do is needed in some situations.
 ** Upgrade of Chopstx
 We use Chopstx 1.20.  This enables use with PC/SC for GNU/Linux
 emulation.
 * Major changes in Gnuk 1.2.18
  Released 2021-04-02, by NIIBE Yutaka
 ** GNU/Linux emulation bug fix
 This time, for GNU/Linux emulation, KDF Data Object is required before
 keygen and key import, really.
 ** tool/upgrade_by_passwd.py
 Now, it checks if the target of binary being written and the
 configured target of running device are same.  This check can be
 skipped by -s option.  Please note that FST-01 and FST-01SZ are
 different target, as it's MHz is different.
 * Major changes in Gnuk 1.2.17
  Released 2021-02-25, by NIIBE Yutaka
 ** GNU/Linux: KDF Data Object is required before keygen and key import
 For GNU/Linux emulation, KDF Data Object is required before keygen and
 key import.
 ** GNU/Linux emulation
 Since 1.2.10, it was not build-able because of MHZ definition.  It is
 build-able again, and its USB product string is now "Gnuk Token".  It
 has ACK button support using terminal.  It now has start-up message,
 and its driver show useful information to setup USBIP.  When no file
 for the .gnuk-flash-image file, it is automatically created.
 ** Removal of tool/gnuk-emulation-setup
 Because it is automatically created, the tool is not needed any more.
 ** Upgrade of Chopstx
 We use Chopstx 1.19.
 * Major changes in Gnuk 1.2.16
  Released 2020-09-10, by NIIBE Yutaka
--- a/630
+++ b/630
@@ -1,630 +0,0 @@
 Gnuk - An Implementation of USB Cryptographic Token for GnuPG
 							 Version 1.2.16
 							     2020-09-10
 							   Niibe Yutaka
 				      Free Software Initiative of Japan
 Release Notes
 =============
 This is the release of Gnuk, version 1.2.16, which has major
 incompatible changes to Gnuk 1.0.x.  Specifically, it now supports
 overriding key import, but importing keys (or generating keys) results
 password reset.  Also, you need to import private keys before changing
 your password.  Please update your documentation for Gnuk Token, so
 that the instruction of importing keys won't cause any confusion.
 It has supports of Ed25519 and X25519 (ECDH on Curve25519).  It also
 has experimental support of ECDSA (on NIST P256 and secp256k1) and
 ECDH (on NIST P256 and secp256k1).
 It also supports RSA-4096, but users should know that it takes more
 than 8 seconds to sign/decrypt.  Key generation of RSA-4096 just fails,
 because the device doesn't have enough memory.
 It supports new KDF-DO feature.  Please note that this is
 experimental.  To use the feature, you need to use newer GnuPG (2.2.6
 or later).  You need to prepare the KDF-DO on your token by the
 card-edit/kdf-setup command.
 With FST-01SZ, experimental ack button support is available for test.
 What's Gnuk?
 ============
 Gnuk is an implementation of USB cryptographic token for GNU Privacy
 Guard.  Gnuk supports OpenPGP card protocol version 3, and it runs on
 STM32F103 processor (and its compatible).
 I wish that Gnuk will be a developer's soother who uses GnuPG.  I have
 been nervous of storing secret key(s) on usual secondary storage.
 There is a solution with OpenPGP card, but it is not the choice for
 me, as card reader is not common device.  With Gnuk, this issue will
 be solved by a USB token.
 Please look at the graphics of "gnuk.svg" for the software name.  My
 son used to be with his NUK(R), always, everywhere.  Now, I am with a
 USB Cryptographic Token by "Gnuk", always, everywhere.
 FAQ
 ===
 Q0: How Gnuk USB Token is superior than other solutions (OpenPGP
    card 2.0/3.3/3.4, YubiKey, etc.) ?
    https://www.g10code.de/p-card.html
    https://www.yubico.com/
 A0: Good points of Gnuk are:
    * If you have skill of electronics and like DIY, you can build
      Gnuk Token cheaper (see Q8-A8).
    * You can study Gnuk to modify and to enhance.  For example, you
      can implement your own authentication method with some sensor
      such as an acceleration sensor.
    * It is "of Free Software"; Gnuk is distributed under GPLv3+,
 	    "by Free Software"; Gnuk development requires only Free Software
 				(GNU Toolchain, Python, etc.), 
 	    "for Free Software"; Gnuk supports GnuPG.
 Q1: What kind of key algorithm is supported?
 A1: Gnuk version 1.0 only supports RSA-2048.
    Gnuk version 1.2.x supports 255-bit EdDSA, as well as RSA-4096.
    (Note that it takes long time to sign with RSA-4096.)
 Q2: How long does it take for digital signing?
 A2: It takes a second and a half or so for RSA-2048. 
    It takes more than 8 seconds for RSA-4096.
 Q3: What's your recommendation for target board?
 A3: Orthodox choice is Olimex STM32-H103.
    FST-01SZ (Flying Stone Tiny 01 SZ) is available for sale, and it
    is a kind of the best choice, hopefully.  If you have a skill of
    electronics, STM32 Nucleo F103 is the best choice for experiment.
 Q4: What's version of GnuPG are you using?
 A4: In Debian GNU/Linux system, I use GnuPG modern 2.2.23.
 Q5: What's version of pcscd and libccid are you using?
 A5: I don't use them, pcscd and libccid are optional, you can use Gnuk
    Token without them.
    I tested pcscd 1.5.5-4 and libccid 1.3.11-2 which were in Debian
    squeeze.
 Q6: What kinds of hardware is required for development?
 A6: You need a target board plus a JTAG/SWD debugger.  If you just
    want to test Gnuk for target boards with DfuSe, JTAG debugger is
    not the requirement.  Note that for real use, you need JTAG/SWD
    debugger to enable flash ROM protection.
 Q7: How much does it cost?
 A7: Olimex STM32-H103 plus ARM-USB-TINY-H cost 70 Euro or so.
 Q8: How much does it cost for DIY version?
 A8: STM32 Nucleo F103 costs about $10 USD.
 Q9: I got an error like "gpg: selecting openpgp failed: ec=6.108", what's up?
 A9: Older GnuPG's SCDaemon has problems for handling insertion/removal of
    card/reader.  When your newly inserted token is not found by
    GnuPG, try killing scdaemon and let it to be invoked again.  I do:
 	 $ gpg-connect-agent "SCD KILLSCD" "SCD BYE" /bye
    and confirm scdaemon doesn't exist, then,
 	 $ gpg-connect-agent learn /bye
 Qa: With GNOME 2, I can't use Gnuk Token for SSH.  How can we use it for SSH?
 Aa: You need to deactivate seahorse-agent and gnome-keyring, but use
    gpg-agant for the role of ssh-agent.  For gnome-keyring please do:
      $ gconftool-2 --type bool --set /apps/gnome-keyring/daemon-components/ssh false
 Qb: With GNOME 3.0, I can't use Gnuk Token at all.  Why?
 Ab: That's because gnome-keyring-daemon interferes GnuPG.  Type:
      $ gnome-session-properties
    and at the tab of "Startup Programs", disable check buttons for
    "GPG Password Agent" and "SSH Key Agent".
 Qc: With GNOME 3.x (x >= 8?), I can't use Gnuk Token at all.  Why?
 Ac: That's because gnome-keyring-daemon interferes GnuPG.  Please
    disable the invocation of gnome-keyring-daemon.  In Debian
    wheezy, it's in the files /etc/xdg/autostart/gnome-keyring-ssh.desktop
    and /etc/xdg/autostart/gnome-keyring-gpg.desktop.
    We have a line something like:
        OnlyShowIn=GNOME;Unity;MATE;
    Please edit this line to:
        OnlyShowIn=
 Qd: Do you know a good SWD debugger to connect FST-01 or something?
 Ad: ST-Link/V2 is cheap one.  We have a tool/stlinkv2.py as flash ROM
    writer program.  STM32 Nucleo F103 comes with the valiant of
    ST-Link/V2.  Note that the firmware of ST-Link/V2 is proprietary.
    So, in case of transparency matters, ST-Link/V2 would not be your
    choice.
    I care transparency for our process of manufacturing FST-01SZ (and
    better control by Free Software, in general), thus, I develop
    BBG-SWD, SWD debugger by BeagleBone Green.
    I use ST-Link/V2 for daily development.  For serious task like
    flashing product, I use BBG-SWD.
 Tested features
 ===============
 Gnuk is tested by test suite.  Please see the "tests" directory.
 	* Personalization of the card
 	  * Changing Login name, URL, Name, Sex, Language, etc.
 	* Password handling (PW1, RC, PW3)
 	* Key import for three types:
 	  * key for digital signing
 	  * key for decryption
 	  * key for authentication
 	* PSO: Digital Signature
 	* PSO: Decipher
 	* INTERNAL AUTHENTICATE
 	* Changing value of password status bytes (0x00C4): forcesig
 	* Verify with pin pad
 	* Modify with pin pad
 	* Card holder certificate (read)
 	* Removal of keys
 	* Key generation on device side for RSA-2048
 	* Overriding key import
 Original features of Gnuk, tested manually lightly:
 	* OpenPGP card serial number setup
 	* Card holder certificate (write by UPDATE BINARY)
 	* Upgrading with "EXTERNAL AUTHENTICATE" by reGNUal
 Targets
 =======
 We use Olimex STM32-H103 board and Flying Stone Tiny 01 (FST-01).
 With DfuSe support, STBee is also our targets.  But this target with
 DfuSe is for experiment only, because it is impossible for DfuSe to
 disable read from flash.  For real use, please consider killing DfuSe
 and enabling read protection using JTAG debugger.
 Build system and Host system
 ============================
 Makefile is written for GNU make.  You need Bash 4.x for configure.
 If your bash is not installed as /bin/bash, you need to run configure
 script prepending 'bash' before './configure'.
 Some tools are written in Python.  If your Python is not installed as
 /usr/bin/python, please prepend 'python' or 'python3' for your command
 invocation.  I use Python 3.8 and PyUSB 1.0.2.
 Source code
 ===========
 Gnuk source code is under src/ directory.
 Note that SHA-2 hash function implementation, src/sha256.c, is based
 on the original implementation by Dr. Brian Gladman.  See:
  http://brg.a2hosted.com//oldsite/cryptography_technology/sha/index.php
 (was at:
 http://gladman.plushost.co.uk/oldsite/cryptography_technology/sha/index.php)
 License
 =======
 It is distributed under GNU General Public Licence version 3 or later
 (GPLv3+).  Please see src/COPYING.
 Please note that it is distributed with external source code too.
 Please read relevant licenses for external source code as well.
 The author(s) of Gnuk expect users of Gnuk will be able to access the
 source code of Gnuk, so that users can study the code and can modify
 if needed.  This doesn't mean person who has a Gnuk Token should be
 able to access everything on the Token, regardless of its protections.
 Private keys, and other information should be protected properly.
 External source code
 ====================
 Gnuk is distributed with external source code.
 * chopstx/  -- Chopstx 1.18
  We use Chopstx as the kernel for Gnuk.
  Chopstx is distributed under GPLv3+ (with a special exception).
 * polarssl/  -- based on PolarSSL 1.2.10 (now mbedTLS)
  Souce code taken from: http://polarssl.org/
  We use PolarSSL for RSA computation, and AES encryption/decryption.
  PolarSSL is distributed under GPLv2+.  We use PolarSSL under GPLv3
  as our options.
  The file include/polarssl/bn_mul.h is heavily modified for ARM
  Cortex-M3.
  The function rsa_private in polarssl/library/rsa.c is modified so
  that it doesn't check T against N.  The function rsa_pkcs1_sign is
  modified to avoid warnings in case of !POLARSSL_PKCS1_V21.
  The functions rsa_pkcs1_verify and rsa_rsassa_pkcs1_v15_verify in
  include/polarssl/rsa.h and polarssl/library/rsa.c are modified
  (fixed) for last argument SIG, as the memory at SIG aren't modified
  by those routines.
  The constant POLARSSL_MPI_MAX_SIZE in include/polarssl/bignum.h is
  modified for 2048-bit keys only Gnuk.
  The function mpi_mul_hlp in library/bignum.c is modified for more
  optimization for ARM Cortex-M3.  Functions mpi_montred, mpi_sub_hlp,
  mpi_sub_abs, mpi_mul_mpi, mpi_montmul, and mpi_exp_mod are modified
  to avoid side channel attacks.  Note that we don't use RSA-blinding
  technique for Gnuk.  Function mpi_gen_prime and mpi_is_prime are
  modified to use Fouque-Tibouchi method.  Function mpi_exp_mod is
  modified to use new function mpi_montsqr for speed up.
  The file library/aes.c is modified so that some constants can
  go to .sys section.
  The file include/polarssl/config.h are modified not to define
  POLARSSL_HAVE_LONGLONG to avoid linking libgcc, to define
  POLARSSL_AES_ROM_TABLES to have AES tables, not to define
  POLARSSL_CIPHER_MODE_CTR, POLARSSL_FS_IO, POLARSSL_PKCS1_V21,
  POLARSSL_SELF_TEST, and POLARSSL_PADLOCK_C, and only define
  POLARSSL_GENPRIME when defined KEYGEN_SUPPORT.
  And polarssl/library/bignum.c is modified to work on 64-bit machine.
  Aurelien Jarno also modified:
 	polarssl/include/polarssl/bn_mul.h
 	polarssl/library/bignum.c
  See ChangeLog (and/or history of git) for detail.
 USB vendor ID and product ID (USB device ID)
 ============================================
 When you have a vendor ID and assign a product ID for Gnuk, edit the
 file GNUK_USB_DEVICE_ID and add an entry for yours.  In this case,
 please contact Niibe, so that it is listed to the file in the official
 release of the source code.
 When you are modifing Gnuk and installing the binary to device, you
 should replace the vendor string and serial number to yours (in the
 file GNUK_USB_DEVICE_ID and SERIALNO of the script of src/configure),
 so that users can see it's not by original vendor, and it is modified
 version.
 FSIJ allows you to use USB device ID of FSIJ (234b:0000) for devices
 with Gnuk under one of following conditions:
  * For everyone for experimental purpose:
    - You must not distribute a binary with FSIJ's USB device ID, but
      must use the binary by yourself only for your experiment.  Note
      that "Distributing binary" includes distributing a device which
      holds the binary.
  * For general individuals:
    - You must use your Gnuk device with a card serial number which is
      *not* by FSIJ.  Easy one would be a card serial number generated
      by chip unique ID.
  * For individuals with explicit permission from FSIJ.
    - You should have an assigned card serial number by FSIJ,
      please use that number for your device.
      (There a file 'GNUK_SERIAL_NUMBER' in the official release.)
 FSIJ could give companies or business entities "second source
 manufacturer" license to use USB device ID of FSIJ for devices with
 unmodified version of Gnuk, provided they support Free Software and
 respect users' freedom for computing.  Please ask FSIJ for the
 license.
 Otherwise, companies which want to distribute Gnuk devices, please use
 your own USB vendor ID and product ID.  Please replace vendor string
 and possibly product string to yours, when you modify Gnuk.
 Host Requirements
 =================
 For GNU/Linux, PC/SC service is an option, you can use GnuPG's
 internal CCID driver instead.  If you chose using PC/SC service,
 libccid version >= 1.3.11 is recommended for GNU/Linux.
 How to compile
 ==============
 You need GNU toolchain and newlib for 'arm-none-eabi' target.
 On Debian we can install the packages of gcc-arm-none-eabi,
 gdb-arm-none-eabi and its friends.  I'm using:
 	binutils-arm-none-eabi	2.31.1-12+11
 	gcc-arm-none-eabi 	15:7-2018-q2-6
 	gdb-multiarch 		8.2.1-1
 	libnewlib-arm-none-eabi	3.1.0.20181231-1
 Or else, see https://launchpad.net/gcc-arm-embedded for preparation of
 GNU Toolchain for 'arm-none-eabi' target.
 Change directory to `src':
  $ cd gnuk-VERSION/src
 Then, run `configure':
  $ ./configure --vidpid=<VID:PID>
 Here, you need to specify USB vendor ID and product ID.  For FSIJ's,
 it's: --vidpid=234b:0000 .  Please read section 'USB vendor ID and
 product ID' above.
 Then, type:
  $ make
 Then, we will have "gnuk.elf" under src/build directory.
 If you are not the authorized vendor, please never distribute this
 file of "gnuk.elf", which includes VID:PID in the image.  If you would
 like to distribute the image (for example, to check if it's
 reproducible or not), the file "gnuk-no-vidpid.elf" is the one with no
 VID:PID.
 How to install
 ==============
 Olimex STM32-H103 board
 -----------------------
 If you are using Olimex JTAG-Tiny, type following to invoke OpenOCD
 and write "gnuk.elf" to Flash ROM:
  $ openocd -f interface/ftdi/olimex-jtag-tiny.cfg \
            -f board/olimex_stm32_h103.cfg \
            -c "program build/gnuk.elf verify reset exit"
 Command invocation is assumed in src/ directory.
 Flying Stone Tiny 01
 --------------------
 If you are using Flying Stone Tiny 01, you need a SWD writer.
 OpenOCD 0.9.0 now supports ST-Link/V2.  We can use it like:
  $ openocd -f interface/stlink-v2.cfg -f target/stm32f1x.cfg \
            -c "program build/gnuk.elf verify reset exit"
 STBee
 -----
 Note that this is only for your experiment; Your private key materials
 on the board can be accessed by DfuSe.
 Reset the board with "USER" switch pushed.  Type following to write
 to flash:
  # cd ../tool
  # ./dfuse.py ../src/build/gnuk.hex
 Then, reset the board.
 How to protect flash ROM
 ========================
 To protect, invoke OpenOCD like (for FST-01):
  $ openocd -f interface/stlink-v2.cfg -f target/stm32f1x.cfg \
            -c init -c "reset halt" -c "stm32f1x lock 0" -c reset -c exit
 After power-off / power-on sequence, the contents of flash ROM cannot
 be accessible from JTAG debugger.
 Unprotecting is:
  $ openocd -f interface/stlink-v2.cfg -f target/stm32f1x.cfg \
            -c init -c "reset halt" -c "stm32f1x unlock 0" -c reset -c exit
 Upon unprotection, flash is erased.
 Note that it would be still possible for some implementation of DfuSe
 to access the contents, even if it's protected.  If you really want to
 protect, killing DfuSe and accessing by JTAG debugger is recommended.
 (Optional) Configure serial number and X.509 certificate
 ========================================================
 This is completely optional.
 For this procedure, you need python and pyscard (python-pyscard
 package in Debian) or PyUSB (python-usb package in Debian).
 (1) [pyscard] Stop scdaemon
    [PyUSB] Stop the pcsc daemon.
 If scdaemon is running, please kill it, or you will get "Smartcard
 Exception" by "Sharing violation".
  $ gpg-connect-agent "SCD KILLSCD" "SCD BYE" /bye
 In case of PyUSB tool, you need to stop pcscd.
  # systemctl stop pcscd
 (2) [Optional] Write fixed serial number
 If you use fixed serial number in the file 'GNUK_SERIAL_NUMBER', you can do:
  $ EMAIL=<YOUR-EMAIL-ADDRESS> ../tool/gnuk_put_binary_usb.py -s ../GNUK_SERIAL_NUMBER
  Writing serial number
  ...
 (3) [Optional] Write card holder certificate
 If you have card holder certificate binary file, you can do:
  $ ../tool/gnuk_put_binary_usb.py ../../<YOUR-CERTIFICATE>.bin
  ../../<YOUR-CERTIFICATE>.bin: <LENGTH-OF-YOUR-CERTIFICATE>
  Updating card holder certificate
  ...
 How to run
 ==========
 Debug enabled
 -------------
 If you compiled with --enable-debug option, Gnuk has two interfaces
 (one is CCID/ICCD device and another is virtual COM port).  Open
 virtual COM port by:
  $ cu -l /dev/ttyACM0
 and you will see debug output of Gnuk.
 Testing Gnuk
 ------------
 Type following command to see Gnuk runs:
  $ gpg --card-status
 Besides, there is a functionality test under tests/ directory.  See
 tests/README.
 Personalize the Token, import keys, and change the password
 -----------------------------------------------------------
 You can personalize the token, putting your information like: Name,
 Login name, Sex, Languages, URL.  To do so, GnuPG command is:
  $ gpg --card-edit
 Note that the factory setting of user password is "123456" and admin
 password is "12345678" as the specification.
 It is recommended to create your keys on your computer, and import
 them to Gnuk Token.  After you create your keys (they must be 2048-bit
 RSA), you can import them.
 Gnuk supports key generation, but this feature is young and should be
 considered experimental.
 For detail, please see documentation under doc/.  You can see the HTML
 version at: https://www.fsij.org/doc-gnuk/
 How to debug
 ============
 We can use GDB.
  $ arm-none-eabi-gdb gnuk.elf
 Inside GDB, we can connect OpenOCD by:
  (gdb) target remote localhost:3333
 or
  (gdb) target extended-remote localhost:3333
 You can see the output of PCSCD:
  # /etc/init.d/pcscd stop
  # LIBCCID_ifdLogLevel=7 /usr/sbin/pcscd --debug --foreground
 You can observe the traffic of USB using "usbmon".  See the file:
 linux/Documentation/usb/usbmon.txt
 Firmware update
 ===============
 See doc/note/firmware-update.
 Git Repositories
 ================
 Please use: https://salsa.debian.org/gnuk-team/gnuk/
 You can get it by:
    $ git clone https://salsa.debian.org/gnuk-team/gnuk/gnuk.git
 It's also available at: www.gniibe.org
 You can browse at: https://git.gniibe.org/cgit/gnuk/gnuk.git/
 I put Chopstx as a submodule of Git.  Please do this:
    $ git submodule update --init
 Information on the Web
 ======================
 For more information, please visit: https://www.fsij.org/gnuk/
 Please see the FST-01 support pages:
    https://www.gniibe.org/category/fst-01.html
 Please consider to join Gnuk-users mailing list:
    https://lists.gnupg.org/mailman/listinfo/gnuk-users
 Your Contributions
 ==================
 FSIJ welcomes your contributions.  Please assign your copyright
 to FSIJ (if possible), as I do.
 Foot note
 ==========
 * NUK(R) is a registered trademark owend by MAPA GmbH, Germany.
 -- 
--- a/README.md
+++ b/README.md
@@ -0,0 +1,138 @@
 ***Note:*** *This fork of Gnuk fixes some compiling bugs and focuses on using the "ST-Link V2" clone hardware.*
 Here is the link to the original project: <http://git.gniibe.org/cgit/gnuk/gnuk.git/>
 What's Gnuk?
 ============
 Gnuk is an implementation of a USB cryptographic security token that supports the OpenPGP card protocol version 2. It runs on a STM32F103 processor (and its compatible). In short it allows one to convert a cheap $2 "ST-Link V2" clone device into a hardware security token.
 It has supports of Ed25519 and X25519 (ECDH on Curve25519). It also has experimental support of ECDSA (on NIST P256 and secp256k1) and ECDH (on NIST P256 and secp256k1).
 Gnuk supports the Key Derived Function (KDF) functionality. To use this feature one will need to use GnuPG 2.2.6 or later.
 How to build the Gnuk firmware
 ==============================
 You will need the GNU toolchain for arm-none-eabi and newlib.
 To clone the source code and compile, use the following commands.
 ```
 git clone --recursive https://git.spengler.co.za/deon/gnuk.git gnuk
 cd gnuk/src
 ./configure --vidpid=1337:0010
 make
 ```
 Then, you will have "gnuk.bin" under src/build directory.
 ***Please read section 'USB vendor ID and product ID' below.***
 How to flash the Gnuk firmware
 ==============================
 In order to flash the firmware ensure that you have openocd installed.
 Execute openocd and connect with telnet
 ```
 openocd -f ../misc/stm32f103.cfg
 telnet localhost 4444
 ```
 Use the following commands to unlock, flash the firmware and lock the device again.
 ```
 reset halt
 stm32f1x unlock 0
 reset halt
 flash write_bank 0 ./build/gnuk.bin 0
 stm32f1x lock 0
 reset halt
 ```
 How to reflash the ST-LINK
 ==========================
 To reflash the ST-LINK, connect the device to a programmer as before while keeping pins 7 and 8 shorted. While the LED is blinking, run openocd. Once it’s running (i.e. it doesn’t show any errors), you can unshort the pins.
 Then use the following to unlock and reflash.
 ```
 reset halt
 stm32f1x unlock 0
 reset halt
 stm32f1x mass_erase 0
 flash write_bank 0 ./build/gnuk.bin 0
 stm32f1x lock 0
 reset halt
 ```
 ***Note: That reprograming will wipe the flash memory and you will lose all key's that was on the device.***
 Testing Gnuk
 ============
 Type following command to see if GnuPG detects the Gnuk token.
 ```
 gpg --card-status
 ```
 ***See tests/README for functionality tests.***
 Personalize the Token, import keys, and change the password
 ===========================================================
 You can personalize your token by putting in your information like: Name, Login and Language.
 The KDF setting needs to be enabled before any keys are imported into the Gnuk token. Once a key has been imported the KDF setting can't be changed until the token has been reset.
 ***Note:*** That the factory user password is "123456" and admin password is "12345678". It is recommended to create your keys on your computer, and import them into the token. Gnuk supports key generation, but this feature is young and should be considered experimental.
 To configure your Gnuk token use the following command.
 ```
 gpg --card-edit
 ```
 For further details, please see documentation under doc.
 Firmware update
 ===============
 See doc/note/firmware-update.
 How to debug
 ============
 Ensure that you have arm-none-eabi-gdb installed and then you must configure and compile the Gnuk firmware with --enable-debug option. After flashing Gnuk debug firmware one will see two interfaces, one is CCID/ICCD device and the another is a virtual COM port.
 Open the virtual COM with the following command:
 ```
 picocom /dev/ttyACM0
 ```
 and you will see debug output of Gnuk firmware.
 You can now use GDB with the following command.
 ```
 arm-none-eabi-gdb src/build/gnuk.elf
 ```
 Inside GDB, we can connect OpenOCD by:
 ```
 (gdb) target remote localhost:3333
 ```
 You can see the output of PCSCD with the following command:
 ```
 /usr/bin/pcscd --debug --foreground
 ```
 You can also observe the traffic of the USB interface using "usbmon".
 USB vendor ID and product ID (USB device ID)
 ============================================
 When you have a vendor ID and assign a product ID for Gnuk, edit the file GNUK_USB_DEVICE_ID and add an entry for yours. In this case, please contact Niibe, so that it is listed to the file in the official release of the source code.
 When you are modifing Gnuk and installing the binary to device, you should replace the vendor string and serial number to yours (in the file GNUK_USB_DEVICE_ID and SERIALNO of the script of src/configure), so that users can see it's not by original vendor, and it is modified version.
 FSIJ allows you to use USB device ID of FSIJ (234b:0000) for devices with Gnuk under one of following conditions:
  * For everyone for experimental purpose:
    - You must not distribute a binary with FSIJ's USB device ID, but must use the binary by yourself only for your experiment. Note that "Distributing binary" includes distributing a device which holds the binary.
  * For general individuals:
    - You must use your Gnuk device with a card serial number which is *not* by FSIJ. Easy one would be a card serial number generated by chip unique ID.
  * For individuals with explicit permission from FSIJ.
    - You should have an assigned card serial number by FSIJ, please use that number for your device.
      (There a file 'GNUK_SERIAL_NUMBER' in the official release.)
 FSIJ could give companies or business entities "second source manufacturer" license to use USB device ID of FSIJ for devices with unmodified version of Gnuk, provided they support Free Software and respect users' freedom for computing. Please ask FSIJ for the license.
 Otherwise, companies which want to distribute Gnuk devices, please use your own USB vendor ID and product ID.  Please replace vendor string and possibly product string to yours, when you modify Gnuk.
--- a/45
+++ b/45
@@ -1,45 +0,0 @@
 							-*- coding: utf-8 -*-
 We would like to express our gratitudes to Werner Koch for GnuPG, and
 Giovanni Di Sirio for ChibiOS/RT.
 Gnuk was originally written by NIIBE Yutaka.  People contributed by
 encouraging the development, testing the implementation, suggesting
 improvements, or fixing bugs.  Here is a list of those people.
 Aurelien Jarno		aurelien@aurel32.net
 Achim Pietig		achim@pietig.com
 Aidan Thornton
 Anibal Monsalve Salazar	anibal@debian.org
 Andre Zepezauer		andre.zepezauer@student.uni-halle.de
 Anthony Romano		anthony.romano@coreos.com
 Bertrand Jacquin	bertrand@jacquin.bzh
 Clint Adams		clint@softwarefreedom.org
 Daniel Kahn Gillmor	dkg@fifthhorseman.net
 Elliott Mitchell
 Fabio Utzig		utzig@apache.org
 Hironobu SUZUKI		hironobu@h2np.net
 Jan Suhr		jan@suhr.info
 Jeremy Drake		jeremydrake+gnuk@eacceleration.com
 Jonathan McDowell	noodles@earth.li
 Kaz Kojima		kkojima@rr.iij4u.or.jp
 Kenji Rikitake
 Ludovic Rousseau	ludovic.rousseau@free.fr
 Luis Felipe R. Murillo	luisfelipe@ucla.edu
 Mateusz Zalega		mateusz@nitrokey.com
 MATSUU Takuto		matsuu@gentoo.org
 Micah Anderson		micah@debian.org
 NAGAMI Takeshi		nagami-takeshi@aist.go.jp
 Nguyễn Hồng Quân	quannguyen@mbm.vn
 Nico Rikken		nico@nicorikken.eu
 NOKUBI Takatsugu	knok@daionet.gr.jp
 Paul Fertser
 Paul Bakker		polarssl_maintainer@polarssl.org
 Peter Lebbing		peter@digitalbrains.com
 Santiago Ruano Rincón	santiago@debian.org
 Shane Coughlan		scoughlan@openinventionnetwork.com
 Stanislas Bach		sbach@0g.re
 Szczepan Zalega		szczepan@nitrokey.com
 Vasily Evseenko
 Werner Koch		wk@gnupg.org
 Yuji Imai		ug@xcast.jp
--- a/2
+++ b/2
@@ -1 +1 @@
-release/1.2.16
+release/1.2.20
--- a/2
+++ b/2
--- a/doc/note/firmware-update-2
+++ b/doc/note/firmware-update-2
@@ -122,7 +122,7 @@ your environment for Gnuk Token.
 How to run the script: ::
  $ cd tool
-  $ ./upgrade_by_passwd.py ../regnual/regnual.bin ../src/build/gnuk.bin
+  $ ./upgrade_by_passwd.py
 Then, the script on your host PC invoke the steps described above, and
 you will get new version of Gnuk installed.
--- a/docker/Dockerfile.check
+++ b/docker/Dockerfile.check
@@ -1,7 +0,0 @@
 FROM gnuk:latest
 LABEL Description="Image for checking gnuK"
 RUN apt install -y shellcheck
 RUN apt install -y clang libfindbin-libs-perl
 RUN apt clean
--- a/docker/Dockerfile.debug
+++ b/docker/Dockerfile.debug
@@ -1,4 +0,0 @@
 FROM gnuk:latest
 LABEL Description="Image for building gnuK with debugging"
 RUN apt install -y gdb-arm-none-eabi && apt clean
--- a/docker/Dockerfile.release
+++ b/docker/Dockerfile.release
@@ -1,6 +0,0 @@
 FROM debian:latest
 LABEL Description="Image for building gnuK"
 RUN apt update -y && apt install -y make gcc-arm-none-eabi && apt clean
 CMD ["/bin/sh", "-c", "cd /gnuk/src && make clean && ./configure $GNUK_CONFIG && make"]
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,36 +0,0 @@
 ifndef GNUK_CONFIG
 $(warning configuration flags not set in GNUK_CONFIG)
 endif
 all: ../chopstx docker-build-release
 	docker run --user=`id -u` --env GNUK_CONFIG --rm -v `pwd`/..:/gnuk/ -t gnuk:latest
 clean: docker-build-release
 	docker run --user=`id -u` --env GNUK_CONFIG --rm -v `pwd`/..:/gnuk/ -w /gnuk/src -t gnuk:latest make clean
 gdb: docker-build-debug
 	docker run --net host  --rm -i -v `pwd`/..:/gnuk/ -t gnuk:latest-debug arm-none-eabi-gdb /gnuk/src/build/gnuk.elf
 shellcheck: docker-build-check
 	docker run --rm -v `pwd`/..:/gnuk/ -t gnuk:latest-check shellcheck /gnuk/src/configure
 CHECKERS=security optin nullability core deadcode alpha.core alpha.security
 scan-build: clean docker-build-check
 	docker run --user=`id -u` --rm -v `pwd`/..:/gnuk/ -w /gnuk/src -t gnuk:latest-check scan-build -o scan-build \
 		-analyze-headers -stats $(addprefix -enable-checker ,$(CHECKERS)) -k \
 		--use-cc=arm-none-eabi-gcc \
 		make
 ../chopstx:
 	git submodule update --init
 docker-build-release:
 	docker build -t gnuk:latest -f `pwd`/Dockerfile.release ..
 docker-build-debug: docker-build-release
 	docker build -t gnuk:latest-debug -f `pwd`/Dockerfile.debug ..
 docker-build-check: docker-build-release
 	docker build -t gnuk:latest-check -f `pwd`/Dockerfile.check ..
 .PHONY: all clean gdb shellcheck scan-build \
 	docker-build-release docker-build-debug docker-build-check
--- a/gnuk-stickers.svg
+++ b/gnuk-stickers.svg
@@ -1,553 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="210mm"
   height="297mm"
   id="svg3961"
   version="1.1"
   inkscape:version="0.47 r22583"
   sodipodi:docname="gnuk-sticers.svg">
  <defs
     id="defs3">
    <inkscape:perspective
       sodipodi:type="inkscape:persp3d"
       inkscape:vp_x="0 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       id="perspective3967" />
    <linearGradient
       gradientUnits="userSpaceOnUse"
       y2="1031.615"
       x2="240.89818"
       y1="1031.615"
       x1="85.996228"
       id="linearGradient4296"
       xlink:href="#linearGradient4290"
       inkscape:collect="always" />
    <inkscape:perspective
       sodipodi:type="inkscape:persp3d"
       inkscape:vp_x="0 : 0.5 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_z="1 : 0.5 : 1"
       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
       id="perspective3903" />
    <filter
       id="filter3875"
       inkscape:collect="always">
      <feBlend
         id="feBlend3877"
         in2="BackgroundImage"
         mode="screen"
         inkscape:collect="always" />
    </filter>
    <inkscape:perspective
       sodipodi:type="inkscape:persp3d"
       inkscape:vp_x="0 : 0.5 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_z="1 : 0.5 : 1"
       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
       id="perspective3830" />
    <inkscape:perspective
       sodipodi:type="inkscape:persp3d"
       inkscape:vp_x="0 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       id="perspective10-5" />
    <linearGradient
       id="linearGradient0">
      <stop
         style="stop-color:#ffffff;stop-opacity:1;"
         offset="0"
         id="stop3620" />
      <stop
         id="stop3632"
         offset="0.07"
         style="stop-color:#c8c8e0;stop-opacity:1;" />
      <stop
         id="stop3630"
         offset="0.17"
         style="stop-color:#9696c8;stop-opacity:1;" />
      <stop
         id="stop3628"
         offset="0.33"
         style="stop-color:#6464b4;stop-opacity:1;" />
      <stop
         style="stop-color:#3232a0;stop-opacity:1;"
         offset="0.5"
         id="stop3634" />
      <stop
         id="stop3636"
         offset="0.66"
         style="stop-color:#282898;stop-opacity:1;" />
      <stop
         id="stop3626"
         offset="0.85"
         style="stop-color:#1e1e90;stop-opacity:1;" />
      <stop
         style="stop-color:#000088;stop-opacity:1;"
         offset="1"
         id="stop3622" />
    </linearGradient>
    <radialGradient
       inkscape:collect="always"
       xlink:href="#linearGradient0"
       id="radialGradient0"
       cx="450"
       cy="750"
       fx="450"
       fy="750"
       r="201.5"
       gradientTransform="matrix(1,0,0,0.75369458,-1.760006,108.15135)"
       gradientUnits="userSpaceOnUse" />
    <linearGradient
       id="linearGradient1">
      <stop
         style="stop-color:#ffffff;stop-opacity:1;"
         offset="0"
         id="stop0" />
      <stop
         id="stop1"
         offset="0.0625"
         style="stop-color:#f8fcff;stop-opacity:1;" />
      <stop
         id="stop2"
         offset="0.17166339"
         style="stop-color:#f0f8ff;stop-opacity:1;" />
      <stop
         id="stop3"
         offset="0.30279359"
         style="stop-color:#ecf4ff;stop-opacity:1;" />
      <stop
         style="stop-color:#e8f0ff;stop-opacity:1;"
         offset="0.5"
         id="stop4" />
      <stop
         id="stop5"
         offset="0.65893352"
         style="stop-color:#e0ecff;stop-opacity:1;" />
      <stop
         id="stop6"
         offset="0.83552629"
         style="stop-color:#d8e8ff;stop-opacity:1;" />
      <stop
         style="stop-color:#d0e0ff;stop-opacity:1;"
         offset="1"
         id="stop7" />
    </linearGradient>
    <radialGradient
       inkscape:collect="always"
       xlink:href="#linearGradient1"
       id="radialGradient1"
       cx="0"
       cy="440"
       fx="0"
       fy="440"
       r="80"
       gradientUnits="userSpaceOnUse" />
    <filter
       inkscape:collect="always"
       id="filter0"
       x="-0.1423529"
       width="1.2847058"
       y="-0.13404847"
       height="1.2680969">
      <feGaussianBlur
         inkscape:collect="always"
         stdDeviation="2.0538481"
         id="feGaussianBlur0" />
    </filter>
    <inkscape:perspective
       sodipodi:type="inkscape:persp3d"
       inkscape:vp_x="0 : 0.5 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_z="1 : 0.5 : 1"
       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
       id="perspective2884" />
    <inkscape:perspective
       id="perspective10"
       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
       inkscape:vp_z="744.09448 : 526.18109 : 1"
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_x="0 : 526.18109 : 1"
       sodipodi:type="inkscape:persp3d" />
    <linearGradient
       id="linearGradient4290"
       inkscape:collect="always">
      <stop
         id="stop4292"
         offset="0"
         style="stop-color:#000734;stop-opacity:1;" />
      <stop
         id="stop4294"
         offset="1"
         style="stop-color:#000734;stop-opacity:0;" />
    </linearGradient>
  </defs>
  <sodipodi:namedview
     inkscape:document-units="mm"
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="0.35"
     inkscape:cx="-75.714286"
     inkscape:cy="520"
     inkscape:current-layer="layer1"
     showgrid="false"
     inkscape:window-width="1122"
     inkscape:window-height="692"
     inkscape:window-x="150"
     inkscape:window-y="51"
     inkscape:window-maximized="0" />
  <metadata
     id="metadata4">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1">
    <g
       style="display:inline"
       transform="translate(0.5,-946.62598)"
       id="layer1-63"
       inkscape:label="Layer1"
       inkscape:tile-cx="124.59931"
       inkscape:tile-cy="53.118107"
       inkscape:tile-w="248.19862"
       inkscape:tile-h="105.23622"
       inkscape:tile-x0="0.5"
       inkscape:tile-y0="0.49999656">
      <rect
         y="947.12598"
         x="0"
         height="105.23622"
         width="248.19862"
         id="rect0"
         style="fill:#d9fffe;fill-opacity:1;stroke:none" />
      <line id="line0"
 	    x1="0" y1="947.12598" x2="20" y2="947.12598"
 	    style="stroke:#000044;stroke-width:0.5;stroke-opacity:1;stroke-dasharray:2,1;stroke-dashoffset:1" />
      <line id="line1"
 	    x1="248.19862" y1="947.12598" x2="248.19862" y2="957.12598"
 	    style="stroke:#000044;stroke-width:0.5;stroke-opacity:1;stroke-dasharray:2,1;stroke-dashoffset:1" />
      <line id="line2"
 	    x1="248.19862" y1="1052.3622" x2="228.19862" y2="1052.3622"
 	    style="stroke:#000044;stroke-width:0.5;stroke-opacity:1;stroke-dasharray:2,1;stroke-dashoffset:1" />
      <line id="line3"
 	    x1="0" y1="1052.3622" x2="0" y2="1042.3622"
 	    style="stroke:#000044;stroke-width:0.5;stroke-opacity:1;stroke-dasharray:2,1;stroke-dashoffset:1" />
      <image
         xlink:href="FSIJ-s.png"
         width="41.757679"
         height="28.346457"
         id="image2886"
         x="202.27382"
         y="951.12598" />
      <text
         sodipodi:linespacing="100%"
         id="text2890"
         y="1014.9048"
         x="94.433884"
         style="font-size:52.27830124px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#032b7f;fill-opacity:1;stroke:none;font-family:Courier 10 Pitch;-inkscape-font-specification:Courier 10 Pitch Bold"
         xml:space="preserve"><tspan
           y="1014.9048"
           x="94.433884"
           id="tspan2892"
           sodipodi:role="line">GNUK</tspan></text>
      <g
         inkscape:label="Layer 1"
         id="layer1-6"
         transform="matrix(-0.1014557,0,0,0.1014557,90.73972,926.6016)">
        <path
           style="fill:#000050;fill-opacity:1;stroke:#000000;stroke-width:2.29999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
           d="m 0,0 c 0,0 0,0 -76,0 0,0 -8,-9 -12,-12 -18,-15 -48,-48 -36,-84 4,-14 12,-36 12,-36 -10,6 -50,26 -66,54 -8,16 -18,30 -18,54 0,24 25,100 48,108 0,0 0,0 150,0 0,0 0,0 150,0 23,-8 48,-84 48,-108 0,-24 -10,-38 -18,-54 -16,-28 -46,-48 -66,-54 0,0 8,22 12,36 12,36 -18,69 -36,84 C 88,-9 80,0 80,0 z"
           transform="matrix(-1.76,0,0,1.76,410,560)"
           id="path0" />
        <path
           inkscape:connector-curvature="0"
           style="fill:#000040;fill-opacity:1;stroke:none"
           d="m 411.01194,560.94628 c 0,0 0,0 133.76,0 0,0 14.08,-15.84 21.12,-21.12 31.68,-26.4 84.48,-84.48 63.36,-147.84 -7.04,-24.64 -21.12,-63.36 -21.12,-63.36 17.6,10.56 38,45.76 66.16,95.04 14.08,28.16 19.18,52.8 19.18,95.04 0,42.24 -44,176 -84.48,190.08 0,0 62.5,0 -201.5,0 0,0 62.5,0 -201.5,0 -40.48,-14.08 -84.48,-147.84 -84.48,-190.08 0,-42.24 5.1,-66.88 19.18,-95.04 28.16,-49.28 30.96,-84.48 66.16,-95.04 0,0 -14.08,38.72 -21.12,63.36 -21.12,63.36 31.68,121.44 63.36,147.84 7.04,5.28 21.12,21.12 21.12,21.12 z"
           id="path0-9"
           sodipodi:nodetypes="ccccccscccscccccc" />
        <path
           style="fill:#c0c0fd;fill-opacity:1;stroke:#000000;stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
           d="m 409.21999,592 c 0,0 90,0 90,-33 0,-20 -4,-28 -12,-40 -5,-8 -8,-18 -8,-28 -1,-13 -1,-20 8,-36 6,-9 8,-23 5,-33 -5,-14 -19,-23 -33,-25 -16,-5 -35,-4 -50,-5 -15,1 -34,0 -50,5 -14,2 -28,9 -33,25 -3,10 1,24 5,33 9,16 9,23 8,36 0,10 -3,20 -8,28 -8,12 -12,20 -12,40 0,33 90,33 90,33 z"
           id="path1" />
        <path
           style="fill:url(#radialGradient1);fill-opacity:1;fill-rule:evenodd;stroke:#d0e0ff;stroke-width:10px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
           d="m 0,592 c 0,0 -90,0 -90,-33 0,-20 4,-28 12,-40 5,-8 8,-18 8,-28 1,-13 1,-20 -8,-36 -6,-9 -8,-23 -5,-33 5,-14 19,-23 33,-25 16,-5 35,-4 50,-5 15,1 34,0 50,5 14,2 28,9 33,25 3,10 -1,24 -5,33 -9,16 -9,23 -8,36 0,10 3,20 8,28 8,12 12,20 12,40 0,33 -90,33 -90,33 z"
           id="path1-1"
           transform="matrix(-0.75,0,0,0.8,410,100)" />
        <path
           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter0)"
           d="m 344.11439,411.54794 c 7.16035,-2.82917 12.68023,-7.05316 25.88561,-1.83463 -11.82218,3.36559 -30.19974,8.74598 -28.4554,30.10894 0,1.43822 0.19526,2.84651 0.53302,4.18858 -5.07909,-3.45362 -6.70449,-9.04022 -6.70449,-15.93734 0,-10.74221 5.00989,-12.63545 8.74126,-16.52555 z"
           id="path1-2"
           sodipodi:nodetypes="ccccsc" />
        <path
           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter0)"
           d="m 474.68123,406.16125 c 7.16035,-2.82917 12.68023,-7.05316 25.88561,-1.83463 -11.82218,3.36559 -30.19974,8.74598 -28.4554,30.10894 0,1.43822 0.19526,2.84651 0.53302,4.18858 -5.07909,-3.45362 -6.70449,-9.04022 -6.70449,-15.93734 0,-10.74221 5.00989,-12.63545 8.74126,-16.52555 z"
           id="path1-3"
           sodipodi:nodetypes="ccccsc"
           transform="matrix(-1,0,0,1,949.00681,5.38669)" />
        <path
           style="fill:#afcfff;fill-opacity:1;stroke:#000000;stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
           d="M 236.90125,452.90625 C 135.34805,496.35376 97.060607,634.496 151.37,761.4375 c 50.02335,116.92341 158.1859,159.40625 257.75,159.40625 99.5641,0 207.72665,-42.48284 257.75,-159.40625 C 721.17939,634.496 682.89195,496.35376 581.33875,452.90625 526.07714,429.26367 466.8919,524.375 409.12,524.375 c -57.7719,0 -116.77668,-94.67646 -172.21875,-71.46875 z"
           id="path2"
           inkscape:connector-curvature="0" />
        <path
           style="fill:url(#radialGradient0);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
           id="path3"
           d="m 538.23999,720 a 130,150 0 0 1 -260,0 130,150 0 1 1 260,0 z"
           inkscape:connector-curvature="0" />
        <path
           style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:4.47213602px;stroke-opacity:1"
           d="m 538.30032,722.21875 c 56.32313,26.16396 100.82185,68.68738 119.76563,119.4375 33.50451,82.59901 -5.55269,179.72665 -93.67188,230.71875 -89.66782,55.4574 -224.43374,55.4574 -314.10156,0 -88.11919,-50.9921 -127.13733,-148.11974 -93.63281,-230.71875 18.61816,-50.41349 63.06491,-92.92973 119.25781,-119.1875 11.1304,10.32118 18.58377,23.0939 22.34375,36.6875 -5.94376,3.59375 -11.63988,7.47175 -16.99219,11.625 -73.95399,55.19241 -81.85302,155.28934 -18.59375,218.125 47.75721,51.30795 139.68,72.55545 213.4375,46.68755 87.41094,-28.2229 135.47694,-110.93384 113.94531,-183.2813 -9.09953,-36.85675 -36.47131,-70.33241 -73.67187,-92.96875 2.51871,-9.1715 6.69761,-18.00492 12.57812,-26 2.55237,-3.99852 5.70954,-7.71801 9.33594,-11.125 z"
           id="path4"
           inkscape:connector-curvature="0" />
      </g>
      <text
         sodipodi:linespacing="85.000002%"
         id="text3817"
         y="1038.1145"
         x="98.368591"
         style="font-size:18px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:85.00000238%;writing-mode:lr-tb;text-anchor:start;fill:#120054;fill-opacity:1;stroke:none;display:inline;font-family:Gentium Basic;-inkscape-font-specification:Gentium Basic Bold Italic"
         xml:space="preserve"><tspan
           y="1038.1145"
           x="98.368591"
           style="fill:#120054;fill-opacity:1"
           id="tspan4288"
           sodipodi:role="line">GnuPG USB Token</tspan></text>
    </g>
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       id="use4758" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(0,105.23622)"
       id="use4760" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(0,210.47244)"
       id="use4762" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(0,315.70866)"
       id="use4764" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(0,420.94489)"
       id="use4766" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(0,526.18111)"
       id="use4768" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(0,631.41733)"
       id="use4770" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(0,736.65355)"
       id="use4772" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(0,841.88977)"
       id="use4774" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(0,947.12599)"
       id="use4776" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(248.19862,0)"
       id="use4778" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(248.19862,105.23622)"
       id="use4780" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(248.19862,210.47244)"
       id="use4782" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(248.19862,315.70866)"
       id="use4784" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(248.19862,420.94489)"
       id="use4786" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(248.19862,526.18111)"
       id="use4788" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(248.19862,631.41733)"
       id="use4790" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(248.19862,736.65355)"
       id="use4792" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(248.19862,841.88977)"
       id="use4794" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(248.19862,947.12599)"
       id="use4796" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(496.39725,0)"
       id="use4798" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(496.39725,105.23622)"
       id="use4800" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(496.39725,210.47244)"
       id="use4802" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(496.39725,315.70866)"
       id="use4804" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(496.39725,420.94489)"
       id="use4806" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(496.39725,526.18111)"
       id="use4808" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(496.39725,631.41733)"
       id="use4810" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(496.39725,736.65355)"
       id="use4812" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(496.39725,841.88977)"
       id="use4814" />
    <use
       x="0"
       y="0"
       inkscape:tiled-clone-of="#layer1-63"
       xlink:href="#layer1-63"
       transform="translate(496.39725,947.12599)"
       id="use4816" />
  </g>
 </svg>
--- a/gnuk.png
+++ b/gnuk.png
--- a/misc/stm32f103.cfg
+++ b/misc/stm32f103.cfg
@@ -0,0 +1,4 @@
 telnet_port 4444
 source [find interface/stlink.cfg]
 source [find target/stm32f1x.cfg]
 set WORKAREASIZE 0x10000
--- a/regnual/regnual.c
+++ b/regnual/regnual.c
@@ -26,12 +26,12 @@
 * ReGNUal
 */
 #include <string.h>
 #include "types.h"
 #include "usb_lld.h"
 #include "sys.h"
 extern void *memset (void *s, int c, size_t n);
 extern void set_led (int);
 extern int flash_write (uint32_t dst_addr, const uint8_t *src, size_t len);
 extern int flash_protect (void);
--- a/regnual/types.h
+++ b/regnual/types.h
@@ -1,5 +1,3 @@
 typedef unsigned long size_t;
 typedef unsigned char uint8_t;
 typedef unsigned short uint16_t;
 typedef unsigned int uint32_t;
@@ -7,5 +5,3 @@ typedef unsigned int uintptr_t;
 #define TRUE  1
 #define FALSE 0
 #define NULL  0
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -12,3 +12,4 @@
@LIFE_CYCLE_MANAGEMENT_DEFINE@
@ACKBTN_DEFINE@
@SERIALNO_STR_LEN_DEFINE@
@KDF_DO_REQUIRED_DEFINE@
--- a/src/configure
+++ b/src/configure
@@ -6,7 +6,7 @@ nl=$'\n'
 #
 # This file is *NOT* generated by GNU Autoconf, but written by NIIBE Yutaka
 #
-# Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+# Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2021
 #               Free Software Initiative of Japan
 #
 # This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -36,16 +36,17 @@ fi
 # Default settings
 help=no
 vidpid=none
-target=FST_01
+target=ST_DONGLE
 with_dfu=default
 debug=no
 sys1_compat=yes
 pinpad=no
 certdo=no
 hid_card_change=no
-factory_reset=no
+factory_reset=yes
 ackbtn_support=yes
 flash_override=""
 kdf_do=${kdf_do:-optional}
 # For emulation
 prefix=/usr/local
 exec_prefix='${prefix}'
@@ -210,26 +211,28 @@ FST_01SZ)
  ;;
 esac
 def_mhz="-DMHZ=$MHZ"
 if test "$target" = "GNU_LINUX"; then
  ldscript=""
  chip="gnu-linux"
  arch="gnu-linux"
  emulation="yes"
  cross=""
  mcu="none"
  kdf_do=${kdf_do:-required}
  def_emulation="-DGNU_LINUX_EMULATION"
  def_memory_size="-DMEMORY_SIZE=1024"
  def_mhz=""
  enable_hexoutput=""
  libs="-lpthread"
 else
  ldscript="gnuk.ld"
  chip="stm32f103"
  arch="cortex-m"
  emulation=""
  cross="arm-none-eabi-"
  mcu="cortex-m3"
  def_emulation=""
  def_memory_size="-DMEMORY_SIZE=$MEMORY_SIZE"
  def_mhz="-DMHZ=$MHZ"
  enable_hexoutput=yes
  libs=""
 fi
@@ -337,14 +340,22 @@ else
  echo "Acknowledge button is not supported"
 fi
 # KDF Data Object is always required for GNU/Linux emulation
 if test "$kdf_do" = "required"; then
  KDF_DO_REQUIRED_DEFINE="#define KDF_DO_REQUIRED 1"
  echo "KDF DO is required before key import/generation"
 else
  KDF_DO_REQUIRED_DEFINE="#undef KDF_DO_REQUIRED"
 fi
 ### !!! Replace following string of "FSIJ" to yours !!! ####
-SERIALNO="FSIJ-$(sed -e 's%^[^/]*/%%' <../VERSION)-"
+SERIALNO="DTS-$(sed -e 's%^[^/]*/%%' <../VERSION)-"
 SERIALNO_STR_LEN_DEFINE="#define SERIALNO_STR_LEN ${#SERIALNO}"
 if test "$sys1_compat" = "yes"; then
-  CONFIG="$target:dfu=$with_dfu:debug=$debug:pinpad=$pinpad:certdo=$certdo:factory_reset=$factory_reset"
+  CONFIG="$target:dfu=$with_dfu:debug=$debug:pinpad=$pinpad:certdo=$certdo:factory_reset=$factory_reset:kdf=$kdf_do"
 else
  if test "$with_dfu" = "yes"; then
    echo "Common binary can't support DFU loader, don't use --with-dfu." >&2
@@ -354,7 +365,7 @@ else
  FLASH_PAGE_SIZE=2048
  FLASH_SIZE=128
  MEMORY_SIZE=20
-  CONFIG="common:debug=$debug:pinpad=$pinpad:certdo=$certdo:factory_reset=$factory_reset"
+  CONFIG="common:debug=$debug:pinpad=$pinpad:certdo=$certdo:factory_reset=$factory_reset:kdf=$kdf_do"
 fi
 output_vid_pid_version () {
@@ -470,6 +481,7 @@ fi
 (echo "CHIP=$chip";
 echo "ARCH=$arch";
 echo "EMULATION=$emulation";
 echo "CROSS=$cross";
 echo "MCU=$mcu";
@@ -519,5 +531,6 @@ sed -e "s/@DEBUG_DEFINE@/$DEBUG_DEFINE/" \
    -e "s/@LIFE_CYCLE_MANAGEMENT_DEFINE@/$LIFE_CYCLE_MANAGEMENT_DEFINE/" \
    -e "s/@ACKBTN_DEFINE@/$ACKBTN_DEFINE/" \
    -e "s/@SERIALNO_STR_LEN_DEFINE@/$SERIALNO_STR_LEN_DEFINE/" \
    -e "s/@KDF_DO_REQUIRED_DEFINE@/$KDF_DO_REQUIRED_DEFINE/" \
 	< config.h.in > config.h
 exit 0
--- a/src/flash.c
+++ b/src/flash.c
@@ -82,10 +82,10 @@ extern uint8_t *flash_addr_data_storage_start;
 #define FLASH_ADDR_DATA_STORAGE_START flash_addr_data_storage_start
 #else
 /* Linker sets these symbols */
-extern uint8_t _keystore_pool;
+extern uint8_t _keystore_pool[];
-extern uint8_t _data_pool;
+extern uint8_t _data_pool[];
-#define FLASH_ADDR_KEY_STORAGE_START  ((&_keystore_pool))
+#define FLASH_ADDR_KEY_STORAGE_START  ((_keystore_pool))
-#define FLASH_ADDR_DATA_STORAGE_START ((&_data_pool))
+#define FLASH_ADDR_DATA_STORAGE_START ((_data_pool))
 #endif
 static int key_available_at (const uint8_t *k, int key_size)
--- a/src/gnuk.h
+++ b/src/gnuk.h
@@ -475,6 +475,6 @@ int pinpad_getline (int msg_code, uint32_t timeout_usec);
 #endif
-extern uint8_t _regnual_start, __heap_end__[];
+extern uint8_t _regnual_start[], __heap_end__[];
 uint8_t * sram_address (uint32_t offset);
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
 /*
 * main.c - main routine of Gnuk
 *
- * Copyright (C) 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018
+ * Copyright (C) 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2021
 *               Free Software Initiative of Japan
 * Author: NIIBE Yutaka <gniibe@fsij.org>
 *
@@ -36,6 +36,11 @@
 #include "usb-cdc.h"
 #include "random.h"
 #ifdef GNU_LINUX_EMULATION
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #define main emulated_main
@@ -372,6 +377,34 @@ main (int argc, const char *argv[])
  else
    flash_image_path = argv[1];
  if (access (flash_image_path, F_OK) < 0)
    {
      int fd;
      char buf[8192];
      memset (buf, 0xff, sizeof buf);
      memset (buf+4*1024, 0, 2);
      fd = open (flash_image_path, O_CREAT|O_WRONLY, S_IRUSR|S_IWUSR);
      if (fd < 0)
 	{
 	  perror ("creating flash file");
 	  exit (1);
 	}
      if (write (fd, buf, sizeof buf) != sizeof buf)
 	{
 	  perror ("initializing flash file");
 	  close (fd);
 	  exit (1);
 	}
      close (fd);
    }
  puts ("Gnuk (emulation with USBIP), a GnuPG USB Token implementation");
  puts ("Copyright (C) 2021 Free Software Initiative of Japan");
  puts ("This is free software under GPLv3+.");
  flash_addr = flash_init (flash_image_path);
  flash_addr_key_storage_start = (uint8_t *)flash_addr;
  flash_addr_data_storage_start = (uint8_t *)flash_addr + 4096;
@@ -470,8 +503,8 @@ main (int argc, const char *argv[])
 #ifdef FLASH_UPGRADE_SUPPORT
  /* Set vector */
-  SCB->VTOR = (uintptr_t)&_regnual_start;
+  SCB->VTOR = (uintptr_t)_regnual_start;
-  entry = calculate_regnual_entry_address (&_regnual_start);
+  entry = calculate_regnual_entry_address (_regnual_start);
 #ifdef DFU_SUPPORT
  {
    /* Use SYS at ORIGIN_REAL instead of the one at ORIGIN */
@@ -563,11 +596,11 @@ gnuk_malloc_init (void)
 }
 static void *
-sbrk (size_t size)
+gnuk_sbrk (intptr_t size)
 {
  void *p = (void *)heap_p;
-  if ((size_t)(HEAP_END - heap_p) < size)
+  if ((HEAP_END - heap_p) < size)
    return NULL;
  heap_p += size;
@@ -603,7 +636,7 @@ gnuk_malloc (size_t size)
    {
      if (m == NULL)
 	{
-	  m = (struct mem_head *)sbrk (size);
+	  m = (struct mem_head *)gnuk_sbrk (size);
 	  if (m)
 	    m->size = size;
 	  break;
--- a/src/openpgp-do.c
+++ b/src/openpgp-do.c
@@ -815,6 +815,8 @@ rw_algorithm_attr (uint16_t tag, int with_tag,
      else if (algo == ALGO_RSA2K && *algo_attr_pp != NULL)
 	{
 	  gpg_reset_algo_attr (kk);
          /* Read it again, since GC may occur.  */
          algo_attr_pp = get_algo_attr_pointer (kk);
 	  flash_enum_clear (algo_attr_pp);
 	  if (*algo_attr_pp != NULL)
 	    return 0;
@@ -823,6 +825,10 @@ rw_algorithm_attr (uint16_t tag, int with_tag,
               (*algo_attr_pp != NULL && (*algo_attr_pp)[1] != algo))
 	{
 	  gpg_reset_algo_attr (kk);
          /* Read it again, since GC may occur.  */
          algo_attr_pp = get_algo_attr_pointer (kk);
          if (*algo_attr_pp)
            flash_enum_clear (algo_attr_pp);
 	  *algo_attr_pp = flash_enum_write (kk_to_nr (kk), algo);
 	  if (*algo_attr_pp == NULL)
 	    return 0;
@@ -986,11 +992,25 @@ rw_kdf (uint16_t tag, int with_tag, const uint8_t *data, int len, int is_write)
    }
 }
 /*
 * Check LEN is valid for HOW_MANY of passphrase string.
 *
 * HOW_MANY = 1: LEN is valid for a single passphrase string.
 * HOW_MANY = 2: LEN is valid for two single passphrase strings.
 *               This is used to change passphrase.
 *               The second passphrase may be nothing.
 *
 * LEN = 0: Check if KDF-DO is available.
 */
 int
 gpg_do_kdf_check (int len, int how_many)
 {
  const uint8_t *kdf_do = do_ptr[NR_DO_KDF];
  if (len == 0)
    return kdf_do != NULL;
  if (kdf_do)
    {
      const uint8_t *kdf_spec = kdf_do+1;
@@ -1598,6 +1618,13 @@ proc_key_import (const uint8_t *data, int len)
  const uint8_t *p = data;
  uint8_t pubkey[512];
 #ifdef KDF_DO_REQUIRED
  const uint8_t *kdf_do = do_ptr[NR_DO_KDF];
  if (kdf_do == NULL)
    return 0;		/* Error.  */
 #endif
  if (admin_authorized == BY_ADMIN)
    keystring_admin = keystring_md_pw3;
  else
--- a/src/openpgp.c
+++ b/src/openpgp.c
@@ -738,7 +738,12 @@ cmd_pgp_gakp (struct eventflag *ccid_comm)
    {
      if (!ac_check_status (AC_ADMIN_AUTHORIZED))
 	GPG_SECURITY_FAILURE ();
-      gpg_do_keygen (&apdu.cmd_apdu_data[0]);
+#ifdef KDF_DO_REQUIRED
      else if (!gpg_do_kdf_check (0, 0))
 	GPG_CONDITION_NOT_SATISFIED ();
 #endif
      else
 	gpg_do_keygen (&apdu.cmd_apdu_data[0]);
    }
 }
--- a/src/usb-ccid.c
+++ b/src/usb-ccid.c
@@ -1929,6 +1929,7 @@ ccid_thread (void *arg)
 	}
      else			/* Timeout */
 	{
 #ifdef ACKBTN_SUPPORT
 	  if (c->timeout_cnt == 7
 	      && c->ccid_state == CCID_STATE_ACK_REQUIRED_1)
 	    {
@@ -1940,6 +1941,7 @@ ccid_thread (void *arg)
 	      goto exec_done;
 	    }
 	  else
 #endif
 	    c->ccid_state = ccid_handle_timeout (c);
 	}
    }
--- a/src/usb_ctrl.c
+++ b/src/usb_ctrl.c
@@ -227,7 +227,7 @@ static const uint8_t lun_table[] = { 0, 0, 0, 0, };
 #endif
 #ifdef FLASH_UPGRADE_SUPPORT
-static const uint8_t *const mem_info[] = { &_regnual_start,  __heap_end__, };
+static const uint8_t *const mem_info[] = { _regnual_start,  __heap_end__, };
 #endif
 #define USB_FSIJ_GNUK_MEMINFO     0
@@ -284,7 +284,7 @@ usb_setup (struct usb_dev *dev)
 	      if (ccid_get_ccid_state () != CCID_STATE_EXITED)
 		return -1;
-	      if (addr < &_regnual_start || addr + arg->len > __heap_end__)
+	      if (addr < _regnual_start || addr + arg->len > __heap_end__)
 		return -1;
 	      if (arg->index + arg->len < 256)
--- a/test/features/202_setup_passphrase.feature
+++ b/test/features/202_setup_passphrase.feature
@@ -4,7 +4,7 @@ Feature: setup pass phrase
  A token should support pass phrase: PW1, PW3 and reset code
  Scenario: setup PW1 (admin-full mode)
-     Given cmd_change_reference_data with 1 and "123456user pass phrase"
+     Given cmd_change_reference_data with 1 and "another user pass phraseuser pass phrase"
     Then it should get success
  Scenario: verify PW1 (1)
--- a/test/rsa_keys.py
+++ b/test/rsa_keys.py
@@ -70,11 +70,11 @@ def build_privkey_template_for_remove(openpgp_keyno):
        keyspec = b'\xb8'
    else:
        keyspec = b'\xa4'
-    return b'\x4d\02' + keyspec + b'\0x00'
+    return b'\x4d\x02' + keyspec + b'\x00'
 def compute_digestinfo(msg):
    digest = sha256(msg).digest()
-    prefix = b'\x30\31\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x01\x05\x00\x04\x20'
+    prefix = b'\x30\x31\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x01\x05\x00\x04\x20'
    return prefix + digest
 # egcd and modinv are from wikibooks
--- a/tests/card_const.py
+++ b/tests/card_const.py
@@ -2,3 +2,11 @@ FACTORY_PASSPHRASE_PW1=b"123456"
 FACTORY_PASSPHRASE_PW3=b"12345678"
 KEY_ATTRIBUTES_RSA4K=b"\x01\x10\x00\x00\x20\x00"
 KEY_ATTRIBUTES_RSA2K=b"\x01\x08\x00\x00\x20\x00"
 KEY_ATTRIBUTES_ECDH_ANSIX9P256R1=b"\x12\x2a\x86\x48\xce\x3d\x03\x01\x07"
 KEY_ATTRIBUTES_ECDH_ANSIX9P384R1=b"\x12\x2b\x81\x04\x00\x22"
 KEY_ATTRIBUTES_ECDH_ANSIX9P521R1=b"\x12\x2b\x81\x04\x00\x23"
 KEY_ATTRIBUTES_ECDH_BRAINPOOLP256R1=b"\x12\x2b\x24\x03\x03\x02\x08\x01\x01\x07"
 KEY_ATTRIBUTES_ECDH_BRAINPOOLP384R1=b"\x12\x2b\x24\x03\x03\x02\x08\x01\x01\x0b"
 KEY_ATTRIBUTES_ECDH_BRAINPOOLP512R1=b"\x12\x2b\x24\x03\x03\x02\x08\x01\x01\x0d"
 KEY_ATTRIBUTES_X25519=b"\x12\x2b\x06\x01\x04\x01\x97\x55\x01\x05\x01"
 KEY_ATTRIBUTES_ED25519=b"\x16\x2b\x06\x01\x04\x01\xda\x47\x0f\x01"
--- a/tests/card_reader.py
+++ b/tests/card_reader.py
@@ -126,9 +126,12 @@ class CardReader(object):
        #       intf.extra_descriptors[41]
        self.__dev = dev
-        self.__timeout = 10000
+        self.__timeout = 100000
        self.__seq = 0
        if self.ccid_get_status() & 0x03 not in (0, 1):
            raise ValueError("Card absent")
    def get_string(self, num):
        return get_string(self.__dev, num)
--- a/tests/card_test_ansix9p256r1.py
+++ b/tests/card_test_ansix9p256r1.py
@@ -0,0 +1,58 @@
 """
 card_test_ansix9p256r1.py - test ansix9p256r1 support
 Copyright (C) 2021  Vincent Pelletier <plr.vincent@gmail.com>
 This file is a part of Gnuk, a GnuPG USB Token implementation.
 Gnuk is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 Gnuk is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
 License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 from func_pso_auth import assert_ec_pso
 from card_const import *
 class Test_Card_AnsiX9P256R1(object):
    def test_ECDH_reference_vectors(self, card):
        assert card.verify(3, FACTORY_PASSPHRASE_PW3)
        assert card.verify(2, FACTORY_PASSPHRASE_PW1)
        # https://tools.ietf.org/html/rfc5903#section-8.1
        assert_ec_pso(
            card=card,
            key_index=1,
            key_attributes=KEY_ATTRIBUTES_ECDH_ANSIX9P256R1,
            key_attribute_caption='ECDH ansix9p256r1',
            private_key=(
                b'\xC8\x8F\x01\xF5\x10\xD9\xAC\x3F\x70\xA2\x92\xDA\xA2\x31\x6D\xE5'
                b'\x44\xE9\xAA\xB8\xAF\xE8\x40\x49\xC6\x2A\x9C\x57\x86\x2D\x14\x33'
            ),
            expected_public_key=(
                b'\x04'
                b'\xDA\xD0\xB6\x53\x94\x22\x1C\xF9\xB0\x51\xE1\xFE\xCA\x57\x87\xD0'
                b'\x98\xDF\xE6\x37\xFC\x90\xB9\xEF\x94\x5D\x0C\x37\x72\x58\x11\x80'
                b'\x52\x71\xA0\x46\x1C\xDB\x82\x52\xD6\x1F\x1C\x45\x6F\xA3\xE5\x9A'
                b'\xB1\xF4\x5B\x33\xAC\xCF\x5F\x58\x38\x9E\x05\x77\xB8\x99\x0B\xB3'
            ),
            pso_input=(
                b'\xa6\x46\x7f\x49\x43\x86\x41'
                b'\x04'
                b'\xD1\x2D\xFB\x52\x89\xC8\xD4\xF8\x12\x08\xB7\x02\x70\x39\x8C\x34'
                b'\x22\x96\x97\x0A\x0B\xCC\xB7\x4C\x73\x6F\xC7\x55\x44\x94\xBF\x63'
                b'\x56\xFB\xF3\xCA\x36\x6C\xC2\x3E\x81\x57\x85\x4C\x13\xC5\x8D\x6A'
                b'\xAC\x23\xF0\x46\xAD\xA3\x0F\x83\x53\xE7\x4F\x33\x03\x98\x72\xAB'
            ),
            expected_pso_output=(
                b'\xD6\x84\x0F\x6B\x42\xF6\xED\xAF\xD1\x31\x16\xE0\xE1\x25\x65\x20'
                b'\x2F\xEF\x8E\x9E\xCE\x7D\xCE\x03\x81\x24\x64\xD0\x4B\x94\x42\xDE'
            ),
        )
--- a/tests/card_test_ansix9p384r1.py
+++ b/tests/card_test_ansix9p384r1.py
@@ -0,0 +1,64 @@
 """
 card_test_ansix9p384r1.py - test ansix9p384r1 support
 Copyright (C) 2021  Vincent Pelletier <plr.vincent@gmail.com>
 This file is a part of Gnuk, a GnuPG USB Token implementation.
 Gnuk is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 Gnuk is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
 License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 from func_pso_auth import assert_ec_pso
 from card_const import *
 class Test_Card_AnsiX9P384R1(object):
    def test_ECDH_reference_vectors(self, card):
        assert card.verify(3, FACTORY_PASSPHRASE_PW3)
        assert card.verify(2, FACTORY_PASSPHRASE_PW1)
        # https://tools.ietf.org/html/rfc5903#section-8.2
        assert_ec_pso(
            card=card,
            key_index=1,
            key_attributes=KEY_ATTRIBUTES_ECDH_ANSIX9P384R1,
            key_attribute_caption='ECDH ansix9p384r1',
            private_key=(
                b'\x09\x9F\x3C\x70\x34\xD4\xA2\xC6\x99\x88\x4D\x73\xA3\x75\xA6\x7F'
                b'\x76\x24\xEF\x7C\x6B\x3C\x0F\x16\x06\x47\xB6\x74\x14\xDC\xE6\x55'
                b'\xE3\x5B\x53\x80\x41\xE6\x49\xEE\x3F\xAE\xF8\x96\x78\x3A\xB1\x94'
            ),
            expected_public_key=(
                b'\x04'
                b'\x66\x78\x42\xD7\xD1\x80\xAC\x2C\xDE\x6F\x74\xF3\x75\x51\xF5\x57'
                b'\x55\xC7\x64\x5C\x20\xEF\x73\xE3\x16\x34\xFE\x72\xB4\xC5\x5E\xE6'
                b'\xDE\x3A\xC8\x08\xAC\xB4\xBD\xB4\xC8\x87\x32\xAE\xE9\x5F\x41\xAA'
                b'\x94\x82\xED\x1F\xC0\xEE\xB9\xCA\xFC\x49\x84\x62\x5C\xCF\xC2\x3F'
                b'\x65\x03\x21\x49\xE0\xE1\x44\xAD\xA0\x24\x18\x15\x35\xA0\xF3\x8E'
                b'\xEB\x9F\xCF\xF3\xC2\xC9\x47\xDA\xE6\x9B\x4C\x63\x45\x73\xA8\x1C'
            ),
            pso_input=(
                b'\xa6\x66\x7f\x49\x63\x86\x61'
                b'\x04'
                b'\xE5\x58\xDB\xEF\x53\xEE\xCD\xE3\xD3\xFC\xCF\xC1\xAE\xA0\x8A\x89'
                b'\xA9\x87\x47\x5D\x12\xFD\x95\x0D\x83\xCF\xA4\x17\x32\xBC\x50\x9D'
                b'\x0D\x1A\xC4\x3A\x03\x36\xDE\xF9\x6F\xDA\x41\xD0\x77\x4A\x35\x71'
                b'\xDC\xFB\xEC\x7A\xAC\xF3\x19\x64\x72\x16\x9E\x83\x84\x30\x36\x7F'
                b'\x66\xEE\xBE\x3C\x6E\x70\xC4\x16\xDD\x5F\x0C\x68\x75\x9D\xD1\xFF'
                b'\xF8\x3F\xA4\x01\x42\x20\x9D\xFF\x5E\xAA\xD9\x6D\xB9\xE6\x38\x6C'
            ),
            expected_pso_output=(
                b'\x11\x18\x73\x31\xC2\x79\x96\x2D\x93\xD6\x04\x24\x3F\xD5\x92\xCB'
                b'\x9D\x0A\x92\x6F\x42\x2E\x47\x18\x75\x21\x28\x7E\x71\x56\xC5\xC4'
                b'\xD6\x03\x13\x55\x69\xB9\xE9\xD0\x9C\xF5\xD4\xA2\x70\xF5\x97\x46'
            ),
        )
--- a/tests/card_test_ansix9p512r1.py
+++ b/tests/card_test_ansix9p512r1.py
@@ -0,0 +1,76 @@
 """
 card_test_ansix9p512r1.py - test ansix9p512r1 support
 Copyright (C) 2021  Vincent Pelletier <plr.vincent@gmail.com>
 This file is a part of Gnuk, a GnuPG USB Token implementation.
 Gnuk is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 Gnuk is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
 License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 from func_pso_auth import assert_ec_pso
 from card_const import *
 class Test_Card_AnsiX9P512R1(object):
    def test_ECDH_reference_vectors(self, card):
        assert card.verify(3, FACTORY_PASSPHRASE_PW3)
        assert card.verify(2, FACTORY_PASSPHRASE_PW1)
        # https://tools.ietf.org/html/rfc5903#section-8.3
        assert_ec_pso(
            card=card,
            key_index=1,
            key_attributes=KEY_ATTRIBUTES_ECDH_ANSIX9P521R1,
            key_attribute_caption='ECDH ansix9p521r1',
            private_key=(
                b'\x00\x37\xAD\xE9\x31\x9A\x89\xF4\xDA\xBD\xB3\xEF\x41\x1A\xAC\xCC'
                b'\xA5\x12\x3C\x61\xAC\xAB\x57\xB5\x39\x3D\xCE\x47\x60\x81\x72\xA0'
                b'\x95\xAA\x85\xA3\x0F\xE1\xC2\x95\x2C\x67\x71\xD9\x37\xBA\x97\x77'
                b'\xF5\x95\x7B\x26\x39\xBA\xB0\x72\x46\x2F\x68\xC2\x7A\x57\x38\x2D'
                b'\x4A\x52'
            ),
            expected_public_key=(
                b'\x04'
                b'\x00\x15\x41\x7E\x84\xDB\xF2\x8C\x0A\xD3\xC2\x78\x71\x33\x49\xDC'
                b'\x7D\xF1\x53\xC8\x97\xA1\x89\x1B\xD9\x8B\xAB\x43\x57\xC9\xEC\xBE'
                b'\xE1\xE3\xBF\x42\xE0\x0B\x8E\x38\x0A\xEA\xE5\x7C\x2D\x10\x75\x64'
                b'\x94\x18\x85\x94\x2A\xF5\xA7\xF4\x60\x17\x23\xC4\x19\x5D\x17\x6C'
                b'\xED\x3E'
                b'\x01\x7C\xAE\x20\xB6\x64\x1D\x2E\xEB\x69\x57\x86\xD8\xC9\x46\x14'
                b'\x62\x39\xD0\x99\xE1\x8E\x1D\x5A\x51\x4C\x73\x9D\x7C\xB4\xA1\x0A'
                b'\xD8\xA7\x88\x01\x5A\xC4\x05\xD7\x79\x9D\xC7\x5E\x7B\x7D\x5B\x6C'
                b'\xF2\x26\x1A\x6A\x7F\x15\x07\x43\x8B\xF0\x1B\xEB\x6C\xA3\x92\x6F'
                b'\x95\x82'
            ),
            pso_input=(
                b'\xa6\x81\x8c\x7f\x49\x81\x88\x86\x81\x85'
                b'\x04'
                b'\x00\xD0\xB3\x97\x5A\xC4\xB7\x99\xF5\xBE\xA1\x6D\x5E\x13\xE9\xAF'
                b'\x97\x1D\x5E\x9B\x98\x4C\x9F\x39\x72\x8B\x5E\x57\x39\x73\x5A\x21'
                b'\x9B\x97\xC3\x56\x43\x6A\xDC\x6E\x95\xBB\x03\x52\xF6\xBE\x64\xA6'
                b'\xC2\x91\x2D\x4E\xF2\xD0\x43\x3C\xED\x2B\x61\x71\x64\x00\x12\xD9'
                b'\x46\x0F'
                b'\x01\x5C\x68\x22\x63\x83\x95\x6E\x3B\xD0\x66\xE7\x97\xB6\x23\xC2'
                b'\x7C\xE0\xEA\xC2\xF5\x51\xA1\x0C\x2C\x72\x4D\x98\x52\x07\x7B\x87'
                b'\x22\x0B\x65\x36\xC5\xC4\x08\xA1\xD2\xAE\xBB\x8E\x86\xD6\x78\xAE'
                b'\x49\xCB\x57\x09\x1F\x47\x32\x29\x65\x79\xAB\x44\xFC\xD1\x7F\x0F'
                b'\xC5\x6A'
            ),
            expected_pso_output=(
                b'\x01\x14\x4C\x7D\x79\xAE\x69\x56\xBC\x8E\xDB\x8E\x7C\x78\x7C\x45'
                b'\x21\xCB\x08\x6F\xA6\x44\x07\xF9\x78\x94\xE5\xE6\xB2\xD7\x9B\x04'
                b'\xD1\x42\x7E\x73\xCA\x4B\xAA\x24\x0A\x34\x78\x68\x59\x81\x0C\x06'
                b'\xB3\xC7\x15\xA3\xA8\xCC\x31\x51\xF2\xBE\xE4\x17\x99\x6D\x19\xF3'
                b'\xDD\xEA'
            ),
        )
--- a/tests/card_test_brainpoolp256r1.py
+++ b/tests/card_test_brainpoolp256r1.py
@@ -0,0 +1,58 @@
 """
 card_test_brainpoolp256r1.py - test brainpoolp256r1 support
 Copyright (C) 2021  Vincent Pelletier <plr.vincent@gmail.com>
 This file is a part of Gnuk, a GnuPG USB Token implementation.
 Gnuk is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 Gnuk is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
 License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 from func_pso_auth import assert_ec_pso
 from card_const import *
 class Test_Card_BrainpoolP256R1(object):
    def test_ECDH_reference_vectors(self, card):
        assert card.verify(3, FACTORY_PASSPHRASE_PW3)
        assert card.verify(2, FACTORY_PASSPHRASE_PW1)
        # https://tools.ietf.org/html/rfc7027#appendix-A.1
        assert_ec_pso(
            card=card,
            key_index=1,
            key_attributes=KEY_ATTRIBUTES_ECDH_BRAINPOOLP256R1,
            key_attribute_caption='ECDH brainpoolp256r1',
            private_key=(
                b'\x81\xDB\x1E\xE1\x00\x15\x0F\xF2\xEA\x33\x8D\x70\x82\x71\xBE\x38'
                b'\x30\x0C\xB5\x42\x41\xD7\x99\x50\xF7\x7B\x06\x30\x39\x80\x4F\x1D'
            ),
            expected_public_key=(
                b'\x04'
                b'\x44\x10\x6E\x91\x3F\x92\xBC\x02\xA1\x70\x5D\x99\x53\xA8\x41\x4D'
                b'\xB9\x5E\x1A\xAA\x49\xE8\x1D\x9E\x85\xF9\x29\xA8\xE3\x10\x0B\xE5'
                b'\x8A\xB4\x84\x6F\x11\xCA\xCC\xB7\x3C\xE4\x9C\xBD\xD1\x20\xF5\xA9'
                b'\x00\xA6\x9F\xD3\x2C\x27\x22\x23\xF7\x89\xEF\x10\xEB\x08\x9B\xDC'
            ),
            pso_input=(
                b'\xa6\x46\x7f\x49\x43\x86\x41'
                b'\x04'
                b'\x8D\x2D\x68\x8C\x6C\xF9\x3E\x11\x60\xAD\x04\xCC\x44\x29\x11\x7D'
                b'\xC2\xC4\x18\x25\xE1\xE9\xFC\xA0\xAD\xDD\x34\xE6\xF1\xB3\x9F\x7B'
                b'\x99\x0C\x57\x52\x08\x12\xBE\x51\x26\x41\xE4\x70\x34\x83\x21\x06'
                b'\xBC\x7D\x3E\x8D\xD0\xE4\xC7\xF1\x13\x6D\x70\x06\x54\x7C\xEC\x6A'
            ),
            expected_pso_output=(
                b'\x89\xAF\xC3\x9D\x41\xD3\xB3\x27\x81\x4B\x80\x94\x0B\x04\x25\x90'
                b'\xF9\x65\x56\xEC\x91\xE6\xAE\x79\x39\xBC\xE3\x1F\x3A\x18\xBF\x2B'
            ),
        )
--- a/tests/card_test_brainpoolp384r1.py
+++ b/tests/card_test_brainpoolp384r1.py
@@ -0,0 +1,64 @@
 """
 card_test_brainpoolp384r1.py - test brainpoolp384r1 support
 Copyright (C) 2021  Vincent Pelletier <plr.vincent@gmail.com>
 This file is a part of Gnuk, a GnuPG USB Token implementation.
 Gnuk is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 Gnuk is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
 License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 from func_pso_auth import assert_ec_pso
 from card_const import *
 class Test_Card_BrainpoolP384R1(object):
    def test_ECDH_reference_vectors(self, card):
        assert card.verify(3, FACTORY_PASSPHRASE_PW3)
        assert card.verify(2, FACTORY_PASSPHRASE_PW1)
        # https://tools.ietf.org/html/rfc7027#appendix-A.2
        assert_ec_pso(
            card=card,
            key_index=1,
            key_attributes=KEY_ATTRIBUTES_ECDH_BRAINPOOLP384R1,
            key_attribute_caption='ECDH brainpoolp384r1',
            private_key=(
                b'\x1E\x20\xF5\xE0\x48\xA5\x88\x6F\x1F\x15\x7C\x74\xE9\x1B\xDE\x2B'
                b'\x98\xC8\xB5\x2D\x58\xE5\x00\x3D\x57\x05\x3F\xC4\xB0\xBD\x65\xD6'
                b'\xF1\x5E\xB5\xD1\xEE\x16\x10\xDF\x87\x07\x95\x14\x36\x27\xD0\x42'
            ),
            expected_public_key=(
                b'\x04'
                b'\x68\xB6\x65\xDD\x91\xC1\x95\x80\x06\x50\xCD\xD3\x63\xC6\x25\xF4'
                b'\xE7\x42\xE8\x13\x46\x67\xB7\x67\xB1\xB4\x76\x79\x35\x88\xF8\x85'
                b'\xAB\x69\x8C\x85\x2D\x4A\x6E\x77\xA2\x52\xD6\x38\x0F\xCA\xF0\x68'
                b'\x55\xBC\x91\xA3\x9C\x9E\xC0\x1D\xEE\x36\x01\x7B\x7D\x67\x3A\x93'
                b'\x12\x36\xD2\xF1\xF5\xC8\x39\x42\xD0\x49\xE3\xFA\x20\x60\x74\x93'
                b'\xE0\xD0\x38\xFF\x2F\xD3\x0C\x2A\xB6\x7D\x15\xC8\x5F\x7F\xAA\x59'
            ),
            pso_input=(
                b'\xa6\x66\x7f\x49\x63\x86\x61'
                b'\x04'
                b'\x4D\x44\x32\x6F\x26\x9A\x59\x7A\x5B\x58\xBB\xA5\x65\xDA\x55\x56'
                b'\xED\x7F\xD9\xA8\xA9\xEB\x76\xC2\x5F\x46\xDB\x69\xD1\x9D\xC8\xCE'
                b'\x6A\xD1\x8E\x40\x4B\x15\x73\x8B\x20\x86\xDF\x37\xE7\x1D\x1E\xB4'
                b'\x62\xD6\x92\x13\x6D\xE5\x6C\xBE\x93\xBF\x5F\xA3\x18\x8E\xF5\x8B'
                b'\xC8\xA3\xA0\xEC\x6C\x1E\x15\x1A\x21\x03\x8A\x42\xE9\x18\x53\x29'
                b'\xB5\xB2\x75\x90\x3D\x19\x2F\x8D\x4E\x1F\x32\xFE\x9C\xC7\x8C\x48'
            ),
            expected_pso_output=(
                b'\x0B\xD9\xD3\xA7\xEA\x0B\x3D\x51\x9D\x09\xD8\xE4\x8D\x07\x85\xFB'
                b'\x74\x4A\x6B\x35\x5E\x63\x04\xBC\x51\xC2\x29\xFB\xBC\xE2\x39\xBB'
                b'\xAD\xF6\x40\x37\x15\xC3\x5D\x4F\xB2\xA5\x44\x4F\x57\x5D\x4F\x42'
            ),
        )
--- a/tests/card_test_brainpoolp512r1.py
+++ b/tests/card_test_brainpoolp512r1.py
@@ -0,0 +1,70 @@
 """
 card_test_brainpoolp512r1.py - test brainpoolp512r1 support
 Copyright (C) 2021  Vincent Pelletier <plr.vincent@gmail.com>
 This file is a part of Gnuk, a GnuPG USB Token implementation.
 Gnuk is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 Gnuk is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
 License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 from func_pso_auth import assert_ec_pso
 from card_const import *
 class Test_Card_BrainpoolP512R1(object):
    def test_ECDH_reference_vectors(self, card):
        assert card.verify(3, FACTORY_PASSPHRASE_PW3)
        assert card.verify(2, FACTORY_PASSPHRASE_PW1)
        # https://tools.ietf.org/html/rfc7027#appendix-A.3
        assert_ec_pso(
            card=card,
            key_index=1,
            key_attributes=KEY_ATTRIBUTES_ECDH_BRAINPOOLP512R1,
            key_attribute_caption='ECDH brainpoolp512r1',
            private_key=(
                b'\x16\x30\x2F\xF0\xDB\xBB\x5A\x8D\x73\x3D\xAB\x71\x41\xC1\xB4\x5A'
                b'\xCB\xC8\x71\x59\x39\x67\x7F\x6A\x56\x85\x0A\x38\xBD\x87\xBD\x59'
                b'\xB0\x9E\x80\x27\x96\x09\xFF\x33\x3E\xB9\xD4\xC0\x61\x23\x1F\xB2'
                b'\x6F\x92\xEE\xB0\x49\x82\xA5\xF1\xD1\x76\x4C\xAD\x57\x66\x54\x22'
            ),
            expected_public_key=(
                b'\x04'
                b'\x0A\x42\x05\x17\xE4\x06\xAA\xC0\xAC\xDC\xE9\x0F\xCD\x71\x48\x77'
                b'\x18\xD3\xB9\x53\xEF\xD7\xFB\xEC\x5F\x7F\x27\xE2\x8C\x61\x49\x99'
                b'\x93\x97\xE9\x1E\x02\x9E\x06\x45\x7D\xB2\xD3\xE6\x40\x66\x8B\x39'
                b'\x2C\x2A\x7E\x73\x7A\x7F\x0B\xF0\x44\x36\xD1\x16\x40\xFD\x09\xFD'
                b'\x72\xE6\x88\x2E\x8D\xB2\x8A\xAD\x36\x23\x7C\xD2\x5D\x58\x0D\xB2'
                b'\x37\x83\x96\x1C\x8D\xC5\x2D\xFA\x2E\xC1\x38\xAD\x47\x2A\x0F\xCE'
                b'\xF3\x88\x7C\xF6\x2B\x62\x3B\x2A\x87\xDE\x5C\x58\x83\x01\xEA\x3E'
                b'\x5F\xC2\x69\xB3\x73\xB6\x07\x24\xF5\xE8\x2A\x6A\xD1\x47\xFD\xE7'
            ),
            pso_input=(
                b'\xa6\x81\x88\x7f\x49\x81\x84\x86\x81\x81'
                b'\x04'
                b'\x9D\x45\xF6\x6D\xE5\xD6\x7E\x2E\x6D\xB6\xE9\x3A\x59\xCE\x0B\xB4'
                b'\x81\x06\x09\x7F\xF7\x8A\x08\x1D\xE7\x81\xCD\xB3\x1F\xCE\x8C\xCB'
                b'\xAA\xEA\x8D\xD4\x32\x0C\x41\x19\xF1\xE9\xCD\x43\x7A\x2E\xAB\x37'
                b'\x31\xFA\x96\x68\xAB\x26\x8D\x87\x1D\xED\xA5\x5A\x54\x73\x19\x9F'
                b'\x2F\xDC\x31\x30\x95\xBC\xDD\x5F\xB3\xA9\x16\x36\xF0\x7A\x95\x9C'
                b'\x8E\x86\xB5\x63\x6A\x1E\x93\x0E\x83\x96\x04\x9C\xB4\x81\x96\x1D'
                b'\x36\x5C\xC1\x14\x53\xA0\x6C\x71\x98\x35\x47\x5B\x12\xCB\x52\xFC'
                b'\x3C\x38\x3B\xCE\x35\xE2\x7E\xF1\x94\x51\x2B\x71\x87\x62\x85\xFA'
            ),
            expected_pso_output=(
                b'\xA7\x92\x70\x98\x65\x5F\x1F\x99\x76\xFA\x50\xA9\xD5\x66\x86\x5D'
                b'\xC5\x30\x33\x18\x46\x38\x1C\x87\x25\x6B\xAF\x32\x26\x24\x4B\x76'
                b'\xD3\x64\x03\xC0\x24\xD7\xBB\xF0\xAA\x08\x03\xEA\xFF\x40\x5D\x3D'
                b'\x24\xF1\x1A\x9B\x5C\x0B\xEF\x67\x9F\xE1\x45\x4B\x21\xC4\xCD\x1F'
            ),
        )
--- a/tests/card_test_ed25519.py
+++ b/tests/card_test_ed25519.py
@@ -0,0 +1,51 @@
 """
 card_test_ed25519.py - test ed25519 support
 Copyright (C) 2021  Vincent Pelletier <plr.vincent@gmail.com>
 This file is a part of Gnuk, a GnuPG USB Token implementation.
 Gnuk is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 Gnuk is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
 License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 import hashlib
 from func_pso_auth import assert_ec_pso
 from card_const import *
 class Test_Card_ED25519(object):
    def test_reference_vectors(self, card):
        assert card.verify(3, FACTORY_PASSPHRASE_PW3)
        assert card.verify(1, FACTORY_PASSPHRASE_PW1)
        # https://tools.ietf.org/html/rfc8032#section-7.3
        assert_ec_pso(
            card=card,
            key_index=0,
            key_attributes=KEY_ATTRIBUTES_ED25519,
            key_attribute_caption='ed25519',
            private_key=(
                b'\x83\x3f\xe6\x24\x09\x23\x7b\x9d\x62\xec\x77\x58\x75\x20\x91\x1e'
                b'\x9a\x75\x9c\xec\x1d\x19\x75\x5b\x7d\xa9\x01\xb9\x6d\xca\x3d\x42'
            ),
            expected_public_key=(
                b'\xec\x17\x2b\x93\xad\x5e\x56\x3b\xf4\x93\x2c\x70\xe1\x24\x50\x34'
                b'\xc3\x54\x67\xef\x2e\xfd\x4d\x64\xeb\xf8\x19\x68\x34\x67\xe2\xbf'
            ),
            pso_input=hashlib.sha512(b'\x61\x62\x63').digest(),
            expected_pso_output=(
                b'\x98\xa7\x02\x22\xf0\xb8\x12\x1a\xa9\xd3\x0f\x81\x3d\x68\x3f\x80'
                b'\x9e\x46\x2b\x46\x9c\x7f\xf8\x76\x39\x49\x9b\xb9\x4e\x6d\xae\x41'
                b'\x31\xf8\x50\x42\x46\x3c\x2a\x35\x5a\x20\x03\xd0\x62\xad\xf5\xaa'
                b'\xa1\x0b\x8c\x61\xe6\x36\x06\x2a\xaa\xd1\x1c\x2a\x26\x08\x34\x06'
            ),
        )
--- a/tests/card_test_x25519.py
+++ b/tests/card_test_x25519.py
@@ -0,0 +1,52 @@
 """
 card_test_x25519.py - test x25519 support
 Copyright (C) 2021  Vincent Pelletier <plr.vincent@gmail.com>
 This file is a part of Gnuk, a GnuPG USB Token implementation.
 Gnuk is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 Gnuk is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
 License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 from func_pso_auth import assert_ec_pso
 from card_const import *
 class Test_Card_X25519(object):
    def test_reference_vectors(self, card):
        assert card.verify(3, FACTORY_PASSPHRASE_PW3)
        assert card.verify(2, FACTORY_PASSPHRASE_PW1)
        # https://tools.ietf.org/html/rfc7748#section-6.1
        assert_ec_pso(
            card=card,
            key_index=1,
            key_attributes=KEY_ATTRIBUTES_X25519,
            key_attribute_caption='x25519',
            private_key=(
                b'\x77\x07\x6d\x0a\x73\x18\xa5\x7d\x3c\x16\xc1\x72\x51\xb2\x66\x45'
                b'\xdf\x4c\x2f\x87\xeb\xc0\x99\x2a\xb1\x77\xfb\xa5\x1d\xb9\x2c\x2a'
            ),
            expected_public_key=(
                b'\x85\x20\xf0\x09\x89\x30\xa7\x54\x74\x8b\x7d\xdc\xb4\x3e\xf7\x5a'
                b'\x0d\xbf\x3a\x0d\x26\x38\x1a\xf4\xeb\xa4\xa9\x8e\xaa\x9b\x4e\x6a'
            ),
            pso_input=(
                b'\xa6\x25\x7f\x49\x22\x86\x20'
                b'\xde\x9e\xdb\x7d\x7b\x7d\xc1\xb4\xd3\x5b\x61\xc2\xec\xe4\x35\x37'
                b'\x3f\x83\x43\xc8\x5b\x78\x67\x4d\xad\xfc\x7e\x14\x6f\x88\x2b\x4f'
            ),
            expected_pso_output=(
                b'\x4a\x5d\x9d\x5b\xa4\xce\x2d\xe1\x72\x8e\x3b\xf4\x80\x35\x0f\x25'
                b'\xe0\x7e\x21\xc9\x47\xd1\x9e\x33\x76\xf0\x9b\x3c\x1e\x16\x17\x42'
            ),
        )
--- a/tests/func_pso_auth.py
+++ b/tests/func_pso_auth.py
@@ -0,0 +1,108 @@
 """
 func_pso_auth.py - functions for testing PSO commands
 Copyright (C) 2021  Vincent Pelletier <plr.vincent@gmail.com>
 This file is a part of Gnuk, a GnuPG USB Token implementation.
 Gnuk is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 Gnuk is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
 License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 import pytest
 from card_const import KEY_ATTRIBUTES_RSA2K
 def _encodeDERLength(length):
    if length < 0x80:
        return length.to_bytes(1, 'big')
    if length < 0x100:
        return b'\x81' + length.to_bytes(1, 'big')
    return b'\x82' + length.to_bytes(2, 'big')
 def get_ec_pso(
    card,
    key_index,
    key_attributes,
    key_attribute_caption,
    private_key, expected_public_key,
    pso_input,
 ):
    """
    If card supports, change key attributes for given key slot, store
    given private key, check that the card could derive the expected
    public key from it, then call the appropriate PSO for this key slot
    and return its result.
    Sets key attributes to RSA2K before returning to caller.
    Skips the test if initial key attribute change is rejected by the card.
    """
    key_attribute_index, control_reference_template, pso_p1, pso_p2 = (
        (0xc1, b'\xb6\x00', 0x9e, 0x9a), # Sign
        (0xc2, b'\xb8\x00', 0x80, 0x86), # Decrypt
        (0xc3, b'\xa4\x00', 0x9e, 0x9a), # Authenticate
    )[key_index]
    try:
        card.cmd_put_data(0x00, key_attribute_index, key_attributes)
    except ValueError:
        pytest.skip('No %s support' % (key_attribute_caption, ))
    try:
        private_key_len = len(private_key)
        r = card.cmd_put_data_odd(
            0x3f,
            0xff,
            b'\x4d' + _encodeDERLength(private_key_len + 10) +
                control_reference_template +
                b'\x7f\x48\x02'
                    b'\x92' + _encodeDERLength(private_key_len) +
                b'\x5f\x48' + _encodeDERLength(private_key_len) +
                    private_key,
        )
        assert r
        r = card.cmd_get_public_key(key_index + 1)
        expected_public_key_len = len(expected_public_key)
        encoded_expected_public_key_len = _encodeDERLength(
            expected_public_key_len,
        )
        expected_public_key_response = (
            b'\x7f\x49' + _encodeDERLength(
                expected_public_key_len +
                len(encoded_expected_public_key_len) + 1,
            ) +
                b'\x86' + encoded_expected_public_key_len +
                    expected_public_key
        )
        assert r == expected_public_key_response
        return card.cmd_pso(pso_p1, pso_p2, pso_input)
    finally:
        card.cmd_put_data(0x00, key_attribute_index, KEY_ATTRIBUTES_RSA2K)
 def assert_ec_pso(
    card,
    key_index,
    key_attributes,
    key_attribute_caption,
    private_key, expected_public_key,
    pso_input, expected_pso_output,
 ):
    """
    Calls get_ec_pso and checks if produced output matches the expected value.
    """
    r = get_ec_pso(
        card=card,
        key_index=key_index,
        key_attributes=key_attributes,
        key_attribute_caption=key_attribute_caption,
        private_key=private_key,
        expected_public_key=expected_public_key,
        pso_input=pso_input,
    )
    assert r == expected_pso_output
--- a/tests/openpgp_card.py
+++ b/tests/openpgp_card.py
@@ -60,6 +60,7 @@ class OpenPGP_Card(object):
        self.__kdf_salt_reset = None
        self.__kdf_salt_admin = None
        self.is_gnuk = (reader.get_string(2) == "Gnuk Token")
        self.is_emulated_gnuk = (reader.get_string(3)[-8:] == "EMULATED")
    def configure_with_kdf(self):
        kdf_data = self.cmd_get_data(0x00, 0xf9)
--- a/tests/rsa_keys.py
+++ b/tests/rsa_keys.py
@@ -70,11 +70,11 @@ def build_privkey_template_for_remove(openpgp_keyno):
        keyspec = b'\xb8'
    else:
        keyspec = b'\xa4'
-    return b'\x4d\02' + keyspec + b'\0x00'
+    return b'\x4d\x02' + keyspec + b'\x00'
 def compute_digestinfo(msg):
    digest = sha256(msg).digest()
-    prefix = b'\x30\31\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x01\x05\x00\x04\x20'
+    prefix = b'\x30\x31\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x01\x05\x00\x04\x20'
    return prefix + digest
 # egcd and modinv are from wikibooks
--- a/tests/skip_if_emulation.py
+++ b/tests/skip_if_emulation.py
@@ -0,0 +1,6 @@
 import pytest
@pytest.fixture(scope="module",autouse=True)
 def check_emulation(card):
    if card.is_emulated_gnuk:
        pytest.skip("Emulation requires KDF setup", allow_module_level=True)
--- a/tests/skip_if_gnuk.py
+++ b/tests/skip_if_gnuk.py
@@ -0,0 +1,6 @@
 import pytest
@pytest.fixture(scope="module",autouse=True)
 def check_gnuk(card):
    if card.is_gnuk:
        pytest.skip("Gnuk has no support for those features", allow_module_level=True)
--- a/tests/test_001_personalize_card.py
+++ b/tests/test_001_personalize_card.py
@@ -1 +1,2 @@
 from skip_if_emulation import *
 from card_test_personalize_card import *
--- a/tests/test_002_personalize_reset.py
+++ b/tests/test_002_personalize_reset.py
@@ -1 +1,2 @@
 from skip_if_emulation import *
 from card_test_personalize_reset import *
--- a/tests/test_003_remove_keys.py
+++ b/tests/test_003_remove_keys.py
@@ -1 +1,2 @@
 from skip_if_emulation import *
 from card_test_remove_keys import *
--- a/tests/test_004_reset_pw3.py
+++ b/tests/test_004_reset_pw3.py
@@ -1 +1,2 @@
 from skip_if_emulation import *
 from card_test_reset_pw3 import *
--- a/tests/test_005_personalize_admin_less.py
+++ b/tests/test_005_personalize_admin_less.py
@@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 from skip_if_emulation import *
 from skip_gnuk_only_tests import *
 from card_test_personalize_admin_less import *
--- a/tests/test_006_pso.py
+++ b/tests/test_006_pso.py
@@ -0,0 +1,9 @@
 from skip_if_gnuk import *
 from card_test_ed25519 import *
 from card_test_x25519 import *
 from card_test_ansix9p256r1 import *
 from card_test_ansix9p384r1 import *
 from card_test_ansix9p512r1 import *
 from card_test_brainpoolp256r1 import *
 from card_test_brainpoolp384r1 import *
 from card_test_brainpoolp512r1 import *
--- a/tests/test_009_keygen.py
+++ b/tests/test_009_keygen.py
@@ -20,5 +20,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 from skip_if_emulation import *
 from card_test_keygen import *
 from card_test_remove_keys import *
--- a/tests/test_021_personalize_admin_less.py
+++ b/tests/test_021_personalize_admin_less.py
@@ -1 +1,5 @@
-from test_005_personalize_admin_less import *
+from skip_gnuk_only_tests import *
 from card_test_personalize_admin_less import *
 from card_test_personalize_reset import *
 from card_test_remove_keys import *
 from card_test_reset_pw3 import *
--- a/tool/gnuk-emulation-setup
+++ b/tool/gnuk-emulation-setup
@@ -1,48 +0,0 @@
 #! /bin/sh
 #
 # gnuk-emulation-setup - Generate flash image for Gnuk
 #
 # Copyright (C) 2017  Free Software Initiative of Japan
 # Author: NIIBE Yutaka <gniibe@fsij.org>
 #
 # This file is a part of Gnuk, a GnuPG USB Token implementation.
 #
 # Gnuk is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # Gnuk is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 if test "$1" = "--help"; then
    echo "Usage:"
    echo "	$0 [output-file]"
    echo "		Generate Gnuk flash image"
    echo "	$0 --help"
    echo "		Show this message"
    exit 0
 fi
 OUTPUT_FILE=${1:-$HOME/.gnuk-flash-image}
 # Generate 8192-byte flash data into OUTPUT_FILE
 exec > $OUTPUT_FILE
 for i in $(seq 512); do
    /bin/echo -n -e '\xff\xff\xff\xff\xff\xff\xff\xff'
 done
 /bin/echo -n -e '\x00\x00\xff\xff\xff\xff\xff\xff'
 for i in $(seq 511); do
    /bin/echo -n -e '\xff\xff\xff\xff\xff\xff\xff\xff'
 done
 chmod og-rw $OUTPUT_FILE
--- a/tool/gnuk_get_random.py
+++ b/tool/gnuk_get_random.py
@@ -11,7 +11,7 @@ if __name__ == '__main__':
    looping = (len(sys.argv) > 1)
    while True:
        try:
-            challenge = gnuk.cmd_get_challenge().tostring()
+            challenge = gnuk.cmd_get_challenge().tobytes()
        except Exception as e:
            print(count)
            raise e
--- a/tool/gnuk_put_binary_libusb.py
+++ b/tool/gnuk_put_binary_libusb.py
@@ -1,10 +1,10 @@
-#! /usr/bin/python
+#! /usr/bin/python3
 """
 gnuk_put_binary.py - a tool to put binary to Gnuk Token
 This tool is for importing certificate, writing serial number, etc.
-Copyright (C) 2011, 2012 Free Software Initiative of Japan
+Copyright (C) 2011, 2012, 2021 Free Software Initiative of Japan
 Author: NIIBE Yutaka <gniibe@fsij.org>
 This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -56,7 +56,7 @@ def main(fileid, is_update, data, passwd):
    if fileid == 0:
        data_in_device = gnuk.cmd_get_data(0x00, 0x4f)
        print(' '.join([ "%02x" % d for d in data_in_device ]))
-        compare(data + b'\x00\x00', data_in_device[8:].tostring())
+        compare(data + b'\x00\x00', data_in_device[8:].tobytes())
    elif fileid >= 1 and fileid <= 4:
        data_in_device = gnuk.cmd_read_binary(fileid)
        compare(data, data_in_device)
--- a/tool/gnuk_remove_keys_libusb.py
+++ b/tool/gnuk_remove_keys_libusb.py
@@ -1,9 +1,9 @@
-#! /usr/bin/python
+#! /usr/bin/python3
 """
 gnuk_remove_keys_libusb.py - a tool to remove keys in Gnuk Token
-Copyright (C) 2012, 2018 Free Software Initiative of Japan
+Copyright (C) 2012, 2018, 2021 Free Software Initiative of Japan
 Author: NIIBE Yutaka <gniibe@fsij.org>
 This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -51,7 +51,7 @@ def main(passwd):
        gnuk.icc_power_on()
    gnuk.cmd_select_openpgp()
    # Compute passwd data
-    kdf_data = gnuk.cmd_get_data(0x00, 0xf9).tostring()
+    kdf_data = gnuk.cmd_get_data(0x00, 0xf9).tobytes()
    if kdf_data == b"":
        passwd_data = passwd.encode('UTF-8')
    else:
--- a/tool/gnuk_token.py
+++ b/tool/gnuk_token.py
@@ -31,6 +31,7 @@ USB_PRODUCT_LIST=[
    { 'vendor' : 0x234b, 'product' : 0x0000 }, # FSIJ Gnuk Token
    { 'vendor' : 0x20a0, 'product' : 0x4211 }, # Nitrokey Start
    { 'vendor' : 0x1209, 'product' : 0x2440 }, # GnuPG e.V.
    { 'vendor' : 0x1337, 'product' : 0x0010 }, # DTS Gnuk Token
 ]
 # USB class, subclass, protocol
@@ -88,11 +89,17 @@ class gnuk_token(object):
                        alt.interfaceSubClass == HID_SUBCLASS_NO_BOOT and \
                        alt.interfaceProtocol == HID_PROTOCOL_0:
                    self.__hid_intf = alt.interfaceNumber
                elif alt.interfaceClass == CCID_CLASS and \
                        alt.interfaceSubClass == CCID_SUBCLASS and \
                        alt.interfaceProtocol == CCID_PROTOCOL_0:
                    for endpoint in alt.endpoints:
                        if endpoint.type == usb.ENDPOINT_TYPE_BULK:
                            if endpoint.address & usb.ENDPOINT_DIR_MASK == usb.ENDPOINT_IN:
                                self.__bulkin = endpoint.address
                            else:
                                self.__bulkout = endpoint.address
-        self.__bulkout = 1
+        self.__timeout = 100000
        self.__bulkin  = 0x81
        self.__timeout = 10000
        self.__seq = 0
    def get_string(self, num):
--- a/tool/gnuk_upgrade.py
+++ b/tool/gnuk_upgrade.py
@@ -1,9 +1,9 @@
-#! /usr/bin/python
+#! /usr/bin/python3
 """
 gnuk_upgrade.py - a tool to upgrade firmware of Gnuk Token
-Copyright (C) 2012, 2015  Free Software Initiative of Japan
+Copyright (C) 2012, 2015, 2021  Free Software Initiative of Japan
 Author: NIIBE Yutaka <gniibe@fsij.org>
 This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -70,7 +70,7 @@ def gpg_sign(keygrip, hash):
        raise ValueError(binascii.hexlify(signed))
    return signed
-def main(keyno,keygrip, data_regnual, data_upgrade):
+def main(keyno, keygrip, data_regnual, data_upgrade):
    l = len(data_regnual)
    if (l & 0x03) != 0:
        data_regnual = data_regnual.ljust(l + 4 - (l & 0x03), b'\x00')
@@ -91,7 +91,7 @@ def main(keyno,keygrip, data_regnual, data_upgrade):
    elif icc.icc_get_status() == 1:
        icc.icc_power_on()
    icc.cmd_select_openpgp()
-    challenge = icc.cmd_get_challenge().tostring()
+    challenge = icc.cmd_get_challenge().tobytes()
    signed = gpg_sign(keygrip, binascii.hexlify(challenge))
    icc.cmd_external_authenticate(keyno, signed)
    icc.stop_gnuk()
@@ -107,17 +107,19 @@ def main(keyno,keygrip, data_regnual, data_upgrade):
    del icc
    icc = None
    #
    print("Wait 3 seconds...")
    time.sleep(3)
    # Then, send upgrade program...
    reg = None
-    for dev in gnuk_devices_by_vidpid():
+    print("Waiting for device to appear:")
-        try:
+    while reg == None:
-            reg = regnual(dev)
+        print("  Wait {} second{}...".format(wait_e, 's' if wait_e > 1 else ''))
-            print("Device: %d" % dev.filename)
+        time.sleep(wait_e)
-            break
+        for dev in gnuk_devices_by_vidpid():
-        except:
+            try:
-            pass
+                reg = regnual(dev)
                print("Device: %s" % dev.filename)
                break
            except:
                pass
    # Then, send upgrade program...
    mem_info = reg.mem_info()
    print("%08x:%08x" % mem_info)
    print("Downloading the program")
--- a/tool/stlinkv2.py
+++ b/tool/stlinkv2.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python3
 """
 stlinkv2.py - a tool to control ST-Link/V2
--- a/tool/upgrade_by_passwd.py
+++ b/tool/upgrade_by_passwd.py
@@ -1,10 +1,10 @@
-#! /usr/bin/python
+#! /usr/bin/python3
 """
 upgrade_by_passwd.py - a tool to install another firmware for Gnuk Token
                       which is just shipped from factory
-Copyright (C) 2012, 2013, 2015, 2018
+Copyright (C) 2012, 2013, 2015, 2018, 2021
              Free Software Initiative of Japan
 Author: NIIBE Yutaka <gniibe@fsij.org>
@@ -52,7 +52,7 @@ def main(wait_e, keyno, passwd, data_regnual, data_upgrade):
    gnuk.cmd_select_openpgp()
    # Compute passwd data
    try:
-        kdf_data = gnuk.cmd_get_data(0x00, 0xf9).tostring()
+        kdf_data = gnuk.cmd_get_data(0x00, 0xf9).tobytes()
    except:
        kdf_data = b""
    if kdf_data == b"":
@@ -70,7 +70,7 @@ def main(wait_e, keyno, passwd, data_regnual, data_upgrade):
    gnuk.cmd_write_binary(1+keyno, rsa_raw_pubkey, False)
    gnuk.cmd_select_openpgp()
-    challenge = gnuk.cmd_get_challenge().tostring()
+    challenge = gnuk.cmd_get_challenge().tobytes()
    digestinfo = binascii.unhexlify(SHA256_OID_PREFIX) + challenge
    signed = rsa.compute_signature(rsa_key, digestinfo)
    signed_bytes = rsa.integer_to_bytes_256(signed)
@@ -128,26 +128,53 @@ if __name__ == '__main__':
    keyno = 0
    passwd = None
    wait_e = DEFAULT_WAIT_FOR_REENUMERATION
-    while len(sys.argv) > 3:
+    skip_check = False
    while len(sys.argv) > 1:
        option = sys.argv[1]
        sys.argv.pop(1)
        if option == '-f':      # F for Factory setting
            sys.argv.pop(1)
            passwd = DEFAULT_PW3
        elif option == '-e':    # E for Enumeration
            sys.argv.pop(1)
            wait_e = int(sys.argv[1])
            sys.argv.pop(1)
        elif option == '-k':    # K for Key number
            sys.argv.pop(1)
            keyno = int(sys.argv[1])
            sys.argv.pop(1)
        elif option == '-s':    # S for skip the check of target
            sys.argv.pop(1)
            skip_check = True
        else:
-            raise ValueError("unknown option", option)
+            if option[0] == '-':
                raise ValueError("unknown option", option)
            else:
                break
    if not passwd:
        passwd = getpass("Admin password: ")
-    filename_regnual = sys.argv[1]
+    if len(sys.argv) > 1:
-    filename_upgrade = sys.argv[2]
+      filename_regnual = sys.argv[1]
      filename_upgrade = sys.argv[2]
    else:
      filename_regnual = "../regnual/regnual.bin"
      filename_upgrade = "../src/build/gnuk.bin"
    if not filename_regnual.endswith('bin') or not filename_upgrade.endswith('bin'):
        print("Both input files must be in binary format (*.bin)!")
        exit(1)
    if not skip_check:
        # More checks
        gnuk = get_gnuk_device()
        u_target = gnuk.get_string(5).split(b':')[0].decode('UTF-8')
        del gnuk
        f = open("../src/usb-strings.c.inc","r")
        config_str = f.read()
        f.close()
        conf_options=config_str[config_str.find('/* configure options: "')+23:]
        target=conf_options[:conf_options.find(':')]
        if target != u_target:
            print("Target", target, "!= device info from USB " , u_target)
            exit(1)
    #
    f = open(filename_regnual,"rb")
    data_regnual = f.read()
    f.close()
Author	SHA1	Message	Date
Deon Spengler	2519f799fd	Default acknowledgement button to yes	2022-07-30 13:29:09 +02:00
Deon Spengler	32f563a28d	Add chopstx update for ST-Dongle	2022-07-30 13:15:50 +02:00
Deon Spengler	7b471948b4	How to reflash st-link	2022-07-30 12:55:04 +02:00
Deon Spengler	d2363c8ad8	Add DTS token	2022-07-30 12:40:24 +02:00
Deon Spengler	9306ad5043	Update how to flash firmware	2022-07-19 10:49:50 +02:00
Deon Spengler	54d031bc27	Remove docker as I will not be maintaning it	2022-07-19 10:42:06 +02:00
Deon Spengler	6909e0359c	Add VID/PID	2022-07-19 10:39:40 +02:00
Deon Spengler	5acd8a23d9	Change serial	2022-07-19 10:39:11 +02:00
Deon Spengler	d5a539986e	Correct OpenPGP version	2022-07-19 10:29:44 +02:00
Deon Spengler	8a19a2cb66	Update openocd documentation	2022-07-18 23:38:33 +02:00
Deon Spengler	5e4a264ac0	Update readme	2022-07-17 23:02:30 +02:00
Deon Spengler	a9079e8b5c	Update readme	2022-07-17 22:41:25 +02:00
Deon Spengler	057920600f	Update readme	2022-07-17 12:39:26 +02:00
Deon Spengler	7d1b5e4b71	Update readme	2022-07-17 12:28:58 +02:00
Deon Spengler	fe66b67317	Update readme	2022-07-17 12:25:42 +02:00
Deon Spengler	14f0acd749	Update readme	2022-07-17 12:20:41 +02:00
Deon Spengler	9ccbd5804a	Update readme	2022-07-17 12:14:38 +02:00
Deon Spengler	b4b82e1557	Update readme	2022-07-17 11:52:09 +02:00
Deon Spengler	357a4b3510	Update readme	2022-07-17 11:44:42 +02:00
Deon Spengler	1fdb74eb10	Update readme	2022-07-17 10:57:37 +02:00
Deon Spengler	977a09f69f	Update readme	2022-07-17 10:49:35 +02:00
Deon Spengler	cd271fbeb5	Update readme	2022-07-17 01:31:11 +02:00
Deon Spengler	7e17548610	Update readme	2022-07-17 01:28:57 +02:00
Deon Spengler	fd7a7c7dfa	Update build section in README	2022-07-17 01:00:38 +02:00
Deon Spengler	8de235b26f	Don't set default VID:PID	2022-07-17 00:57:08 +02:00
Deon Spengler	53cbb62738	Update readme	2022-07-17 00:47:47 +02:00
Deon Spengler	511f6de8b1	Change default configuration	2022-07-17 00:00:54 +02:00
Deon Spengler	0132723c7a	Move license info into root of project	2022-07-16 23:59:01 +02:00
Deon Spengler	a37f7aca5c	Update readme	2022-07-16 23:52:00 +02:00
Deon Spengler	531be827dd	Remove unnecessary svg	2022-07-16 23:44:27 +02:00
Deon Spengler	d6c040400a	Update readme	2022-07-16 23:28:47 +02:00
Deon Spengler	b8ada80163	Remove redundant files	2022-07-16 21:46:55 +02:00
Deon Spengler	1d63372017	Remove old ChangeLog	2022-07-16 21:24:23 +02:00
Deon Spengler	8dfbf63452	Fix compile bug when acknowledgement button is disabled	2022-07-16 20:56:25 +02:00
Deon Spengler	b9f6c3be7a	Update submodule url	2022-07-16 20:05:23 +02:00
NIIBE Yutaka	9d3c08bd2b	Version 1.2.20. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2022-04-22 11:19:41 +09:00
NIIBE Yutaka	a909502388	Update Chopstx to 1.21. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2022-04-22 11:17:22 +09:00
NIIBE Yutaka	286b620648	Fix for address calculation and access to object on memory. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2022-04-22 10:36:13 +09:00
Bertrand Jacquin	cce65c6d34	regnual: remove duplicate type declaration.	2022-03-29 15:11:24 +09:00
NIIBE Yutaka	57fdadf283	Version 1.2.19. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-10-12 11:42:44 +09:00
NIIBE Yutaka	870de72ee2	configure: Allow override of kdf_do variable. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-10-11 11:51:55 +09:00
NIIBE Yutaka	fa667b04f7	configure: Add KDF configuration. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-07-01 13:43:42 +09:00
Bertrand Jacquin	2a72f3df08	regnual: add missing header regnual.c:32:1: note: ‘memset’ is declared in header ‘<string.h>’	2021-06-15 10:56:57 +09:00
NIIBE Yutaka	db2527459f	Fix scripts. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-06-10 14:31:45 +09:00
NIIBE Yutaka	1ca3bbdaae	Fix for key attributes (long standing bug). Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-04-30 13:55:52 +09:00
NIIBE Yutaka	98119dc991	Version 1.2.18. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-04-02 16:58:04 +09:00
NIIBE Yutaka	03cca1e451	Write ChangeLog entries and AUTHORS. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-04-02 16:53:56 +09:00
NIIBE Yutaka	3f65bf73e8	Add a check to make sure device is the one intended. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-04-01 16:23:39 +09:00
NIIBE Yutaka	07be37f45e	Fix tests for Gnuk emulation (skip test with no KDF setup). Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-03-19 17:37:32 +09:00
Vincent Pelletier	dcef6e0ffa	tests/card_test_personalize_card.py: Exercise ECDH, X25519 and ED25519. ECDH curves exercised are OpenPGP recommended set: ANSIx9p{256,384,521}r1 and BRAINPOOLp{256,384,512}r1, plus X25519 and ED25519. Signature is only tested (for now ?) with ED25519 as other signature schemes are (usually) non-deterministic and require implementing the signature verification algorithm rather than just testing for equality with a test vector. Signed-off-by: Vincent Pelletier <plr.vincent@gmail.com>	2021-03-19 16:09:03 +09:00
NIIBE Yutaka	d31687ebd6	Fix typo of configure. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-03-12 12:07:57 +09:00
NIIBE Yutaka	92443f8f07	Fix previous change. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-03-12 03:00:44 +09:00
NIIBE Yutaka	4af98308e0	Version 1.2.17. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-02-25 15:46:02 +09:00
NIIBE Yutaka	baec3a1c1e	Fix the previous commit.	2021-02-25 14:26:31 +09:00
NIIBE Yutaka	4f1325794d	Require KDF Data Object for GNU/Linux emulation. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-02-22 10:52:44 +09:00
NIIBE Yutaka	0acf6485ae	Prepare next release. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-02-19 16:37:08 +09:00
NIIBE Yutaka	4d15700580	Python3 update things. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-02-19 13:12:48 +09:00
NIIBE Yutaka	8822fcae77	Update AUTHORS. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-02-19 12:07:15 +09:00
NIIBE Yutaka	20a2f99691	Update Chopstx. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-02-19 12:07:02 +09:00
NIIBE Yutaka	acfccb729d	Add changelog entries. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-02-18 16:00:13 +09:00
Vincent Pelletier	5283506755	tests/card_reader.py: Ignore CCID devices which report card absence. Helps running tests on computers which have a "real" card reader in addition to the ICC to be tested.	2021-02-18 14:42:47 +09:00
Vincent Pelletier	c688df7c2c	{tests/card_reader.py,tool/gnuk_token.py}: Extend timeout. Some devices are slow at generating RSA4096 after a key settings change, and may take time to notice a later change to a shorter key size. Signed-off-by: Vincent Pelletier <plr.vincent@gmail.com>	2021-02-18 14:28:32 +09:00
Vincent Pelletier	594896ac57	test/feature/202_setup_passphease.feature: Fix expected PW1 value. Since 040_passphrase_change.feature, PW1 has this value and not the reset default. Signed-off-by: Vincent Pelletier <plr.vincent@gmail.com>	2021-02-18 14:28:27 +09:00
Vincent Pelletier	dfe046e08d	tool/gnuk_token.py: Detect CCID bulk endpoints addresses. Signed-off-by: Vincent Pelletier <plr.vincent@gmail.com>	2021-02-18 14:28:23 +09:00
Vincent Pelletier	c66b01e74b	test{,s}/rka_keys.py: Add missing char escape specifiers. Removes a 2-bytes trailer to the private key template, fitting in the 2-bytes length (which itself lacked an hexadecimal escape specifier, but without effect on the result). Fixes the length of the DigestInfo outermost list, from 25 to the intended 49. Signed-off-by: Vincent Pelletier <plr.vincent@gmail.com>	2021-02-18 14:28:17 +09:00
NIIBE Yutaka	21a46306ae	Make GNU/Linux emulation work again, with initialization support. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2021-02-18 14:04:21 +09:00
`@@ -1 +1,2 @@`
		`from skip_if_emulation import *`
	`from card_test_personalize_card import *`	`from card_test_personalize_card import *`
`@@ -1 +1,2 @@`
		`from skip_if_emulation import *`
	`from card_test_personalize_reset import *`	`from card_test_personalize_reset import *`
`@@ -1 +1,2 @@`
		`from skip_if_emulation import *`
	`from card_test_remove_keys import *`	`from card_test_remove_keys import *`
`@@ -1 +1,2 @@`
		`from skip_if_emulation import *`
	`from card_test_reset_pw3 import *`	`from card_test_reset_pw3 import *`