Version 1.1.7

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "chopstx"]
 	path = chopstx
-	url = git@gitorious.org:chopstx/chopstx.git
+	url = ../../chopstx/chopstx.git

AUTHORS

@@ -1,35 +1,10 @@
 Kaz Kojima:
-    Added STM32 Primer2 support:
-	boards/STM32_PRIMER2/board.c
-	boards/STM32_PRIMER2/board.h
-	boards/STM32_PRIMER2/mcuconf.h
+    Added STM32 Primer2 support.
 
 NIIBE Yutaka:
     Founder of the project.
-    Added FST_01 support:
-	boards/FST_01/board.c
-	boards/FST_01/board.h
-	boards/FST_01/mcuconf.h
-    Added FST_01_00 support:
-	boards/FST_01_00/board.c
-	boards/FST_01_00/board.h
-	boards/FST_01_00/mcuconf.h
-    Added STBee support:
-	boards/STBEE/board.c
-	boards/STBEE/board.h
-	boards/STBEE/mcuconf.h
-    Added STM8S Discovery Kit support:
-	boards/STM8S_DISCOVERY/board.c
-	boards/STM8S_DISCOVERY/board.h
-	boards/STM8S_DISCOVERY/mcuconf.h
-    Added STBee Mini support:
-	boards/STBEE_MINI/board.c
-	boards/STBEE_MINI/board.h
-	boards/STBEE_MINI/mcuconf.h
-    Added CQ STARM support:
-	boards/CQ_STARM/board.c
-	boards/CQ_STARM/board.h
-	boards/CQ_STARM/mcuconf.h
+    Wrote tools for STLink/V2:
+	tool/stlinkv2.py
     Wrote tools for DfuSe:
 	tool/dfuse.py
 	tool/dump_mem.py

ChangeLog

@@ -1,3 +1,713 @@
+2015-08-05  Niibe Yutaka  <gniibe@fsij.org>
+
+	* VERSION: 1.1.7.
+
+2015-08-04  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/adc_stm32f103.c: Update from NeuG 1.0.3.
+
+	* chopstx: Update to 0.08.
+	* src/sys.h: Update.
+
+2015-08-03  Niibe Yutaka  <gniibe@fsij.org>
+
+	* test/features/steps.py (set_msg): Python3 fix.
+	* test/generate_keys.py: Likewise.
+	* test/rsa_keys.py: Likewise.
+
+	* tool/gnuk_token.py (gnuk_token.download, gnuk_token.execute)
+	(regnual.download): Python3 fix.
+	(list_to_string): Remove.
+
+	* tool/upgrade_by_passwd.py (maian): Python3 fix.
+	* tool/usb_strings.py (main): Python3 fix.
+
+2015-07-31  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/configure (output_vendor_product_serial_strings): Fix sed
+	script when string is short.  Remove empty line.
+
+	* regnual/regnual.c (usb_cb_ctrl_write_finish, usb_cb_setup)
+	(usb_cb_get_descriptor, usb_cb_interface): Follow the change
+	of USB API.
+
+	* tool/stlinkv2.py: Support ST-Link/V2-1.
+
+2015-07-28  Niibe Yutaka  <gniibe@fsij.org>
+
+	* tool/stlinkv2.py: Fix for Python3.  Thanks to Bertrand Jacquin.
+
+	* tool/gpg_agent.py: Fix for Python3.
+
+	* src/usb-msc.c: Update from Fraucheky.
+
+	* src/usb_stm32f103.c (struct DATA_INFO): Remove offset.
+	(struct DEVICE_INFO): Integrate CONTROL_INFO.
+
+2015-07-27  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/usb_stm32f103.c (usb_lld_reply_request): New.
+	(usb_lld_set_data_to_send): Remove.
+	(usb_lld_set_data_to_recv): Not a macro but a function.
+	(std_get_status): Don't use statically allocated memory.
+	(std_get_configuration): Use usb_lld_reply_request.
+	(handle_setup0): Follow the change.
+	* src/usb_ctrl.c (vcom_port_data_setup, usb_cb_setup)
+	(usb_cb_interface): Use	usb_lld_reply_request.
+	* src/usb_desc.c (usb_cb_get_descriptor): Likewise.
+
+2015-07-24  Niibe Yutaka  <gniibe@fsij.org>
+
+	* tool/gnuk_put_binary.py: Remove.
+	* tool/gnuk_remove_keys.py: Remove.
+
+2015-07-23  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/configure (nl): New.  Follow the change of NeuG.
+
+2015-07-21  Niibe Yutaka  <gniibe@fsij.org>
+
+	* VERSION: 1.1.6.
+
+2015-07-20  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/openpgp-do.c (gpg_do_keygen): Support ECC.
+	* src/call-ec.c (ecc_check_secret): New.
+	* src/ecc.c (check_secret): New.
+
+2015-07-18  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/configure (keygen): It's always enabled.
+	* src/openpgp-do.c (gpg_do_keygen): Support key generation.
+	* src/openpgp.c (cmd_pgp_gakp): Likewise.
+	* src/call-rsa.c (rsa_genkey): Likewise.
+	* src/random.c (random_gen):  Likewise.
+	* src/Makefile.in (KEYGEN_SUPPORT): Remove.
+	* polarssl/include/polarssl/config.h (POLARSSL_GENPRIME): Define.
+
+2015-07-16  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/configure (FLASH_PAGE_SIZE, FLASH_SIZE, MEMORY_SIZE)
+	[sys1_compat]: Use safe values for common binary.
+	(TARGET_DEFINE): Remove.
+
+2015-07-15  Niibe Yutaka  <gniibe@fsij.org>
+
+	* tool/usb_strings.py (field): Add 'Board'.
+
+	* regnual/regnual.c (usb_cb_get_descriptor): Update.
+	* src/usb_ctrl.c (usb_cb_interface): Call usb_lld_write.
+	* src/usb_desc.c (usb_cb_get_descriptor): Support sys_board_name,
+	using usb_lld_write.
+	* src/usb_lld.h (usb_cb_get_descriptor): Add last argument length
+	for asked length.
+	* src/usb_stm32f103.c (handle_setup0): Allow setup callback to
+	call usb_lld_write with ENDP0.
+	* src/usb_conf.h (NUM_STRING_DESC): Remove.
+
+	* src/configure [!sys1_compat] (CONFIG): Don't include target
+	board name.
+
+	* src/flash.c: Detect flash_page_size at runtime.
+
+	* src/main.c: Remove dependency to board.h.
+
+	* src/neug.c: Update from NeuG 1.0.2.
+	* src/adc_stm32f103.c: Update.
+
+	* chopstx: Update to 0.07.
+	* src/sys.c: Update.
+	* src/sys.h: Update.
+	* src/gnuk.ld.in: Update.
+
+	* tool/stlinkv2.py (stlinkv2.get_chip_id): New.  Detect flash
+	size, too.
+	(main): Call stlinkv2.get_chip_id after MCU reset and stop.
+	Verify read out fix.
+
+2015-07-11  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/configure (help): Add STM32_PRIMER2 and CQ_STARM.
+
+	* chopstx: Update to 0.06.
+
+	* tool/stlinkv2.py: Support 512kB version of STM32F103.
+	The size of executable file should be even.
+
+2015-07-07  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/Makefile.in (CSRC): Add ecc-mont.c.
+
+	* src/ecc-mont.c (mod25638_mul_121665): Fix.
+	(ecdh_compute_public_25519, ecdh_decrypt_curve25519): New.
+
+	* src/openpgp.c (cmd_pso): Support ALGO_CURVE25519.
+
+	* src/openpgp-do.c (algorithm_attr_cv25519): New.
+	(rw_algorithm_attr, get_algo_attr_data_object)
+	(gpg_get_algo_attr_key_size, gpg_do_write_prvkey)
+	(proc_key_import, gpg_do_public_key): Support ALGO_CURVE25519.
+
+	* src/gnuk.h (ALGO_CURVE25519): New.
+
+2015-07-06  Niibe Yutaka  <gniibe@fsij.org>
+
+	Enhancement for FSM-55.
+	* tool/stlinkv2.py (stlinkv2.control_nrst): New.
+	(stlinkv2.get_rdp_key,has_spi_flash,has_protection): New.
+	(stlinkv2.get_core_id): Rename.
+	(stlinkv2.blank_check): Use self.flash_size.
+	(stlinkv2.start): Call control_nrst.  Call get_core_id.
+	Distinguishing chip, and set rdp_key, flash_size and require_nrst.
+	(stlinkv2.flash_write): Use self.flash_block_size.
+	(main): Call control_nrst.
+	(prog_flash_write_body, prog_option_bytes_write_body)
+	(prog_blank_check_body): Support Cortex-M0.
+	(main): Call API V2 halt twice.
+	* tool/asm-thumb/*.S: Updated for Cortex-M0.
+
+2015-06-30  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/sys.c: Update from chopstx/example-cdc/sys.c.
+
+	* src/main.c (device_initialize_once): Apply change of NeuG.
+
+2015-06-03  Niibe Yutaka  <gniibe@fsij.org>
+
+	* VERSION: 1.1.5.
+
+	* test/ecc_nistp256_keys.py: New.
+
+	* tool/upgrade_by_passwd.py: Remove -p option and add -f option.
+
+	* tool/gnuk_token.py (gnuk_token.download): Add verbose flag.
+	(regnual.download): Ditto.
+
+	* tool/gnuk_upgrade.py: Use gnuk_token module.
+
+2015-06-02  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/openpgp.c (cmd_pso): Support OpenPGPcard spec v3.0.
+
+2015-04-20  Niibe Yutaka  <gniibe@fsij.org>
+
+	* chopstx: Upgrade to 0.05.
+
+2015-04-19  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/gnuk.h (CCID_CARD_INIT): New.
+	* src/usb_desc.c (gnukConfigDescriptor): Update dwDefaultClock,
+	dwMaximumClock,	dwFeatures, and bClassEnvelope.
+	* src/usb_ctrl.c (freq_table): Change the value to 4000MHz.
+	(usb_cb_handle_event): Call ccid_card_change_signal after configure.
+	* src/usb-icc.c (ccid_thread): Change EV_CARD_CHANGE handling.
+
+2015-04-18  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/main.c (main): Call chopstx_main_init.
+	* src/Makefile.in (DEFS): Remove CHX_PRIO_MAIN.
+
+2015-04-17  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/configure: Fix shell syntax.
+
+2015-03-31  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/usb_conf.h (ICC_NUM_INTERFACES, HID_NUM_INTERFACES)
+	(HID_NUM_INTERFACES, VCOM_NUM_INTERFACES, MSC_NUM_INTERFACES)
+	(NUM_INTERFACES): Define here (moved from usb_desc.c).
+	(ICC_INTERFACE, HID_INTERFACE, VCOM_INTERFACE_0, VCOM_INTERFACE_1)
+	(MSC_INTERFACE): New.
+	* src/usb_ctrl.c (gnuk_setup_endpoints_for_interface)
+	(usb_cb_setup, usb_cb_ctrl_write_finish): Use *_INTERFACE.
+	* src/usb_desc.c (gnukConfigDescriptor): Likewise.
+
+2015-03-06  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/ecc-edwards.c (eddsa_sign_25519): Return 0.
+
+2015-02-25  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/openpgp.c (cmd_internal_authenticate): Fix storing to
+	res_APDU_size.
+
+2015-02-10  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/openpgp.c (cmd_pso): Fix counter update for EdDSA.  Thanks
+	to Jonathan Schleifer.
+
+	* src/call-rsa.c (rsa_sign): Don't set res_APDU_len.
+	(rsa_decrypt): Likewise, but get OUTPUT_LEN_P as an argument.
+
+2015-02-09  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/openpgp.c (cmd_pso): Fix EdDSA. Use GPG_KEY_FOR_SIGNING.
+
+2014-12-15  Niibe Yutaka  <gniibe@fsij.org>
+
+	* VERSION: 1.1.4.
+
+2014-12-13  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/flash.c (flash_key_getpage, flash_key_release_page): New.
+
+	* src/openpgp-do.c (gpg_do_delete_prvkey): New arg.
+	(rw_algorithm_attr): Call gpg_do_delete_prvkey with CLEAN_PAGE_FULL.
+
+2014-12-12  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/Makefile.in (build/bignum.o): Specific OPT for this target.
+
+	* src/configure (target): Default is FST-01.
+	(--with-dfu): FST-01 doesn't have DFU.  If set, it must be
+	mistake.
+
+	* boards/STBEE_MINI: Remove, since it is now supported by Chopstx.
+
+	* test/features/802_get_data_static.feature: Reflect the change
+	of extended capabilities.
+	* test/features/402_get_data_static.feature: Ditto.
+	* test/features/002_get_data_static.feature: Ditto.
+
+	* test/features/003_keyattr_change.feature: New test.
+
+	* src/usb_lld.h: Don't use 'extern' for function declarations.
+	* src/usb-icc.c (end_cmd_apdu_data): Fix Le handling.
+
+2014-12-11  Niibe Yutaka  <gniibe@fsij.org>
+
+	* chopstx: Upgrade to 0.04.
+	* src/syc.c: Update from 0.04.
+
+2014-12-10  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/ecc-cdh.c: Remove as smartcard only does
+	a part of ECDH computation as gpg-agent does.
+
+	* src/chconf.h, src/halconf.h: Remove files needed for ChibiOS/RT.
+
+2014-12-09  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/call-ec.c (ecc_compute_public): Rename, as we share
+	same routine among ECDSA and ECDH.
+	(ecdh_decrypt): New.
+
+2014-12-09  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/ecc.c (compute_kP): Bug fix.  It's P, not G.
+	(point_is_on_the_curve): Bug fix.
+
+2014-12-03  Niibe Yutaka  <gniibe@fsij.org>
+
+	Changes for RSA-4096.
+
+	* src/gnuk.h (MAX_CMD_APDU_DATA_SIZE, MAX_RES_APDU_DATA_SIZE):
+	Send/Recv buffer should be bigger.
+	* polarssl/library/bignum.c (mpi_exp_mod): Don't consume much.
+	* polarssl/library/rsa.c (rsa_rsaes_pkcs1_v15_decrypt): buffer
+	allocation size should be variable.
+
+2014-12-01  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/Makefile.in (DEFS): Don't define compile time preference of
+	key algo attributes.
+
+	* src/openpgp-do.c (proc_key_import): Support modifiable key algo
+	attributes.
+
+2014-11-21  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/gnuk.h (ALGO_RSA4K, ALGO_NISTP256R1, ALGO_SECP256K1)
+	(ALGO_ED25519, ALGO_RSA2K): New.
+	(struct key_data_internal): Move to ...
+	* src/openpgp-do.c (struct key_data_internal): ... here.
+	(CHECKSUM_ADDR, kdi_len): New.
+	(CKDC_CALC, CKDC_CHECK): New.
+	(compute_key_data_checksum): Add arg PRVKEY_LEN.
+	(gpg_do_load_prvkey, gpg_do_delete_prvkey): Support modifiable key
+	algo attributes.
+	(gpg_do_write_prvkey, gpg_do_public_key, gpg_do_keygen): Likewise.
+	(gpg_do_clear_prvkey): Use MAX_PRVKEY_LEN.
+
+	* src/openpgp.c (gpg_init): Call flash_init_keys after
+	gpg_data_scan.
+	(cmd_pso): Support modifiable key algo attributes.
+	(cmd_internal_authenticate): Likewise.
+
+2014-11-21  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/openpgp-do.c (algorithm_attr_rsa2k): Rename from *_rsa.
+	(algorithm_attr_rsa4k): New.
+	(get_algo_attr_pointer, kk_to_nr, gpg_get_algo_attr)
+	(get_algo_attr_data_object, gpg_get_algo_attr_key_size): New.
+	(rw_algorithm_attr): New.
+	(gpg_do_table): Register rw_algorithm_attr for GPG_DO_ALG_*.
+	(gpg_data_scan, gpg_data_copy): Handle algo attributes.
+
+	(rw_pw_status): Fix checking against redundant write.
+
+2014-11-20  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/openpgp-do.c (extended_capabilities): Key attributes can be
+	modifid now.
+
+2014-11-20  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/gnuk.h (NR_NONE, NR_DO__FIRST__): Remove.
+	(NR_DO_*): Redefine.
+	(NR_KEY_ALGO_ATTR_SIG, NR_KEY_ALGO_ATTR_DEC)
+	(NR_KEY_ALGO_ATTR_AUT): New.
+
+	* src/openpgp-do.c (gpg_do_load_prvkey, gpg_do_delete_prvkey)
+	(gpg_do_write_prvkey, gpg_do_chks_prvkey, gpg_data_scan)
+	(gpg_data_copy, gpg_do_read_simple)
+	(gpg_do_write_simple): Don't use NR_DO__FIRST__.
+	(gpg_do_put_data): Don't use NR_NONE any more.
+	(do_tag_to_nr): Use -1 to specify NONE.
+
+	* src/flash.c (flash_enum_clear, flash_enum_write_internal)
+	(flash_enum_write): New.
+
+2014-11-19  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/gnuk.h (FIRMWARE_UPDATE_KEY_CONTENT_LEN): New.
+	(size_of_key): New enum.
+
+	* src/openpgp.c (gpg_get_firmware_update_key)
+	(cmd_read_binary, cmd_external_authenticate): Use
+	FIRMWARE_UPDATE_KEY_CONTENT_LEN.
+
+	* src/flash.c (KEY_SIZE): Remove.
+	(key_available_at): Add new arg as KEY_SIZE.
+	(flash_check_all_other_keys_released): Likewise.
+	(flash_key_fill_zero_as_released, flash_key_release): Likewise.
+
+	(flash_init): Move initializing keys into another function.
+	(flash_init_keys): New function.
+
+	(flash_key_alloc): Use gpg_get_algo_attr_key_size.
+	(flash_key_write): Add new arg as KEY_DATA_LEN.
+
+	(flash_write_binary): Use FIRMWARE_UPDATE_KEY_CONTENT_LEN.
+
+2014-09-16  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/gnuk.h (MAX_PRVKEY_LEN): New.
+	(KEY_CONTENT_LEN): Remove.
+
+	* src/call-rsa.c (RSA_SIGNATURE_LENGTH): Remove.
+	(rsa_sign, rsa_verify, rsa_genkey): Add new arg: PUBKEY_LEN.
+	(rsa_decrypt): Don't use KEY_CONTENT_LEN.
+
+2014-06-19  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/ecc-mont.c (compute_nQ): Add comment.
+
+	* src/mod.c (mod_inv): Fix comment. X^-1 = 0 when X=0
+	is important for Montgomery curve computation.
+
+2014-06-05  Niibe Yutaka  <gniibe@fsij.org>
+
+	* tool/add_openpgp_authkey_from_gpgssh.py: New.
+
+2014-04-17  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/muladd_256.h (MULADD_256_ASM): New.
+	(MULADD_256): Use MULADD_256_ASM.
+	* src/ecc-mont.c (mod25638_mul_121665): Add asm implementation.
+
+	* src/bn.c (bn256_add_uint, bn256_sub_uint): Simplify.
+	* src/mod25638.c (mod25638_add, mod25638_sub): Simplify.
+	(n25638, add19): Remove.
+	(ADDWORD_256): Add s_ as source pointer.
+	(mod25519_reduce): Remove a call to memcpy.  Use bn256_add_uint.
+	* src/ecc-edwards.c (point_double): Simplify.
+
+2014-04-16  Niibe Yutaka  <gniibe@fsij.org>
+
+	* VERSION: 1.1.3.
+
+2014-04-15  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/ecc-mont.c: New.
+
+	* src/mod25638.c (p25519): Move from ecc-edwards.c.
+	(mod25519_reduce, add19): Likewise.
+	(mod25638_reduce) [!ASM_IMPLEMENTATION]: Use bn256_add_uint.
+
+2014-04-14  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/jpc.c (jpc_to_ac): Error check before mod_inv.
+
+	* src/mod.c (mod_inv): No return value (if N==0 returns ZERO).
+
+	* src/bn.c [BN256_NO_RANDOM]: Only include "random.h" if needed.
+
+2014-04-08  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/mod.c (mod_inv): Use MAX_GCD_STEPS_BN256.
+	Return failure or success.
+	* src/jpc.c (jpc_to_ac): Use mod_inv.
+	* src/modp256k1.c (modp256k1_inv): Remove.
+	* src/modp256r1.c (modp256r1_inv): Remove.
+
+2014-04-07  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/openpgp-do.c (algorithm_attr_ed25519): It's OID only.
+
+2014-04-03  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/ecc-edwards.c (eddsa_sign_25519): Change type of OUT.
+	* src/openpgp.c (cmd_internal_authenticate): Have a buffer.
+
+	* src/flash.c (flash_init): Fix key address finder.
+
+2014-04-02  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/openpgp-do.c (proc_key_import): Handle EdDSA.
+	(algorithm_attr_ed25519): Fix OID and add ID for SHA512.
+
+2014-04-01  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/ecc-edwards.c (eddsa_compute_public_25519): New.
+
+	* src/openpgp-do.c (algorithm_attr_ed25519): New.
+	(gpg_do_write_prvkey, proc_key_import, gpg_do_public_key): Add
+	EdDSA handling.
+
+2014-03-31  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/ecc-edwards.c (eddsa_sign_25519): Rename and API change.
+
+	* src/openpgp-do.c (gpg_do_load_prvkey, gpg_do_delete_prvkey)
+	(gpg_do_write_prvkey, gpg_do_public_key, gpg_do_keygen): Follow
+	the change of PRVKEY_DATA and KEY_DATA.
+
+	* src/flash.c (key_available_at): New.
+	(flash_init): Initilize KD.
+
+	* src/gnuk.h (struct prvkey_data): Remove member KEY_ADDR.
+	(struct key_data): Addd member KEY_ADDR.
+
+	* src/openpgp-do.c (gpg_do_keygen): Bug fix.  Reset the signature
+	counter when new key is generated.
+
+	* src/flash.c (flash_key_alloc): Change API, supply KK.
+
+2014-03-29  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/ecc-edwards.c (point_double, point_add): Rename.
+	(mod25519_reduce): New.
+
+2014-03-28  Niibe Yutaka  <gniibe@fsij.org>
+
+	* misc/t-eddsa.c (main): Update for new API of eddsa_25519.
+
+	* src/ecc-edwards.c (compute_kG_25519): Tune for 252-bit.
+	(eddsa_25519): Public key should be provided by caller.
+	(eddsa_public_key_25519): New.
+
+2014-03-27  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/ecc-edwards.c (ed_add_25638): Remove the third argument.
+	(compute_kG_25519): The curve is complete, we don't need to avoid
+	identity element as NIST curve or secp256k1 curve.
+	(eddsa_25519): Change the API, with A and the seed.
+
+2014-03-26  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/mod25638.c (mod25638_reduce): New.
+	(mod25638_mul, mod25638_sqr): Use mod25638_reduce.
+
+	* src/ecc-edwards.c (ptc_to_ac_25519): No need to subtract p25519.
+
+2014-03-25  Niibe Yutaka  <gniibe@fsij.org>
+
+	* misc/t-eddsa.c: New.
+
+	* src/ecc-edwards.c (bnX_mul_C, mod_reduce_M): New.
+	(eddsa_25519): New.
+
+2014-03-20  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/ecc-edwards.c (ed_add_25638): Fix for X == A.
+	(main): Compute pre-computed tables.
+	(precomputed_KG, precomputed_2E_KG): Add.
+	(compute_kG_25519): New.
+
+2014-03-19  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/bn.c (bn256_add): Fix for X == B.
+	(bn256_sub): Likewise.
+
+	* src/ecc-edwards.c: New.
+
+2014-03-18  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/mod25638.c (mod25638_add, mod25638_sub, mod25638_sqr)
+	(mod25638_shift): New.
+
+2014-03-13  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/mod25638.c: Rename from fe25519.c.
+	* src/mod25638.h: Likewise.
+
+2014-03-07  Niibe Yutaka  <gniibe@fsij.org>
+
+	* VERSION: 1.1.2.
+
+2014-02-25  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/openpgp-do.c (gpg_do_public_key): Don't put OID.
+
+	* src/configure [certdo] (gnuk.ld): Add TIM_SIZE and EXT_SIZE.
+	Thanks to Vasily Evseenko for the bug report.
+
+2014-02-21  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/ecc.c (compute_kG): Compute higer index at first.
+	(point_is_on_the_curve): Don't use coefficient_a if it's zero.
+
+	* src/jpc.c (jpc_double): Care coefficient A.
+
+	* src/ec_p256r1.c (COEFFICIENT_A_IS_MINUS_3): New.
+	* src/ec_p256k1.c (COEFFICIENT_A_IS_ZERO): New.
+	* src/jpc_p256r1.c (COEFFICIENT_A_IS_MINUS_3): Likewise.
+	* src/jpc_p256k1.c (COEFFICIENT_A_IS_MINUS_3): Likewise.
+
+	* src/modp256k1.c (modp256k1_shift): Bug fix.
+
+2014-02-20  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/Makefile.in (CSRC): Add files of p256k1.
+
+	* src/openpgp.c (cmd_pso): Support p256k1 for signature.
+
+	* src/openpgp-do.c (algorithm_attr_p256k1): New.
+	(gpg_do_write_prvkey): Support p256k1 for signature.
+	(proc_key_import, gpg_do_table, gpg_do_public_key): Likewise.
+
+	* src/Makefile.in (DEFS): Add -DRSA_SIG.
+
+	* src/openpgp-do.c (gpg_do_write_prvkey): Use _p256r1.
+	* src/openpgp.c (cmd_internal_authenticate): Likewise.
+
+	* src/call-ec_p256k1.c: New.  Use call-ec.c.
+	* src/call-ec_p256r1.c: Use call-ec.c.
+	* src/call-ec.c: New.
+	(ecdsa_sign): Change the signature.
+
+2014-02-19  Niibe Yutaka  <gniibe@fsij.org>
+
+	* tool/calc_precompute_table_ecc.py: New.
+
+	* src/ec_p256k1.c: New.  Use ecc.c.
+	* src/ec_p256k1.h: New.
+	* src/ec_p256r1.c: Use ecc.c.
+	* src/ecc.c: New.
+
+2014-02-18  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/jpc_p256k1.c: New.  Use jpc.c.
+	* src/jpc_p256r1.c: Use jpc.c.
+	* src/jpc.c: New.
+
+	* src/sha256.c (memcpy_output_bswap32): Bug fix.
+
+	* src/modp256k1.h, src/modp256k1.c: New.
+
+2014-02-17  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/Makefile.in (CSRC): Follow the changes of filenames.
+
+	* src/modp256r1.c (modp256r1_add, modp256r1_sub, S3)
+	(modp256r1_mul, modp256r1_sqr, modp256r1_inv, modp256r1_shift):
+	Use new function names.
+	* src/jpc_p256r1.c (jpc_double_p256r1, jpc_add_ac_signed_p256r1)
+	(jpc_to_ac_p256r1): Likewise.
+	* src/ec_p256r1.c (point_is_on_the_curve)
+	(compute_kG_p256r1, compute_kP_p256r1): Likewise.
+	* src/call-ec_p256r1.c (ecdsa_sign): Likewise.
+
+	* src/modp256r1.h: Rename from modp256.h.
+	* src/jpc-ac_p256r1.h: Rename from jpc-ac.h.
+	* src/ec_p256r1.h: Rename from ec_p256.h.
+
+	* src/modp256r1.c: Rename from modp256.c.
+	* src/jpc_p256r1.c: Rename from jpc.c.
+	* src/ec_p256r1.c: Rename from ec_p256.c.
+	* src/call-ec_p256r1.c: Rename from call-ec_p256.c.
+
+2014-02-05  NIIBE Yutaka  <gniibe@fsij.org>
+
+	* src/sha512.h, src/sha512.c: New.
+
+	* src/sha256.c (initial_state): Don't export, it's internal.
+	(memcpy_output_bswap32): Rename and remove last argument.
+
+2014-01-28  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/muladd_256.h: New.
+	* src/bn.c (bn256_mul, bn256_sqr): Assembler implementation.
+
+	* src/ec_p256.c (get_vk_kP): Bug fix.
+	(compute_kP): Bug fix for index table.
+
+2014-01-27  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/ec_p256.c (get_vk_kP): New.
+	(naf4_257_set, naf4_257_get, compute_naf4_257):	Remove.
+	(compute_kP): Change the argument, fixing for constant time.
+
+2014-01-24  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/ec_p256.c (get_vk): New.
+	(compute_kG): Fix for constant time.
+	(compute_kP): Simplify.
+
+2014-01-23  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/jpc.c (jpc_add_ac_signed): Fix for constant time.
+
+	* src/ec_p256.c (ecdsa): Bug fix for k selection.
+
+2014-01-22  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/modp256.c (modp256_inv): Fix for constant time.
+
+	* src/bn.c (bn256_sqr): Fix for constant time.
+
+	* src/mod.c (mod_inv): Fix for constant time.
+
+	* src/ec_p256.c (compute_kG): Simplify.
+
+	* src/jpc.c (jpc_double): Support calling with A = infinity.
+
+2014-01-21  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/jpc.c (jpc_add_ac_signed): Bug fix for A check.
+
+	* src/ec_p256.c (ecdsa): Fix for constant time.
+
+	* src/modp256.c (modp256_add, modp256_sub, modp256_reduce)
+	(modp256_shift): Fix for constant time.
+	(modp256_inv): Likewise (not fully constant time, yet).
+
+	* src/mod.c (mod_reduce): Fix for constant time.
+	(mod_inv): Likewise (not fully constant time, yet).
+
+	* src/bn.h (bn256, bn512): words -> word.
+	* src/ec_p256.h (naf4_257): Likewise.
+
+2014-01-20  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/fe25519.h, src/fe25519.c: New.
+
+2014-01-15  Niibe Yutaka  <gniibe@fsij.org>
+
+	* src/bn.c (bn256_is_zero, bn256_is_ge, bn256_cmp): Computation
+	should be constant time.
+
 2013-12-25  Niibe Yutaka  <gniibe@fsij.org>
 
 	* VERSION: 1.1.1.

NEWS

@@ -1,5 +1,106 @@
 Gnuk NEWS - User visible changes
 
+* Major changes in Gnuk 1.1.7
+
+  Released 2015-08-05, by NIIBE Yutaka
+
+** Upgrade of Chopstx
+We use Chopstx 0.08, which supports STM32 Nucleo and ST Dongle.
+
+
+* Major changes in Gnuk 1.1.6
+
+  Released 2015-07-21, by NIIBE Yutaka
+
+** USB SerialNumber String
+The way to determine a serial number of Gnuk Token has been changed.
+It uses the 96-bit unique bits of MCU, but the portion for use is
+changed.
+
+** Upgrade of Chopstx
+We use Chopstx 0.07, which supports STM32 Primer2 and CQ STARM, too.
+
+** Experimental Curve25519 support.
+
+Gnuk can support Curve25519 (for deecryption).  Note that this is
+pretty much experimental, and subjects to change.  The low level code
+is somehow stable, but there are no consensus in higer level.
+Especially, OID in the key attribute would be changed in future.
+
+** No --enable-keygen option
+It is now standard feature included always.  Note that it doesn't mean
+this feature is stable now.  It is becoming stable, hopefully.
+
+
+* Major changes in Gnuk 1.1.5
+
+  Released 2015-06-03, by NIIBE Yutaka
+
+** upgrade_by_passwd.py is not so noisy any more.
+Since it's getting stable, no debug output any more.
+
+** Maple mini support.
+Although its random number generation is not tested, Maple mini
+support is added.
+
+** Windows interoperability fix.
+1.1.x (0 to 4) didn't work with Windows because of INTERRUPT transfer.
+It's fixed and it works now.
+
+** OpenPGPcard specification v3.0 compatibility.
+OpenPGPcard specification v3.0 now include NIST curves (and other
+curves) and ECDSA and ECDH operations are defined.  Gnuk follows
+this specification.
+
+
+* Major changes in Gnuk 1.1.4
+
+  Released 2014-12-15, by NIIBE Yutaka
+
+** Experimental RSA-4096 support.
+Although it takes too long (more than 8.7 second), RSA-4096
+is now implemented.
+
+** ECDH support.
+ECDH is now supported.  You need development branch (master)
+of GnuPG to use this feature.
+
+** ECDSA and EdDSA is not that experimental.
+You don't need to edit DEFS variable in src/Makefile.
+
+** STM8S_DISCOVERY is not supported any more.
+It's flash ROM size (64KiB) is a bit small to have all features of
+Gnuk now.  If you manually edit code to limit the size of executable,
+it still could run Gnuk, though.
+
+** configure's default target is now FST-01.
+Receiving reports from those who complain default target, I
+reconsidered.  Those who has Olimex STM32 H103 usually has JTAG
+debugger, while FST-01 users don't.  So, to be safe, the default
+target is now FST-01, instead of Olimex STM32 H103.
+
+
+* Major changes in Gnuk 1.1.3
+
+  Released 2014-04-16, by NIIBE Yutaka
+
+** Experimental EdDSA support.
+After configure, you can edit the DEFS variable in src/Makefile, so
+that Gnuk can support EdDSA with Ed25519 (for authentication).  Note
+that this is pretty much experimental, and subjects to change.
+
+
+* Major changes in Gnuk 1.1.2
+
+  Released 2014-03-07, by NIIBE Yutaka
+
+** Experimental ECC support for secp256k1.
+After configure, you can edit the DEFS variable in src/Makefile, so
+that Gnuk can support ECDSA with NIST P256 (for authentication), and
+ECDSA with secp256k1 (for signature).  Note that this is pretty much
+experimental, and subjects to change.
+
+
 * Major changes in Gnuk 1.1.1
 
   Released 2013-12-25, by NIIBE Yutaka

README

@@ -1,25 +1,36 @@
 Gnuk - An Implementation of USB Cryptographic Token for GnuPG
 
-							  Version 1.1.1
-							     2013-12-25
+							  Version 1.1.7
+							     2015-08-05
 							   Niibe Yutaka
 				      Free Software Initiative of Japan
 
 Warning
 =======
 
-This is another experimental release of Gnuk 1.1.1, which has
+This is another experimental release of Gnuk, version 1.1.7, which has
 incompatible changes to Gnuk 1.0.x.  Specifically, it now supports
 overriding key import, but importing keys (or generating keys) results
 password reset.  Please update your documentation for Gnuk Token, so
-that the instruction of importing keys won't cause any confusion.
+that the instruction of importing keys won't cause any confusion.  It
+has supports of ECDSA (with NIST P256 and secp256k1), EdDSA, and ECDH
+(with NIST P256, secp256k1, and Curve25519), but this ECC feature is
+pretty much experimental, and it requires development version of GnuPG
+with newest version of libgcrypt (Further, for Curve25519, it requires
+additional patches by me).
+
+It also support RSA-4096 experimentally, but users should know that it
+takes more than 8 second to sign/decrypt.
+
+You will not able to keep using Curve25519 keys, as the key format is
+subject to change.
 
 
 What's Gnuk?
 ============
 
 Gnuk is an implementation of USB cryptographic token for GNU Privacy
-Guard.  Gnuk supports OpenPGP card protocol version 2, and it runs on
+Guard.  Gnuk supports OpenPGP card protocol version 3, and it runs on
 STM32F103 processor.
 
 I wish that Gnuk will be a developer's soother who uses GnuPG.  I have
@@ -52,15 +63,15 @@ A0: Good points of Gnuk are:
 	    "for Free Software"; Gnuk supports GnuPG.
 
 Q1: What kind of key algorithm is supported?
-A1: Gnuk version 1 only supports 2048-bit RSA.
+A1: Gnuk version 1.0 only supports RSA 2048.
+    Development version of Gnuk (1.1.x) supports 256-bit ECDSA and EdDSA,
+    as well as RSA 4096-bit.  But 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. 
 
 Q3: What's your recommendation for target board?
 A3: Orthodox choice is Olimex STM32-H103.
-    If you have skill of electronics and like DIY, STM32 part of STM8S
-    Discovery Kit might be the best choice.
     FST-01 (Flying Stone Tiny 01) is available for sale, and it is a
     kind of the best choice, hopefully.
 
@@ -83,13 +94,7 @@ A6: You need a target board plus a JTAG/SWD debugger.  If you just
 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: STM8S Discovery Kit costs 750 JPY (< $10 USD) only.  You can build
-    your own JTAG debugger using FTDI2232 module (1450 JPY), see:
-    http://www.fsij.org/gnuk/jtag_dongle_ftdi2232
-
 Q9: I got an error like "gpg: selecting openpgp failed: ec=6.108", what's up?
-
 A9: 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:
@@ -106,7 +111,7 @@ Aa: You need to deactivate seahorse-agent and gnome-keyring, but use
 
       $ gconftool-2 --type bool --set /apps/gnome-keyring/daemon-components/ssh false
 
-Qb: With GNOME 3, I can't use Gnuk Token at all.  Why?
+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
@@ -114,19 +119,37 @@ Ab: That's because gnome-keyring-daemon interferes GnuPG.  Type:
     and at the tab of "Startup Programs", disable check buttons for
     "GPG Password Agent" and "SSH Key Agent".
 
-Qc: Do you know a good SWD debugger to connect FST-01 or something?
-Ac: ST-Link/V2 is cheap one.  We have a tool/stlinkv2.py as flash ROM
+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.
 
 
+
+
 Release notes
 =============
 
-This is another experimental release in version 1.1 series of Gnuk.
+This is seventh experimental release in version 1.1 series of Gnuk.
 
-While it is daily use for more than two years, some newly introduced
-features (including key generation and firmware upgrade) should be
-considered experimental.
+While it is daily use by its developer, some newly introduced features
+(including ECDSA/EdDSA/ECDH, key generation and firmware upgrade)
+should be considered experimental.  ECDSA/EdDSA/ECDH is really
+experimental.  Further, ECDH on Curve25519 is much experimental.  You
+won't be able to keep using the key, since the key format of GnuPG is
+not defined and it's subject to change.
 
 Tested features are:
 
@@ -167,25 +190,37 @@ It is known not-working well:
 Targets
 =======
 
-We use Olimex STM32-H103 board and Flying Stone Tiny 01 (FST-01).  We
-also use STM32 part of STM8S Discovery Kit.
+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.
 
-For PIN-pad support, I connect a consumer IR receive module to FST-01
-and STM8S Discovery Kit, and use controller for TV.  PIN verification
-is supported by this configuration.  Yes, it is not secure at all,
-since it is very easy to monitor IR output of the controllers.  It is
-just an experiment.  Note that hardware needed for this experiment is
-only a consumer IR receive module which is as cheap as 50 JPY.
+For PIN-pad support, I connect a consumer IR receive module to FST-01,
+and use controller for TV.  PIN verification is supported by this
+configuration.  Yes, it is not secure at all, since it is very easy to
+monitor IR output of the controllers.  It is just an experiment.  Note
+that hardware needed for this experiment is only a consumer IR receive
+module which is as cheap as 50 JPY.
 
 Note that you need pinpad support for GnuPG to use PIN-pad enabled
 Gnuk.  The pinpad support for GnuPG is only available in version 2.
 
 
+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' for your command invocation.
+Python 2.7 and PyUSB 0.4.3 is assumed.
+
+
 Souce code
 ==========
 
@@ -218,14 +253,14 @@ External source code
 
 Gnuk is distributed with external source code.
 
-* chopstx/  -- Chopstx 0.03 (+ STBee support)
+* chopstx/  -- Chopstx 0.07
 
   We use Chopstx as the kernel for Gnuk.
 
   Chopstx is distributed under GPLv3+ (with a special exception).
 
 
-* polarssl/  -- PolarSSL 1.2.10
+* polarssl/  -- based on PolarSSL 1.2.10 (now mbedTLS)
 
   Souce code taken from: http://polarssl.org/
 
@@ -345,7 +380,8 @@ 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.
 
-Type:
+
+Then, type:
 
   $ make
 
@@ -360,7 +396,7 @@ Olimex STM32-H103 board
 
 If you are using Olimex JTAG-Tiny, type following to invoke OpenOCD:
 
-  $ openocd -f interface/olimex-jtag-tiny.cfg -f board/olimex_stm32_h103.cfg
+  $ openocd -f interface/ftdi/olimex-jtag-tiny.cfg -f board/olimex_stm32_h103.cfg
 
 Then, with another terminal, type following to write "gnuk.elf" to Flash ROM:
 
@@ -375,59 +411,12 @@ Then, with another terminal, type following to write "gnuk.elf" to Flash ROM:
 Flying Stone Tiny 01
 --------------------
 
-If you are using Flying Stone Tiny 01, you need a SWD writer.  I am
-using revision 946 of Simon Qian's Versaloon.
+If you are using Flying Stone Tiny 01, you need a SWD writer.
 
-    svn checkout -r 946 http://vsprog.googlecode.com/svn/trunk/
-
-For OpenOCD, we need unofficial patch.
-
-See the article of Versaloon Forum:
-
-    http://www.versaloon.com/bbs/viewtopic.php?p=16179
-
-
-Type following to invoke OpenOCD:
-
-  $ openocd -f interface/vsllink.cfg -c "transport select swd" -c "swd_mode 2" -f target/stm32f1x.cfg
-
-Then, with another terminal, type following to write "gnuk.elf" to Flash ROM:
-
-  $ telnet localhost 4444
-  > reset halt
-  > flash write_image erase gnuk.elf
-  > reset
-  > exit
-  $ 
-
-OpenOCD 0.6.1 now supports ST-Link/V2.  We can use it:
+OpenOCD 0.9 now supports ST-Link/V2.  We can use it:
 
   $ openocd -f interface/stlink-v2.cfg -f target/stm32f1x_stlink.cfg
 
-But it doesn't support option bytes handling (protection) yet.
-
-
-STM8S Discovery Kit
--------------------
-
-If you are using FTDI-2232D module and the connection is standard, type:
-
-  $ openocd -f interface/openocd-usb.cfg -f target/stm32f1x.cfg
-
-Initially, the flash ROM of the chip is protected.  you need to do:
-
-  $ telnet localhost 4444
-  > reset halt
-  > stm32f1x unlock 0
-  > reset
-  > shutdown
-  $ 
-
-and re-connect the board.  Note that power-off / power-on sequence is
-required to reset flash ROM.
-
-Then, invoke OpenOCD again and telnet to connect OpenCD and write
-image as above example of Olimex STM32-H103.
 
 
 STBee
@@ -465,7 +454,7 @@ How to configure
 ================
 
 You need python and pyscard (python-pyscard package in Debian) or
-PyUSB (python-usb package in Debian).
+PyUSB 0.4.3 (python-usb package in Debian).
 
 (1) [pyscard] Stop scdaemon
     [PyUSB] Stop the pcsc daemon.
@@ -484,7 +473,7 @@ In case of PyUSB tool, you need to stop pcscd.
 
 If you use fixed serial number in the file 'GNUK_SERIAL_NUMBER', you can do:
 
-  $ EMAIL=<YOUR-EMAIL-ADDRESS> ../tool/gnuk_put_binary.py -s ../GNUK_SERIAL_NUMBER
+  $ EMAIL=<YOUR-EMAIL-ADDRESS> ../tool/gnuk_put_binary_usb.py -s ../GNUK_SERIAL_NUMBER
   Writing serial number
   ...
 
@@ -492,7 +481,7 @@ If you use fixed serial number in the file 'GNUK_SERIAL_NUMBER', you can do:
 
 If you have card holder certificate binary file, you can do:
 
-  $ ../tool/gnuk_put_binary.py ../../<YOUR-CERTIFICATE>.bin
+  $ ../tool/gnuk_put_binary_usb.py ../../<YOUR-CERTIFICATE>.bin
   ../../<YOUR-CERTIFICATE>.bin: <LENGTH-OF-YOUR-CERTIFICATE>
   Updating card holder certificate
   ...
@@ -579,14 +568,14 @@ See doc/note/firmware-update.
 Git Repositories
 ================
 
-Please use: http://gitorious.org/gnuk
+Please use: https://anonscm.debian.org/cgit/gnuk/gnuk/
 
 You can get it by:
  
-    $ git clone git://gitorious.org/gnuk/gnuk.git
+    $ git clone git://anonscm.debian.org/gnuk/gnuk/gnuk.git
 
 It's also available at: www.gniibe.org
-You can browse at: http://www.gniibe.org/gitweb?p=gnuk.git;a=summary
+You can browse at: http://git.gniibe.org/gitweb?p=gnuk/gnuk.git;a=summary
 
 I put Chopstx as a submodule of Git.  Please do this:
 
@@ -605,6 +594,14 @@ Information on the Web
 
 Please visit: http://www.fsij.org/gnuk/
 
+Please see the FST-01 support pages:
+
+    http://www.gniibe.org/category/fst-01.html
+
+Please consider to join Gnuk-users mailing list:
+
+    https://lists.alioth.debian.org/mailman/listinfo/gnuk-users
+
 
 Your Contributions
 ==================
@@ -615,5 +612,6 @@ to FSIJ (if possible).
 
 Foot note
 ==========
+
 * NUK(R) is a registered trademark owend by MAPA GmbH, Germany.
 -- 

THANKS

@@ -8,7 +8,9 @@ encouraging the development, testing the implementation, suggesting
 improvements, or fixing bugs.  Here is a list of those people.
 
 Achim Pietig		achim@pietig.com
+Aidan Thornton
 Andre Zepezauer		andre.zepezauer@student.uni-halle.de
+Bertrand Jacquin	bertrand@jacquin.bzh
 Hironobu SUZUKI		hironobu@h2np.net
 Jan Suhr		jan@suhr.info
 Kaz Kojima		kkojima@rr.iij4u.or.jp
@@ -17,6 +19,9 @@ Luis Felipe R. Murillo	luisfelipe@ucla.edu
 MATSUU Takuto		matsuu@gentoo.org
 NAGAMI Takeshi		nagami-takeshi@aist.go.jp
 Nguyễn Hồng Quân	quannguyen@mbm.vn
+NOKUBI Takatsugu	knok@daionet.gr.jp
 Paul Bakker		polarssl_maintainer@polarssl.org
 Shane Coughlan		scoughlan@openinventionnetwork.com
+Vasily Evseenko
 Werner Koch		wk@gnupg.org
+Yuji Imai		ug@xcast.jp

VERSION

@@ -1 +1 @@
-release/1.1.1
+release/1.1.7

boards/CQ_STARM/board.c

@@ -1,10 +0,0 @@
-#include "config.h"
-#include "ch.h"
-#include "hal.h"
-
-/*
- * Board-specific initialization code.
- */
-void boardInit(void)
-{
-}

boards/CQ_STARM/board.h

@@ -1,163 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
-
-    This file is part of ChibiOS/RT.
-
-    ChibiOS/RT 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.
-
-    ChibiOS/RT 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/>.
-
-                                      ---
-
-    A special exception to the GPL can be applied should you wish to distribute
-    a combined work that includes ChibiOS/RT, without being obliged to provide
-    the source code for any proprietary components. See the file exception.txt
-    for full details of how and when the exception can be applied.
-*/
-
-#ifndef _BOARD_H_
-#define _BOARD_H_
-
-/*
- * Setup for the CQ STARM board.
- */
-#undef	SET_USB_CONDITION		/* No functionality to disconnect USB */
-#define	SET_LED_CONDITION(on) on	/* To emit light, call palSetPad */
-#define GPIO_LED	GPIOC_LED
-#define IOPORT_LED	GPIOC
-
-/*
- * Board identifier.
- */
-#define BOARD_CQ_STARM
-#define BOARD_NAME "CQ STARM"
-
-/*
- * Board frequencies.
- */
-#define STM32_LSECLK            32768
-#define STM32_HSECLK            8000000
-
-/*
- * MCU type, this macro is used by both the ST library and the ChibiOS/RT
- * native STM32 HAL.
- */
-#define STM32F10X_MD
-
-/*
- * IO pins assignments.
- */
-#define GPIOC_LED               6
-
-#if 0
-#define GPIOA_BUTTON            0
-#define GPIOA_SPI1NSS           4
-
-#define GPIOB_SPI2NSS           12
-#define GPIOC_MMCWP             6
-#define GPIOC_MMCCP             7
-#define GPIOC_CANCNTL           10
-#define GPIOC_DISC              11
-#endif
-
-/*
- * I/O ports initial setup, this configuration is established soon after reset
- * in the initialization code.
- *
- * The digits have the following meaning:
- *   0 - Analog input.
- *   1 - Push Pull output 10MHz.
- *   2 - Push Pull output 2MHz.
- *   3 - Push Pull output 50MHz.
- *   4 - Digital input.
- *   5 - Open Drain output 10MHz.
- *   6 - Open Drain output 2MHz.
- *   7 - Open Drain output 50MHz.
- *   8 - Digital input with PullUp or PullDown resistor depending on ODR.
- *   9 - Alternate Push Pull output 10MHz.
- *   A - Alternate Push Pull output 2MHz.
- *   B - Alternate Push Pull output 50MHz.
- *   C - Reserved.
- *   D - Alternate Open Drain output 10MHz.
- *   E - Alternate Open Drain output 2MHz.
- *   F - Alternate Open Drain output 50MHz.
- * Please refer to the STM32 Reference Manual for details.
- */
-
-/*
- * Port A setup.
- * Everything input with pull-up except:
- * PA4  - Normal input      (ADC_IN4 : VoutX of LIS344ALH).
- * PA5  - Alternate output  (MMC SPI1 SCK).
- * PA6  - Normal input      (MMC SPI1 MISO).
- * PA7  - Alternate output  (MMC SPI1 MOSI).
- * PA11 - (USBDM)
- * PA12 - (USBDP)
- */
-#define VAL_GPIOACRL            0xB4B48888      /*  PA7...PA0 */
-#define VAL_GPIOACRH            0x88888888      /* PA15...PA8 */
-#define VAL_GPIOAODR            0xFFFFFFFF
-
-/*
- * Port B setup.
- * Everything input with pull-up except:
- * PB13 - Alternate output  (MMC SPI2 SCK).
- * PB14 - Normal input      (MMC SPI2 MISO).
- * PB15 - Alternate output  (MMC SPI2 MOSI).
- */
-#define VAL_GPIOBCRL            0x88888888      /*  PB7...PB0 */
-#define VAL_GPIOBCRH            0xB4B88888      /* PB15...PB8 */
-#define VAL_GPIOBODR            0xFFFFFFFF
-
-/*
- * Port C setup.
- * Everything input with pull-up except:
- * PC4  - Normal input      (ADC_IN14 : VoutY of LIS344ALH).
- * PC5  - Normal input      (ADC_IN15 : VoutZ of LIS344ALH).
- * PC6  - Push Pull output (LED).
- * (PC9  - SDCard CD)
- * (PC12 - SDCard CS)
- * PC14 - Normal input (XTAL).
- * PC15 - Normal input (XTAL).
- */
-#define VAL_GPIOCCRL            0x83448888      /*  PC7...PC0 */
-#define VAL_GPIOCCRH            0x44888888      /* PC15...PC8 */
-#define VAL_GPIOCODR            0xFFFFFFFF
-
-/*
- * Port D setup.
- * Everything input with pull-up except:
- * (PD9 - USB_DC)
- */
-#define VAL_GPIODCRL            0x88888888      /*  PD7...PD0 */
-#define VAL_GPIODCRH            0x88888888      /* PD15...PD8 */
-#define VAL_GPIODODR            0xFFFFFFFF
-
-/*
- * Port E setup.
- * Everything input with pull-up except:
- */
-#define VAL_GPIOECRL            0x88888888      /*  PE7...PE0 */
-#define VAL_GPIOECRH            0x88888888      /* PE15...PE8 */
-#define VAL_GPIOEODR            0xFFFFFFFF
-
-#if !defined(_FROM_ASM_)
-#ifdef __cplusplus
-extern "C" {
-#endif
-  void boardInit(void);
-#ifdef __cplusplus
-}
-#endif
-#endif /* _FROM_ASM_ */
-
-#endif /* _BOARD_H_ */

boards/CQ_STARM/mcuconf.h

@@ -1,14 +0,0 @@
-/*
- * HAL driver system settings.
- */
-#define STM32_SW                    STM32_SW_PLL
-#define STM32_PLLSRC                STM32_PLLSRC_HSE
-#define STM32_PLLXTPRE              STM32_PLLXTPRE_DIV1
-#define STM32_PLLMUL_VALUE          9
-#define STM32_HPRE                  STM32_HPRE_DIV1
-#define STM32_PPRE1                 STM32_PPRE1_DIV2
-#define STM32_PPRE2                 STM32_PPRE2_DIV1
-#define STM32_ADCPRE                STM32_ADCPRE_DIV6
-#define STM32_RTCSEL                STM32_RTCSEL_NOCLOCK
-
-#include "mcuconf-common.h"

boards/STBEE_MINI/board.c

@@ -1,151 +0,0 @@
-#include "config.h"
-#include "ch.h"
-#include "hal.h"
-
-/*
- * Board-specific initialization code.
- */
-void boardInit(void)
-{
-#if !defined(DFU_SUPPORT)
-  if (palReadPad (IOPORT3, GPIOC_BUTTON) == 0)
-    /*
-     * Since LEDs are connected to JTMS/SWDIO and JTDI pin,
-     * we can't use LED to let know users in this state.
-     */
-    for (;;);		       /* Wait for JTAG debugger connection */
-#endif
-
-#if defined(PINPAD_SUPPORT) && !defined(DFU_SUPPORT)
-  palWritePort(IOPORT2, 0x7fff); /* Only clear GPIOB_7SEG_DP */
-  while (palReadPad (IOPORT2, GPIOB_BUTTON) != 0)
-    ;				/* Wait for JTAG debugger connection */
-  palWritePort(IOPORT2, 0xffff); /* All set */
-#endif
-
-#if defined(PINPAD_CIR_SUPPORT)
-  /* EXTI0 <= PB0 */
-  AFIO->EXTICR[0] = AFIO_EXTICR1_EXTI0_PB;
-  EXTI->IMR = 0;
-  EXTI->FTSR = EXTI_FTSR_TR0;
-  NVICEnableVector(EXTI0_IRQn,
-		   CORTEX_PRIORITY_MASK(CORTEX_MINIMUM_PRIORITY));
-
-  /* TIM3 */
-  RCC->APB1ENR |= RCC_APB1ENR_TIM3EN;
-  RCC->APB1RSTR = RCC_APB1RSTR_TIM3RST;
-  RCC->APB1RSTR = 0;
-  NVICEnableVector(TIM3_IRQn,
-		   CORTEX_PRIORITY_MASK(CORTEX_MINIMUM_PRIORITY));
-  TIM3->CR1 = TIM_CR1_URS | TIM_CR1_ARPE; /* Don't enable TIM3 for now */
-  TIM3->CR2 = TIM_CR2_TI1S;
-  TIM3->SMCR = TIM_SMCR_TS_0 | TIM_SMCR_TS_2 | TIM_SMCR_SMS_2;
-  TIM3->DIER = 0;		/* Disable interrupt for now */
-  TIM3->CCMR1 = TIM_CCMR1_CC1S_0 | TIM_CCMR1_IC1F_0 | TIM_CCMR1_IC1F_3
-    | TIM_CCMR1_CC2S_1 | TIM_CCMR1_IC2F_0 | TIM_CCMR1_IC2F_3;
-  TIM3->CCMR2 = 0;
-  TIM3->CCER =  TIM_CCER_CC1E | TIM_CCER_CC2E | TIM_CCER_CC2P;
-  TIM3->PSC = 72 - 1;		/* 1 MHz */
-  TIM3->ARR = 18000;		/* 18 ms */
-  /* Generate UEV to upload PSC and ARR */
-  TIM3->EGR = TIM_EGR_UG;	
-#elif defined(PINPAD_DIAL_SUPPORT)
-  /* EXTI2 <= PB2 */
-  AFIO->EXTICR[0] = AFIO_EXTICR1_EXTI2_PB;
-  EXTI->IMR = 0;
-  EXTI->FTSR = EXTI_FTSR_TR2;
-  NVICEnableVector(EXTI2_IRQn,
-		   CORTEX_PRIORITY_MASK(CORTEX_MINIMUM_PRIORITY));
-
-  /* TIM4 */
-  RCC->APB1ENR |= RCC_APB1ENR_TIM4EN;
-  RCC->APB1RSTR = RCC_APB1RSTR_TIM4RST;
-  RCC->APB1RSTR = 0;
-
-  TIM4->CR1 = TIM_CR1_URS |  TIM_CR1_ARPE | TIM_CR1_CKD_1;
-  TIM4->CR2 = 0;
-  TIM4->SMCR = TIM_SMCR_SMS_0;
-  TIM4->DIER = 0;		/* no interrupt */
-  TIM4->CCMR1 = TIM_CCMR1_CC1S_0 | TIM_CCMR1_CC2S_0
-    | TIM_CCMR1_IC1F_0 | TIM_CCMR1_IC1F_1 | TIM_CCMR1_IC1F_2 | TIM_CCMR1_IC1F_3
-    | TIM_CCMR1_IC2F_0 | TIM_CCMR1_IC2F_1 | TIM_CCMR1_IC2F_2 | TIM_CCMR1_IC2F_3;
-  TIM4->CCMR2 = 0;
-  TIM4->CCER = 0;
-  TIM4->PSC = 0;
-  TIM4->ARR = 31;
-  /* Generate UEV to upload PSC and ARR	 */
-  TIM4->EGR = TIM_EGR_UG;
-#endif
-  /*
-   * Disable JTAG and SWD, done after hwinit1_common as HAL resets AFIO
-   */
-  AFIO->MAPR |= AFIO_MAPR_SWJ_CFG_DISABLE;
-  /* We use LED2 as optional "error" indicator */
-  palSetPad (IOPORT1, GPIOA_LED2);
-}
-
-#if defined(PINPAD_CIR_SUPPORT)
-void
-cir_ext_disable (void)
-{
-  EXTI->PR = EXTI_PR_PR0;
-  EXTI->IMR &= ~EXTI_IMR_MR0;
-}
-
-void
-cir_ext_enable (void)
-{
-  EXTI->IMR |= EXTI_IMR_MR0;
-}
-
-extern void cir_ext_interrupt (void);
-extern void cir_timer_interrupt (void);
-
-CH_IRQ_HANDLER (EXTI0_IRQHandler)
-{
-  CH_IRQ_PROLOGUE ();
-  chSysLockFromIsr ();
-
-  cir_ext_interrupt ();
-
-  chSysUnlockFromIsr ();
-  CH_IRQ_EPILOGUE ();
-}
-
-CH_IRQ_HANDLER (TIM3_IRQHandler)
-{
-  CH_IRQ_PROLOGUE();
-  chSysLockFromIsr();
-
-  cir_timer_interrupt ();
-
-  chSysUnlockFromIsr();
-  CH_IRQ_EPILOGUE();
-}
-#elif defined(PINPAD_DIAL_SUPPORT)
-void
-dial_sw_disable (void)
-{
-  EXTI->PR = EXTI_PR_PR2;
-  EXTI->IMR &= ~EXTI_IMR_MR2;
-}
-
-void
-dial_sw_enable (void)
-{
-  EXTI->IMR |= EXTI_IMR_MR2;
-}
-
-extern void dial_sw_interrupt (void);
-
-CH_IRQ_HANDLER (EXTI2_IRQHandler)
-{
-  CH_IRQ_PROLOGUE ();
-  chSysLockFromIsr ();
-
-  dial_sw_interrupt ();
-
-  chSysUnlockFromIsr ();
-  CH_IRQ_EPILOGUE ();
-}
-#endif

boards/STBEE_MINI/board.h

@@ -1,205 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
-
-    This file is part of ChibiOS/RT.
-
-    ChibiOS/RT 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.
-
-    ChibiOS/RT 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/>.
-
-                                      ---
-
-    A special exception to the GPL can be applied should you wish to distribute
-    a combined work that includes ChibiOS/RT, without being obliged to provide
-    the source code for any proprietary components. See the file exception.txt
-    for full details of how and when the exception can be applied.
-*/
-
-#ifndef _BOARD_H_
-#define _BOARD_H_
-
-#include "config.h"
-/*
- * Setup for the STBee Mini board.
- */
-#define	SET_USB_CONDITION(en) (en)	/* To connect USB, call palSetPad */
-#define	SET_LED_CONDITION(on) (!on)	/* To emit light, call palClearPad */
-#define GPIO_USB	GPIOA_USB_ENABLE
-#define IOPORT_USB	GPIOA
-#define GPIO_LED	GPIOA_LED1
-#define IOPORT_LED	GPIOA
-
-#define NEUG_ADC_SETTING2_SMPR1 0
-#define NEUG_ADC_SETTING2_SMPR2 ADC_SMPR2_SMP_AN1(ADC_SAMPLE_1P5)    \
-                              | ADC_SMPR2_SMP_AN2(ADC_SAMPLE_1P5)
-#define NEUG_ADC_SETTING2_SQR3  ADC_SQR3_SQ1_N(ADC_CHANNEL_IN1)      \
-                              | ADC_SQR3_SQ2_N(ADC_CHANNEL_IN2)
-#define NEUG_ADC_SETTING2_NUM_CHANNELS 2
-
-/*
- * Board identifier.
- */
-#define BOARD_STBEE_MINI
-#define BOARD_NAME "STBee Mini"
-
-#if defined(PINPAD_CIR_SUPPORT) || defined(PINPAD_DIAL_SUPPORT)
-#define HAVE_7SEGLED	1
-/*
- * Timer assignment for CIR
- */
-#define TIMx	TIM3
-#endif
-
-/*
- * Board frequencies.
- */
-#define STM32_LSECLK            32768
-#define STM32_HSECLK            12000000
-
-/*
- * MCU type, this macro is used by both the ST library and the ChibiOS/RT
- * native STM32 HAL.
- */
-#define STM32F10X_MD
-
-/*
- * IO pins assignments.
- */
-#define GPIOA_LED1              13
-#define GPIOA_USB_ENABLE        14
-#define GPIOA_LED2              15
-
-#define GPIOC_BUTTON            13
-
-/*
- * I/O ports initial setup, this configuration is established soon after reset
- * in the initialization code.
- *
- * The digits have the following meaning:
- *   0 - Analog input.
- *   1 - Push Pull output 10MHz.
- *   2 - Push Pull output 2MHz.
- *   3 - Push Pull output 50MHz.
- *   4 - Digital input.
- *   5 - Open Drain output 10MHz.
- *   6 - Open Drain output 2MHz.
- *   7 - Open Drain output 50MHz.
- *   8 - Digital input with PullUp or PullDown resistor depending on ODR.
- *   9 - Alternate Push Pull output 10MHz.
- *   A - Alternate Push Pull output 2MHz.
- *   B - Alternate Push Pull output 50MHz.
- *   C - Reserved.
- *   D - Alternate Open Drain output 10MHz.
- *   E - Alternate Open Drain output 2MHz.
- *   F - Alternate Open Drain output 50MHz.
- * Please refer to the STM32 Reference Manual for details.
- */
-
-#if defined(PINPAD_CIR_SUPPORT) || defined(PINPAD_DIAL_SUPPORT)
-/*
- * Port A setup.
- * PA1  - Digital input with PullUp.  AN1 for NeuG
- * PA2  - Digital input with PullUp.  AN2 for NeuG
- * PA6  - (TIM3_CH1) input with pull-up
- * PA7  - (TIM3_CH2) input with pull-down
- * PA11 - input with pull-up (USBDM)
- * PA12 - input with pull-up (USBDP)
- * Everything input with pull-up except:
- * PA13 - Open Drain output (LED1 0:ON 1:OFF)
- * PA14 - Push pull output  (USB ENABLE 0:DISABLE 1:ENABLE)
- * PA15 - Open Drain output (LED2 0:ON 1:OFF)
- */
-#define VAL_GPIOACRL            0x88888888      /*  PA7...PA0 */
-#define VAL_GPIOACRH            0x63688888      /* PA15...PA8 */
-#define VAL_GPIOAODR            0xFFFFFF7F
-
-/* Port B setup. */
-#define GPIOB_CIR		0
-#define GPIOB_BUTTON            2
-#define GPIOB_ROT_A             6
-#define GPIOB_ROT_B             7
-
-#define GPIOB_7SEG_DP           15
-#define GPIOB_7SEG_A            14
-#define GPIOB_7SEG_B            13
-#define GPIOB_7SEG_C            12
-#define GPIOB_7SEG_D            11
-#define GPIOB_7SEG_E            10
-#define GPIOB_7SEG_F            9
-#define GPIOB_7SEG_G            8
-
-#define VAL_GPIOBCRL            0x88888888      /*  PB7...PB0 */
-#define VAL_GPIOBCRH            0x66666666      /* PB15...PB8 */
-#define VAL_GPIOBODR            0xFFFFFFFF
-#else
-/*
- * Port A setup.
- * PA1  - Digital input with PullUp.  AN1 for NeuG
- * PA2  - Digital input with PullUp.  AN2 for NeuG
- * PA11 - input with pull-up (USBDM)
- * PA12 - input with pull-up (USBDP)
- * Everything input with pull-up except:
- * PA13 - Open Drain output (LED1 0:ON 1:OFF)
- * PA14 - Push pull output  (USB ENABLE 0:DISABLE 1:ENABLE)
- * PA15 - Open Drain output (LED2 0:ON 1:OFF)
- */
-#define VAL_GPIOACRL            0x88888888      /*  PA7...PA0 */
-#define VAL_GPIOACRH            0x63688888      /* PA15...PA8 */
-#define VAL_GPIOAODR            0xFFFFFFFF
-
-/* Port B setup. */
-/* Everything input with pull-up */
-#define VAL_GPIOBCRL            0x88888888      /*  PB7...PB0 */
-#define VAL_GPIOBCRH            0x88888888      /* PB15...PB8 */
-#define VAL_GPIOBODR            0xFFFFFFFF
-#endif
-
-/*
- * Port C setup.
- * Everything input with pull-up except:
- * PC13 - Normal input.
- * PC14 - Normal input.
- * PC15 - Normal input.
- */
-#define VAL_GPIOCCRL            0x88888888      /*  PC7...PC0 */
-#define VAL_GPIOCCRH            0x44488888      /* PC15...PC8 */
-#define VAL_GPIOCODR            0xFFFFFFFF
-
-/*
- * Port D setup.
- * Everything input with pull-up except:
- * PD0  - Normal input (XTAL).
- * PD1  - Normal input (XTAL).
- */
-#define VAL_GPIODCRL            0x88888844      /*  PD7...PD0 */
-#define VAL_GPIODCRH            0x88888888      /* PD15...PD8 */
-#define VAL_GPIODODR            0xFFFFFFFF
-
-/*
- * Port E setup.
- * Everything input with pull-up except:
- */
-#define VAL_GPIOECRL            0x88888888      /*  PE7...PE0 */
-#define VAL_GPIOECRH            0x88888888      /* PE15...PE8 */
-#define VAL_GPIOEODR            0xFFFFFFFF
-
-#if !defined(_FROM_ASM_)
-#ifdef __cplusplus
-extern "C" {
-#endif
-  void boardInit(void);
-#ifdef __cplusplus
-}
-#endif
-#endif /* _FROM_ASM_ */
-
-#endif /* _BOARD_H_ */

boards/STBEE_MINI/mcuconf.h

@@ -1,14 +0,0 @@
-/*
- * HAL driver system settings.
- */
-#define STM32_SW                    STM32_SW_PLL
-#define STM32_PLLSRC                STM32_PLLSRC_HSE
-#define STM32_PLLXTPRE              STM32_PLLXTPRE_DIV1
-#define STM32_PLLMUL_VALUE          6
-#define STM32_HPRE                  STM32_HPRE_DIV1
-#define STM32_PPRE1                 STM32_PPRE1_DIV2
-#define STM32_PPRE2                 STM32_PPRE2_DIV1
-#define STM32_ADCPRE                STM32_ADCPRE_DIV6
-#define STM32_RTCSEL                STM32_RTCSEL_NOCLOCK
-
-#include "mcuconf-common.h"

boards/STM32_PRIMER2/board.c

@@ -1,15 +0,0 @@
-#include "config.h"
-#include "ch.h"
-#include "hal.h"
-
-/*
- * Board-specific initialization code.
- */
-void boardInit(void)
-{
-  /*
-   * Clear LED and SHUTDOWN output.
-   */
-  palClearPad (IOPORT5, GPIOE_LED);
-  palClearPad (IOPORT3, GPIOC_SHUTDOWN);
-}

boards/STM32_PRIMER2/board.h

@@ -1,175 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
-
-    This file is part of ChibiOS/RT.
-
-    ChibiOS/RT 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.
-
-    ChibiOS/RT 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/>.
-
-                                      ---
-
-    A special exception to the GPL can be applied should you wish to distribute
-    a combined work that includes ChibiOS/RT, without being obliged to provide
-    the source code for any proprietary components. See the file exception.txt
-    for full details of how and when the exception can be applied.
-*/
-
-#ifndef _BOARD_H_
-#define _BOARD_H_
-
-/*
- * Setup for the STM32 Primer2.
- */
-#define	SET_USB_CONDITION(en) (!en)	/* To connect USB, call palClearPad */
-#define	SET_LED_CONDITION(on) (!on)	/* To emit light, call palClearPad */
-#define GPIO_USB	GPIOD_DISC
-#define IOPORT_USB	GPIOD
-#define GPIO_LED	GPIOE_LEDR
-#define IOPORT_LED	GPIOE
-
-/* NeuG settings for ADC2.  */
-
-/*
- * Board identifier.
- */
-#define BOARD_STM32_PRIMER2
-#define BOARD_NAME "STM32 Primer2"
-
-/*
- * Board frequencies.
- */
-#define STM32_LSECLK            32768
-#define STM32_HSECLK            12000000
-
-/*
- * MCU type, this macro is used by both the ST library and the ChibiOS/RT
- * native STM32 HAL.
- */
-#define STM32F10X_MD
-
-/*
- * IO pins assignments.
- */
-#define GPIOA_BUTTON            8
-#define GPIOC_SHUTDOWN		13
-#define GPIOD_DISC              3
-#define GPIOE_LED               0
-#define GPIOE_LEDR		1
-
-/*
- * I/O ports initial setup, this configuration is established soon after reset
- * in the initialization code.
- *
- * The digits have the following meaning:
- *   0 - Analog input.
- *   1 - Push Pull output 10MHz.
- *   2 - Push Pull output 2MHz.
- *   3 - Push Pull output 50MHz.
- *   4 - Digital input.
- *   5 - Open Drain output 10MHz.
- *   6 - Open Drain output 2MHz.
- *   7 - Open Drain output 50MHz.
- *   8 - Digital input with PullUp or PullDown resistor depending on ODR.
- *   9 - Alternate Push Pull output 10MHz.
- *   A - Alternate Push Pull output 2MHz.
- *   B - Alternate Push Pull output 50MHz.
- *   C - Reserved.
- *   D - Alternate Open Drain output 10MHz.
- *   E - Alternate Open Drain output 2MHz.
- *   F - Alternate Open Drain output 50MHz.
- * Please refer to the STM32 Reference Manual for details.
- */
-
-/*
- * Port A setup.
- * Everything input with pull-up except:
- * PA0  - Digital input with PullUp.  AN0
- * PA1  - Digital input with PullUp.  AN1
- * PA2  - Alternate output  (USART2 TX).
- * PA3  - Normal input      (USART2 RX).
- * PA8  - Input with pull-down (PBUTTON).
- */
-#define VAL_GPIOACRL            0x88884B88      /*  PA7...PA0 */
-#define VAL_GPIOACRH            0x88888888      /* PA15...PA8 */
-#define VAL_GPIOAODR            0xFFFFFEFF
-
-/*
- * Port B setup.
- * Everything input with pull-up except:
- * PB13 - Alternate output  (AUDIO SPI2 SCK).
- * PB14 - Normal input      (AUDIO SPI2 MISO).
- * PB15 - Alternate output  (AUDIO SPI2 MOSI).
- */
-#define VAL_GPIOBCRL            0x88888888      /*  PB7...PB0 */
-#define VAL_GPIOBCRH            0xB4B88888      /* PB15...PB8 */
-#define VAL_GPIOBODR            0xFFFFFFFF
-
-/*
- * Port C setup.
- * Everything input with pull-up except:
- * PC6  - Normal input because there is an external resistor.
- * PC7  - Normal input because there is an external resistor.
- * PC13 - Push Pull output (SHUTDOWN)
- */
-#define VAL_GPIOCCRL            0x44888888      /*  PC7...PC0 */
-#define VAL_GPIOCCRH            0x88388888      /* PC15...PC8 */
-#define VAL_GPIOCODR            0xFFFFFFFF
-
-/*
- * Port D setup.
- * Everything input with pull-up except:
- * PD3  - Push Pull output (USB_DISCONNECT)
- */
-#define VAL_GPIODCRL            0x88883888      /*  PD7...PD0 */
-#define VAL_GPIODCRH            0x88888888      /* PD15...PD8 */
-#define VAL_GPIODODR            0xFFFFFFFF
-
-/*
- * Port E setup.
- * Everything input with pull-up except:
- * PE0  - Push Pull output (LED0).
- * PD1  - Push Pull output (LED1).
- */
-#define VAL_GPIOECRL            0x88888833      /*  PE7...PE0 */
-#define VAL_GPIOECRH            0x88888888      /* PE15...PE8 */
-#define VAL_GPIOEODR            0xFFFFFFFF
-
-#if 0
-/*
- * Port F setup.
- * Everything input with pull-up except:
- */
-#define VAL_GPIOFCRL            0x88888888      /*  PF7...PF0 */
-#define VAL_GPIOFCRH            0x88888888      /* PF15...PF8 */
-#define VAL_GPIOFODR            0xFFFFFFFF
-
-/*
- * Port G setup.
- * Everything input with pull-up except:
- */
-#define VAL_GPIOGCRL            0x88888888      /*  PG7...PG0 */
-#define VAL_GPIOGCRH            0x88888888      /* PG15...PG8 */
-#define VAL_GPIOGODR            0xFFFFFFFF
-#endif
-
-#if !defined(_FROM_ASM_)
-#ifdef __cplusplus
-extern "C" {
-#endif
-  void boardInit(void);
-#ifdef __cplusplus
-}
-#endif
-#endif /* _FROM_ASM_ */
-
-#endif /* _BOARD_H_ */

boards/STM32_PRIMER2/mcuconf.h

@@ -1,14 +0,0 @@
-/*
- * HAL driver system settings.
- */
-#define STM32_SW                    STM32_SW_PLL
-#define STM32_PLLSRC                STM32_PLLSRC_HSE
-#define STM32_PLLXTPRE              STM32_PLLXTPRE_DIV2
-#define STM32_PLLMUL_VALUE          12
-#define STM32_HPRE                  STM32_HPRE_DIV1
-#define STM32_PPRE1                 STM32_PPRE1_DIV2
-#define STM32_PPRE2                 STM32_PPRE2_DIV1
-#define STM32_ADCPRE                STM32_ADCPRE_DIV6
-#define STM32_RTCSEL                STM32_RTCSEL_NOCLOCK
-
-#include "mcuconf-common.h"

boards/common/board-common.c

@@ -1,69 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
-
-    This file is part of ChibiOS/RT.
-
-    ChibiOS/RT 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.
-
-    ChibiOS/RT 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/>.
-
-                                      ---
-
-    A special exception to the GPL can be applied should you wish to distribute
-    a combined work that includes ChibiOS/RT, without being obliged to provide
-    the source code for any proprietary components. See the file exception.txt
-    for full details of how and when the exception can be applied.
-*/
-
-#include "ch.h"
-#include "hal.h"
-#include "config.h"
-
-/**
- * @brief   PAL setup.
- * @details Digital I/O ports static configuration as defined in @p board.h.
- *          This variable is used by the HAL when initializing the PAL driver.
- */
-#if HAL_USE_PAL || defined(__DOXYGEN__)
-const PALConfig pal_default_config =
-{
-  {VAL_GPIOAODR, VAL_GPIOACRL, VAL_GPIOACRH},
-  {VAL_GPIOBODR, VAL_GPIOBCRL, VAL_GPIOBCRH},
-  {VAL_GPIOCODR, VAL_GPIOCCRL, VAL_GPIOCCRH},
-  {VAL_GPIODODR, VAL_GPIODCRL, VAL_GPIODCRH},
-  {VAL_GPIOEODR, VAL_GPIOECRL, VAL_GPIOECRH},
-#if defined(STM32F10X_HD)
-  {VAL_GPIOFODR, VAL_GPIOFCRL, VAL_GPIOFCRH},
-  {VAL_GPIOGODR, VAL_GPIOGCRL, VAL_GPIOGCRH},
-#endif
-};
-#endif
-
-/*
- * Early initialization code.
- * This initialization must be performed just after stack setup and before
- * any other initialization.
- */
-void
-__early_init(void)
-{
-  stm32_clock_init();
-}
-
-const uint8_t *
-unique_device_id (void)
-{
-  /* STM32F103 has 96-bit unique device identifier */
-  const uint8_t *addr = (const uint8_t *)0x1ffff7e8;
-
-  return addr;
-}

boards/common/mcuconf-common.h

@@ -1,116 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
-
-    This file is part of ChibiOS/RT.
-
-    ChibiOS/RT 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.
-
-    ChibiOS/RT 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/>.
-
-                                      ---
-
-    A special exception to the GPL can be applied should you wish to distribute
-    a combined work that includes ChibiOS/RT, without being obliged to provide
-    the source code for any proprietary components. See the file exception.txt
-    for full details of how and when the exception can be applied.
-*/
-
-/*
- * STM32 drivers configuration.
- * The following settings override the default settings present in
- * the various device driver implementation headers.
- * Note that the settings for each driver only have effect if the driver
- * is enabled in halconf.h.
- *
- * IRQ priorities:
- * 15...0       Lowest...Highest.
- *
- * DMA priorities:
- * 0...3        Lowest...Highest.
- */
-
-/*
- * HAL driver system settings.
- */
-#define STM32_NO_INIT                       FALSE
-#define STM32_HSI_ENABLED                   TRUE
-#define STM32_LSI_ENABLED                   FALSE
-#define STM32_HSE_ENABLED                   TRUE
-#define STM32_LSE_ENABLED                   FALSE
-#define STM32_USB_CLOCK_REQUIRED            TRUE
-#define STM32_USBPRE                        STM32_USBPRE_DIV1P5
-#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
-#define STM32_PVD_ENABLE                    FALSE
-#define STM32_PLS                           STM32_PLS_LEV0
-
-/*
- * ADC driver system settings.
- */
-#define USE_STM32_ADC1              TRUE
-#define STM32_ADC1_DMA_PRIORITY     3
-#define STM32_ADC1_IRQ_PRIORITY     5
-#define STM32_ADC1_DMA_ERROR_HOOK() chSysHalt()
-
-/*
- * CAN driver system settings.
- */
-#define USE_STM32_CAN1              FALSE
-#define STM32_CAN1_IRQ_PRIORITY     11
-
-/*
- * PWM driver system settings.
- */
-#define USE_STM32_PWM1              FALSE
-#define USE_STM32_PWM2              FALSE
-#define USE_STM32_PWM3              FALSE
-#define USE_STM32_PWM4              FALSE
-#define STM32_PWM1_IRQ_PRIORITY     7
-#define STM32_PWM2_IRQ_PRIORITY     7
-#define STM32_PWM3_IRQ_PRIORITY     7
-#define STM32_PWM4_IRQ_PRIORITY     7
-
-/*
- * SERIAL driver system settings.
- */
-#define USE_STM32_USART1            FALSE
-#define USE_STM32_USART2            FALSE
-#define USE_STM32_USART3            FALSE
-#if defined(STM32F10X_HD) || defined(STM32F10X_CL)
-#define USE_STM32_UART4             FALSE
-#define USE_STM32_UART5             FALSE
-#endif
-#define STM32_USART1_PRIORITY       12
-#define STM32_USART2_PRIORITY       12
-#define STM32_USART3_PRIORITY       12
-#if defined(STM32F10X_HD) || defined(STM32F10X_CL)
-#define STM32_UART4_PRIORITY        12
-#define STM32_UART5_PRIORITY        12
-#endif
-
-/*
- * SPI driver system settings.
- */
-#define USE_STM32_SPI1              FALSE
-#define USE_STM32_SPI2              FALSE
-#define STM32_SPI1_DMA_PRIORITY     2
-#define STM32_SPI2_DMA_PRIORITY     2
-#define STM32_SPI1_IRQ_PRIORITY     10
-#define STM32_SPI2_IRQ_PRIORITY     10
-#define STM32_SPI1_DMA_ERROR_HOOK() chSysHalt()
-
-/*
- * USB driver system settings.
- */
-#define STM32_USB_USE_USB1                  TRUE
-#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
-#define STM32_USB_USB1_HP_IRQ_PRIORITY      6
-#define STM32_USB_USB1_LP_IRQ_PRIORITY      14

doc/gnome3-gpg-settings.rst

@@ -1,8 +1,8 @@
-==========================
-GnuPG settings for GNOME 3
-==========================
+===========================================
+GnuPG settings for GNOME 3.1x and GNOME 3.0
+===========================================
 
-In the article `GnuPG settings`_, I wrote how I disable GNOME-keyrings for SSH.
+In the section `GnuPG settings`_, I wrote how I disable GNOME-keyrings for SSH.
 
 It was for GNOME 2.  The old days was good, we just disabled GNOME-keyrings
 interference to SSH and customizing our desktop was easy for GNU and UNIX users.
@@ -10,29 +10,33 @@ interference to SSH and customizing our desktop was easy for GNU and UNIX users.
 .. _GnuPG settings: gpg-settings
 
 
-GNOME keyrings in GNOME 3
-=========================
+GNOME keyrings in GNOME 3.1x
+============================
 
-It seems that it is more integrated into the desktop.
-It is difficult to kill it.  It would be possible to kill it simply,
-but then, I can't use, say, wi-fi access (which needs to access "secrets")
-any more.
+In the files /etc/xdg/autostart/gnome-keyring-ssh.desktop
+and /etc/xdg/autostart/gnome-keyring-gpg.desktop,
+we have a line something like: ::
 
-We can't use GNOME configuration tool to disable interference by
-GNOME keyrings any more.  It seems that desktop should not have
-customization these days.
+    OnlyShowIn=GNOME;Unity;MATE;
+
+Please edit this line to: ::
+
+    OnlyShowIn=
+
+Then, no desktop environment invokes gnome-keyring for ssh and gpg.  I think that it is The Right Thing.
 
 
-GNOME-SESSION-PROPERTIES
-========================
+GNOME keyrings in GNOME 3.0 by GNOME-SESSION-PROPERTIES
+=======================================================
 
-After struggling some hours, I figured out it is GNOME-SESSION-PROPERTIES
-to disable the interference.  Invoking::
+We can't use GNOME configuration tool (like GNOME 2) to disable interference by
+GNOME keyrings in GNOME 3.0.
+
+It is GNOME-SESSION-PROPERTIES to disable the interference.  Invoking::
 
  $ gnome-session-properties
 
 and at the tab of "Startup Programs", I removed radio check buttons
 for "GPG Password Agent" and "SSH Key Agent".
 
-
-Now, I use gpg-agent for GnuPG Agent and SSH agent with Gnuk Token.
+Then, I can use proper gpg-agent for GnuPG Agent Service and SSH Agent Service with Gnuk Token in GNOME 3.0.

doc/gnuk-keytocard-noremoval.rst

@@ -5,174 +5,14 @@ Key import from PC to Gnuk Token (no removal)
 This document describes how I put my **keys on PC** to the Token
 without removing keys from PC.
 
-The difference is just not-to-save changes after key imports.
+The difference is only the last step.
+I don't save changes on PC after keytocard.
 
-After personalization, I put my keys into the Token.
+For the steps before the last step, please see `keytocard with removing keys on PC`_.
 
-Here is the log.
+.. _keytocard removing keys: gnuk-keytocard
 
-I invoke GnuPG with my key (4ca7babe) and with ``--homedir`` option
-to specify the directory which contains my secret keys.  ::
-
-  $ gpg --homedir=/home/gniibe/tmp/gnuk-testing-dir --edit-key 4ca7babe 
-  gpg (GnuPG) 1.4.11; Copyright (C) 2010 Free Software Foundation, Inc.
-  This is free software: you are free to change and redistribute it.
-  There is NO WARRANTY, to the extent permitted by law.
-  
-  Secret key is available.
-  
-  pub  2048R/4CA7BABE  created: 2010-10-15  expires: never       usage: SC  
-                       trust: ultimate      validity: ultimate
-  sub  2048R/084239CF  created: 2010-10-15  expires: never       usage: E   
-  sub  2048R/5BB065DC  created: 2010-10-22  expires: never       usage: A   
-  [ultimate] (1). NIIBE Yutaka <gniibe@fsij.org>
-
-
-Then, GnuPG enters its own command interaction mode.  The prompt is ``gpg>``.
-To enable ``keytocard`` command, I type ``toggle`` command.  ::
-
-  gpg> toggle
-  
-  sec  2048R/4CA7BABE  created: 2010-10-15  expires: never     
-  ssb  2048R/084239CF  created: 2010-10-15  expires: never     
-  ssb  2048R/5BB065DC  created: 2010-10-22  expires: never     
-  (1)  NIIBE Yutaka <gniibe@fsij.org>
-
-Firstly, I import my primary key into Gnuk Token.
-I type ``keytocard`` command, answer ``y`` to confirm keyimport,
-and type ``1`` to say it's signature key. ::
-
-  gpg> keytocard
-  Really move the primary key? (y/N) y
-  Signature key ....: [none]
-  Encryption key....: [none]
-  Authentication key: [none]
-  
-  Please select where to store the key:
-     (1) Signature key
-     (3) Authentication key
-  Your selection? 1
-
-Then, GnuPG asks two passwords.  One is the passphrase of **keys on PC**
-and another is the password of **Gnuk Token**.  Note that the password of
-the token and the password of the keys on PC are different things,
-although they can be same.
-
-Here, I assume that Gnuk Token's admin password of factory setting (12345678).
-
-I enter these passwords. ::
-
-  You need a passphrase to unlock the secret key for
-  user: "NIIBE Yutaka <gniibe@fsij.org>"
-  2048-bit RSA key, ID 4CA7BABE, created 2010-10-15
-  <PASSWORD-KEY-4CA7BABE>
-  gpg: writing new key
-  gpg: 3 Admin PIN attempts remaining before card is permanently locked
-  
-  Please enter the Admin PIN
-  Enter Admin PIN: 12345678
-  
-  sec  2048R/4CA7BABE  created: 2010-10-15  expires: never     
-                       card-no: F517 00000001
-  ssb  2048R/084239CF  created: 2010-10-15  expires: never     
-  ssb  2048R/5BB065DC  created: 2010-10-22  expires: never     
-  (1)  NIIBE Yutaka <gniibe@fsij.org>
-
-The primary key is now on the Token and GnuPG says its card-no (F517 00000001),
-where F517 is the vendor ID of FSIJ.
-
-Secondly, I import my subkey of encryption.  I select key number '1'. ::
-
-  gpg> key 1
-  
-  sec  2048R/4CA7BABE  created: 2010-10-15  expires: never     
-                       card-no: F517 00000001
-  ssb* 2048R/084239CF  created: 2010-10-15  expires: never     
-  ssb  2048R/5BB065DC  created: 2010-10-22  expires: never     
-  (1)  NIIBE Yutaka <gniibe@fsij.org>
-
-You can see that the subkey is marked by '*'.
-I type ``keytocard`` command to import this subkey to Gnuk Token.
-I select ``2`` as it's encryption key. ::
-
-  gpg> keytocard
-  Signature key ....: [none]
-  Encryption key....: [none]
-  Authentication key: [none]
-  
-  Please select where to store the key:
-     (2) Encryption key
-  Your selection? 2
-
-Then, GnuPG asks the passphrase of **keys on PC** again.  I enter. ::
-
-  You need a passphrase to unlock the secret key for
-  user: "NIIBE Yutaka <gniibe@fsij.org>"
-  2048-bit RSA key, ID 084239CF, created 2010-10-15
-  <PASSWORD-KEY-4CA7BABE>
-  gpg: writing new key
-  
-  sec  2048R/4CA7BABE  created: 2010-10-15  expires: never     
-                       card-no: F517 00000001
-  ssb* 2048R/084239CF  created: 2010-10-15  expires: never     
-                       card-no: F517 00000001
-  ssb  2048R/5BB065DC  created: 2010-10-22  expires: never     
-  (1)  NIIBE Yutaka <gniibe@fsij.org>
-
-The sub key is now on the Token and GnuPG says its card-no for it.
-  
-I type ``key 1`` to deselect key number '1'. ::
-
-  gpg> key 1
-  
-  sec  2048R/4CA7BABE  created: 2010-10-15  expires: never     
-                       card-no: F517 00000001
-  ssb  2048R/084239CF  created: 2010-10-15  expires: never     
-                       card-no: F517 00000001
-  ssb  2048R/5BB065DC  created: 2010-10-22  expires: never     
-  (1)  NIIBE Yutaka <gniibe@fsij.org>
-
-Thirdly, I select sub key of authentication which has key number '2'. ::
-
-  gpg> key 2
-  
-  sec  2048R/4CA7BABE  created: 2010-10-15  expires: never     
-                       card-no: F517 00000001
-  ssb  2048R/084239CF  created: 2010-10-15  expires: never     
-                       card-no: F517 00000001
-  ssb* 2048R/5BB065DC  created: 2010-10-22  expires: never     
-  (1)  NIIBE Yutaka <gniibe@fsij.org>
-
-You can see that the subkey number '2' is marked by '*'.
-I type ``keytocard`` command to import this subkey to Gnuk Token.
-I select ``3`` as it's authentication key. ::
-
-  gpg> keytocard
-  Signature key ....: [none]
-  Encryption key....: [none]
-  Authentication key: [none]
-  
-  Please select where to store the key:
-     (3) Authentication key
-  Your selection? 3
-
-Then, GnuPG asks the passphrase of **keys on PC** again.  I enter. ::
-
-  You need a passphrase to unlock the secret key for
-  user: "NIIBE Yutaka <gniibe@fsij.org>"
-  2048-bit RSA key, ID 5BB065DC, created 2010-10-22
-  <PASSWORD-KEY-4CA7BABE>
-  gpg: writing new key
-  
-  sec  2048R/4CA7BABE  created: 2010-10-15  expires: never     
-                       card-no: F517 00000001
-  ssb  2048R/084239CF  created: 2010-10-15  expires: never     
-                       card-no: F517 00000001
-  ssb* 2048R/5BB065DC  created: 2010-10-22  expires: never     
-                       card-no: F517 00000001
-  (1)  NIIBE Yutaka <gniibe@fsij.org>
-
-The sub key is now on the Token and GnuPG says its card-no for it.
+Here is the session log of the last step.
 
 Lastly, I quit GnuPG.  Note that I **don't** save changes. ::
 

doc/gnuk-keytocard.rst

@@ -22,7 +22,7 @@ See `another document`_ to import keys to the Token from copied directory.
 
 After personalization, I put my keys into the Token.
 
-Here is the log.
+Here is the session log.
 
 I invoke GnuPG with my key (4ca7babe).  ::
 

doc/gnuk-token-initial-configuration.rst

@@ -37,9 +37,3 @@ The tool ``../tool/gnuk_put_binary_libusb.py`` examines  environment variable of
   Configuration:  1
   Interface:  0
   d2 76 00 01 24 01 02 00 f5 17 00 00 00 01 00 00
-
-
-The example above is the case of libusb version.
-
-Use the tool ``../tool/gnuk_put_binary.py`` instead , for PC/SC Lite.
-You need PyScard for this.

doc/gpg-settings.rst

@@ -31,7 +31,7 @@ For GnuPG 2.0.x, gpg-agent is always used, so there is no need to specify the ``
 Let gpg-agent manage SSH key
 ============================
 
-I deactivate seahose-agent.  Also, for GNOME 2, I deactivate gnome-keyring managing SSH key. ::
+I deactivate seahorse-agent.  Also, for GNOME 2, I deactivate gnome-keyring managing SSH key. ::
 
   $ gconftool-2 --type bool --set /apps/gnome-keyring/daemon-components/ssh false
 

doc/note/NOTES

@@ -76,7 +76,6 @@ KEYPTR
          ----> [   P   ][   Q   ][       N        ]
                <---encrypted----><---  plain  ---->
 
-key_addr                       4-byte
 initial_vector (random)        16-byte
 checksum_encrypted             16-byte
 dek_encrypted_by_keystring_pw1 16-byte

doc/note/firmware-update

@@ -48,9 +48,9 @@ I have three keys in my token.
 With the script below, I extract public key of the keygrip
 5D6C89682D07CCFC034AF508420BF2276D8018ED into the file: 5D6C8968.bin::
 
-   $ ./get_public_key.py 5D6C89682D07CCFC034AF508420BF2276D8018ED
+   $ ./get_raw_public_key.py 5D6C89682D07CCFC034AF508420BF2276D8018ED
 
-Here is the script, get_public_key.py::
+Here is the script, get_raw_public_key.py::
 
    #! /usr/bin/python
    

misc/debug-bn.c

@@ -0,0 +1,220 @@
+/*
+ * debug-bn.c - Debug Bignum
+ * Copyright (C) 2014 Free Software Initiative of Japan
+ * Author: NIIBE Yutaka <gniibe@fsij.org>
+ *
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "bn.h"
+
+void
+print_le_bn256 (const bn256 *X)
+{
+  int i;
+  const uint8_t *p = (const uint8_t *)X;
+
+  for (i = 0; i < 32; i++)
+    printf ("%02x", p[i]);
+  puts ("");
+}
+
+void
+print_be_bn256 (const bn256 *X)
+{
+  int i;
+
+  for (i = 7; i >= 0; i--)
+    printf ("%08x", X->word[i]);
+  puts ("");
+}
+
+#define MAXLINE 4096
+
+static int lineno;
+static int test_no;
+static bn256 sk[1];
+static bn256 pk[1];
+static unsigned char msg[MAXLINE];
+static size_t msglen;
+static bn512 sig[1];
+
+const char *
+skip_white_space (const char *l)
+{
+  while (*l != '\n' && isspace (*l))
+    l++;
+
+  return l;
+}
+
+
+static int
+read_hex_4bit (char c)
+{
+  int r;
+
+  if (c >= '0' && c <= '9')
+    r = c - '0';
+  else if (c >= 'a' && c <= 'f')
+    r = c - 'a' + 10;
+  else if (c >= 'A' && c <= 'F')
+    r = c - 'A' + 10;
+  else
+    r = -1;
+  return r;
+}
+
+static int
+read_hex_8bit (const char **l_p)
+{
+  const char *l = *l_p;
+  int r, v;
+
+  r = read_hex_4bit (*l++);
+  if (r < 0)
+    return -1;
+  v = r*16;
+  r = read_hex_4bit (*l++);
+  if (r < 0)
+    return -1;
+  v += r;
+
+  *l_p = l;
+  return v;
+}
+
+static int
+read_msg (unsigned char *msg, const char *l, int len)
+{
+  int i, r;
+
+  for (i = 0; i < len; i++)
+    {
+      r = read_hex_8bit (&l);
+      if (r < 0)
+	return -1;
+      msg[i] = r;
+    }
+
+  return 0;
+}
+
+
+static int
+read_le_bn256 (bn256 *sk, const char *l)
+{
+  int i;
+  uint8_t *p = (uint8_t *)sk;
+
+  for (i = 0; i < sizeof (bn256); i++)
+    {
+      int r;
+
+      if (*l == '\n')
+	{
+	  /* should support small input??? */
+	  return -1;
+	}
+
+      r = read_hex_8bit (&l);
+      if (r < 0)
+	return -1;
+
+      p[i] = r;
+    }
+
+  return 0;
+}
+
+static int
+read_be_bn256 (bn256 *sk, const char *l)
+{
+  int i;
+  uint8_t *p = (uint8_t *)sk;
+
+  for (i = 0; i < sizeof (bn256); i++)
+    {
+      int r;
+
+      if (*l == '\n')
+	{
+	  /* should support small input??? */
+	  return -1;
+	}
+
+      r = read_hex_8bit (&l);
+      if (r < 0)
+	return -1;
+
+      p[31 - i] = r;
+    }
+
+  return 0;
+}
+
+
+static int
+read_pk (bn256 *pk, const char *l, int len)
+{
+  int r;
+
+  if (len == 64)		/* 64 chars == 32-byte */
+    {				/* compressed form */
+      r = read_le_bn256 (pk, l);
+      if (r < 0)
+	return -1;
+      return 0;
+    }
+  else
+    {
+      bn256 x[1];
+
+      r = read_hex_8bit (&l);
+      if (r < 0)
+	return -1;
+      if (r != 4)
+	return -1;
+
+      r = read_be_bn256 (x, l);
+      if (r < 0)
+	return -1;
+      r = read_be_bn256 (pk, l+64);
+      if (r < 0)
+	return -1;
+
+      pk->word[7] ^= (x->word[0] & 1) * 0x80000000;
+      return 0;
+    }
+}
+
+static int
+read_le_bn512 (bn512 *sig, const char *l)
+{
+  int i;
+  uint8_t *p = (uint8_t *)sig;
+
+  for (i = 0; i < sizeof (bn512); i++)
+    {
+      int r;
+
+      if (*l == '\n')
+	{
+	  /* should support small input??? */
+	  return -1;
+	}
+
+      r = read_hex_8bit (&l);
+      if (r < 0)
+	return -1;
+
+      p[i] = r;
+    }
+
+  return 0;
+}

misc/t-eddsa.c

@@ -0,0 +1,398 @@
+/*
+ * t-eddsa.c - testing EdDSA
+ * Copyright (C) 2014 Free Software Initiative of Japan
+ * Author: NIIBE Yutaka <gniibe@fsij.org>
+ *
+ * Run following commands.  The file t-ed25519.inp is available in GNU
+ * libgcrypt source code under 'tests' directory.
+
+  gcc -Wall -c ecc-edwards.c
+  gcc -Wall -c -DBN256_NO_RANDOM -DBN256_C_IMPLEMENTATION bn.c
+  gcc -Wall -c mod.c
+  gcc -Wall -c -DBN256_C_IMPLEMENTATION mod25638.c
+  gcc -Wall -c sha512.c
+  gcc -Wall -c t-eddsa.c
+  gcc -o t-eddsa t-eddsa.o ecc-edwards.o bn.o mod.o mod25638.o sha512.o
+  ./t-eddsa < ./t-ed25519.inp
+
+ *
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "bn.h"
+#include "affine.h"
+#include "sha512.h"
+
+static void
+print_le_bn256 (const bn256 *X)
+{
+  int i;
+  const uint8_t *p = (const uint8_t *)X;
+
+  for (i = 0; i < 32; i++)
+    printf ("%02x", p[i]);
+  puts ("");
+}
+
+static void
+print_be_bn256 (const bn256 *X)
+{
+  int i;
+
+  for (i = 7; i >= 0; i--)
+    printf ("%08x", X->word[i]);
+  puts ("");
+}
+
+#define MAXLINE 4096
+
+static int lineno;
+static int test_no;
+static bn256 sk[1];
+static bn256 pk[1];
+static unsigned char msg[MAXLINE];
+static size_t msglen;
+static bn512 sig[1];
+
+static const char *
+skip_white_space (const char *l)
+{
+  while (*l != '\n' && isspace (*l))
+    l++;
+
+  return l;
+}
+
+
+static int
+read_hex_4bit (char c)
+{
+  int r;
+
+  if (c >= '0' && c <= '9')
+    r = c - '0';
+  else if (c >= 'a' && c <= 'f')
+    r = c - 'a' + 10;
+  else if (c >= 'A' && c <= 'F')
+    r = c - 'A' + 10;
+  else
+    r = -1;
+  return r;
+}
+
+static int
+read_hex_8bit (const char **l_p)
+{
+  const char *l = *l_p;
+  int r, v;
+
+  r = read_hex_4bit (*l++);
+  if (r < 0)
+    return -1;
+  v = r*16;
+  r = read_hex_4bit (*l++);
+  if (r < 0)
+    return -1;
+  v += r;
+
+  *l_p = l;
+  return v;
+}
+
+static int
+read_msg (unsigned char *msg, const char *l, int len)
+{
+  int i, r;
+
+  for (i = 0; i < len; i++)
+    {
+      r = read_hex_8bit (&l);
+      if (r < 0)
+	return -1;
+      msg[i] = r;
+    }
+
+  return 0;
+}
+
+
+static int
+read_le_bn256 (bn256 *sk, const char *l)
+{
+  int i;
+  uint8_t *p = (uint8_t *)sk;
+
+  for (i = 0; i < sizeof (bn256); i++)
+    {
+      int r;
+
+      if (*l == '\n')
+	{
+	  /* should support small input??? */
+	  return -1;
+	}
+
+      r = read_hex_8bit (&l);
+      if (r < 0)
+	return -1;
+
+      p[i] = r;
+    }
+
+  return 0;
+}
+
+static int
+read_be_bn256 (bn256 *sk, const char *l)
+{
+  int i;
+  uint8_t *p = (uint8_t *)sk;
+
+  for (i = 0; i < sizeof (bn256); i++)
+    {
+      int r;
+
+      if (*l == '\n')
+	{
+	  /* should support small input??? */
+	  return -1;
+	}
+
+      r = read_hex_8bit (&l);
+      if (r < 0)
+	return -1;
+
+      p[31 - i] = r;
+    }
+
+  return 0;
+}
+
+
+static int
+read_pk (bn256 *pk, const char *l, int len)
+{
+  int r;
+
+  if (len == 64)		/* 64 chars == 32-byte */
+    {				/* compressed form */
+      r = read_le_bn256 (pk, l);
+      if (r < 0)
+	return -1;
+      return 0;
+    }
+  else
+    {
+      bn256 x[1];
+
+      r = read_hex_8bit (&l);
+      if (r < 0)
+	return -1;
+      if (r != 4)
+	return -1;
+
+      r = read_be_bn256 (x, l);
+      if (r < 0)
+	return -1;
+      r = read_be_bn256 (pk, l+64);
+      if (r < 0)
+	return -1;
+
+      pk->word[7] ^= (x->word[0] & 1) * 0x80000000;
+      return 0;
+    }
+}
+
+static int
+read_le_bn512 (bn512 *sig, const char *l)
+{
+  int i;
+  uint8_t *p = (uint8_t *)sig;
+
+  for (i = 0; i < sizeof (bn512); i++)
+    {
+      int r;
+
+      if (*l == '\n')
+	{
+	  /* should support small input??? */
+	  return -1;
+	}
+
+      r = read_hex_8bit (&l);
+      if (r < 0)
+	return -1;
+
+      p[i] = r;
+    }
+
+  return 0;
+}
+
+static int
+read_testcase (void)
+{
+  ssize_t r;
+  size_t len = 0;
+  char *line = NULL;
+  int start = 0;
+  int err = 0;
+
+  test_no = 0;
+  memset (sk, 0, sizeof (bn256));
+  memset (pk, 0, sizeof (ac));
+  msglen = 0;
+  memset (sig, 0, sizeof (bn512));
+
+  while (1)
+    {
+      lineno++;
+      r = getline (&line, &len, stdin);
+      if (r < 0)
+	{
+	  /* EOF */
+	  if (!start)
+	    err = -1;
+	  break;
+	}
+      len = r;	       /* We don't need allocated size, but length.  */
+      if (len >= MAXLINE)
+	{
+	  fprintf (stderr, "Line too long: %d: >= %d\n", lineno, MAXLINE);
+	  err = -1;
+	  break;
+	}
+
+      if (r == 1 && *line == '\n')
+	{
+	  if (start)
+	    break;		/* Done. */
+	  else
+	    continue; /* Ignore blank line before start.  */
+	}
+
+      if (r > 0 && *line == '#') /* Ignore comment line.  */
+	continue;
+
+      start = 1;
+      if (r > 4 && strncmp (line, "TST:", 4) == 0)
+	test_no = strtol (line+4, NULL, 10);
+      else if (r > 3 && strncmp (line, "SK:", 3) == 0)
+	{
+	  const char *l = skip_white_space (line+3);
+	  if (read_le_bn256 (sk, l) < 0)
+	    {
+	      fprintf (stderr, "read_le_bn256: %d\n", lineno);
+	      err = -1;
+	      break;
+	    }
+	}
+      else if (r > 3 && strncmp (line, "PK:", 3) == 0)
+	{
+	  const char *l = skip_white_space (line+3);
+	  if (read_pk (pk, l, line+len-1-l) < 0)
+	    {
+	      fprintf (stderr, "read_pk: %d\n", lineno);
+	      err = -1;
+	      break;
+	    }
+	}
+      else if (r > 4 && strncmp (line, "MSG:", 4) == 0)
+	{
+	  const char *l = skip_white_space (line+4);
+	  msglen = (line+len-1-l)/2;
+	  if (read_msg (msg, l, msglen) < 0)
+	    {
+	      fprintf (stderr, "read_msg: %d\n", lineno);
+	      err = -1;
+	      break;
+	    }
+	}
+      else if (r > 4 && strncmp (line, "SIG:", 4) == 0)
+	{
+	  const char *l = skip_white_space (line+4);
+	  if (read_le_bn512 (sig, l) < 0)
+	    {
+	      fprintf (stderr, "read_le_bn512: %d\n", lineno);
+	      err = -1;
+	      break;
+	    }
+	}
+      else
+	{
+	  fprintf (stderr, "Garbage line: %d", lineno);
+	  err = -1;
+	  break;
+	}
+    }
+
+  free (line);
+  return err;
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  int all_good = 1;
+  int r;
+  bn256 pk_calculated[1];
+  uint8_t hash[64];
+  bn256 a[1];
+  bn256 *R, *S;
+  uint8_t out[64];
+
+  extern void eddsa_sign_25519 (const uint8_t *input, size_t ilen,
+				uint8_t *output,
+				const bn256 *a, const uint8_t *seed,
+				const bn256 *pk);
+  extern void eddsa_public_key_25519 (bn256 *pk, const bn256 *a);
+
+  R = (bn256 *)out;
+  S = (bn256 *)(out+32);
+
+  while (1)
+    {
+      r = read_testcase ();
+      if (r < 0)
+	break;
+
+      sha512 ((uint8_t *)sk, sizeof (bn256), hash);
+      hash[0] &= 248;
+      hash[31] &= 127;
+      hash[31] |= 64;
+      memcpy (a, hash, sizeof (bn256)); /* Lower half of hash */
+
+      eddsa_public_key_25519 (pk_calculated, a);
+      if (memcmp (pk, pk_calculated, sizeof (bn256)) != 0)
+	{
+	  printf ("ERR PK: %d\n", test_no);
+	  print_be_bn256 (sk);
+	  print_be_bn256 (pk);
+	  print_be_bn256 (pk_calculated);
+	  all_good = 0;
+	  continue;
+	}
+
+      eddsa_sign_25519 (msg, msglen, out, a, hash+32, pk);
+      if (memcmp (sig, R, sizeof (bn256)) != 0
+	  || memcmp (((const uint8_t *)sig)+32, S, sizeof (bn256)) != 0)
+	{
+	  printf ("ERR SIG: %d\n", test_no);
+	  print_le_bn256 (R);
+	  print_le_bn256 (S);
+	  print_le_bn256 ((const bn256 *)sig);
+	  print_le_bn256 ((const bn256 *)(((const uint8_t *)sig)+32));
+	  all_good = 0;
+	  continue;
+	}
+
+      printf ("%d\n", test_no);
+    }
+  return all_good == 1?0:1;
+}

misc/t-mont.c

@@ -0,0 +1,92 @@
+/*
+ * t-eddsa.c - testing EdDSA
+ * Copyright (C) 2014 Free Software Initiative of Japan
+ * Author: NIIBE Yutaka <gniibe@fsij.org>
+ *
+ * Run following commands.  The file t-ed25519.inp is available in GNU
+ * libgcrypt source code under 'tests' directory.
+
+  gcc -Wall -c -DBN256_C_IMPLEMENTATION ecc-mont.c
+  gcc -Wall -c -DBN256_NO_RANDOM -DBN256_C_IMPLEMENTATION bn.c
+  gcc -Wall -c mod.c
+  gcc -Wall -c -DBN256_C_IMPLEMENTATION mod25638.c
+  gcc -Wall -c t-mont.c
+  gcc -Wall -c debug-bn.c
+  gcc -o t-mont t-mont.o ecc-mont.o bn.o mod.o mod25638.o debug-bn.o
+
+
+ *
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "bn.h"
+
+const uint8_t k[32] = {
+  0x30, 0x01, 0x33, 0xE7, 0xDC, 0x52, 0xAD, 0x9F,
+  0x89, 0xFE, 0xC0, 0x59, 0x4A, 0x6D, 0x65, 0xE5,
+  0xF8, 0x7A, 0xD6, 0xA9, 0xA4, 0x89, 0x00, 0xB1,
+  0x93, 0x7E, 0xD3, 0x6F, 0x09, 0x1E, 0xB7, 0x76,
+};
+
+int
+main (int argc, char *argv[])
+{
+  int all_good = 1;
+  int r;
+  bn256 *pk;
+  bn256 a[1];
+  uint8_t out[32];
+
+  extern void ecdh_decrypt_curve25519 (const uint8_t *input,
+				       uint8_t *output,
+				       const bn256 *k);
+  extern uint8_t *ecdh_compute_public_25519 (const uint8_t*k);
+  extern void print_le_bn256 (const bn256 *X);
+
+  while (1)
+    {
+#if 0
+      hash[0] &= 248;
+      hash[31] &= 127;
+      hash[31] |= 64;
+      memcpy (a, hash, sizeof (bn256)); /* Lower half of hash */
+#endif
+
+      pk = ecdh_compute_public_25519 (k);
+      print_le_bn256 (pk);
+      return 0;
+
+#if 0
+      if (memcmp (pk, pk_calculated, sizeof (bn256)) != 0)
+	{
+	  printf ("ERR PK: %d\n", test_no);
+	  print_be_bn256 (sk);
+	  print_be_bn256 (pk);
+	  print_be_bn256 (pk_calculated);
+	  all_good = 0;
+	  continue;
+	}
+
+      ecdh_decrypt_25519 (msg, out, a);
+      if (memcmp (sig, R, sizeof (bn256)) != 0
+	  || memcmp (((const uint8_t *)sig)+32, S, sizeof (bn256)) != 0)
+	{
+	  printf ("ERR SIG: %d\n", test_no);
+	  print_le_bn256 (R);
+	  print_le_bn256 (S);
+	  print_le_bn256 ((const bn256 *)sig);
+	  print_le_bn256 ((const bn256 *)(((const uint8_t *)sig)+32));
+	  all_good = 0;
+	  continue;
+	}
+
+      printf ("%d\n", test_no);
+#endif
+    }
+  return all_good == 1?0:1;
+}

polarssl/include/polarssl/config.h

@@ -209,9 +209,7 @@
  *
  * Enable the RSA prime-number generation code.
  */
-#ifdef KEYGEN_SUPPORT
 #define POLARSSL_GENPRIME
-#endif
 
 /**
  * \def POLARSSL_FS_IO

polarssl/library/bignum.c

@@ -1545,7 +1545,8 @@ int mpi_exp_mod( mpi *X, const mpi *A, const mpi *E, const mpi *N, mpi *_RR )
 {
     int ret;
     size_t i = mpi_msb( E );
-    size_t wsize = ( i > 671 ) ? 6 : ( i > 239 ) ? 5 :
+    size_t wsize = ( i > 1024 ) ? 4 : /* Because of not enough memory.  */
+      		   ( i > 671 ) ? 6 : ( i > 239 ) ? 5 :
                    ( i >  79 ) ? 4 : ( i >  23 ) ? 3 : 1;
     size_t wbits, one = 1;
     size_t nblimbs;

polarssl/library/rsa.c

@@ -671,14 +671,14 @@ int rsa_rsaes_pkcs1_v15_decrypt( rsa_context *ctx,
     size_t ilen, pad_count = 0;
     unsigned char *p, *q;
     unsigned char bt;
-    unsigned char buf[POLARSSL_MPI_MAX_SIZE];
+    unsigned char buf[ctx->len];
 
     if( ctx->padding != RSA_PKCS_V15 )
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
     ilen = ctx->len;
 
-    if( ilen < 16 || ilen > sizeof( buf ) )
+    if( ilen < 16)
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
 
     ret = ( mode == RSA_PUBLIC )

regnual/Makefile

@@ -32,7 +32,7 @@ LDFLAGS = -T$(LDSCRIPT) -nostartfiles $(MCFLAGS) $(TOPT)
 
 all: regnual.hex
 
-regnual.o: regnual.c ../src/sys.h
+regnual.o: regnual.c ../src/sys.h ../src/usb_lld.h
 
 regnual.hex: regnual.elf
 	$(OBJCOPY) -Obinary regnual.elf regnual.bin

regnual/regnual.c

@@ -1,7 +1,8 @@
 /*
  * regnual.c -- Firmware installation for STM32F103 Flash ROM
  *
- * Copyright (C) 2012, 2013 Free Software Initiative of Japan
+ * Copyright (C) 2012, 2013, 2015
+ *               Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -32,12 +33,18 @@
 extern void *memset (void *s, int c, size_t n);
 
 extern void set_led (int);
-extern uint8_t _flash_start,  _flash_end;
 extern int flash_write (uint32_t dst_addr, const uint8_t *src, size_t len);
 extern int flash_protect (void);
 extern void nvic_system_reset (void);
 
 
+#define FLASH_START_ADDR 0x08000000 /* Fixed for all STM32F1.  */
+#define FLASH_OFFSET     0x1000     /* First pages are not-writable.  */
+#define FLASH_START      (FLASH_START_ADDR+FLASH_OFFSET)
+#define FLASH_SIZE_REG   ((uint16_t *)0x1ffff7e0)
+static uint32_t flash_end;
+
+
 #define ENDP0_RXADDR        (0x40)
 #define ENDP0_TXADDR        (0x80)
 
@@ -166,8 +173,7 @@ static uint32_t calc_crc32 (void)
 }
 
 
-void usb_cb_ctrl_write_finish (uint8_t req, uint8_t req_no, uint16_t value,
-			       uint16_t index, uint16_t len)
+void usb_cb_ctrl_write_finish (uint8_t req, uint8_t req_no, uint16_t value)
 {
   uint8_t type_rcp = req & (REQUEST_TYPE|RECIPIENT);
 
@@ -175,24 +181,21 @@ void usb_cb_ctrl_write_finish (uint8_t req, uint8_t req_no, uint16_t value,
     {
       if (req_no == USB_REGNUAL_SEND && value == 0)
 	result = calc_crc32 ();
-      else if (req_no == USB_REGNUAL_FLASH && len == 0 && index == 0)
+      else if (req_no == USB_REGNUAL_FLASH)
 	{
 	  uint32_t dst_addr = (0x08000000 + value * 0x100);
 
 	  result = flash_write (dst_addr, (const uint8_t *)mem, 256);
 	}
-      else if (req_no == USB_REGNUAL_PROTECT && len == 0
-	       && value == 0 && index == 0)
+      else if (req_no == USB_REGNUAL_PROTECT && value == 0)
 	result = flash_protect ();
-      else if (req_no == USB_REGNUAL_FINISH && len == 0
-	       && value == 0 && index == 0)
+      else if (req_no == USB_REGNUAL_FINISH && value == 0)
 	nvic_system_reset ();
     }
 }
 
 int
-usb_cb_setup (uint8_t req, uint8_t req_no,
-	      uint16_t value, uint16_t index, uint16_t len)
+usb_cb_setup (uint8_t req, uint8_t req_no, struct control_info *detail)
 {
   uint8_t type_rcp = req & (REQUEST_TYPE|RECIPIENT);
 
@@ -202,45 +205,42 @@ usb_cb_setup (uint8_t req, uint8_t req_no,
 	{
 	  if (req_no == USB_REGNUAL_MEMINFO)
 	    {
-	      static const uint8_t *mem_info[2];
+	      const uint8_t *mem_info[2];
 
-	      mem_info[0] = &_flash_start;
-	      mem_info[1] = &_flash_end;
-	      usb_lld_set_data_to_send (mem_info, sizeof (mem_info));
-	      return USB_SUCCESS;
+	      mem_info[0] = (const uint8_t *)FLASH_START;
+	      mem_info[1] = (const uint8_t *)flash_end;
+	      return usb_lld_reply_request (mem_info, sizeof (mem_info), detail);
 	    }
 	  else if (req_no == USB_REGNUAL_RESULT)
-	    {
-	      usb_lld_set_data_to_send (&result, sizeof (uint32_t));
-	      return USB_SUCCESS;
-	    }
+	    return usb_lld_reply_request (&result, sizeof (uint32_t), detail);
 	}
       else /* SETUP_SET */
 	{
 	  if (req_no == USB_REGNUAL_SEND)
 	    {
-	      if (value != 0 || index + len > 256)
+	      if (detail->value != 0 || detail->index + detail->len > 256)
 		return USB_UNSUPPORT;
 
-	      if (index + len < 256)
-		memset ((uint8_t *)mem + index + len, 0xff,
-			256 - (index + len));
+	      if (detail->index + detail->len < 256)
+		memset ((uint8_t *)mem + detail->index + detail->len, 0xff,
+			256 - (detail->index + detail->len));
 
-	      usb_lld_set_data_to_recv (mem + index, len);
+	      usb_lld_set_data_to_recv (mem + detail->index, detail->len);
 	      return USB_SUCCESS;
 	    }
-	  else if (req_no == USB_REGNUAL_FLASH && len == 0 && index == 0)
+	  else if (req_no == USB_REGNUAL_FLASH && detail->len == 0
+		   && detail->index == 0)
 	    {
-	      uint32_t dst_addr = (0x08000000 + value * 0x100);
+	      uint32_t dst_addr = (0x08000000 + detail->value * 0x100);
 
-	      if (dst_addr + 256 <= (uint32_t)&_flash_end)
+	      if (dst_addr + 256 <= flash_end)
 		return USB_SUCCESS;
 	    }
-	  else if (req_no == USB_REGNUAL_PROTECT && len == 0
-		   && value == 0 && index == 0)
+	  else if (req_no == USB_REGNUAL_PROTECT && detail->len == 0
+		   && detail->value == 0 && detail->index == 0)
 	    return USB_SUCCESS;
-	  else if (req_no == USB_REGNUAL_FINISH && len == 0
-		   && value == 0 && index == 0)
+	  else if (req_no == USB_REGNUAL_FINISH && detail->len == 0
+		   && detail->value == 0 && detail->index == 0)
 	    return USB_SUCCESS;
 	}
     }
@@ -250,24 +250,17 @@ usb_cb_setup (uint8_t req, uint8_t req_no,
 
 int
 usb_cb_get_descriptor (uint8_t rcp, uint8_t desc_type, uint8_t desc_index,
-		       uint16_t index)
+		       struct control_info *detail)
 {
-  (void)index;
   if (rcp != DEVICE_RECIPIENT)
     return USB_UNSUPPORT;
 
   if (desc_type == DEVICE_DESCRIPTOR)
-    {
-      usb_lld_set_data_to_send (regnual_device_desc,
-				sizeof (regnual_device_desc));
-      return USB_SUCCESS;
-    }
+    return usb_lld_reply_request (regnual_device_desc,
+				  sizeof (regnual_device_desc), detail);
   else if (desc_type == CONFIG_DESCRIPTOR)
-    {
-      usb_lld_set_data_to_send (regnual_config_desc,
-				sizeof (regnual_config_desc));
-      return USB_SUCCESS;
-    }
+    return usb_lld_reply_request (regnual_config_desc,
+				     sizeof (regnual_config_desc), detail); 
   else if (desc_type == STRING_DESCRIPTOR)
     {
       const uint8_t *str;
@@ -280,12 +273,12 @@ usb_cb_get_descriptor (uint8_t rcp, uint8_t desc_type, uint8_t desc_index,
 	  size = sizeof (regnual_string_lang_id);
 	  break;
 	case 1:
-	  str = gnukStringVendor;
-	  size = sizeof (gnukStringVendor);
+	  str = gnuk_string_vendor;
+	  size = sizeof (gnuk_string_vendor);
 	  break;
 	case 2:
-	  str = gnukStringProduct;
-	  size = sizeof (gnukStringProduct);
+	  str = gnuk_string_product;
+	  size = sizeof (gnuk_string_product);
 	  break;
 	case 3:
 	  str = regnual_string_serial;
@@ -295,8 +288,7 @@ usb_cb_get_descriptor (uint8_t rcp, uint8_t desc_type, uint8_t desc_index,
 	  return USB_UNSUPPORT;
 	}
 
-      usb_lld_set_data_to_send (str, size);
-      return USB_SUCCESS;
+      return usb_lld_reply_request (str, size, detail);
     }
 
   return USB_UNSUPPORT;
@@ -318,9 +310,9 @@ int usb_cb_handle_event (uint8_t event_type, uint16_t value)
   return USB_UNSUPPORT;
 }
 
-int usb_cb_interface (uint8_t cmd, uint16_t interface, uint16_t alt)
+int usb_cb_interface (uint8_t cmd, struct control_info *detail)
 {
-  (void)cmd; (void)interface; (void)alt;
+  (void)cmd; (void)detail;
   return USB_UNSUPPORT;
 }
 
@@ -342,6 +334,7 @@ main (int argc, char *argv[])
 
   set_led (0);
 
+  flash_end = FLASH_START_ADDR + (*FLASH_SIZE_REG)*1024;
   usb_lld_init (regnual_config_desc[7]);
 
   while (1)

regnual/regnual.ld

@@ -12,8 +12,6 @@ MEMORY
 }
 
 vector = 0x08000000;
-_flash_start = 0x08001000;
-_flash_end   = 0x08020000;
 
 __ram_start__           = ORIGIN(ram0);
 __ram_size__            = 20k;

src/Makefile.in

@@ -12,7 +12,10 @@ CSRC = main.c usb_stm32f103.c adc_stm32f103.c \
 	usb_desc.c usb_ctrl.c \
 	call-rsa.c \
 	usb-icc.c openpgp.c ac.c openpgp-do.c flash.c \
-	bn.c modp256.c jpc.c mod.c ec_p256.c call-ec_p256.c \
+	bn.c mod.c \
+	modp256r1.c jpc_p256r1.c ec_p256r1.c call-ec_p256r1.c \
+	modp256k1.c jpc_p256k1.c ec_p256k1.c call-ec_p256k1.c \
+	mod25638.c ecc-edwards.c ecc-mont.c sha512.c \
 	random.c neug.c sha256.c sys.c
 
 INCDIR =
@@ -52,7 +55,7 @@ OBJCOPY   = $(CROSS)objcopy
 MCU   = cortex-m3
 CWARN = -Wall -Wextra -Wstrict-prototypes
 # DEFS: Add  
-DEFS  = -DCHX_PRIO_MAIN=5 -DRSA_AUTH @KEYGEN_SUPPORT@ @HAVE_SYS_H@
+DEFS  = @HAVE_SYS_H@
 OPT   = -O3 -Os -g
 LIBS  =
 
@@ -65,6 +68,8 @@ board.h:
 
 sys.c: board.h
 
+build/bignum.o: OPT = -O3 -g
+
 distclean: clean
 	-rm -f gnuk.ld config.h board.h Makefile \
 	       usb-strings.c.inc usb-vid-pid-ver.c.inc

src/adc_stm32f103.c

@@ -3,7 +3,8 @@
  *                   In this ADC driver, there are NeuG specific parts.
  *                   You need to modify to use this as generic ADC driver.
  *
- * Copyright (C) 2011, 2012, 2013 Free Software Initiative of Japan
+ * Copyright (C) 2011, 2012, 2013, 2015
+ *               Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of NeuG, a True Random Number Generator
@@ -92,15 +93,6 @@
                               | ADC_SQR3_SQ4_N(ADC_CHANNEL_VREFINT)     
 #define NEUG_ADC_SETTING1_NUM_CHANNELS 4
 
-#if !defined(NEUG_ADC_SETTING2_SMPR1)
-#define NEUG_ADC_SETTING2_SMPR1 0
-#define NEUG_ADC_SETTING2_SMPR2 ADC_SMPR2_SMP_AN0(ADC_SAMPLE_1P5)    \
-                              | ADC_SMPR2_SMP_AN1(ADC_SAMPLE_1P5)
-#define NEUG_ADC_SETTING2_SQR3  ADC_SQR3_SQ1_N(ADC_CHANNEL_IN0)      \
-                              | ADC_SQR3_SQ2_N(ADC_CHANNEL_IN1)
-#define NEUG_ADC_SETTING2_NUM_CHANNELS 2
-#endif
-
 
 /*
  * Do calibration for both of ADCs.
@@ -133,9 +125,69 @@ void adc_init (void)
   RCC->APB2ENR &= ~(RCC_APB2ENR_ADC1EN | RCC_APB2ENR_ADC2EN);
 }
 
+#include "sys.h"
+#if defined(HAVE_SYS_H)
+# define SYS_BOARD_ID sys_board_id
+#else
+# include "board.h"
+# define SYS_BOARD_ID BOARD_ID
+#endif
+
+static void
+get_adc_config (uint32_t config[4])
+{
+  config[2] = ADC_SQR1_NUM_CH(2);
+  switch (SYS_BOARD_ID)
+    {
+    case BOARD_ID_FST_01:
+      config[0] = 0;
+      config[1] = ADC_SMPR2_SMP_AN0(ADC_SAMPLE_1P5)
+		| ADC_SMPR2_SMP_AN9(ADC_SAMPLE_1P5);
+      config[3] = ADC_SQR3_SQ1_N(ADC_CHANNEL_IN0)
+		| ADC_SQR3_SQ2_N(ADC_CHANNEL_IN9);
+      break;
+
+    case BOARD_ID_OLIMEX_STM32_H103:
+    case BOARD_ID_STBEE:
+      config[0] = ADC_SMPR1_SMP_AN10(ADC_SAMPLE_1P5) 
+		| ADC_SMPR1_SMP_AN11(ADC_SAMPLE_1P5);
+      config[1] = 0;
+      config[3] = ADC_SQR3_SQ1_N(ADC_CHANNEL_IN10)
+		| ADC_SQR3_SQ2_N(ADC_CHANNEL_IN11);
+      break;
+
+    case BOARD_ID_STBEE_MINI:
+      config[0] = 0;
+      config[1] = ADC_SMPR2_SMP_AN1(ADC_SAMPLE_1P5)
+		| ADC_SMPR2_SMP_AN2(ADC_SAMPLE_1P5);
+      config[3] = ADC_SQR3_SQ1_N(ADC_CHANNEL_IN1)
+		| ADC_SQR3_SQ2_N(ADC_CHANNEL_IN2);
+      break;
+
+    case BOARD_ID_CQ_STARM:
+    case BOARD_ID_FST_01_00:
+    case BOARD_ID_MAPLE_MINI:
+    case BOARD_ID_STM32_PRIMER2:
+    case BOARD_ID_STM8S_DISCOVERY:
+    case BOARD_ID_ST_DONGLE:
+    case BOARD_ID_ST_NUCLEO_F103:
+    default:
+      config[0] = 0;
+      config[1] = ADC_SMPR2_SMP_AN0(ADC_SAMPLE_1P5)
+		| ADC_SMPR2_SMP_AN1(ADC_SAMPLE_1P5);
+      config[3] = ADC_SQR3_SQ1_N(ADC_CHANNEL_IN0)
+		| ADC_SQR3_SQ2_N(ADC_CHANNEL_IN1);
+      break;
+    }
+}
+
 
 void adc_start (void)
 {
+  uint32_t config[4];
+
+  get_adc_config (config);
+
   /* Use DMA channel 1.  */
   RCC->AHBENR |= RCC_AHBENR_DMA1EN;
   DMA1_Channel1->CCR = STM32_DMA_CCR_RESET_VALUE;
@@ -156,11 +208,11 @@ void adc_start (void)
   ADC2->CR1 = (ADC_CR1_DUALMOD_2 | ADC_CR1_DUALMOD_1 | ADC_CR1_DUALMOD_0
 	       | ADC_CR1_SCAN);
   ADC2->CR2 = ADC_CR2_EXTTRIG | ADC_CR2_CONT | ADC_CR2_ADON;
-  ADC2->SMPR1 = NEUG_ADC_SETTING2_SMPR1;
-  ADC2->SMPR2 = NEUG_ADC_SETTING2_SMPR2;
-  ADC2->SQR1 = ADC_SQR1_NUM_CH(NEUG_ADC_SETTING2_NUM_CHANNELS);
+  ADC2->SMPR1 = config[0];
+  ADC2->SMPR2 = config[1];
+  ADC2->SQR1 = config[2];
   ADC2->SQR2 = 0;
-  ADC2->SQR3 = NEUG_ADC_SETTING2_SQR3;
+  ADC2->SQR3 = config[3];
 
 #ifdef DELIBARATELY_DO_IT_WRONG_START_STOP
   /*

src/affine.h

@@ -0,0 +1,8 @@
+/**
+ * @brief	Affine coordinates
+ */
+typedef struct
+{
+  bn256 x[1];
+  bn256 y[1];
+} ac;

src/bn.c

@@ -1,7 +1,7 @@
 /*
  * bn.c -- 256-bit (and 512-bit) bignum calculation
  *
- * Copyright (C) 2011, 2013 Free Software Initiative of Japan
+ * Copyright (C) 2011, 2013, 2014 Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -22,28 +22,32 @@
  */
 
 #include <stdint.h>
-#include <stdlib.h>
+#include <string.h>
+#ifndef BN256_NO_RANDOM
 #include "random.h"
+#endif
 #include "bn.h"
 
 uint32_t
 bn256_add (bn256 *X, const bn256 *A, const bn256 *B)
 {
   int i;
+  uint32_t v;
   uint32_t carry = 0;
   uint32_t *px;
   const uint32_t *pa, *pb;
 
-  px = X->words;
-  pa = A->words;
-  pb = B->words;
+  px = X->word;
+  pa = A->word;
+  pb = B->word;
 
   for (i = 0; i < BN256_WORDS; i++)
     {
+      v = *pb;
       *px = *pa + carry;
       carry = (*px < carry);
-      *px += *pb;
-      carry += (*px < *pb);
+      *px += v;
+      carry += (*px < v);
       px++;
       pa++;
       pb++;
@@ -56,21 +60,23 @@ uint32_t
 bn256_sub (bn256 *X, const bn256 *A, const bn256 *B)
 {
   int i;
+  uint32_t v;
   uint32_t borrow = 0;
   uint32_t *px;
   const uint32_t *pa, *pb;
 
-  px = X->words;
-  pa = A->words;
-  pb = B->words;
+  px = X->word;
+  pa = A->word;
+  pb = B->word;
 
   for (i = 0; i < BN256_WORDS; i++)
     {
       uint32_t borrow0 = (*pa < borrow);
 
+      v = *pb;
       *px = *pa - borrow;
-      borrow = (*px < *pb) + borrow0;
-      *px -= *pb;
+      borrow = (*px < v) + borrow0;
+      *px -= v;
       px++;
       pa++;
       pb++;
@@ -83,23 +89,17 @@ uint32_t
 bn256_add_uint (bn256 *X, const bn256 *A, uint32_t w)
 {
   int i;
-  uint32_t carry = 0;
+  uint32_t carry = w;
   uint32_t *px;
   const uint32_t *pa;
 
-  px = X->words;
-  pa = A->words;
+  px = X->word;
+  pa = A->word;
 
   for (i = 0; i < BN256_WORDS; i++)
     {
       *px = *pa + carry;
       carry = (*px < carry);
-      if (i == 0)
-	{
-	  *px += w;
-	  carry += (*px < w);
-	}
-
       px++;
       pa++;
     }
@@ -111,26 +111,19 @@ uint32_t
 bn256_sub_uint (bn256 *X, const bn256 *A, uint32_t w)
 {
   int i;
-  uint32_t borrow = 0;
+  uint32_t borrow = w;
   uint32_t *px;
   const uint32_t *pa;
 
-  px = X->words;
-  pa = A->words;
+  px = X->word;
+  pa = A->word;
 
   for (i = 0; i < BN256_WORDS; i++)
     {
       uint32_t borrow0 = (*pa < borrow);
 
       *px = *pa - borrow;
-      if (i == 0)
-	{
-	  borrow = (*px < w) + borrow0;
-	  *px -= w;
-	}
-      else
-	borrow = borrow0;
-
+      borrow = borrow0;
       px++;
       pa++;
     }
@@ -138,9 +131,30 @@ bn256_sub_uint (bn256 *X, const bn256 *A, uint32_t w)
   return borrow;
 }
 
+#ifndef BN256_C_IMPLEMENTATION
+#define ASM_IMPLEMENTATION 1
+#endif
 void
 bn256_mul (bn512 *X, const bn256 *A, const bn256 *B)
 {
+#if ASM_IMPLEMENTATION
+#include "muladd_256.h"
+  const uint32_t *s;
+  uint32_t *d;
+  uint32_t w;
+  uint32_t c;
+
+  memset (X->word, 0, sizeof (uint32_t)*BN256_WORDS*2);
+
+  s = A->word;  d = &X->word[0];  w = B->word[0];  MULADD_256 (s, d, w, c);
+  s = A->word;  d = &X->word[1];  w = B->word[1];  MULADD_256 (s, d, w, c);
+  s = A->word;  d = &X->word[2];  w = B->word[2];  MULADD_256 (s, d, w, c);
+  s = A->word;  d = &X->word[3];  w = B->word[3];  MULADD_256 (s, d, w, c);
+  s = A->word;  d = &X->word[4];  w = B->word[4];  MULADD_256 (s, d, w, c);
+  s = A->word;  d = &X->word[5];  w = B->word[5];  MULADD_256 (s, d, w, c);
+  s = A->word;  d = &X->word[6];  w = B->word[6];  MULADD_256 (s, d, w, c);
+  s = A->word;  d = &X->word[7];  w = B->word[7];  MULADD_256 (s, d, w, c);
+#else
   int i, j, k;
   int i_beg, i_end;
   uint32_t r0, r1, r2;
@@ -167,7 +181,7 @@ bn256_mul (bn512 *X, const bn256 *A, const bn256 *B)
 
 	  j = k - i;
 
-	  uv = ((uint64_t )A->words[i])*((uint64_t )B->words[j]);
+	  uv = ((uint64_t )A->word[i])*((uint64_t )B->word[j]);
 	  v = uv;
 	  u = (uv >> 32);
 	  r0 += v;
@@ -179,18 +193,96 @@ bn256_mul (bn512 *X, const bn256 *A, const bn256 *B)
 	  r2 += carry;
 	}
 
-      X->words[k] = r0;
+      X->word[k] = r0;
       r0 = r1;
       r1 = r2;
       r2 = 0;
     }
 
-  X->words[k] = r0;
+  X->word[k] = r0;
+#endif
 }
 
 void
 bn256_sqr (bn512 *X, const bn256 *A)
 {
+#if ASM_IMPLEMENTATION
+  int i;
+
+  memset (X->word, 0, sizeof (bn512));
+  for (i = 0; i < BN256_WORDS; i++)
+    {
+      uint32_t *wij = &X->word[i*2];
+      const uint32_t *xj = &A->word[i];
+      uint32_t x_i = *xj++;
+      uint32_t c;
+
+      asm (/* (C,R4,R5) := w_i_i + x_i*x_i; w_i_i := R5; */
+           "mov    %[c], #0\n\t"
+           "ldr    r5, [%[wij]]\n\t"          /* R5 := w_i_i; */
+           "mov    r4, %[c]\n\t"
+           "umlal  r5, r4, %[x_i], %[x_i]\n\t"
+           "str    r5, [%[wij]], #4\n\t"
+           "cmp    %[xj], %[x_max1]\n\t"
+           "bhi    0f\n\t"
+           "mov    r9, %[c]\n\t"  /* R9 := 0, the constant ZERO from here.  */
+           "beq    1f\n"
+   "2:\n\t"
+           "ldmia  %[xj]!, { r7, r8 }\n\t"
+           "ldmia  %[wij], { r5, r6 }\n\t"
+           /* (C,R4,R5) := (C,R4) + w_i_j + 2*x_i*x_j; */
+           "umull  r7, r12, %[x_i], r7\n\t"
+           "adds   r5, r5, r4\n\t"
+           "adc    r4, %[c], r9\n\t"
+           "adds   r5, r5, r7\n\t"
+           "adcs   r4, r4, r12\n\t"
+           "adc    %[c], r9, r9\n\t"
+           "adds   r5, r5, r7\n\t"
+           "adcs   r4, r4, r12\n\t"
+           "adc    %[c], %[c], r9\n\t"
+           /* (C,R4,R6) := (C,R4) + w_i_j + 2*x_i*x_j; */
+           "adds   r6, r6, r4\n\t"
+           "adc    r4, %[c], r9\n\t"
+           "umull  r7, r12, %[x_i], r8\n\t"
+           "adds   r6, r6, r7\n\t"
+           "adcs   r4, r4, r12\n\t"
+           "adc    %[c], r9, r9\n\t"
+           "adds   r6, r6, r7\n\t"
+           "adcs   r4, r4, r12\n\t"
+           "adc    %[c], %[c], r9\n\t"
+           /**/
+           "stmia  %[wij]!, { r5, r6 }\n\t"
+           "cmp    %[xj], %[x_max1]\n\t"
+           "bcc    2b\n\t"
+           "bne    0f\n"
+   "1:\n\t"
+           /* (C,R4,R5) := (C,R4) + w_i_j + 2*x_i*x_j; */
+           "ldr    r5, [%[wij]]\n\t"
+           "ldr    r6, [%[xj]], #4\n\t"
+           "adds   r5, r5, r4\n\t"
+           "adc    r4, %[c], r9\n\t"
+           "umull  r7, r12, %[x_i], r6\n\t"
+           "adds   r5, r5, r7\n\t"
+           "adcs   r4, r4, r12\n\t"
+           "adc    %[c], r9, r9\n\t"
+           "adds   r5, r5, r7\n\t"
+           "adcs   r4, r4, r12\n\t"
+           "adc    %[c], %[c], r9\n\t"
+           "str    r5, [%[wij]], #4\n"
+   "0:\n\t"
+           "ldr    r5, [%[wij]]\n\t"
+           "adds   r4, r4, r5\n\t"
+           "adc    %[c], %[c], #0\n\t"
+           "str    r4, [%[wij]], #4"
+           : [c] "=&r" (c), [wij] "=r" (wij), [xj] "=r" (xj)
+           : [x_i] "r" (x_i), [x_max1] "r" (&A->word[BN256_WORDS-1]),
+             "[wij]" (wij), "[xj]" (xj)
+           : "r4", "r5", "r6", "r7", "r8", "r9", "r12", "memory", "cc");
+
+      if (i < BN256_WORDS - 1)
+	*wij = c;
+    }
+#else
   int i, j, k;
   int i_beg, i_end;
   uint32_t r0, r1, r2;
@@ -217,11 +309,10 @@ bn256_sqr (bn512 *X, const bn256 *A)
 
 	  j = k - i;
 
-	  uv = ((uint64_t )A->words[i])*((uint64_t )A->words[j]);
+	  uv = ((uint64_t )A->word[i])*((uint64_t )A->word[j]);
 	  if (i < j)
 	    {
-	      if ((uv >> 63) != 0)
-		r2++;
+	      r2 += ((uv >> 63) != 0);
 	      uv <<= 1;
 	    }
 	  v = uv;
@@ -235,13 +326,14 @@ bn256_sqr (bn512 *X, const bn256 *A)
 	  r2 += carry;
 	}
 
-      X->words[k] = r0;
+      X->word[k] = r0;
       r0 = r1;
       r1 = r2;
       r2 = 0;
     }
 
-  X->words[k] = r0;
+  X->word[k] = r0;
+#endif
 }
 
 uint32_t
@@ -254,8 +346,8 @@ bn256_shift (bn256 *X, const bn256 *A, int shift)
     {
       for (i = 0; i < BN256_WORDS; i++)
 	{
-	  next_carry = A->words[i] >> (32 - shift);
-	  X->words[i] = (A->words[i] << shift) | carry;
+	  next_carry = A->word[i] >> (32 - shift);
+	  X->word[i] = (A->word[i] << shift) | carry;
 	  carry = next_carry;
 	}
     }
@@ -265,8 +357,8 @@ bn256_shift (bn256 *X, const bn256 *A, int shift)
 
       for (i = BN256_WORDS - 1; i >= 0; i--)
 	{
-	  next_carry = A->words[i] & ((1 << shift) - 1);
-	  X->words[i] = (A->words[i] >> shift) | (carry << (32 - shift));
+	  next_carry = A->word[i] & ((1 << shift) - 1);
+	  X->word[i] = (A->word[i] >> shift) | (carry << (32 - shift));
 	  carry = next_carry;
 	}
     }
@@ -278,63 +370,59 @@ int
 bn256_is_zero (const bn256 *X)
 {
   int i;
+  int r = 1;
 
   for (i = 0; i < BN256_WORDS; i++)
-    if (X->words[i] != 0)
-      return 0;
+    r &=  (X->word[i] == 0);
 
-  return 1;
+  return r;
 }
 
 int
 bn256_is_even (const bn256 *X)
 {
-  return !(X->words[0] & 1);
+  return !(X->word[0] & 1);
 }
 
 int
 bn256_is_ge (const bn256 *A, const bn256 *B)
 {
-  int i;
+  uint32_t borrow;
+  bn256 tmp[1];
 
-  for (i = BN256_WORDS - 1; i >= 0; i--)
-    if (A->words[i] > B->words[i])
-      return 1;
-    else if (A->words[i] < B->words[i])
-      return 0;
-
-  return 1;
+  borrow = bn256_sub (tmp, A, B);
+  return borrow == 0;
 }
 
 
 int
 bn256_cmp (const bn256 *A, const bn256 *B)
 {
-  int i;
+  uint32_t borrow;
+  int is_zero;
+  bn256 tmp[1];
 
-  for (i = BN256_WORDS - 1; i >= 0; i--)
-    if (A->words[i] > B->words[i])
-      return 1;
-    else if (A->words[i] < B->words[i])
-      return -1;
-
-  return 0;
+  borrow = bn256_sub (tmp, A, B);
+  is_zero = bn256_is_zero (tmp);
+  return is_zero ? 0 : (borrow ? -1 : 1);
 }
 
 
+#ifndef BN256_NO_RANDOM
 void
 bn256_random (bn256 *X)
 {
   const uint8_t *rand = random_bytes_get ();
 
-  X->words[7] = ((uint32_t *)rand)[7];
-  X->words[6] = ((uint32_t *)rand)[6];
-  X->words[5] = ((uint32_t *)rand)[5];
-  X->words[4] = ((uint32_t *)rand)[4];
-  X->words[3] = ((uint32_t *)rand)[3];
-  X->words[2] = ((uint32_t *)rand)[2];
-  X->words[1] = ((uint32_t *)rand)[1];
-  X->words[0] = ((uint32_t *)rand)[0];
+  X->word[7] = ((uint32_t *)rand)[7];
+  X->word[6] = ((uint32_t *)rand)[6];
+  X->word[5] = ((uint32_t *)rand)[5];
+  X->word[4] = ((uint32_t *)rand)[4];
+  X->word[3] = ((uint32_t *)rand)[3];
+  X->word[2] = ((uint32_t *)rand)[2];
+  X->word[1] = ((uint32_t *)rand)[1];
+  X->word[0] = ((uint32_t *)rand)[0];
 
   random_bytes_free (rand);
 }
+#endif

src/bn.h

@@ -1,11 +1,11 @@
 #define BN256_WORDS 8
 typedef struct bn256 {
-  uint32_t words[ BN256_WORDS ]; /* Little endian */
+  uint32_t word[ BN256_WORDS ]; /* Little endian */
 } bn256;
 
 #define BN512_WORDS 16
 typedef struct bn512 {
-  uint32_t words[ BN512_WORDS ]; /* Little endian */
+  uint32_t word[ BN512_WORDS ]; /* Little endian */
 } bn512;
 
 uint32_t bn256_add (bn256 *X, const bn256 *A, const bn256 *B);

src/call-ec.c

@@ -1,7 +1,7 @@
 /*
- * call-ec_p256.c - interface between Gnuk and Elliptic curve over GF(p256)
+ * call-ec.c - interface between Gnuk and Elliptic curve over GF(prime)
  *
- * Copyright (C) 2013 Free Software Initiative of Japan
+ * Copyright (C) 2013, 2014 Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -21,24 +21,16 @@
  *
  */
 
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include "bn.h"
-#include "jpc-ac.h"
-#include "ec_p256.h"
+#include "field-group-select.h"
 
-#include "config.h"
-
-#include "gnuk.h"
-
-/* We are little endian.  */
+/* We are little-endian in the computation, but the protocol is big-endian.  */
 
 #define ECDSA_BYTE_SIZE 32
+#define ECDH_BYTE_SIZE 32
 
 int
-ecdsa_sign (const uint8_t *hash, uint8_t *output,
-	    const struct key_data *kd)
+FUNC(ecdsa_sign) (const uint8_t *hash, uint8_t *output,
+		  const uint8_t *key_data)
 {
   int i;
   bn256 r[1], s[1], z[1], d[1];
@@ -46,13 +38,13 @@ ecdsa_sign (const uint8_t *hash, uint8_t *output,
 
   p = (uint8_t *)d;
   for (i = 0; i < ECDSA_BYTE_SIZE; i++)
-    p[ECDSA_BYTE_SIZE - i - 1] = kd->data[i];
+    p[ECDSA_BYTE_SIZE - i - 1] = key_data[i];
 
   p = (uint8_t *)z;
   for (i = 0; i < ECDSA_BYTE_SIZE; i++)
     p[ECDSA_BYTE_SIZE - i - 1] = hash[i];
 
-  ecdsa (r, s, z, d);
+  FUNC(ecdsa) (r, s, z, d);
   p = (uint8_t *)r;
   for (i = 0; i < ECDSA_BYTE_SIZE; i++)
     *output++ = p[ECDSA_BYTE_SIZE - i - 1];
@@ -63,7 +55,7 @@ ecdsa_sign (const uint8_t *hash, uint8_t *output,
 }
 
 uint8_t *
-ecdsa_compute_public (const uint8_t *key_data)
+FUNC(ecc_compute_public) (const uint8_t *key_data)
 {
   uint8_t *p0, *p, *p1;
   ac q[1];
@@ -77,7 +69,7 @@ ecdsa_compute_public (const uint8_t *key_data)
   p = (uint8_t *)k;
   for (i = 0; i < ECDSA_BYTE_SIZE; i++)
     p[ECDSA_BYTE_SIZE - i - 1] = key_data[i];
-  if (compute_kG (q, k) < 0)
+  if (FUNC(compute_kG) (q, k) < 0)
     {
       free (p0);
       return NULL;
@@ -93,3 +85,59 @@ ecdsa_compute_public (const uint8_t *key_data)
 
   return p0;
 }
+
+int
+FUNC(ecdh_decrypt) (const uint8_t *input, uint8_t *output,
+		    const uint8_t *key_data)
+{
+  bn256 k[1];
+  ac X[1], P[1];
+  int i;
+  uint8_t *p0;
+  const uint8_t *p1;
+  int r;
+
+  p0 = (uint8_t *)k;
+  for (i = 0; i < ECDH_BYTE_SIZE; i++)
+    p0[ECDH_BYTE_SIZE - i - 1] = key_data[i];
+
+  p1 = input+1;			/* skip '04' */
+  p0 = (uint8_t *)P->x;
+  for (i = 0; i < ECDH_BYTE_SIZE; i++)
+    p0[ECDH_BYTE_SIZE - i - 1] = *p1++;
+  p0 = (uint8_t *)P->y;
+  for (i = 0; i < ECDH_BYTE_SIZE; i++)
+    p0[ECDH_BYTE_SIZE - i - 1] = *p1++;
+
+  r = FUNC(compute_kP) (X, k, P);
+  if (r == 0)
+    {
+      p0 = output;
+      p1 = (const uint8_t *)X->x;
+      *p0++ = 4;
+      for (i = 0; i < ECDH_BYTE_SIZE; i++)
+	*p0++ = p1[ECDH_BYTE_SIZE - i - 1];
+      p1 = (const uint8_t *)X->y;
+      for (i = 0; i < ECDH_BYTE_SIZE; i++)
+	*p0++ = p1[ECDH_BYTE_SIZE - i - 1];
+    }
+
+  return r;
+}
+
+
+/**
+ * @brief Check if a secret d0 is valid or not
+ *
+ * @param D0	scalar D0: secret
+ * @param D1	scalar D1: secret candidate N-D0
+ *
+ * Return 0 on error.
+ * Return -1 when D1 should be used as the secret
+ * Return 1 when D0 should be used as the secret
+ */
+int
+FUNC(ecc_check_secret) (const uint8_t *d0, uint8_t *d1)
+{
+  return FUNC(check_secret) ((const bn256 *)d0, (bn256 *)d1);
+}

src/call-ec_p256k1.c

@@ -0,0 +1,35 @@
+/*
+ * call-ec_p256k1.c - interface between Gnuk and Elliptic curve over
+ *                    GF(p256k1)
+ *
+ * Copyright (C) 2014 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/>.
+ *
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include "bn.h"
+#include "affine.h"
+#include "jpc-ac_p256k1.h"
+#include "ec_p256k1.h"
+
+#define FIELD p256k1
+
+#include "call-ec.c"

src/call-ec_p256r1.c

@@ -0,0 +1,35 @@
+/*
+ * call-ec_p256r1.c - interface between Gnuk and Elliptic curve over
+ *                    GF(p256r1)
+ *
+ * Copyright (C) 2014 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/>.
+ *
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include "bn.h"
+#include "affine.h"
+#include "jpc-ac_p256r1.h"
+#include "ec_p256r1.h"
+
+#define FIELD p256r1
+
+#include "call-ec.c"

src/call-rsa.c

@@ -1,7 +1,8 @@
 /*
  * call-rsa.c -- Glue code between RSA computation and OpenPGP card protocol
  *
- * Copyright (C) 2010, 2011, 2012, 2013 Free Software Initiative of Japan
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014
+ *               Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -32,29 +33,25 @@
 #include "polarssl/config.h"
 #include "polarssl/rsa.h"
 
-#define RSA_SIGNATURE_LENGTH KEY_CONTENT_LEN
- /* 256 byte == 2048-bit */
- /* 128 byte == 1024-bit */
-
 static rsa_context rsa_ctx;
 
 int
 rsa_sign (const uint8_t *raw_message, uint8_t *output, int msg_len,
-	  struct key_data *kd)
+	  struct key_data *kd, int pubkey_len)
 {
   mpi P1, Q1, H;
   int ret = 0;
-  unsigned char temp[RSA_SIGNATURE_LENGTH];
+  unsigned char temp[pubkey_len];
 
   rsa_init (&rsa_ctx, RSA_PKCS_V15, 0);
 
   mpi_init (&P1);  mpi_init (&Q1);  mpi_init (&H);
 
-  rsa_ctx.len = KEY_CONTENT_LEN;
+  rsa_ctx.len = pubkey_len;
   MPI_CHK( mpi_lset (&rsa_ctx.E, 0x10001) );
-  MPI_CHK( mpi_read_binary (&rsa_ctx.P, &kd->data[0], rsa_ctx.len / 2) );
-  MPI_CHK( mpi_read_binary (&rsa_ctx.Q, &kd->data[KEY_CONTENT_LEN/2],
-			    rsa_ctx.len / 2) );
+  MPI_CHK( mpi_read_binary (&rsa_ctx.P, &kd->data[0], pubkey_len / 2) );
+  MPI_CHK( mpi_read_binary (&rsa_ctx.Q, &kd->data[pubkey_len / 2],
+			    pubkey_len / 2) );
 #if 0
   MPI_CHK( mpi_mul_mpi (&rsa_ctx.N, &rsa_ctx.P, &rsa_ctx.Q) );
 #endif
@@ -74,7 +71,7 @@ rsa_sign (const uint8_t *raw_message, uint8_t *output, int msg_len,
       ret = rsa_rsassa_pkcs1_v15_sign (&rsa_ctx, NULL, NULL,
 				       RSA_PRIVATE, SIG_RSA_RAW,
 				       msg_len, raw_message, temp);
-      memcpy (output, temp, RSA_SIGNATURE_LENGTH);
+      memcpy (output, temp, pubkey_len);
     }
 
   rsa_free (&rsa_ctx);
@@ -86,7 +83,6 @@ rsa_sign (const uint8_t *raw_message, uint8_t *output, int msg_len,
     }
   else
     {
-      res_APDU_size = RSA_SIGNATURE_LENGTH;
       DEBUG_INFO ("done.\r\n");
       GPG_SUCCESS ();
       return 0;
@@ -123,14 +119,13 @@ modulus_calc (const uint8_t *p, int len)
 
 int
 rsa_decrypt (const uint8_t *input, uint8_t *output, int msg_len,
-	     struct key_data *kd)
+	     struct key_data *kd, unsigned int *output_len_p)
 {
   mpi P1, Q1, H;
   int ret;
-  unsigned int output_len;
 
   DEBUG_INFO ("RSA decrypt:");
-  DEBUG_WORD ((uint32_t)&output_len);
+  DEBUG_WORD ((uint32_t)&ret);
 
   rsa_init (&rsa_ctx, RSA_PKCS_V15, 0);
   mpi_init (&P1);  mpi_init (&Q1);  mpi_init (&H);
@@ -139,9 +134,8 @@ rsa_decrypt (const uint8_t *input, uint8_t *output, int msg_len,
   DEBUG_WORD (msg_len);
 
   MPI_CHK( mpi_lset (&rsa_ctx.E, 0x10001) );
-  MPI_CHK( mpi_read_binary (&rsa_ctx.P, &kd->data[0], KEY_CONTENT_LEN / 2) );
-  MPI_CHK( mpi_read_binary (&rsa_ctx.Q, &kd->data[KEY_CONTENT_LEN/2],
-			    KEY_CONTENT_LEN / 2) );
+  MPI_CHK( mpi_read_binary (&rsa_ctx.P, &kd->data[0], msg_len / 2) );
+  MPI_CHK( mpi_read_binary (&rsa_ctx.Q, &kd->data[msg_len / 2], msg_len / 2) );
 #if 0
   MPI_CHK( mpi_mul_mpi (&rsa_ctx.N, &rsa_ctx.P, &rsa_ctx.Q) );
 #endif
@@ -158,7 +152,7 @@ rsa_decrypt (const uint8_t *input, uint8_t *output, int msg_len,
     {
       DEBUG_INFO ("RSA decrypt ...");
       ret = rsa_rsaes_pkcs1_v15_decrypt (&rsa_ctx, NULL, NULL,
-					 RSA_PRIVATE, &output_len, input,
+					 RSA_PRIVATE, output_len_p, input,
 					 output, MAX_RES_APDU_DATA_SIZE);
     }
 
@@ -171,7 +165,6 @@ rsa_decrypt (const uint8_t *input, uint8_t *output, int msg_len,
     }
   else
     {
-      res_APDU_size = output_len;
       DEBUG_INFO ("done.\r\n");
       GPG_SUCCESS ();
       return 0;
@@ -179,14 +172,15 @@ rsa_decrypt (const uint8_t *input, uint8_t *output, int msg_len,
 }
 
 int
-rsa_verify (const uint8_t *pubkey, const uint8_t *hash, const uint8_t *sig)
+rsa_verify (const uint8_t *pubkey, int pubkey_len,
+	    const uint8_t *hash, const uint8_t *sig)
 {
   int ret;
 
   rsa_init (&rsa_ctx, RSA_PKCS_V15, 0);
-  rsa_ctx.len = KEY_CONTENT_LEN;
+  rsa_ctx.len = pubkey_len;
   MPI_CHK( mpi_lset (&rsa_ctx.E, 0x10001) );
-  MPI_CHK( mpi_read_binary (&rsa_ctx.N, pubkey, KEY_CONTENT_LEN) );
+  MPI_CHK( mpi_read_binary (&rsa_ctx.N, pubkey, pubkey_len) );
 
   DEBUG_INFO ("RSA verify...");
 
@@ -210,16 +204,15 @@ rsa_verify (const uint8_t *pubkey, const uint8_t *hash, const uint8_t *sig)
 
 #define RSA_EXPONENT 0x10001
 
-#ifdef KEYGEN_SUPPORT
 uint8_t *
-rsa_genkey (void)
+rsa_genkey (int pubkey_len)
 {
   int ret;
   uint8_t index = 0;
-  uint8_t *p_q_modulus = (uint8_t *)malloc (KEY_CONTENT_LEN*2);
+  uint8_t *p_q_modulus = (uint8_t *)malloc (pubkey_len * 2);
   uint8_t *p = p_q_modulus;
-  uint8_t *q = p_q_modulus + KEY_CONTENT_LEN/2;
-  uint8_t *modulus = p_q_modulus + KEY_CONTENT_LEN;
+  uint8_t *q = p_q_modulus + pubkey_len / 2;
+  uint8_t *modulus = p_q_modulus + pubkey_len;
   extern int prng_seed (int (*f_rng)(void *, unsigned char *, size_t),
 			void *p_rng);
   extern void neug_flush (void);
@@ -231,8 +224,8 @@ rsa_genkey (void)
   prng_seed (random_gen, &index);
 
   rsa_init (&rsa_ctx, RSA_PKCS_V15, 0);
-  MPI_CHK( rsa_gen_key (&rsa_ctx, random_gen, &index,
-			KEY_CONTENT_LEN * 8, RSA_EXPONENT) );
+  MPI_CHK( rsa_gen_key (&rsa_ctx, random_gen, &index, pubkey_len * 8,
+			RSA_EXPONENT) );
   if (ret != 0)
     {
       free (p_q_modulus);
@@ -240,9 +233,9 @@ rsa_genkey (void)
       return NULL;
     }
 
-  MPI_CHK( mpi_write_binary (&rsa_ctx.P, p, KEY_CONTENT_LEN/2) );
-  MPI_CHK( mpi_write_binary (&rsa_ctx.Q, q, KEY_CONTENT_LEN/2) );
-  MPI_CHK( mpi_write_binary (&rsa_ctx.N, modulus, KEY_CONTENT_LEN) );
+  MPI_CHK( mpi_write_binary (&rsa_ctx.P, p, pubkey_len / 2) );
+  MPI_CHK( mpi_write_binary (&rsa_ctx.Q, q, pubkey_len / 2) );
+  MPI_CHK( mpi_write_binary (&rsa_ctx.N, modulus, pubkey_len) );
 
  cleanup:
   rsa_free (&rsa_ctx);
@@ -251,4 +244,3 @@ rsa_genkey (void)
   else
     return p_q_modulus;
 }
-#endif

src/chconf.h

@@ -1,74 +0,0 @@
-/* ChibiOS/RT configuration file */
-
-#ifndef _CHCONF_H_
-#define _CHCONF_H_
-
-#include <config.h>
-#ifdef DFU_SUPPORT
-#define CORTEX_VTOR_INIT (0x00003000+0x00001000)
-#else
-#define CORTEX_VTOR_INIT 0x00001000
-#endif
-
-#define CH_FREQUENCY                    1000
-#define CH_TIME_QUANTUM                 20
-#define CH_USE_NESTED_LOCKS             FALSE
-#define CH_MEMCORE_SIZE                 0 /* Whole RAM */
-#define CH_NO_IDLE_THREAD               FALSE
-#define CH_OPTIMIZE_SPEED               TRUE
-#define CH_USE_REGISTRY                 TRUE
-#define CH_USE_WAITEXIT                 TRUE
-#define CH_USE_SEMAPHORES               TRUE
-#define CH_USE_SEMAPHORES_PRIORITY      FALSE
-#define CH_USE_SEMSW                    FALSE
-#define CH_USE_MUTEXES                  TRUE
-#define CH_USE_CONDVARS                 TRUE
-#define CH_USE_CONDVARS_TIMEOUT         TRUE
-#define CH_USE_EVENTS                   TRUE /* We use this! */
-#define CH_USE_EVENTS_TIMEOUT           TRUE /* We use this! */
-#define CH_USE_MESSAGES                 FALSE
-#define CH_USE_MESSAGES_PRIORITY        FALSE
-#define CH_USE_MAILBOXES                FALSE
-#define CH_USE_QUEUES                   FALSE
-#define CH_USE_MEMCORE                  TRUE
-#define CH_USE_HEAP                     TRUE
-#define CH_USE_MALLOC_HEAP              FALSE
-#define CH_USE_MEMPOOLS                 FALSE
-#define CH_USE_DYNAMIC                  TRUE
-
-/* Debug options */
-#define CH_DBG_ENABLE_CHECKS            FALSE
-#define CH_DBG_ENABLE_ASSERTS           FALSE
-#define CH_DBG_ENABLE_TRACE             FALSE
-#define CH_DBG_ENABLE_STACK_CHECK       TRUE
-#define CH_DBG_FILL_THREADS             FALSE
-#define CH_DBG_THREADS_PROFILING        FALSE
-
-#define THREAD_EXT_FIELDS                                               \
-  /* Add threads custom fields here.*/                                  \
-
-#define THREAD_EXT_INIT(tp) {                                           \
-  /* Add threads initialization code here.*/                            \
-}
-
-#define THREAD_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
-  /* System halt code here.*/                                               \
-}
-
-#define THREAD_EXT_EXIT(tp) {                                           \
-  /* Add threads finalization code here.*/                              \
-}
-
-#define IDLE_LOOP_HOOK() {                                              \
-  /* Idle loop code here.*/                                             \
-}
-
-#define SYSTEM_TICK_EVENT_HOOK() {                                          \
-  /* System tick event code here.*/                                         \
-}
-
-#define SYSTEM_HALT_HOOK() {                                                \
-  /* System halt code here.*/                                               \
-}
-
-#endif  /* _CHCONF_H_ */

src/config.h.in

@@ -7,4 +7,4 @@
 @PINPAD_MORE_DEFINE@
 @CERTDO_DEFINE@
 @HID_CARD_CHANGE_DEFINE@
-@SERIALNO_STR_LEN@
+@SERIALNO_STR_LEN_DEFINE@

src/configure

@@ -1,9 +1,13 @@
 #! /bin/bash
 
+# This is bash which supports ANSI-C Quoting
+nl=$'\n'
+
 #
 # This file is *NOT* generated by GNU Autoconf, but written by NIIBE Yutaka
 #
-# Copyright (C) 2010, 2011, 2012, 2013 Free Software Initiative of Japan
+# Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015
+#               Free Software Initiative of Japan
 #
 # This file is a part of Gnuk, a GnuPG USB Token implementation.
 # Gnuk is free software: you can redistribute it and/or modify it
@@ -22,16 +26,22 @@
 # Default settings
 help=no
 vidpid=none
-target=OLIMEX_STM32_H103
+target=FST_01
 verbose=no
 with_dfu=default
 debug=no
+sys1_compat=yes
 pinpad=no
 certdo=no
-keygen=no
-sys1_compat=yes
 hid_card_change=no
 
+# Revision number
+if test -d ../.git; then
+  REVISION=`git describe --dirty="-modified"` 
+else
+  REVISION=`cat ../VERSION`
+fi
+
 # Process each option
 for option; do
   case $option in
@@ -60,18 +70,14 @@ for option; do
     certdo=yes ;;
   --disable-certdo)
     certdo=no ;;
-  --enable-keygen)
-    keygen=yes ;;
-  --disable-keygen)
-    keygen=no ;;
-  --enable-sys1-compat)
-    sys1_compat = yes ;;
-  --disable-sys1-compat)
-    sys1_compat = no ;;
   --enable-hid-card-change)
-    hid_card_change = yes ;;
+    hid_card_change=yes ;;
   --disable-hid-card-change)
-    hid_card_change = no ;;
+    hid_card_change=no ;;
+  --enable-sys1-compat)
+    sys1_compat=yes ;;
+  --disable-sys1-compat)
+    sys1_compat=no ;;
   --with-dfu)
     with_dfu=yes ;;
   --without-dfu)
@@ -93,17 +99,20 @@ Defaults for the options are specified in brackets.
 Configuration:
   -h, --help		display this help and exit	[no]
   --vidpid=VID:PID	specify vendor/product ID	[<NONE>]
-  --target=TARGET	specify target			[OLIMEX_STM32_H103]
+  --target=TARGET	specify target			[FST_01]
 			supported targets are:
-			   OLIMEX_STM32_H103
-			   STM8S_DISCOVERY
 			   FST_01
-			   FST_01_00
+			   OLIMEX_STM32_H103
+			   STM32_PRIMER2
+			   STBEE
+			   STBEE_MINI
+			   MAPLE_MINI
+			   CQ_STARM
+			   FST_01_00 (unreleased version with 8MHz XTAL)
   --enable-debug	debug with virtual COM port	[no]
   --enable-pinpad=cir
 			PIN entry support		[no]
   --enable-certdo	support CERT.3 data object	[no]
-  --enable-keygen	support key generation		[no]
   --enable-sys1-compat	enable SYS 1.0 compatibility	[yes]
 			   executable is target dependent
   --disable-sys1-compat	disable SYS 1.0 compatibility	[no]
@@ -119,14 +128,13 @@ if test "$vidpid" = "none"; then
   exit 1
 fi
 
-TARGET_DEFINE="#define BOARD_$target 1"
 BOARD_HEADER_FILE=board-`echo $target | tr '_[:upper:]' '-[:lower:]'`.h
 echo Header file is: $BOARD_HEADER_FILE
 ln -sf ../chopstx/board/$BOARD_HEADER_FILE board.h
 
 # Flash page size in byte
 FLASH_PAGE_SIZE=1024
-# Flash memory size in KB
+# Flash memory size in KiB
 FLASH_SIZE=128
 # Memory size in KiB
 MEMORY_SIZE=20
@@ -169,6 +177,10 @@ fi
 
 # --with-dfu option
 if test "$with_dfu" = "yes"; then
+  if test "$target" = "FST_01" -o "$target" = "FST_01_00"; then
+      echo "FST-01 doesn't have DFU loader, you should not use --with-dfu."
+      exit 1
+  fi
   echo "Configured for DFU"
   ORIGIN=0x08003000
   FLASH_SIZE=`expr $FLASH_SIZE - 12`
@@ -213,15 +225,6 @@ else
   echo "CERT.3 Data Object is NOT supported"
 fi
 
-# --enable-keygen option
-if test "$keygen" = "yes"; then
-  KEYGEN_SUPPORT="-DKEYGEN_SUPPORT"
-  echo "Key generation on device is supported"
-else
-  KEYGEN_SUPPORT=""
-  echo "Key generation on device is NOT supported"
-fi
-
 # --enable-hid-card-change option
 if test "$hid_card_change" = "yes"; then
   HID_CARD_CHANGE_DEFINE="#define HID_CARD_CHANGE_SUPPORT 1"
@@ -231,65 +234,82 @@ else
   echo "Card insert/removal by HID device is NOT supported"
 fi
 
-if test -d ../.git; then
-  REVISION=`git describe --dirty="-modified"` 
-else
-  REVISION=`cat ../VERSION`
-fi
-
 ### !!! Replace following string of "FSIJ" to yours !!! ####
 SERIALNO="FSIJ-`cat ../VERSION | sed -e 's%^[^/]*/%%'`-"
 
 SERIALNO_STR_LEN_DEFINE="#define SERIALNO_STR_LEN ${#SERIALNO}"
 
 
-CONFIG="$target:dfu=$with_dfu:debug=$debug:pinpad=$pinpad:certdo=$certdo:keygen=$keygen"
+if test "$sys1_compat" = "yes"; then
+  CONFIG="$target:dfu=$with_dfu:debug=$debug:pinpad=$pinpad:certdo=$certdo"
+else
+  if test "$with_dfu" = "yes"; then
+    echo "Common binary can't support DFU loader, don't use --with-dfu."
+    exit 1
+  fi
+  # Override settings for common binary.  Safer side.
+  FLASH_PAGE_SIZE=2048
+  FLASH_SIZE=128
+  MEMORY_SIZE=20
+  CONFIG="common:debug=$debug:pinpad=$pinpad:certdo=$certdo"
+fi
+
+output_vid_pid_version () {
+  echo $VIDPID | sed -n -e "s%^\([0-9a-f][0-9a-f]\)\([0-9a-f][0-9a-f]\):\([0-9a-f][0-9a-f]\)\([0-9a-f][0-9a-f]\)$%  0x\2, 0x\1, /* idVendor  */\\${nl}  0x\4, 0x\3, /* idProduct */%p"
+  echo $VERSION | sed -n -e "s%^\([0-9a-f][0-9a-f]\)\([0-9a-f][0-9a-f]\)$%  0x\2, 0x\1, /* bcdDevice  */%p"
+}
+
+output_vendor_product_serial_strings () {
+  prefix=$1
+
+  echo "static const uint8_t ${prefix}string_vendor[] = {"
+  echo "  ${#VENDOR}*2+2,			/* bLength */"
+  echo "  USB_STRING_DESCRIPTOR_TYPE,	/* bDescriptorType */"
+  echo "  /* Manufacturer: \"$VENDOR\" */"
+  echo $VENDOR | sed -e "s/\(........\)/\1\\${nl}/g" | sed -n -e "s/\(.\)/'\1', 0, /g" -e "s/^/  /" -e "/^  ./s/ $//p"
+  echo '};'
+  echo
+  echo "static const uint8_t ${prefix}string_product[] = {"
+  echo "  ${#PRODUCT}*2+2,			/* bLength */"
+  echo "  USB_STRING_DESCRIPTOR_TYPE,	/* bDescriptorType */"
+  echo "  /* Product name: \"$PRODUCT\" */"
+  echo $PRODUCT | sed -e "s/\(........\)/\1\\${nl}/g" | sed -n -e "s/\(.\)/'\1', 0, /g" -e "s/^/  /" -e "/^  ./s/ $//p"
+  echo '};'
+
+  if test -n "$prefix"; then
+  echo
+  echo "uint8_t ${prefix}string_serial[] = {"
+  echo "  ${#SERIALNO}*2+2+16,			/* bLength */"
+  echo "  USB_STRING_DESCRIPTOR_TYPE,	/* bDescriptorType */"
+  echo "  /* Serial number: \"$SERIALNO\" */"
+  echo $SERIALNO | sed -e "s/\(........\)/\1\\${nl}/g" | sed -n -e "s/\(.\)/'\1', 0, /g" -e "s/^/  /" -e "/^  ./s/ $//p"
+  echo "  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,"
+  echo "  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,"
+  echo '};'
+  echo
+  echo '#ifdef USB_STRINGS_FOR_GNUK'
+  echo "static const uint8_t ${prefix}revision_detail[] = {"
+  echo "  ${#REVISION}*2+2,			/* bLength */"
+  echo "  USB_STRING_DESCRIPTOR_TYPE,	/* bDescriptorType */"
+  echo "  /* revision detail: \"$REVISION\" */"
+  echo $REVISION | sed -e "s/\(........\)/\1\\${nl}/g" | sed -n -e "s/\(.\)/'\1', 0, /g" -e "s/^/  /" -e "/^  ./s/ $//p"
+  echo '};'
+  echo
+  echo "static const uint8_t ${prefix}config_options[] = {"
+  echo "  ${#CONFIG}*2+2,			/* bLength */"
+  echo "  USB_STRING_DESCRIPTOR_TYPE,	/* bDescriptorType */"
+  echo "  /* configure options: \"$CONFIG\" */"
+  echo $CONFIG | sed -e "s/\(........\)/\1\\${nl}/g" | sed -n -e "s/\(.\)/'\1', 0, /g" -e "s/^/  /" -e "/^  ./s/ $//p"
+  echo '};'
+  echo '#endif'
+  fi
+}
 
 if !(IFS="	"
   while read VIDPID VERSION PRODUCT VENDOR; do
     if test "$vidpid" = "$VIDPID"; then
-      (echo $VIDPID | sed -n -e "s%^\([0-9a-f][0-9a-f]\)\([0-9a-f][0-9a-f]\):\([0-9a-f][0-9a-f]\)\([0-9a-f][0-9a-f]\)$%  0x\2, 0x\1, /* idVendor  */\n  0x\4, 0x\3, /* idProduct */%p"
-       echo $VERSION | sed -n -e "s%^\([0-9a-f][0-9a-f]\)\([0-9a-f][0-9a-f]\)$%  0x\2, 0x\1, /* bcdDevice  */%p"
-      ) > usb-vid-pid-ver.c.inc
-      (echo 'static const uint8_t gnukStringVendor[] = {'
-       echo "  ${#VENDOR}*2+2,			/* bLength */"
-       echo "  USB_STRING_DESCRIPTOR_TYPE,	/* bDescriptorType */"
-       echo "  /* Manufacturer: \"$VENDOR\" */"
-       echo $VENDOR | sed -n -e "s/\(........\)/\1\n/gp" | sed -n -e "s/\(.\)/'\1', 0, /g" -e "s/^/  /" -e "s/ $//p"
-       echo '};'
-       echo
-       echo 'static const uint8_t gnukStringProduct[] = {'
-       echo "  ${#PRODUCT}*2+2,			/* bLength */"
-       echo "  USB_STRING_DESCRIPTOR_TYPE,	/* bDescriptorType */"
-       echo "  /* Product name: \"$PRODUCT\" */"
-       echo $PRODUCT | sed -n -e "s/\(........\)/\1\n/gp" | sed -n -e "s/\(.\)/'\1', 0, /g" -e "s/^/  /" -e "s/ $//p"
-       echo '};'
-       echo
-       echo 'const uint8_t gnukStringSerial[] = {'
-       echo "  ${#SERIALNO}*2+2+16,			/* bLength */"
-       echo "  USB_STRING_DESCRIPTOR_TYPE,	/* bDescriptorType */"
-       echo "  /* Serial number: \"$SERIALNO\" */"
-       echo $SERIALNO | sed -n -e "s/\(........\)/\1\n/gp" | sed -n -e "s/\(.\)/'\1', 0, /g" -e "s/^/  /" -e "s/ $//p"
-       echo "  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,"
-       echo "  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,"
-       echo '};'
-       echo
-       echo '#ifdef USB_STRINGS_FOR_GNUK'
-       echo 'static const uint8_t gnuk_revision_detail[] = {'
-       echo "  ${#REVISION}*2+2,			/* bLength */"
-       echo "  USB_STRING_DESCRIPTOR_TYPE,	/* bDescriptorType */"
-       echo "  /* revision detail: \"$REVISION\" */"
-       echo $REVISION | sed -n -e "s/\(........\)/\1\n/gp" | sed -n -e "s/\(.\)/'\1', 0, /g" -e "s/^/  /" -e "s/ $//p"
-       echo '};'
-       echo
-       echo 'static const uint8_t gnuk_config_options[] = {'
-       echo "  ${#CONFIG}*2+2,			/* bLength */"
-       echo "  USB_STRING_DESCRIPTOR_TYPE,	/* bDescriptorType */"
-       echo "  /* configure options: \"$CONFIG\" */"
-       echo $CONFIG | sed -n -e "s/\(........\)/\1\n/gp" | sed -n -e "s/\(.\)/'\1', 0, /g" -e "s/^/  /" -e "s/ $//p"
-       echo '};'
-       echo '#endif'
-       ) >usb-strings.c.inc
+      output_vid_pid_version > usb-vid-pid-ver.c.inc
+      output_vendor_product_serial_strings gnuk_ >usb-strings.c.inc
       exit 0
     fi
   done; exit 1) < ../GNUK_USB_DEVICE_ID
@@ -300,8 +320,8 @@ then
 fi
 
 if test "$sys1_compat" = "no"; then
-   # Disable when you are sure that it's sys version 2.0.
-   # Note that Gnuk 1.0 and Neug (until 0.06) uses sys version 1.0.
+   # Disable when you are sure that it's sys version 2.1.
+   # Note that Gnuk 1.0 and NeuG (until 0.06) uses sys version 1.0.
    # Disabling the compatibility, executable will be target independent,
    # assuming the clock initialization will be done by SYS (before entry).
    have_sys_h="-DHAVE_SYS_H"
@@ -309,10 +329,10 @@ else
    have_sys_h=""
 fi
 
+
 sed -e "s%@HAVE_SYS_H@%$have_sys_h%" \
     -e "s%@DEBUG_MAKE_OPTION@%$DEBUG_MAKE_OPTION%" \
     -e "s%@PINPAD_MAKE_OPTION@%$PINPAD_MAKE_OPTION%" \
-    -e "s%@KEYGEN_SUPPORT@%$KEYGEN_SUPPORT%" \
     -e "s%@HEXOUTPUT_MAKE_OPTION@%$HEXOUTPUT_MAKE_OPTION%" \
 	< Makefile.in > Makefile
 if test "$certdo" = "yes"; then
@@ -321,6 +341,8 @@ if test "$certdo" = "yes"; then
       -e "s/@MEMORY_SIZE@/$MEMORY_SIZE/" \
       -e "s/@FLASH_PAGE_SIZE@/$FLASH_PAGE_SIZE/" \
       -e "s/@MSC_SIZE@/$MSC_SIZE/" \
+      -e "s/@TIM_SIZE@/$TIM_SIZE/" \
+      -e "s/@EXT_SIZE@/$EXT_SIZE/" \
 	< gnuk.ld.in > gnuk.ld
 else
   sed -e "/^@CERTDO_SUPPORT_START@$/,/^@CERTDO_SUPPORT_END@$/ d" \
@@ -338,6 +360,6 @@ sed -e "s/@DEBUG_DEFINE@/$DEBUG_DEFINE/" \
     -e "s/@PINPAD_MORE_DEFINE@/$PINPAD_MORE_DEFINE/" \
     -e "s/@CERTDO_DEFINE@/$CERTDO_DEFINE/" \
     -e "s/@HID_CARD_CHANGE_DEFINE@/$HID_CARD_CHANGE_DEFINE/" \
-    -e "s/@SERIALNO_STR_LEN@/$SERIALNO_STR_LEN_DEFINE/" \
+    -e "s/@SERIALNO_STR_LEN_DEFINE@/$SERIALNO_STR_LEN_DEFINE/" \
 	< config.h.in > config.h
 exit 0

src/ec_p256.h

@@ -1,12 +0,0 @@
-/* Non-adjacent form */
-typedef struct naf4_257 {
-  uint32_t words[ BN256_WORDS*4 ]; /* Little endian */
-  uint8_t last_nibble;		   /* most significant nibble */
-} naf4_257;
-
-void compute_naf4_257 (naf4_257 *NAF_K, const bn256 *K);
-int compute_kP (ac *X, const naf4_257 *NAF_K, const ac *P);
-
-int compute_kG (ac *X, const bn256 *K);
-void ecdsa (bn256 *r, bn256 *s, const bn256 *z, const bn256 *d);
-

src/ec_p256k1.c

@@ -0,0 +1,231 @@
+/*                                                    -*- coding: utf-8 -*-
+ * ec_p256k1.c - Elliptic curve over GF(p256k1)
+ *
+ * Copyright (C) 2014 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/>.
+ *
+ */
+
+/*
+ * Note: we don't take advantage of the specific feature of this curve,
+ * but use same method of computation as NIST P-256 curve.  That's due
+ * to some software patent(s).
+ */
+
+#include <stdint.h>
+#include <string.h>
+#include "bn.h"
+#include "modp256k1.h"
+#include "affine.h"
+#include "jpc-ac_p256k1.h"
+#include "mod.h"
+#include "ec_p256k1.h"
+
+#define FIELD p256k1
+#define COEFFICIENT_A_IS_ZERO    1
+
+/*
+ * a = 0, b = 7
+ */
+static const bn256 coefficient_a[1] = {
+  {{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }}
+};
+
+static const bn256 coefficient_b[1] = {
+  {{ 0x7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }}
+};
+
+
+static const ac precomputed_KG[15] = {
+  {
+    {{{ 0x16f81798, 0x59f2815b, 0x2dce28d9, 0x029bfcdb,
+	0xce870b07, 0x55a06295, 0xf9dcbbac, 0x79be667e }}},
+    {{{ 0xfb10d4b8, 0x9c47d08f, 0xa6855419, 0xfd17b448,
+	0x0e1108a8, 0x5da4fbfc, 0x26a3c465, 0x483ada77 }}}
+  }, {
+    {{{ 0x42d0e6bd, 0x13b7e0e7, 0xdb0f5e53, 0xf774d163,
+	0x104d6ecb, 0x82a2147c, 0x243c4e25, 0x3322d401 }}},
+    {{{ 0x6c28b2a0, 0x24f3a2e9, 0xa2873af6, 0x2805f63e,
+	0x4ddaf9b7, 0xbfb019bc, 0xe9664ef5, 0x56e70797 }}}
+  }, {
+    {{{ 0x829d122a, 0xdca81127, 0x67e99549, 0x8f17f314,
+	0x6a8a9e73, 0x9b889085, 0x846dd99d, 0x583fdfd9 }}},
+    {{{ 0x63c4eac4, 0xf3c7719e, 0xb734b37a, 0xb44685a3,
+	0x572a47a6, 0x9f92d2d6, 0x2ff57d81, 0xabc6232f }}}
+  }, {
+    {{{ 0x9ec4c0da, 0x1b7b444c, 0x723ea335, 0xe88c5678,
+	0x981f162e, 0x9239c1ad, 0xf63b5f33, 0x8f68b9d2 }}},
+    {{{ 0x501fff82, 0xf23cbf79, 0x95510bfd, 0xbbea2cfe,
+	0xb6be215d, 0xde1d90c2, 0xba063986, 0x662a9f2d }}}
+  }, {
+    {{{ 0x114cbf09, 0x63c5e885, 0x7be77e3e, 0x2f27ce93,
+	0xf54a3e33, 0xdaa6d12d, 0x3eff872c, 0x8b300e51 }}},
+    {{{ 0xb3b10a39, 0x26c6ff28, 0x9aaf7169, 0x08f6a7aa,
+	0x6b8238ea, 0x446f0d46, 0x7f43c0cc, 0x1cec3067 }}}
+  }, {
+    {{{ 0x075e9070, 0xba16ce6a, 0x9b5cfe37, 0xbc26893d,
+	0x9c510774, 0xe1ddadfe, 0xfe3ae2f4, 0x90922d88 }}},
+    {{{ 0x5c08824a, 0x653943cc, 0xfce8f4bc, 0x06d74475,
+	0x533c615d, 0x8d101fa7, 0x742108a9, 0x7b1903f6 }}}
+  }, {
+    {{{ 0x6ebdc96c, 0x1bcfa45c, 0x1c7584ba, 0xe400bc04,
+	0x74cf531f, 0x6395e20e, 0xc5131b30, 0x1edd0bb1 }}},
+    {{{ 0xe358cf9e, 0xa117161b, 0x2724d11c, 0xe490d6f0,
+	0xee6dd8c9, 0xf75062f6, 0xfba373e4, 0x31e03b2b }}}
+  }, {
+    {{{ 0x2120e2b3, 0x7f3b58fa, 0x7f47f9aa, 0x7a58fdce,
+	0x4ce6e521, 0xe7be4ae3, 0x1f51bdba, 0xeaa649f2 }}},
+    {{{ 0xba5ad93d, 0xd47a5305, 0xf13f7e59, 0x01a6b965,
+	0x9879aa5a, 0xc69a80f8, 0x5bbbb03a, 0xbe3279ed }}}
+  }, {
+    {{{ 0x27bb4d71, 0xcf291a33, 0x33524832, 0x6caf7d6b,
+	0x766584ee, 0x6e0ee131, 0xd064c589, 0x160cb0f6 }}},
+    {{{ 0x17136e8d, 0x9d5de554, 0x1aab720e, 0xe3f2d468,
+	0xccf75cc2, 0xd1378b49, 0xc4ff16e1, 0x6920c375 }}}
+  }, {
+    {{{ 0x1a9ee611, 0x3eef9e96, 0x9cc37faf, 0xfe4d7bf3,
+	0xb321d965, 0x462aa9b3, 0x208736c5, 0x1702da3e }}},
+    {{{ 0x3a545ceb, 0xfba57bbf, 0x7ea858f5, 0x6dbcd766,
+	0x680d92f1, 0x088e897c, 0xbc626c80, 0x468c1fd8 }}}
+  }, {
+    {{{ 0xb188660a, 0xb40f85c7, 0x99bc3c36, 0xc5873c19,
+	0x7f33b54c, 0x3c7b4541, 0x1f8c9bf8, 0x4cd3a93c }}},
+    {{{ 0x33099cb0, 0xf8dce380, 0x2edd2f33, 0x7a167dd6,
+	0x0ffe35b7, 0x576d8987, 0xc68ace5c, 0xd2de0386 }}}
+  }, {
+    {{{ 0x6658bb08, 0x9a9e0a72, 0xc589607b, 0xe23c5f2a,
+	0xf2bfb4c8, 0xa048ca14, 0xc62c2291, 0x4d9a0f89 }}},
+    {{{ 0x0f827294, 0x427b5f31, 0x9f2c35cd, 0x1ea7a8b5,
+	0x85a3c00f, 0x95442e56, 0x9b57975a, 0x8cb83121 }}}
+  }, {
+    {{{ 0x51f5cf67, 0x4333f0da, 0xf4f0d3cb, 0x6d3ea47c,
+	0xa05a831f, 0x442fda14, 0x016d3e81, 0x6a496013 }}},
+    {{{ 0xe52e0f48, 0xf647318c, 0x4a0d5ff1, 0x5ff3a66e,
+	0x61199ba8, 0x046ed81a, 0x3e79c23a, 0x578edf08 }}}
+  }, {
+    {{{ 0x3ea01ea7, 0xb8f996f8, 0x7497bb15, 0xc0045d33,
+	0x6205647c, 0xc4749dc9, 0x0efd22c9, 0xd8946054 }}},
+    {{{ 0x12774ad5, 0x062dcb09, 0x8be06e3a, 0xcb13f310,
+	0x235de1a9, 0xca281d35, 0x69c3645c, 0xaf8a7412 }}}
+  }, {
+    {{{ 0xbeb8b1e2, 0x8808ca5f, 0xea0dda76, 0x0262b204,
+	0xddeb356b, 0xb6fffffc, 0xfbb83870, 0x52de253a }}},
+    {{{ 0x8f8d21ea, 0x961f40c0, 0x002f03ed, 0x89686278,
+	0x38e421ea, 0x0ff834d7, 0xd36fb8db, 0x3a270d6f }}}
+  }
+};
+
+static const ac precomputed_2E_KG[15] = {
+  {
+    {{{ 0x39a48db0, 0xefd7835b, 0x9b3c03bf, 0x9f1215a2,
+	0x9b7bde45, 0x2791d0a0, 0x696e7167, 0x100f44da }}},
+    {{{ 0x2bc65a09, 0x0fbd5cd6, 0xff5195ac, 0xb7ff4a18,
+	0x0c090666, 0x2ec8f330, 0x92a00b77, 0xcdd9e131 }}}
+  }, {
+    {{{ 0x40fb27b6, 0x32427e28, 0xbe430576, 0xc76e3db2,
+	0x61686aa5, 0x10f238ad, 0xbe778b1b, 0xfea74e3d }}},
+    {{{ 0xf23cb96f, 0x701d3db7, 0x973f7b77, 0x126b596b,
+	0xccb6af93, 0x7cf674de, 0x9b0b1329, 0x6e0568db }}}
+  }, {
+    {{{ 0x2c8118bc, 0x6cac5154, 0x399ddd98, 0x19bd4b34,
+	0x2e9c8949, 0x47248a8d, 0x2cefa3b1, 0x734cb6a8 }}},
+    {{{ 0x1e410fd5, 0xf1b340ad, 0xc4873539, 0xa2982bee,
+	0xd4de4530, 0x7b5a3ea4, 0x42202574, 0xae46e10e }}}
+  }, {
+    {{{ 0xac1f98cd, 0xcbfc99c8, 0x4d7f0308, 0x52348905,
+	0x1cc66021, 0xfaed8a9c, 0x4a474870, 0x9c3919a8 }}},
+    {{{ 0xd4fc599d, 0xbe7e5e03, 0x6c64c8e6, 0x905326f7,
+	0xf260e641, 0x584f044b, 0x4a4ddd57, 0xddb84f0f }}}
+  }, {
+    {{{ 0xed7cebed, 0xc4aacaa8, 0x4fae424e, 0xb75d2dce,
+	0xba20735e, 0xa01585a2, 0xba122399, 0x3d75f24b }}},
+    {{{ 0xd5570dce, 0xcbe4606f, 0x2da192c2, 0x9d00bfd7,
+	0xa57b7265, 0x9c3ce86b, 0xec4edf5e, 0x987a22f1 }}}
+  }, {
+    {{{ 0x73ea0665, 0x211b9715, 0xf3a1abbb, 0x86f485d4,
+	0xcd076f0e, 0xabd242d8, 0x0ba5dc88, 0x862332ab }}},
+    {{{ 0x7b784911, 0x09af505c, 0xcaf4fae7, 0xc89544e8,
+	0xae9a32eb, 0x256625f6, 0x606d1a3f, 0xe2532b72 }}}
+  }, {
+    {{{ 0x0deaf885, 0x79e9f313, 0x46df21c9, 0x938ff76e,
+	0xa953bb2c, 0x1968f5fb, 0x29155f27, 0xdff538bf }}},
+    {{{ 0x31d5d020, 0xf7bae0b1, 0x1a676a8d, 0x5afdc787,
+	0xfa9d53ff, 0x11b4f032, 0xc5959167, 0x86ba433e }}}
+  }, {
+    {{{ 0x9475b7ba, 0x884fdff0, 0xe4918b3d, 0xe039e730,
+	0xf5018cdb, 0x3d3e57ed, 0x1943785c, 0x95939698 }}},
+    {{{ 0x7524f2fd, 0xe9b8abf8, 0xc8709385, 0x9c653f64,
+	0x4b9cd684, 0x8ba0386a, 0x88c331dd, 0x2e7e5528 }}}
+  }, {
+    {{{ 0xeefe79e5, 0x940bef53, 0xbe9b87f3, 0xc518d286,
+	0x7833042c, 0x9e0c7c76, 0x11fbe152, 0x104e2cb5 }}},
+    {{{ 0x50bbec83, 0xc0d35e0f, 0x4acd0fcc, 0xee4879be,
+	0x006085ee, 0xc8d80f5d, 0x72fe1ac1, 0x3c51bc1c }}}
+  }, {
+    {{{ 0xb2de976e, 0x06187f61, 0xf5e4b4b6, 0x52869e18,
+	0x38d332ca, 0x74d4facd, 0xb3a2f8d9, 0x5c1c90b4 }}},
+    {{{ 0xdaa37893, 0x98644d09, 0xabe39818, 0x682435a8,
+	0x469c53a0, 0x17e46617, 0x77dc2e64, 0x642f9632 }}}
+  }, {
+    {{{ 0x222f6c54, 0xad2101c5, 0xfa74785e, 0xb05c7a58,
+	0x489bcdaf, 0xce55fa79, 0xffe88d54, 0xc1f920fd }}},
+    {{{ 0x9065e490, 0x32553ab0, 0x35329f74, 0x7611b9af,
+	0xab7b24c0, 0x57df19ef, 0x6181c447, 0xb9a78749 }}}
+  }, {
+    {{{ 0xa80b7ea8, 0x392f156f, 0x8ae4a8bf, 0x57ab7ca0,
+	0x50c4b178, 0xac320747, 0x0e781feb, 0x146041b9 }}},
+    {{{ 0x845279b2, 0xd343f075, 0x7387afa5, 0x2d4fe757,
+	0xa72f3c39, 0x151e0948, 0x550da168, 0x41a6d54e }}}
+  }, {
+    {{{ 0x075a0010, 0xb3134ed3, 0x7ae93e23, 0x9fa76f4b,
+	0x7bb4daaa, 0xc0db256f, 0x464dd8a3, 0x7668dc27 }}},
+    {{{ 0x9f5da977, 0x150063f5, 0x05efce00, 0x3acac5c8,
+	0x884493fe, 0xc8e12ffc, 0x88f06bd2, 0x4ab936d8 }}}
+  }, {
+    {{{ 0x5d09ea98, 0x996fde77, 0x4145da58, 0x16ddf512,
+	0xdc2fb225, 0xa97a6ca8, 0xfbdcdf5a, 0xc7331f30 }}},
+    {{{ 0x86a86e52, 0x838f99e0, 0x77795edd, 0x68d39b29,
+	0x9f412aaa, 0xe4e4f97e, 0x30d25352, 0xe5cc2c0a }}}
+  }, {
+    {{{ 0x9c21ff71, 0xb3d68650, 0xddbe3884, 0x11e7589d,
+	0x423bac67, 0x7efd4055, 0x46957425, 0x587a7293 }}},
+    {{{ 0x8f5a8fc6, 0x360adc2e, 0xbd69f12e, 0x6f8bbafb,
+	0x0a3f3b4d, 0xf671f423, 0x59942dc3, 0xb49acb47 }}}
+  }
+};
+
+/*
+ * N: order of G
+ *    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141
+ */
+static const bn256 N[1] = {
+  {{ 0xd0364141, 0xbfd25e8c, 0xaf48a03b, 0xbaaedce6,
+     0xfffffffe, 0xffffffff, 0xffffffff, 0xffffffff }}
+};
+
+/*
+ * MU = 2^512 / N
+ * MU = ( (1 << 256) | MU_lower )
+ */
+static const bn256 MU_lower[1] = {
+  {{ 0x2fc9bec0, 0x402da173, 0x50b75fc4, 0x45512319,
+     0x1, 0x0, 0x0, 0x0 }}
+};
+
+
+#include "ecc.c"

src/ec_p256k1.h

@@ -0,0 +1,4 @@
+int compute_kP_p256k1 (ac *X, const bn256 *K, const ac *P);
+int compute_kG_p256k1 (ac *X, const bn256 *K);
+void ecdsa_p256k1 (bn256 *r, bn256 *s, const bn256 *z, const bn256 *d);
+int check_secret_p256k1 (const bn256 *q, bn256 *d1);

src/ec_p256r1.c

@@ -1,7 +1,7 @@
-/*
- * ec_p256.c - Elliptic curve over GF(p256)
+/*                                                    -*- coding: utf-8 -*-
+ * ec_p256r1.c - Elliptic curve over GF(p256r1)
  *
- * Copyright (C) 2011, 2013 Free Software Initiative of Japan
+ * Copyright (C) 2014 Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -21,45 +21,20 @@
  *
  */
 
-/*
- * References:
- *
- * [1] Suite B Implementer's Guide to FIPS 186-3 (ECDSA), February 3, 2010.
- *
- * [2] Michael Brown, Darrel Hankerson, Julio López, and Alfred Menezes,
- *     Software Implementation of the NIST Elliptic Curves Over Prime Fields,
- *     Proceedings of the 2001 Conference on Topics in Cryptology: The
- *     Cryptographer's Track at RSA
- *     Pages 250-265, Springer-Verlag London, UK, 2001
- *     ISBN:3-540-41898-9
- */
-
 #include <stdint.h>
 #include <string.h>
 #include "bn.h"
-#include "modp256.h"
-#include "jpc-ac.h"
+#include "modp256r1.h"
+#include "affine.h"
+#include "jpc-ac_p256r1.h"
 #include "mod.h"
-#include "ec_p256.h"
-
-#if TEST
-/*
- * Generator of Elliptic curve over GF(p256)
- */
-const bn256 Gx[1] = {
-  {{  0xd898c296, 0xf4a13945, 0x2deb33a0, 0x77037d81,
-      0x63a440f2, 0xf8bce6e5, 0xe12c4247, 0x6b17d1f2  }}
-};
-
-const bn256 Gy[1] = {
-  {{  0x37bf51f5, 0xcbb64068, 0x6b315ece, 0x2bce3357,
-      0x7c0f9e16, 0x8ee7eb4a, 0xfe1a7f9b, 0x4fe342e2  }}
-};
-#endif
+#include "ec_p256r1.h"
 
+#define FIELD p256r1
+#define COEFFICIENT_A_IS_MINUS_3 1
 
 /*
- * a = -3 mod p256
+ * a = -3 mod p256r1
  */
 static const bn256 coefficient_a[1] = {
   {{  0xfffffffc, 0xffffffff, 0xffffffff, 0x00000000,
@@ -72,13 +47,6 @@ static const bn256 coefficient_b[1] = {
 };
 
 
-/*
- * w = 4
- * m = 256
- * d = 64
- * e = 32
- */
-
 static const ac precomputed_KG[15] = {
   {
     {{{ 0xd898c296, 0xf4a13945, 0x2deb33a0, 0x77037d81,
@@ -237,271 +205,6 @@ static const ac precomputed_2E_KG[15] = {
   }
 };
 
-/**
- * @brief	X  = k * G
- *
- * @param K	scalar k
- *
- * Return -1 on error.
- * Return 0 on success.
- */
-int
-compute_kG (ac *X, const bn256 *K)
-{
-  int i;
-  int q_is_infinite = 1;
-  jpc Q[1];
-
-  for (i = 31; i >= 0; i--)
-    {
-      int k_i, k_i_e;
-
-      if (!q_is_infinite)
-	jpc_double (Q, Q);
-
-      k_i = (((K->words[6] >> i) & 1) << 3)
-	| (((K->words[4] >> i) & 1) << 2)
-	| (((K->words[2] >> i) & 1) << 1)
-	| ((K->words[0] >> i) & 1);
-      k_i_e = (((K->words[7] >> i) & 1) << 3)
-	| (((K->words[5] >> i) & 1) << 2)
-	| (((K->words[3] >> i) & 1) << 1)
-	| ((K->words[1] >> i) & 1);
-
-      if (k_i)
-	{
-	  if (q_is_infinite)
-	    {
-	      memcpy (Q->x, (&precomputed_KG[k_i - 1])->x, sizeof (bn256));
-	      memcpy (Q->y, (&precomputed_KG[k_i - 1])->y, sizeof (bn256));
-	      Q->z->words[0] = 1;
-	      Q->z->words[1] = Q->z->words[2] = Q->z->words[3]
-		= Q->z->words[4] = Q->z->words[5] = Q->z->words[6]
-		= Q->z->words[7] = 0;
-	      q_is_infinite = 0;
-	    }
-	  else
-	    jpc_add_ac (Q, Q, &precomputed_KG[k_i - 1]);
-	}
-      if (k_i_e)
-	{
-	  if (q_is_infinite)
-	    {
-	      memcpy (Q->x, (&precomputed_2E_KG[k_i_e - 1])->x, sizeof (bn256));
-	      memcpy (Q->y, (&precomputed_2E_KG[k_i_e - 1])->y, sizeof (bn256));
-	      memset (Q->z, 0, sizeof (bn256));
-	      Q->z->words[0] = 1;
-	      q_is_infinite = 0;
-	    }
-	  else
-	    jpc_add_ac (Q, Q, &precomputed_2E_KG[k_i_e - 1]);
-	}
-    }
-
-  return jpc_to_ac (X, Q);
-}
-
-
-#define NAF_K_SIGN(k)	(k&8)
-#define NAF_K_INDEX(k)	((k&7)-1)
-
-static void
-naf4_257_set (naf4_257 *NAF_K, int i, int ki)
-{
-  if (ki != 0)
-    {
-      if (ki > 0)
-	ki = (ki+1)/2;
-      else
-	ki = (1-ki)/2 | 8;
-    }
-
-  if (i == 256)
-    NAF_K->last_nibble = ki;
-  else
-    {
-      NAF_K->words[i/8] &= ~(0x0f << ((i & 0x07)*4));
-      NAF_K->words[i/8] |= (ki << ((i & 0x07)*4));
-    }
-}
-
-static int
-naf4_257_get (const naf4_257 *NAF_K, int i)
-{
-  int ki;
-
-  if (i == 256)
-    ki = NAF_K->last_nibble;
-  else
-    {
-      ki = NAF_K->words[i/8] >> ((i & 0x07)*4);
-      ki &= 0x0f;
-    }
-
-  return ki;
-}
-
-
-/*
- * convert 256-bit bignum into non-adjacent form (NAF)
- */
-void
-compute_naf4_257 (naf4_257 *NAF_K, const bn256 *K)
-{
-  int i = 0;
-  bn256 K_tmp[1];
-  uint32_t carry = 0;
-
-  memcpy (K_tmp, K, sizeof (bn256));
-  memset (NAF_K, 0, sizeof (naf4_257));
-
-  while (!bn256_is_zero (K_tmp))
-    {
-      if (bn256_is_even (K_tmp))
-	naf4_257_set (NAF_K, i, 0);
-      else
-	{
-	  int ki = (K_tmp->words[0]) & 0x0f;
-
-	  if ((ki & 0x08))
-	    {
-	      carry = bn256_add_uint (K_tmp, K_tmp, 16 - ki);
-	      ki = ki - 16;
-	    }
-	  else
-	    K_tmp->words[0] &= 0xfffffff0;
-
-	  naf4_257_set (NAF_K, i, ki);
-	}
-
-      bn256_shift (K_tmp, K_tmp, -1);
-      if (carry)
-	{
-	  K_tmp->words[7] |= 0x80000000;
-	  carry = 0;
-	}
-      i++;
-    }
-}
-
-/**
- * check if P is on the curve.
- *
- * Return -1 on error.
- * Return 0 on success.
- */
-static int
-point_is_on_the_curve (const ac *P)
-{
-  bn256 s[1], t[1];
-
-  /* Elliptic curve: y^2 = x^3 + a*x + b */
-  modp256_sqr (s, P->x);
-  modp256_mul (s, s, P->x);
-
-  modp256_mul (t, coefficient_a, P->x);
-  modp256_add (s, s, t);
-  modp256_add (s, s, coefficient_b);
-
-  modp256_sqr (t, P->y);
-  if (bn256_cmp (s, t) == 0)
-    return 0;
-
-  return -1;
-}
-
-/**
- * @brief	X  = k * P
- *
- * @param NAF_K	NAF representation of k
- * @param P	P in affine coordiate
- *
- * Return -1 on error.
- * Return 0 on success.
- *
- * For the curve (cofactor is 1 and n is prime), possible error cases are:
- *
- *     P is not on the curve.
- *     P = G, k = n
- *     Something wrong in the code.
- *
- * Mathmatically, k=1 and P=O is another possible case, but O cannot be
- * represented by affine coordinate.
- */
-int
-compute_kP (ac *X, const naf4_257 *NAF_K, const ac *P)
-{
-  int i;
-  int q_is_infinite = 1;
-  jpc Q[1];
-  ac P3[1], P5[1], P7[1];
-  const ac *p_Pi[4];
-
-  if (point_is_on_the_curve (P) < 0)
-    return -1;
-
-  p_Pi[0] = P;
-  p_Pi[1] = P3;
-  p_Pi[2] = P5;
-  p_Pi[3] = P7;
-
-  {
-    jpc Q1[1];
-
-    memcpy (Q->x, P->x, sizeof (bn256));
-    memcpy (Q->y, P->y, sizeof (bn256));
-    memset (Q->z, 0, sizeof (bn256));
-    Q->z->words[0] = 1;
-
-    jpc_double (Q, Q);
-    jpc_add_ac (Q1, Q, P);
-    if (jpc_to_ac (P3, Q1) < 0)	/* Never occurs, except coding errors.  */
-      return -1;
-    jpc_double (Q, Q);
-    jpc_add_ac (Q1, Q, P);
-    if (jpc_to_ac (P5, Q1) < 0)	/* Never occurs, except coding errors.  */
-      return -1;
-
-    memcpy (Q->x, P3->x, sizeof (bn256));
-    memcpy (Q->y, P3->y, sizeof (bn256));
-    memset (Q->z, 0, sizeof (bn256));
-    Q->z->words[0] = 1;
-    jpc_double (Q, Q);
-    jpc_add_ac (Q1, Q, P);
-    if (jpc_to_ac (P7, Q1) < 0)	/* Never occurs, except coding errors.  */
-      return -1;
-  }
-
-  for (i = 256; i >= 0; i--)
-    {
-      int k_i;
-
-      if (!q_is_infinite)
-	jpc_double (Q, Q);
-
-      k_i = naf4_257_get (NAF_K, i);
-      if (k_i)
-	{
-	  if (q_is_infinite)
-	    {
-	      memcpy (Q->x, p_Pi[NAF_K_INDEX(k_i)]->x, sizeof (bn256));
-	      if (NAF_K_SIGN (k_i))
-		bn256_sub (Q->y, P256, p_Pi[NAF_K_INDEX(k_i)]->y);
-	      else
-		memcpy (Q->y, p_Pi[NAF_K_INDEX(k_i)]->y, sizeof (bn256));
-	      memset (Q->z, 0, sizeof (bn256));
-	      Q->z->words[0] = 1;
-	      q_is_infinite = 0;
-	    }
-	  else
-	    jpc_add_ac_signed (Q, Q, p_Pi[NAF_K_INDEX(k_i)], NAF_K_SIGN (k_i));
-	}
-    }
-
-  return jpc_to_ac (X, Q);
-}
-
-
 /*
  * N: order of G
  */
@@ -520,46 +223,4 @@ static const bn256 MU_lower[1] = {
 };
 
 
-/**
- * @brief Compute signature (r,s) of hash string z with secret key d
- */
-void
-ecdsa (bn256 *r, bn256 *s, const bn256 *z, const bn256 *d)
-{
-  bn256 k[1];
-  ac KG[1];
-  bn512 tmp[1];
-  bn256 k_inv[1];
-  uint32_t carry;
-
-#define tmp_k k_inv
-
-  do
-    {
-      do
-	{
-	  bn256_random (k);
-	  if (bn256_sub (tmp_k, k, N) == 0)	/* > N, it's too big.  */
-	    continue;
-	  if (bn256_add_uint (tmp_k, tmp_k, 2)) /* > N - 2, still big.  */
-	    continue;
-	  bn256_add_uint (k, k, 1);
-	  compute_kG (KG, k);
-	  if (bn256_is_ge (KG->x, N))
-	    bn256_sub (r, KG->x, N);
-	  else
-	    memcpy (r, KG->x, sizeof (bn256));
-	}
-      while (bn256_is_zero (r));
-
-      mod_inv (k_inv, k, N);
-      bn256_mul (tmp, r, d);
-      mod_reduce (s, tmp, N, MU_lower);
-      carry = bn256_add (s, s, z);
-      if (carry)
-	bn256_sub (s, s, N);
-      bn256_mul (tmp, s, k_inv);
-      mod_reduce (s, tmp, N, MU_lower);
-    }
-  while (bn256_is_zero (s));
-}
+#include "ecc.c"

src/ec_p256r1.h

@@ -0,0 +1,4 @@
+int compute_kP_p256r1 (ac *X, const bn256 *K, const ac *P);
+int compute_kG_p256r1 (ac *X, const bn256 *K);
+void ecdsa_p256r1 (bn256 *r, bn256 *s, const bn256 *z, const bn256 *d);
+int check_secret_p256r1 (const bn256 *q, bn256 *d1);

src/ecc-cdh.c

@@ -1,76 +0,0 @@
-/*
- * ecc-cdh.c - One-Pass Diffie-Hellman method implementation
- *             C(1, 1, ECC CDH) for EC DH of OpenPGP ECC
- *
- * Copyright (C) 2013 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/>.
- *
- */
-
-/*
- * References:
- *
- * [1] A. Jivsov, Elliptic Curve Cryptography (ECC) in OpenPGP, RFC 6637,
- *     June 2012.
- *
- * [2] Suite B Implementer's Guide to NIST SP 800-56A, July 28, 2009.
- *
- */
-
-static const char param[] = {
-  /**/
-  curve_OID_len,
-  curve_OID,
-  public-key_alg_ID, /*ecdh*/
-  0x03,
-  0x01,
-  KDF_hash_ID, /*sha256*/
-  KEK_alg_ID, /*aes128*/
-  "Anonymous Sender    ",
-  my_finger_print /*20-byte*/
-};
-
-/*
- *
- */
-int
-ecdh (unsigned char *key,
-      const unsigned char *key_encrypted, const ac *P,
-      const naf4_257 *naf_d, const unsigned char *fp)
-{
-  ac S[1];
-  sha256_context ctx;
-  unsigned char kek[32];
-  unsigned char x[32];
-  int i;
-  const unsigned char *p;
-
-  compute_kP (S, naf_d, P);	/* Get shared secret.  */
-
-  /* Endian change from big to little.  */
-  p = (const unsigned char *)S->x;
-  for (i = 0; i < 32; i++)
-    x[31-i] = p[i];
-
-  /* kdf (kek, S, parameter) */
-  sha256_start (&ctx);
-  sha256_update (&ctx, "\x00\x00\x00\x01", 4);
-  sha256_update (&ctx, x, size of x);
-  sha256_update (&ctx, (const char *)param, size of param);
-  sha256_finish (&ctx, kek);
-}

src/ecc-edwards.c

@@ -0,0 +1,960 @@
+/*                                                    -*- coding: utf-8 -*-
+ * ecc-edwards.c - Elliptic curve computation for
+ *                 the twisted Edwards curve: -x^2 + y^2 = 1 + d*x^2*y^2
+ *
+ * Copyright (C) 2014 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/>.
+ *
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "bn.h"
+#include "mod.h"
+#include "mod25638.h"
+#include "sha512.h"
+
+/*
+ * References:
+ *
+ * [1] Daniel J. Bernstein, Niels Duif, Tanja Lange, Peter Schwabe, Bo-Yin Yang.
+ *     High-speed high-security signatures.
+ *     Journal of Cryptographic Engineering 2 (2012), 77--89.
+ *     http://cr.yp.to/papers.html#ed25519
+ *
+ * [2] Daniel J. Bernstein, Peter Birkner, Marc Joye, Tanja Lange,
+ *     Christiane Peters.
+ *     Twisted Edwards curves.
+ *     Pages 389--405 in Progress in cryptology---AFRICACRYPT 2008.
+ *     http://cr.yp.to/papers.html#twisted
+ */
+
+/*
+ * IMPLEMENTATION NOTE
+ *
+ * (0) We assume that the processor has no cache, nor branch target
+ *     prediction.  Thus, we don't avoid indexing by secret value. 
+ *     We don't avoid conditional jump if both cases have same timing,
+ *     either.
+ *
+ * (1) We use Radix-32 field arithmetic.  It's a representation like
+ *     2^256-38, but it's more redundant.  For example, "1" can be
+ *     represented in three ways in 256-bit: 1, 2^255-18, and
+ *     2^256-37.
+ *
+ * (2) We use fixed base comb multiplication.  Scalar is 252-bit.
+ *     There are various possible choices for 252 = 2 * 2 * 3 * 3 * 7.
+ *     Current choice of total size is 3KB.  We use three tables, and
+ *     a table has 16 points (3 * 1KB).
+ *
+ *     Window size W = 4-bit, E = 21.
+ *                                                       <--21-bit-
+ *                                             <---42-bit----------
+ *     [        ][########][////////][        ][########][////////]
+ *                                   <-------63-bit----------------
+ *                         <-----------84-bit----------------------
+ *               <--------------105-bit----------------------------
+ *
+ *     [        ][########][////////][        ][########][////////]
+ *                                                                 <-126-bit-
+ *                                                       <-147-bit-
+ *                                             <----168-bit--------
+ *
+ *                                   <-------189-bit---------------
+ *                         <----------210-bit----------------------
+ *               <-------------231-bit-----------------------------
+ */
+
+/*
+ * Identity element: (0,1)
+ * Negation: -(x,y) = (-x,y)
+ *
+ * d: -0x2DFC9311D490018C7338BF8688861767FF8FF5B2BEBE27548A14B235ECA6874A
+ * order:
+ *     0x1000000000000000000000000000000014DEF9DEA2F79CD65812631A5CF5D3ED
+ * Gx: 0x216936D3CD6E53FEC0A4E231FDD6DC5C692CC7609525A7B2C9562D608F25D51A
+ * Gy: 0x6666666666666666666666666666666666666666666666666666666666666658
+ */
+
+/* d + 2^255 - 19 */
+static const bn256 coefficient_d[1] = {
+  {{ 0x135978a3, 0x75eb4dca, 0x4141d8ab, 0x00700a4d,
+     0x7779e898, 0x8cc74079, 0x2b6ffe73, 0x52036cee }} };
+
+
+/**
+ * @brief	Projective Twisted Coordinates
+ */
+typedef struct
+{
+  bn256 x[1];
+  bn256 y[1];
+  bn256 z[1];
+} ptc;
+
+#include "affine.h"
+
+
+static int
+mod25519_is_neg (const bn256 *a)
+{
+  return (a->word[0] & 1);
+}
+
+
+/**
+ * @brief  X = 2 * A
+ *
+ * Compute (X3 : Y3 : Z3) = 2 * (X1 : Y1 : Z1)
+ */
+static void
+point_double (ptc *X, const ptc *A)
+{
+  bn256 b[1], d[1], e[1];
+
+  /* Compute: B = (X1 + Y1)^2 */
+  mod25638_add (b, A->x, A->y);
+  mod25638_sqr (b, b);
+
+  /* Compute: C = X1^2        : E      */
+  mod25638_sqr (e, A->x);
+
+  /* Compute: D = Y1^2             */
+  mod25638_sqr (d, A->y);
+
+  /* E = aC; where a = -1 */
+  /* Compute: D - E = D + C : Y3_tmp */
+  mod25638_add (X->y, e, d);
+
+  /* Compute: -F = -(E + D) = C - D; where a = -1 : E */
+  mod25638_sub (e, e, d);
+
+  /* Compute: H = Z1^2        : D     */
+  mod25638_sqr (d, A->z);
+
+  /* Compute: -J = 2*H - F    : D     */
+  mod25638_add (d, d, d);
+  mod25638_add (d, d, e);
+
+  /* Compute: X3 = (B-C-D)*J = -J*(C+D-B) = -J*(Y3_tmp-B)  */
+  mod25638_sub (X->x, X->y, b);
+  mod25638_mul (X->x, X->x, d);
+
+  /* Compute: Y3 = -F*(D-E) = -F*Y3_tmp            */
+  mod25638_mul (X->y, X->y, e);
+
+  /* Z3 = -F*-J             */
+  mod25638_mul (X->z, e, d);
+}
+
+
+/**
+ * @brief	X = A + B
+ *
+ * @param X	Destination PTC
+ * @param A	PTC
+ * @param B	AC
+ *
+ * Compute: (X3 : Y3 : Z3) = (X1 : Y1 : Z1) + (X2 : Y2 : 1)
+ */
+static void
+point_add (ptc *X, const ptc *A, const ac *B)
+{
+  bn256 c[1], d[1], e[1], tmp[1];
+
+  /* Compute: C = X1 * X2 */
+  mod25638_mul (c, A->x, B->x);
+
+  /* Compute: D = Y1 * Y2 */
+  mod25638_mul (d, A->y, B->y);
+
+  /* Compute: E = d * C * D */
+  mod25638_mul (e, c, d);
+  mod25638_mul (e, coefficient_d, e);
+
+  /* Compute: C_1 = C + D */
+  mod25638_add (c, c, d);
+
+  /* Compute: D_1 = Z1^2 : B */
+  mod25638_sqr (d, A->z);
+
+  /* tmp = D_1 - E : F */
+  mod25638_sub (tmp, d, e);
+
+  /* D_2 = D_1 + E : G */
+  mod25638_add (d, d, e);
+
+  /* X3_final = Z1 * tmp * ((X1 + Y1) * (X2 + Y2) - C_1) */
+  mod25638_add (X->x, A->x, A->y);
+  mod25638_add (e, B->x, B->y);
+  mod25638_mul (e, X->x, e);
+  mod25638_sub (e, e, c);
+  mod25638_mul (e, tmp, e);
+  mod25638_mul (X->x, A->z, e);
+
+  /* Y3_final = Z1 * D_2 * C_1 */
+  mod25638_mul (c, d, c);
+  mod25638_mul (X->y, A->z, c);
+
+  /* Z3_final = tmp * D_2 */
+  mod25638_mul (X->z, tmp, d);
+
+  /* A = Z1 */
+  /* B = A^2 */
+  /* C = X1 * X2 */
+  /* D = Y1 * Y2 */
+  /* E = d * C * D */
+  /* F = B - E */
+  /* G = B + E */
+  /* X3 = A * F * ((X1 + Y1) * (X2 + Y2) - C - D) */
+  /* Y3 = A * G * (D - aC); where a = -1 */
+  /* Z3 = F * G */
+}
+
+
+/**
+ * @brief	X = convert A
+ *
+ * @param X	Destination AC
+ * @param A	PTC
+ *
+ * (X1:Y1:Z1) represents the affine point (x=X1/Z1, y=Y1/Z1) 
+ */
+static void
+point_ptc_to_ac (ac *X, const ptc *A)
+{
+  bn256 z_inv[1];
+
+  /*
+   * A->z may be bigger than p25519, or two times bigger than p25519.
+   * But this is no problem for computation of mod_inv.
+   */
+  mod_inv (z_inv, A->z, p25519);
+
+  mod25638_mul (X->x, A->x, z_inv);
+  mod25519_reduce (X->x);
+  mod25638_mul (X->y, A->y, z_inv);
+  mod25519_reduce (X->y);
+}
+
+
+static const ac precomputed_KG[16] = {
+  { {{{ 0, 0, 0, 0, 0, 0, 0, 0 }}},
+    {{{ 1, 0, 0, 0, 0, 0, 0, 0 }}}                         },
+  { {{{ 0x8f25d51a, 0xc9562d60, 0x9525a7b2, 0x692cc760, 
+        0xfdd6dc5c, 0xc0a4e231, 0xcd6e53fe, 0x216936d3 }}},
+    {{{ 0x66666658, 0x66666666, 0x66666666, 0x66666666, 
+        0x66666666, 0x66666666, 0x66666666, 0x66666666 }}} },
+  { {{{ 0x3713af22, 0xac7137bd, 0xac634604, 0x25ed77a4, 
+        0xa815e038, 0xce0d0064, 0xbca90151, 0x041c030f }}},
+    {{{ 0x0780f989, 0xe9b33fcf, 0x3d4445e7, 0xe4e97c2a, 
+        0x655e5c16, 0xc67dc71c, 0xee43fb7a, 0x72467625 }}} },
+  { {{{ 0x3ee99893, 0x76a19171, 0x7ba9b065, 0xe647edd9, 
+        0x6aeae260, 0x31f39299, 0x5f4a9bb2, 0x6d9e4545 }}},
+    {{{ 0x94cae280, 0xc41433da, 0x79061211, 0x8e842de8, 
+        0xa259dc8a, 0xaab95e0b, 0x99013cd0, 0x28bd5fc3 }}} },
+  { {{{ 0x7d23ea24, 0x59e22c56, 0x0460850e, 0x1e745a88, 
+        0xda13ef4b, 0x4583ff4c, 0x95083f85, 0x1f13202c }}},
+    {{{ 0x90275f48, 0xad42025c, 0xb55c4778, 0x0085087e, 
+        0xfdfd7ffa, 0xf21109e7, 0x6c381b7e, 0x66336d35 }}} },
+  { {{{ 0xd00851f2, 0xaa9476ab, 0x4a61600b, 0xe7838534, 
+        0x1a52df87, 0x0de65625, 0xbd675870, 0x5f0dd494 }}},
+    {{{ 0xe23493ba, 0xf20aec1b, 0x3414b0a8, 0x8f7f2741, 
+        0xa80e1eb6, 0x497e74bd, 0xe9365b15, 0x1648eaac }}} },
+  { {{{ 0x04ac2b69, 0x5b78dcec, 0x32001a73, 0xecdb66ce, 
+        0xb34cf697, 0xb75832f4, 0x3a2bce94, 0x7aaf57c5 }}},
+    {{{ 0x60fdfc6f, 0xb32ed2ce, 0x757924c6, 0x77bf20be, 
+        0x48742dd1, 0xaebd15dd, 0x55d38439, 0x6311bb16 }}} },
+  { {{{ 0x42ff5c97, 0x139cdd73, 0xdbd82964, 0xee4c359e, 
+        0x70611a3f, 0x91c1cd94, 0x8075dbcb, 0x1d0c34f6 }}},
+    {{{ 0x5f931219, 0x43eaa549, 0xa23d35a6, 0x3737aba7, 
+        0x46f167bb, 0x54b1992f, 0xb74a9944, 0x01a11f3c }}} },
+  { {{{ 0xba46b161, 0x67a5310e, 0xd9d67f6c, 0x790f8527, 
+        0x2f6cc814, 0x359c5b5f, 0x7786383d, 0x7b6a5565 }}},
+    {{{ 0x663ab0d3, 0xf1431b60, 0x09995826, 0x14a32d8f, 
+        0xeddb8571, 0x61d526f6, 0x0eac739a, 0x0cb7acea }}} },
+  { {{{ 0x4a2d009f, 0x5eb1a697, 0xd8df987a, 0xdacb43b4, 
+        0x8397f958, 0x4870f214, 0x8a175fbb, 0x5aa0c67c }}},
+    {{{ 0x78887db3, 0x27dbbd4c, 0x64e322ab, 0xe327b707, 
+        0x7cbe4e3b, 0x87e293fa, 0xbda72395, 0x17040799 }}} },
+  { {{{ 0x99d1e696, 0xc833a5a2, 0x2d9d5877, 0x969bff8e, 
+        0x2216fa67, 0x383a533a, 0x684d3925, 0x338bbe0a }}},
+    {{{ 0xd6cfb491, 0x35b5aae8, 0xaa12f3f8, 0x4a588279, 
+        0x2e30380e, 0xa7c2e708, 0x9e4b3d62, 0x69f13e09 }}} },
+  { {{{ 0x27f1cd56, 0xec0dc2ef, 0xdb11cc97, 0x1af11548, 
+        0x9ebc7613, 0xb642f86a, 0xcb77c3b9, 0x5ce45e73 }}},
+    {{{ 0x3eddd6de, 0x5d128786, 0x4859eab7, 0x16f9a6b4, 
+        0xd8782345, 0x55c53916, 0xdb7b202a, 0x6b1dfa87 }}} },
+  { {{{ 0x19e30528, 0x2461a8ed, 0x665cfb1c, 0xaf756bf9, 
+        0x3a6e8673, 0x0fcafd1d, 0x45d10f48, 0x0d264435 }}},
+    {{{ 0x5431db67, 0x543fd4c6, 0x60932432, 0xc153a5b3, 
+        0xd2119aa4, 0x41d5b8eb, 0x8b09b6a5, 0x36bd9ab4 }}} },
+  { {{{ 0x21e06738, 0x6d39f935, 0x3765dd86, 0x4e6a7c59, 
+        0xa4730880, 0xefc0dd80, 0x4079fe2f, 0x40617e56 }}},
+    {{{ 0x921439b9, 0xbc83cdff, 0x98833c09, 0xd5cccc06, 
+        0xda13cdcb, 0xe315c425, 0x67ff5370, 0x37bc6e84 }}} },
+  { {{{ 0xf643b5f5, 0x65e7f028, 0x0ffbf5a8, 0x5b0d4831, 
+        0xf4085f62, 0x0f540498, 0x0db7bd1b, 0x6f0bb035 }}},
+    {{{ 0x9733742c, 0x51f65571, 0xf513409f, 0x2fc047a0, 
+        0x355facf6, 0x07f45010, 0x3a989a9c, 0x5cd416a9 }}} },
+  { {{{ 0x748f2a67, 0x0bdd7208, 0x415b7f7f, 0x0cf0b80b, 
+        0x57aa0119, 0x44afdd5f, 0x430dc946, 0x05d68802 }}},
+    {{{ 0x1a60eeb2, 0x420c46e5, 0x665024f5, 0xc60a9b33, 
+        0x48c51347, 0x37520265, 0x00a21bfb, 0x6f4be0af }}} }
+};
+
+static const ac precomputed_2E_KG[16] = {
+  { {{{ 0, 0, 0, 0, 0, 0, 0, 0 }}},
+    {{{ 1, 0, 0, 0, 0, 0, 0, 0 }}}                         },
+  { {{{ 0x199c4f7d, 0xec314ac0, 0xb2ebaaf9, 0x66a39c16, 
+        0xedd4d15f, 0xab1c92b8, 0x57d9eada, 0x482a4cdf }}},
+    {{{ 0x6e4eb04b, 0xbd513b11, 0x25e4fd6a, 0x3f115fa5, 
+        0x14519298, 0x0b3c5fc6, 0x81c2f7a8, 0x7391de43 }}} },
+  { {{{ 0x1254fe02, 0xa57dca18, 0x6da34368, 0xa56a2a14, 
+        0x63e7328e, 0x44c6e34f, 0xca63ab3e, 0x3f748617 }}},
+    {{{ 0x7dc1641e, 0x5a13dc52, 0xee4e9ca1, 0x4cbb2899, 
+        0x1ba9acee, 0x3938a289, 0x420fc47b, 0x0fed89e6 }}} },
+  { {{{ 0x49cbad08, 0x3c193f32, 0x15e80ef5, 0xdda71ef1, 
+        0x9d128c33, 0xda44186c, 0xbf98c24f, 0x54183ede }}},
+    {{{ 0x93d165c1, 0x2cb483f7, 0x177f44aa, 0x51762ace, 
+        0xb4ab035d, 0xb3fe651b, 0xa0b0d4e5, 0x426c99c3 }}} },
+  { {{{ 0xef3f3fb1, 0xb3fcf4d8, 0x065060a0, 0x7052292b, 
+        0x24240b15, 0x18795ff8, 0x9989ffcc, 0x13aea184 }}},
+    {{{ 0xc2b81f44, 0x1930c101, 0x10600555, 0x672d6ca4, 
+        0x1b25e570, 0xfbddbff2, 0x8ca12b70, 0x0884949c }}} },
+  { {{{ 0x00564bbf, 0x9983a033, 0xde61b72d, 0x95587d25, 
+        0xeb17ad71, 0xb6719dfb, 0xc0bc3517, 0x46871ad0 }}},
+    {{{ 0xe95a6693, 0xb034fb61, 0x76eabad9, 0x5b0d8d18, 
+        0x884785dc, 0xad295dd0, 0x74a1276a, 0x359debad }}} },
+  { {{{ 0xe89fb5ca, 0x2e5a2686, 0x5656c6c5, 0xd3d200ba, 
+        0x9c969001, 0xef4c051e, 0x02cb45f4, 0x0d4ea946 }}},
+    {{{ 0x76d6e506, 0xa6f8a422, 0x63209e23, 0x454c768f, 
+        0x2b372386, 0x5c12fd04, 0xdbfee11f, 0x1aedbd3e }}} },
+  { {{{ 0x00dbf569, 0x700ab50f, 0xd335b313, 0x9553643c, 
+        0xa17dc97e, 0xeea9bddf, 0x3350a2bd, 0x0d12fe3d }}},
+    {{{ 0xa16a3dee, 0xe5ac35fe, 0xf81950c3, 0x4ae4664a, 
+        0x3dbbf921, 0x75c63df4, 0x2958a5a6, 0x545b109c }}} },
+  { {{{ 0x0a61b29c, 0xd7a52a98, 0x65aca9ee, 0xe21e0acb, 
+        0x5985dcbe, 0x57a69c0f, 0xeb87a534, 0x3c0c1e7b }}},
+    {{{ 0x6384bd2f, 0xf0a0b50d, 0xc6939e4b, 0xff349a34, 
+        0x6e2f1973, 0x922c4554, 0xf1347631, 0x74e826b2 }}} },
+  { {{{ 0xa655803c, 0xd7eaa066, 0x38292c5c, 0x09504e76, 
+        0x2c874953, 0xe298a02e, 0x8932b73f, 0x225093ed }}},
+    {{{ 0xe69c3efd, 0xf93e2b4d, 0x8a87c799, 0xa2cbd5fc, 
+        0x85dba986, 0xdf41da94, 0xccee8edc, 0x36fe85e7 }}} },
+  { {{{ 0x7d742813, 0x78df7dc5, 0x4a193e64, 0x333bcc6d, 
+        0x6a966d2d, 0x8242aa25, 0x4cd36d32, 0x03500a94 }}},
+    {{{ 0x580505d7, 0xd5d110fc, 0xfa11e1e9, 0xb2f47e16, 
+        0x06eab6b4, 0xd0030f92, 0x62c91d46, 0x2dc80d5f }}} },
+  { {{{ 0x2a75e492, 0x5788b01a, 0xbae31352, 0x992acf54, 
+        0x8159db27, 0x4591b980, 0xd3d84740, 0x36c6533c }}},
+    {{{ 0x103883b5, 0xc44c7c00, 0x515d0820, 0x10329423, 
+        0x71b9dc16, 0xbd306903, 0xf88f8d32, 0x7edd5a95 }}} },
+  { {{{ 0x005523d7, 0xfd63b1ac, 0xad70dd21, 0x74482e0d, 
+        0x02b56105, 0x67c9d9d0, 0x5971b456, 0x4d318012 }}},
+    {{{ 0x841106df, 0xdc9a6f6d, 0xa326987f, 0x7c52ed9d, 
+        0x00607ea0, 0x4dbeaa6f, 0x6959e688, 0x115c221d }}} },
+  { {{{ 0xc80f7c16, 0xf8718464, 0xe9930634, 0x05dc8f40, 
+        0xc2e9d5f4, 0xefa699bb, 0x021da209, 0x2469e813 }}},
+    {{{ 0xc602a3c4, 0x75c02845, 0x0a200f9d, 0x49d1b2ce, 
+        0x2fb3ec8f, 0xd21b75e4, 0xd72a7545, 0x10dd726a }}} },
+  { {{{ 0x63ef1a6c, 0xeda58527, 0x051705e0, 0xb3fc0e72, 
+        0x44f1161f, 0xbda6f3ee, 0xf339efe5, 0x7680aebf }}},
+    {{{ 0xb1b070a7, 0xe8d3fd01, 0xdbfbaaa0, 0xc3ff7dbf, 
+        0xa320c916, 0xd81ef6f2, 0x62a3b54d, 0x3e22a1fb }}} },
+  { {{{ 0xb1fa18c8, 0xcdbb9187, 0xcb483a17, 0x8ddb5f6b, 
+        0xea49af98, 0xc0a880b9, 0xf2dfddd0, 0x53bf600b }}},
+    {{{ 0x9e25b164, 0x4217404c, 0xafb74aa7, 0xfabf06ee, 
+        0x2b9f233c, 0xb17712ae, 0xd0eb909e, 0x71f0b344 }}} }
+};
+
+static const ac precomputed_4E_KG[16] = {
+  { {{{ 0, 0, 0, 0, 0, 0, 0, 0 }}},
+    {{{ 1, 0, 0, 0, 0, 0, 0, 0 }}}                         },
+  { {{{ 0xe388a820, 0xbb6ec091, 0x5182278a, 0xa928b283, 
+        0xa9a6eb83, 0x2259174d, 0x45500054, 0x184b48cb }}},
+    {{{ 0x26e77c33, 0xfe324dba, 0x83faf453, 0x6679a5e3, 
+        0x2380ef73, 0xdd60c268, 0x03dc33a9, 0x3ee0e07a }}} },
+  { {{{ 0xce974493, 0x403aff28, 0x9bf6f5c4, 0x84076bf4, 
+        0xecd898fb, 0xec57038c, 0xb663ed49, 0x2898ffaa }}},
+    {{{ 0xf335163d, 0xf4b3bc46, 0xfa4fb6c6, 0xe613a0f4, 
+        0xb9934557, 0xe759d6bc, 0xab6c9477, 0x094f3b96 }}} },
+  { {{{ 0x6afffe9e, 0x168bb5a0, 0xee748c29, 0x950f7ad7, 
+        0xda17203d, 0xa4850a2b, 0x77289e0f, 0x0062f7a7 }}},
+    {{{ 0x4b3829fa, 0x6265d4e9, 0xbdfcd386, 0x4f155ada, 
+        0x475795f6, 0x9f38bda4, 0xdece4a4c, 0x560ed4b3 }}} },
+  { {{{ 0x141e648a, 0xdad4570a, 0x019b965c, 0x8bbf674c, 
+        0xdb08fe30, 0xd7a8d50d, 0xa2851109, 0x7efb45d3 }}},
+    {{{ 0xd0c28cda, 0x52e818ac, 0xa321d436, 0x792257dd, 
+        0x9d71f8b7, 0x867091c6, 0x11a1bf56, 0x0fe1198b }}} },
+  { {{{ 0x06137ab1, 0x4e848339, 0x3e6674cc, 0x5673e864, 
+        0x0140502b, 0xad882043, 0x6ea1e46a, 0x34b5c0cb }}},
+    {{{ 0x1d70aa7c, 0x29786814, 0x8cdbb8aa, 0x840ae3f9, 
+        0xbd4801fb, 0x78b4d622, 0xcf18ae9a, 0x6cf4e146 }}} },
+  { {{{ 0x36297168, 0x95c270ad, 0x942e7812, 0x2303ce80, 
+        0x0205cf0e, 0x71908cc2, 0x32bcd754, 0x0cc15edd }}},
+    {{{ 0x2c7ded86, 0x1db94364, 0xf141b22c, 0xc694e39b, 
+        0x5e5a9312, 0xf22f64ef, 0x3c5e6155, 0x649b8859 }}} },
+  { {{{ 0xb6417945, 0x0d5611c6, 0xac306c97, 0x9643fdbf, 
+        0x0df500ff, 0xe81faaa4, 0x6f50e615, 0x0792c79b }}},
+    {{{ 0xd2af8c8d, 0xb45bbc49, 0x84f51bfe, 0x16c615ab, 
+        0xc1d02d32, 0xdc57c526, 0x3c8aaa55, 0x5fb9a9a6 }}} },
+  { {{{ 0xdee40b98, 0x82faa8db, 0x6d520674, 0xff8a5208, 
+        0x446ac562, 0x1f8c510f, 0x2cc6b66e, 0x4676d381 }}},
+    {{{ 0x2e7429f4, 0x8f1aa780, 0x8ed6bdf6, 0x2a95c1bf, 
+        0x457fa0eb, 0x051450a0, 0x744c57b1, 0x7d89e2b7 }}} },
+  { {{{ 0x3f95ea15, 0xb6bdacd2, 0x2f1a5d69, 0xc9a9d1b1, 
+        0xf4d22d72, 0xd4c2f1a9, 0x4dc516b5, 0x73ecfdf1 }}},
+    {{{ 0x05391e08, 0xa1ce93cd, 0x7b8aac17, 0x98f1e99e, 
+        0xa098cbb3, 0x9ba84f2e, 0xf9bdd37a, 0x1425aa8b }}} },
+  { {{{ 0x966abfc0, 0x8a385bf4, 0xf081a640, 0x55e5e8bc, 
+        0xee26f5ff, 0x835dff85, 0xe509e1ea, 0x4927e622 }}},
+    {{{ 0x352334b0, 0x164c8dbc, 0xa3fea31f, 0xcac1ad63, 
+        0x682fd457, 0x9b87a676, 0x1a53145f, 0x75f382ff }}} },
+  { {{{ 0xc3efcb46, 0x16b944f5, 0x68cb184c, 0x1fb55714, 
+        0x9ccf2dc8, 0xf1c2b116, 0x808283d8, 0x7417e00f }}},
+    {{{ 0x930199ba, 0x1ea67a22, 0x718990d8, 0x9fbaf765, 
+        0x8f3d5d57, 0x231fc664, 0xe5853194, 0x38141a19 }}} },
+  { {{{ 0x2f81290d, 0xb9f00390, 0x04a9ca6c, 0x44877827, 
+        0xe1dbdd65, 0x65d7f9b9, 0xf7c6698a, 0x7133424c }}},
+    {{{ 0xa7cd250f, 0x604cfb3c, 0x5acc18f3, 0x460c3c4b, 
+        0xb518e3eb, 0xa53e50e0, 0x98a40196, 0x2b4b9267 }}} },
+  { {{{ 0xc5dbd06c, 0x591b0672, 0xaa1eeb65, 0x10d43dca, 
+        0xcd2517af, 0x420cdef8, 0x0b695a8a, 0x513a307e }}},
+    {{{ 0x66503215, 0xee9d6a7b, 0x088fd9a4, 0xdea58720, 
+        0x973afe12, 0x8f3cbbea, 0x872f2538, 0x005c2350 }}} },
+  { {{{ 0x35af3291, 0xe5024b70, 0x4f5e669a, 0x1d3eec2d, 
+        0x6e79d539, 0xc1f6d766, 0x795b5248, 0x34ec043f }}},
+    {{{ 0x400960b6, 0xb2763511, 0x29e57df0, 0xff7a3d84, 
+        0x1666c1f1, 0xaeac7792, 0x66084bc0, 0x72426e97 }}} },
+  { {{{ 0x44f826ca, 0x5b1c3199, 0x790aa408, 0x68b00b73, 
+        0x69e9b92b, 0xaf0984b4, 0x3ffe9093, 0x5fe6736f }}},
+    {{{ 0xffd49312, 0xd67f2889, 0x5cb9ed21, 0x3520d747, 
+        0x3c65a606, 0x94f893b1, 0x2d65496f, 0x2fee5e8c }}} }
+};
+
+/**
+ * @brief	X  = k * G
+ *
+ * @param K	scalar k
+ *
+ * Return -1 on error.
+ * Return 0 on success.
+ */
+static void
+compute_kG_25519 (ac *X, const bn256 *K)
+{
+  ptc Q[1];
+  int i;
+
+  /* identity element */
+  memset (Q, 0, sizeof (ptc));
+  Q->y->word[0] = 1;
+  Q->z->word[0] = 1;
+
+  for (i = 20; i >= 0; i--)
+    {
+      int k0, k1, k2;
+
+      k0 = ((K->word[0] >> i) & 1)
+	| (i < 1 ? ((K->word[1] >> 30) & 2)
+	   : (((K->word[2] >> (i-1)) & 1) << 1))
+	| (i < 2 ? ((K->word[3] >> (i+28)) & 4)
+	   : (((K->word[4] >> (i-2)) & 1) << 2))
+	| (i < 3 ? ((K->word[5] >> (i+26)) & 8)
+	   : (((K->word[6] >> (i-3)) & 1) << 3));
+
+      k1 = (i < 11 ? ((K->word[0] >> (i+21)) & 1)
+	    : ((K->word[1] >> (i-11)) & 1))
+	| (i < 12 ? ((K->word[2] >> (i+19)) & 2)
+	   : (((K->word[3] >> (i-12)) & 1) << 1))
+	| (i < 13 ? ((K->word[4] >> (i+17)) & 4)
+	   : (((K->word[5] >> (i-13)) & 1) << 2))
+	| (i < 14 ? ((K->word[6] >> (i+15)) & 8)
+	   : (((K->word[7] >> (i-14)) & 1) << 3));
+
+      k2 = ((K->word[1] >> (i+10)) & 1)
+	| ((K->word[3] >> (i+8)) & 2)
+	| ((K->word[5] >> (i+6)) & 4)
+	| ((K->word[7] >> (i+4)) & 8);
+
+      point_double (Q, Q);
+      point_add (Q, Q, &precomputed_KG[k0]);
+      point_add (Q, Q, &precomputed_2E_KG[k1]);
+      point_add (Q, Q, &precomputed_4E_KG[k2]);
+    }
+
+  point_ptc_to_ac (X, Q);
+}
+
+
+#define BN416_WORDS 13
+#define BN128_WORDS 4
+
+/* M: The order of the generator G.  */
+static const bn256 M[1] = {
+  {{  0x5CF5D3ED, 0x5812631A, 0xA2F79CD6, 0x14DEF9DE,
+      0x00000000, 0x00000000, 0x00000000, 0x10000000  }}
+};
+
+#define C ((const uint32_t *)M)
+
+static void
+bnX_mul_C (uint32_t *r, const uint32_t *q, int q_size)
+{
+  int i, j, k;
+  int i_beg, i_end;
+  uint32_t r0, r1, r2;
+
+  r0 = r1 = r2 = 0;
+  for (k = 0; k <= q_size + BN128_WORDS - 2; k++)
+    {
+      if (q_size < BN128_WORDS)
+	if (k < q_size)
+	  {
+	    i_beg = 0;
+	    i_end = k;
+	  }
+	else
+	  {
+	    i_beg = k - q_size + 1;
+	    i_end = k;
+	    if (i_end > BN128_WORDS - 1)
+	      i_end = BN128_WORDS - 1;
+	  }
+      else
+	if (k < BN128_WORDS)
+	  {
+	    i_beg = 0;
+	    i_end = k;
+	  }
+	else
+	  {
+	    i_beg = k - BN128_WORDS + 1;
+	    i_end = k;
+	    if (i_end > q_size - 1)
+	      i_end = q_size - 1;
+	  }
+
+      for (i = i_beg; i <= i_end; i++)
+	{
+	  uint64_t uv;
+	  uint32_t u, v;
+	  uint32_t carry;
+
+	  j = k - i;
+	  if (q_size < BN128_WORDS)
+	    uv = ((uint64_t )q[j])*((uint64_t )C[i]);
+	  else
+	    uv = ((uint64_t )q[i])*((uint64_t )C[j]);
+	  v = uv;
+	  u = (uv >> 32);
+	  r0 += v;
+	  carry = (r0 < v);
+	  r1 += carry;
+	  carry = (r1 < carry);
+	  r1 += u;
+	  carry += (r1 < u);
+	  r2 += carry;
+	}
+
+      r[k] = r0;
+      r0 = r1;
+      r1 = r2;
+      r2 = 0;
+    }
+
+  r[k] = r0;
+}
+
+/**
+ * @brief R = A mod M (using M=2^252+C) (Barret reduction)
+ * 
+ * See HAC 14.47.
+ */
+static void
+mod_reduce_M (bn256 *R, const bn512 *A)
+{
+  uint32_t q[BN256_WORDS+1];
+  uint32_t tmp[BN416_WORDS];
+  bn256 r[1];
+  uint32_t carry, next_carry;
+  int i;
+#define borrow carry
+
+  q[8] = A->word[15]>>28;
+  carry = A->word[15] & 0x0fffffff;
+  for (i = BN256_WORDS - 1; i >= 0; i--)
+    {
+      next_carry = A->word[i+7] & 0x0fffffff;
+      q[i] = (A->word[i+7] >> 28) | (carry << 4);
+      carry = next_carry;
+    }
+  memcpy (R, A, sizeof (bn256));
+  R->word[7] &= 0x0fffffff;
+
+  /* Q_size: 9 */
+  bnX_mul_C (tmp, q, 9); /* TMP = Q*C */
+  /* Q = tmp / 2^252 */
+  carry = tmp[12] & 0x0fffffff;
+  for (i = 4; i >= 0; i--)
+    {
+      next_carry = tmp[i+7] & 0x0fffffff;
+      q[i] = (tmp[i+7] >> 28) | (carry << 4);
+      carry = next_carry;
+    }
+  /* R' = tmp % 2^252 */
+  memcpy (r, tmp, sizeof (bn256));
+  r->word[7] &= 0x0fffffff;
+  /* R -= R' */
+  borrow = bn256_sub (R, R, r);
+  if (borrow)
+    bn256_add (R, R, M);
+  else
+    bn256_add ((bn256 *)tmp, R, M);
+
+  /* Q_size: 5 */
+  bnX_mul_C (tmp, q, 5); /* TMP = Q*C */
+  carry = tmp[8] & 0x0fffffff;
+  q[0] = (tmp[7] >> 28) | (carry << 4);
+  /* R' = tmp % 2^252 */
+  memcpy (r, tmp, sizeof (bn256));
+  r->word[7] &= 0x0fffffff;
+  /* R += R' */
+  bn256_add (R, R, r);
+  borrow = bn256_sub (R, R, M);
+  if (borrow)
+    bn256_add (R, R, M);
+  else
+    bn256_add ((bn256 *)tmp, R, M);
+
+  /* Q_size: 1 */
+  bnX_mul_C (tmp, q, 1); /* TMP = Q*C */
+  /* R' = tmp % 2^252 */
+  memset (((uint8_t *)r)+(sizeof (uint32_t)*5), 0, sizeof (uint32_t)*3);
+  memcpy (r, tmp, sizeof (uint32_t)*5);
+  /* R -= R' */
+  borrow = bn256_sub (R, R, r);
+  if (borrow)
+    bn256_add (R, R, M);
+  else
+    bn256_add ((bn256 *)tmp, R, M);
+#undef borrow
+}
+
+
+int
+eddsa_sign_25519 (const uint8_t *input, size_t ilen, uint32_t *out,
+		  const bn256 *a, const uint8_t *seed, const bn256 *pk)
+{
+  bn256 *r, *s;
+  sha512_context ctx;
+  uint8_t hash[64];
+  bn256 tmp[1];
+  ac R[1];
+  uint32_t carry, borrow;
+
+  r = (bn256 *)out;
+  s = (bn256 *)(out+(32/4));
+
+  sha512_start (&ctx);
+  sha512_update (&ctx, seed, sizeof (bn256)); /* It's upper half of the hash */
+  sha512_update (&ctx, input, ilen);
+  sha512_finish (&ctx, hash);
+
+  mod_reduce_M (r, (bn512 *)hash);
+  compute_kG_25519 (R, r);
+
+  /* EdDSA encoding.  */
+  memcpy (tmp, R->y, sizeof (bn256));
+  tmp->word[7] ^= mod25519_is_neg (R->x) * 0x80000000;
+
+  sha512_start (&ctx);
+  sha512_update (&ctx, (uint8_t *)tmp, sizeof (bn256));
+  sha512_update (&ctx, (uint8_t *)pk, sizeof (bn256));
+  sha512_update (&ctx, input, ilen);
+  sha512_finish (&ctx, (uint8_t *)hash);
+
+  mod_reduce_M (s, (bn512 *)hash);
+  bn256_mul ((bn512 *)hash, s, a);
+  mod_reduce_M (s, (bn512 *)hash);
+  carry = bn256_add (s, s, r);
+  borrow = bn256_sub (s, s, M);
+
+  memcpy (r, tmp, sizeof (bn256));
+
+  if ((borrow && !carry))
+    bn256_add (s, s, M);
+  else
+    bn256_add (tmp, s, M);
+
+  return 0;
+}
+
+void
+eddsa_public_key_25519 (bn256 *pk, const bn256 *a)
+{
+  ac R[1];
+  ptc X[1];
+  bn256 a0[1];
+
+  bn256_shift (a0, a, -3);
+  compute_kG_25519 (R, a0);
+  memcpy (X, R, sizeof (ac));
+  memset (X->z, 0, sizeof (bn256));
+  X->z->word[0] = 1;
+  point_double (X, X);
+  point_double (X, X);
+  point_double (X, X);
+  point_ptc_to_ac (R, X);
+  /* EdDSA encoding.  */
+  memcpy (pk, R->y, sizeof (bn256));
+  pk->word[7] ^= mod25519_is_neg (R->x) * 0x80000000;
+}
+
+
+uint8_t *
+eddsa_compute_public_25519 (const uint8_t *kd)
+{
+  uint8_t *p0;
+  const bn256 *a = (const bn256 *)kd;
+
+  p0 = (uint8_t *)malloc (sizeof (bn256));
+  if (p0 == NULL)
+    return NULL;
+
+  eddsa_public_key_25519 ((bn256 *)p0, a);
+  return p0;
+}
+
+
+#if 0
+/**
+ * check if P is on the curve.
+ *
+ * Return -1 on error.
+ * Return 0 on success.
+ */
+static int
+point_is_on_the_curve (const ac *P)
+{
+  bn256 s[1], t[1];
+
+  /* Twisted Edwards curve: a*x^2 + y^2 = 1 + d*x^2*y^2 */
+}
+
+int
+compute_kP_25519 (ac *X, const bn256 *K, const ac *P);
+#endif
+
+#ifdef PRINT_OUT_TABLE
+static const ptc G[1] = {{
+  {{{ 0x8f25d51a, 0xc9562d60, 0x9525a7b2, 0x692cc760,
+      0xfdd6dc5c, 0xc0a4e231, 0xcd6e53fe, 0x216936d3 }}},
+  {{{ 0x66666658, 0x66666666, 0x66666666, 0x66666666,
+      0x66666666, 0x66666666, 0x66666666, 0x66666666 }}},
+  {{{ 1, 0, 0, 0, 0, 0, 0, 0 }}},
+}};
+
+#include <stdio.h>
+
+#ifdef TESTING_EDDSA
+static void
+print_bn256 (const bn256 *X)
+{
+  int i;
+
+  for (i = 7; i >= 0; i--)
+    printf ("%08x", X->word[i]);
+  puts ("");
+}
+#endif
+
+#if 0
+static void
+print_point (const ac *X)
+{
+  int i;
+
+#ifdef PRINT_OUT_TABLE_AS_C
+  fputs ("  { {{{ ", stdout);
+  for (i = 0; i < 4; i++)
+    printf ("0x%08x, ", X->x->word[i]);
+  fputs ("\n        ", stdout);
+  for (; i < 7; i++)
+    printf ("0x%08x, ", X->x->word[i]);
+  printf ("0x%08x }}},\n", X->x->word[i]);
+  fputs ("    {{{ ", stdout);
+  for (i = 0; i < 4; i++)
+    printf ("0x%08x, ", X->y->word[i]);
+  fputs ("\n        ", stdout);
+  for (; i < 7; i++)
+    printf ("0x%08x, ", X->y->word[i]);
+  printf ("0x%08x }}} },\n", X->y->word[i]);
+#else
+  puts ("--");
+  for (i = 7; i >= 0; i--)
+    printf ("%08x", X->x->word[i]);
+  puts ("");
+  for (i = 7; i >= 0; i--)
+    printf ("%08x", X->y->word[i]);
+  puts ("");
+  puts ("--");
+#endif
+}
+
+static void
+print_point_ptc (const ptc *X)
+{
+  int i;
+
+  puts ("---");
+  for (i = 7; i >= 0; i--)
+    printf ("%08x", X->x->word[i]);
+  puts ("");
+  for (i = 7; i >= 0; i--)
+    printf ("%08x", X->y->word[i]);
+  puts ("");
+  for (i = 7; i >= 0; i--)
+    printf ("%08x", X->z->word[i]);
+  puts ("");
+  puts ("---");
+}
+#endif
+
+
+#ifndef TESTING_EDDSA
+static void power_2 (ac *A, ptc *a, int N)
+{
+  int i;
+
+  for (i = 0; i < N; i++)
+    ed_double_25638 (a, a);
+  ptc_to_ac_25519 (A, a);
+}
+
+static void print_table (ac *a0001, ac *a0010, ac *a0100, ac *a1000)
+{
+  int i;
+  ptc a[1];
+  ac x[1];
+
+  for (i = 1; i < 16; i++)
+    {
+      /* A := Identity Element  */
+      memset (a, 0, sizeof (ptc));
+      a->y->word[0] = 1;
+      a->z->word[0] = 1;
+
+      if ((i & 1))
+	ed_add_25638 (a, a, a0001);
+      if ((i & 2))
+	ed_add_25638 (a, a, a0010);
+      if ((i & 4))
+	ed_add_25638 (a, a, a0100);
+      if ((i & 8))
+	ed_add_25638 (a, a, a1000);
+
+      ptc_to_ac_25519 (x, a);
+      print_point (x);
+    }
+
+  fputs ("\n", stdout);
+}
+
+static void compute_and_print_table (ac *a0001, ac *a0010, ac *a0100, ac *a1000)
+{
+  ptc a[1];
+
+  memcpy (a, a0001, sizeof (ac));
+  memset (a->z, 0, sizeof (bn256));
+  a->z->word[0] = 1;
+  power_2 (a0010, a, 63);
+  power_2 (a0100, a, 63);
+  power_2 (a1000, a, 63);
+  print_table (a0001, a0010, a0100, a1000);
+}
+#endif
+
+int
+main (int argc, char *argv[])
+{
+#ifdef TESTING_EDDSA
+  uint8_t hash[64];
+  bn256 a[1];
+  uint8_t r_s[64];
+  bn256 pk[1];
+  bn256 *r, *s;
+
+  const bn256 sk[1] = {
+    {{ 0x9db1619d, 0x605afdef, 0xf44a84ba, 0xc42cec92,
+       0x69c54944, 0x1969327b, 0x03ac3b70, 0x607fae1c }} };
+
+  const bn256 r_expected[1] = {
+    {{ 0x004356e5, 0x72ac60c3, 0xcce28690, 0x8a826e80,
+       0x1e7f8784, 0x74d9e5b8, 0x65e073d8, 0x55014922 }} };
+
+  const bn256 s_expected[1] = {
+    {{ 0x1582b85f, 0xac3ba390, 0x70391ec6, 0x6bb4f91c,
+       0xf0f55bd2, 0x24be5b59, 0x43415165, 0x0b107a8e }} };
+
+  r = (bn256 *)r_s;
+  s = (bn256 *)(r_s+32);
+
+  sha512 ((uint8_t *)sk, sizeof (bn256), hash);
+  hash[0] &= 248;
+  hash[31] &= 127;
+  hash[31] |= 64;
+  memcpy (a, hash, sizeof (bn256));
+
+  eddsa_public_key_25519 (pk, a);
+  eddsa_sign_25519 ((const uint8_t *)"", 0, r_s, a, hash+32, pk);
+
+  if (memcmp (r, r_expected, sizeof (bn256)) != 0
+      || memcmp (s, s_expected, sizeof (bn256)) != 0)
+    {
+      print_bn256 (r);
+      print_bn256 (s);
+      return 1;
+    }
+#else
+  ac a0001[1], a0010[1], a0100[1], a1000[1];
+  ptc a[1];
+
+  memcpy (a, G, sizeof (ptc));
+  ptc_to_ac_25519 (a0001, a);
+  compute_and_print_table (a0001, a0010, a0100, a1000);
+
+  memcpy (a, a0001, sizeof (ac));
+  memset (a->z, 0, sizeof (bn256));
+  a->z->word[0] = 1;
+  power_2 (a0001, a, 21);
+  compute_and_print_table (a0001, a0010, a0100, a1000);
+
+  memcpy (a, a0001, sizeof (ac));
+  memset (a->z, 0, sizeof (bn256));
+  a->z->word[0] = 1;
+  power_2 (a0001, a, 21);
+  compute_and_print_table (a0001, a0010, a0100, a1000);
+#endif
+
+  return 0;
+}
+#endif

src/ecc-mont.c

@@ -0,0 +1,232 @@
+/*                                                    -*- coding: utf-8 -*-
+ * ecc-mont.c - Elliptic curve computation for
+ *              the Montgomery curve: y^2 = x^3 + 486662*x^2 + x.
+ *
+ * Copyright (C) 2014, 2015 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/>.
+ *
+ */
+
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include "bn.h"
+#include "mod25638.h"
+#include "mod.h"
+
+/*
+ * References:
+ *
+ * [1] D. J. Bernstein. Curve25519: new Diffie-Hellman speed records.
+ *     Proceedings of PKC 2006, to appear. 
+ *     http://cr.yp.to/papers.html#curve25519. Date: 2006.02.09.
+ *
+ * [2] D. J. Bernstein. Can we avoid tests for zero in fast
+ *     elliptic-curve arithmetic?
+ *     http://cr.yp.to/papers.html#curvezero. Date: 2006.07.26.
+ *
+ */
+
+/*
+ * IMPLEMENTATION NOTE
+ *
+ * (0) We assume that the processor has no cache, nor branch target
+ *     prediction.  Thus, we don't avoid indexing by secret value. 
+ *     We don't avoid conditional jump if both cases have same timing,
+ *     either.
+ *
+ * (1) We use Radix-32 field arithmetic.  It's a representation like
+ *     2^256-38, but it's more redundant.  For example, "1" can be
+ *     represented in three ways in 256-bit: 1, 2^255-18, and
+ *     2^256-37.
+ *
+ * (2) We use Montgomery double-and-add.
+ *
+ */
+
+#ifndef BN256_C_IMPLEMENTATION
+#define ASM_IMPLEMENTATION 1
+#endif
+/*
+ *
+ * 121665 = 0x1db41
+ *            1 1101 1011 0100 0001
+ */
+static void
+mod25638_mul_121665 (bn256 *x, const bn256 *a)
+{
+#if ASM_IMPLEMENTATION
+#include "muladd_256.h"
+  const uint32_t *s;
+  uint32_t *d;
+  uint32_t w;
+  uint32_t c;
+
+  s = a->word;
+  d = x->word;
+  memset (d, 0, sizeof (bn256));
+  w = 121665;
+  MULADD_256_ASM (s, d, w, c);
+#else
+  uint32_t c, c1;
+  bn256 m[1];
+
+  c = c1 = bn256_shift (m, a, 6); c += bn256_add (x, a, m);
+  c1 <<= 2; c1 |= bn256_shift (m, m, 2); c = c + c1 + bn256_add (x, x, m);
+  c1 <<= 1; c1 |= bn256_shift (m, m, 1); c = c + c1 + bn256_add (x, x, m);
+  c1 <<= 2; c1 |= bn256_shift (m, m, 2); c = c + c1 + bn256_add (x, x, m);
+  c1 <<= 1; c1 |= bn256_shift (m, m, 1); c = c + c1 + bn256_add (x, x, m);
+  c1 <<= 2; c1 |= bn256_shift (m, m, 2); c = c + c1 + bn256_add (x, x, m);
+  c1 <<= 1; c1 |= bn256_shift (m, m, 1); c = c + c1 + bn256_add (x, x, m);
+  c1 <<= 1; c1 |= bn256_shift (m, m, 1); c = c + c1 + bn256_add (x, x, m);
+#endif
+  c = bn256_add_uint (x, x, c*38);
+  x->word[0] += c * 38;
+}
+
+
+typedef struct
+{
+  bn256 x[1];
+  bn256 z[1];
+} pt;
+
+
+/**
+ * @brief  Process Montgomery double-and-add
+ *
+ * With Q0, Q1, DIF (= Q0 - Q1), compute PRD = 2Q0, SUM = Q0 + Q1
+ * Q0 and Q1 are clobbered.
+ *
+ */
+static void
+mont_d_and_a (pt *prd, pt *sum, pt *q0, pt *q1, const bn256 *dif_x)
+{
+                                        mod25638_add (sum->x, q1->x, q1->z);
+                                        mod25638_sub (q1->z, q1->x, q1->z);
+  mod25638_add (prd->x, q0->x, q0->z);
+  mod25638_sub (q0->z, q0->x, q0->z);
+                                        mod25638_mul (q1->x, q0->z, sum->x);
+                                        mod25638_mul (q1->z, prd->x, q1->z);
+  mod25638_sqr (q0->x, prd->x);
+  mod25638_sqr (q0->z, q0->z);
+                                        mod25638_add (sum->x, q1->x, q1->z);
+                                        mod25638_sub (q1->z, q1->x, q1->z);
+  mod25638_mul (prd->x, q0->x, q0->z);
+  mod25638_sub (q0->z, q0->x, q0->z);
+                                        mod25638_sqr (sum->x, sum->x);
+                                        mod25638_sqr (sum->z, q1->z);
+  mod25638_mul_121665 (prd->z, q0->z);
+                                        mod25638_mul (sum->z, sum->z, dif_x);
+  mod25638_add (prd->z, q0->x, prd->z);
+  mod25638_mul (prd->z, prd->z, q0->z);
+}
+
+
+/**
+ * @brief	RES  = x-coordinate of [n]Q
+ *
+ * @param N	Scalar N (three least significant bits are 000)
+ * @param Q_X	x-coordinate of Q
+ *
+ */
+static void
+compute_nQ (bn256 *res, const bn256 *n, const bn256 *q_x)
+{
+  int i, j;
+  pt p0[1], p1[1], p0_[1], p1_[1];
+
+  /* P0 = O = (1:0)  */
+  memset (p0->x, 0, sizeof (bn256));
+  p0->x->word[0] = 1;
+  memset (p0->z, 0, sizeof (bn256));
+
+  /* P1 = (X:1) */
+  memcpy (p1->x, q_x, sizeof (bn256));
+  memset (p1->z, 0, sizeof (bn256));
+  p1->z->word[0] = 1;
+
+  for (i = 0; i < 8; i++)
+    {
+      uint32_t u = n->word[7-i];
+
+      for (j = 0; j < 16; j++)
+	{
+	  pt *q0, *q1;
+	  pt *sum_n, *prd_n;
+
+	  if ((u & 0x80000000))
+	    q0 = p1,  q1 = p0,  sum_n = p0_, prd_n = p1_;
+	  else
+	    q0 = p0,  q1 = p1,  sum_n = p1_, prd_n = p0_;
+	  mont_d_and_a (prd_n, sum_n, q0, q1, q_x);
+
+	  if ((u & 0x40000000))
+	    q0 = p1_, q1 = p0_, sum_n = p0,  prd_n = p1;
+	  else
+	    q0 = p0_, q1 = p1_, sum_n = p1,  prd_n = p0;
+	  mont_d_and_a (prd_n, sum_n, q0, q1, q_x);
+
+	  u <<= 2;
+	}
+    }
+
+  /* We know the LSB of N is always 0.  Thus, result is always in P0.  */
+  /*
+   * p0->z may be zero here, but our mod_inv doesn't raise error for 0,
+   * but returns 0 (like the implementation of z^(p-2)), thus, RES will
+   * be 0 in that case, which is correct value.
+   */
+  mod_inv (res, p0->z, p25519);
+  mod25638_mul (res, res, p0->x);
+  mod25519_reduce (res);
+}
+
+
+uint8_t *
+ecdh_compute_public_25519 (const uint8_t *key_data)
+{
+  uint8_t *p;
+  bn256 gx[1];
+  bn256 k[1];
+
+  memset (gx, 0, sizeof (bn256));
+  gx[0].word[0] = 9;			/* Gx = 9 */
+  memcpy (k, key_data, sizeof (bn256));
+  p = (uint8_t *)malloc (sizeof (bn256));
+  if (p == NULL)
+    return NULL;
+
+  compute_nQ ((bn256 *)p, k, gx);
+  return p;
+}
+
+int
+ecdh_decrypt_curve25519 (const uint8_t *input, uint8_t *output,
+			 const uint8_t *key_data)
+{
+  bn256 q_x[1];
+  bn256 k[1];
+  bn256 shared[1];
+
+  memcpy (q_x, input, sizeof (bn256));
+  memcpy (k, key_data, sizeof (bn256));
+  compute_nQ (shared, k, q_x);
+  memcpy (output, shared, sizeof (bn256));
+  return 0;
+}

src/ecc.c

@@ -0,0 +1,398 @@
+/*                                                    -*- coding: utf-8 -*-
+ * ecc.c - Elliptic curve over GF(prime)
+ *
+ * Copyright (C) 2011, 2013, 2014, 2015
+ *               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/>.
+ *
+ */
+
+/*
+ * References:
+ *
+ * [1] Suite B Implementer's Guide to FIPS 186-3 (ECDSA), February 3, 2010.
+ *
+ * [2] Michael Brown, Darrel Hankerson, Julio López, and Alfred Menezes,
+ *     Software Implementation of the NIST Elliptic Curves Over Prime Fields,
+ *     Proceedings of the 2001 Conference on Topics in Cryptology: The
+ *     Cryptographer's Track at RSA
+ *     Pages 250-265, Springer-Verlag London, UK, 2001
+ *     ISBN:3-540-41898-9
+ *
+ * [3] Mustapha Hedabou, Pierre Pinel, Lucien Bénéteau, 
+ *     A comb method to render ECC resistant against Side Channel Attacks,
+ *     2004
+ */
+
+#include "field-group-select.h"
+
+/*
+ * Coefficients
+ */
+/*
+ * static const bn256 *coefficient_a;
+ * static const bn256 *coefficient_b;
+ */
+/*
+ * N: order of G
+ */
+/*
+ * static const bn256 N[1];
+ */
+/*
+ * MU = 2^512 / N
+ * MU = ( (1 << 256) | MU_lower )
+ */
+/*
+ * static const bn256 MU_lower[1];
+ */
+
+/*
+ * w = 4
+ * m = 256
+ * d = 64
+ * e = 32
+ */
+
+/*
+ * static const ac precomputed_KG[15];
+ * static const ac precomputed_2E_KG[15];
+ */
+
+#if TEST
+/*
+ * Generator of Elliptic curve over GF(p256)
+ */
+const ac *G = &precomputed_KG[0];
+#endif
+
+
+static int
+get_vk (const bn256 *K, int i)
+{
+  uint32_t w0, w1, w2, w3;
+
+  if (i < 32)
+    {
+      w3 = K->word[6]; w2 = K->word[4]; w1 = K->word[2]; w0 = K->word[0];
+    }
+  else
+    {
+      w3 = K->word[7]; w2 = K->word[5]; w1 = K->word[3]; w0 = K->word[1];
+      i -= 32;
+    }
+
+  w3 >>= i;  w2 >>= i;  w1 >>= i;  w0 >>= i;
+  return ((w3 & 1) << 3) | ((w2 & 1) << 2) | ((w1 & 1) << 1) | (w0 & 1);
+}
+
+
+/**
+ * @brief	X  = k * G
+ *
+ * @param K	scalar k
+ *
+ * Return -1 on error.
+ * Return 0 on success.
+ */
+int
+FUNC(compute_kG) (ac *X, const bn256 *K)
+{
+  uint8_t index[64]; /* Lower 4-bit for index absolute value, msb is
+			for sign (encoded as: 0 means 1, 1 means -1).  */
+  bn256 K_dash[1];
+  jpc Q[1], tmp[1], *dst;
+  int i;
+  int vk;
+  uint32_t k_is_even = bn256_is_even (K);
+
+  bn256_sub_uint (K_dash, K, k_is_even);
+  /* It keeps the condition: 1 <= K' <= N - 2, and K' is odd.  */
+
+  /* Fill index.  */
+  vk = get_vk (K_dash, 0);
+  for (i = 1; i < 64; i++)
+    {
+      int vk_next, is_zero;
+
+      vk_next = get_vk (K_dash, i);
+      is_zero = (vk_next == 0);
+      index[i-1] = (vk - 1) | (is_zero << 7);
+      vk = (is_zero ? vk : vk_next);
+    }
+  index[63] = vk - 1;
+
+  memset (Q->z, 0, sizeof (bn256)); /* infinity */
+  for (i = 31; i >= 0; i--)
+    {
+      FUNC(jpc_double) (Q, Q);
+      FUNC(jpc_add_ac_signed) (Q, Q, &precomputed_2E_KG[index[i+32]&0x0f],
+			       index[i+32] >> 7);
+      FUNC(jpc_add_ac_signed) (Q, Q, &precomputed_KG[index[i]&0x0f],
+			       index[i] >> 7);
+    }
+
+  dst = k_is_even ? Q : tmp;
+  FUNC(jpc_add_ac) (dst, Q, &precomputed_KG[0]);
+
+  return FUNC(jpc_to_ac) (X, Q);
+}
+
+
+
+/**
+ * check if P is on the curve.
+ *
+ * Return -1 on error.
+ * Return 0 on success.
+ */
+static int
+point_is_on_the_curve (const ac *P)
+{
+  bn256 s[1], t[1];
+
+  /* Elliptic curve: y^2 = x^3 + a*x + b */
+  MFNC(sqr) (s, P->x);
+  MFNC(mul) (s, s, P->x);
+
+#ifndef COEFFICIENT_A_IS_ZERO
+  MFNC(mul) (t, coefficient_a, P->x);
+  MFNC(add) (s, s, t);
+#endif
+  MFNC(add) (s, s, coefficient_b);
+
+  MFNC(sqr) (t, P->y);
+  if (bn256_cmp (s, t) == 0)
+    return 0;
+  else
+    return -1;
+}
+
+
+static int
+get_vk_kP (const bn256 *K, int i)
+{
+  uint32_t w;
+  uint8_t blk = i/32;
+  uint8_t pos = i%32;
+  uint8_t col = 3*(pos % 11) + (pos >= 11) + (pos >= 22);
+  uint8_t word_index = (blk * 3) + (pos / 11);
+
+  w = ((K->word[word_index] >> col) & 7);
+  if (word_index < 7 && (pos == 10 || pos == 21))
+    {
+      uint8_t mask;
+      uint8_t shift;
+
+      word_index++;
+      if (pos == 10)
+	{
+	  shift = 2;
+	  mask = 4;
+	}
+      else
+	{
+	  shift = 1;
+	  mask = 6;
+	}
+
+      w |= ((K->word[word_index] << shift) & mask);
+    }
+
+  return w;
+}
+
+/**
+ * @brief	X  = k * P
+ *
+ * @param K	scalar k
+ * @param P	P in affine coordiate
+ *
+ * Return -1 on error.
+ * Return 0 on success.
+ *
+ * For the curve (cofactor is 1 and n is prime), possible error cases are:
+ *
+ *     P is not on the curve.
+ *     P = G, k = n
+ *     Something wrong in the code.
+ *
+ * Mathmatically, k=1 and P=O is another possible case, but O cannot be
+ * represented by affine coordinate.
+ */
+int
+FUNC(compute_kP) (ac *X, const bn256 *K, const ac *P)
+{
+  uint8_t index[86]; /* Lower 2-bit for index absolute value, msb is
+			for sign (encoded as: 0 means 1, 1 means -1).  */
+  bn256 K_dash[1];
+  uint32_t k_is_even = bn256_is_even (K);
+  jpc Q[1], tmp[1], *dst;
+  int i;
+  int vk;
+  ac P3[1], P5[1], P7[1];
+  const ac *p_Pi[4];
+
+  if (point_is_on_the_curve (P) < 0)
+    return -1;
+
+  if (bn256_sub (K_dash, K, N) == 0)	/* >= N, it's too big.  */
+    return -1;
+
+  bn256_sub_uint (K_dash, K, k_is_even);
+  /* It keeps the condition: 1 <= K' <= N - 2, and K' is odd.  */
+
+  p_Pi[0] = P;
+  p_Pi[1] = P3;
+  p_Pi[2] = P5;
+  p_Pi[3] = P7;
+
+  {
+    jpc Q1[1];
+
+    memcpy (Q->x, P->x, sizeof (bn256));
+    memcpy (Q->y, P->y, sizeof (bn256));
+    memset (Q->z, 0, sizeof (bn256));
+    Q->z->word[0] = 1;
+
+    FUNC(jpc_double) (Q, Q);
+    FUNC(jpc_add_ac) (Q1, Q, P);
+    if (FUNC(jpc_to_ac) (P3, Q1) < 0) /* Never occurs, except coding errors.  */
+      return -1;
+    FUNC(jpc_double) (Q, Q);
+    FUNC(jpc_add_ac) (Q1, Q, P);
+    if (FUNC(jpc_to_ac) (P5, Q1) < 0) /* Never occurs, except coding errors.  */
+      return -1;
+
+    memcpy (Q->x, P3->x, sizeof (bn256));
+    memcpy (Q->y, P3->y, sizeof (bn256));
+    memset (Q->z, 0, sizeof (bn256));
+    Q->z->word[0] = 1;
+    FUNC(jpc_double) (Q, Q);
+    FUNC(jpc_add_ac) (Q1, Q, P);
+    if (FUNC(jpc_to_ac) (P7, Q1) < 0) /* Never occurs, except coding errors.  */
+      return -1;
+  }
+
+  /* Fill index.  */
+  vk = get_vk_kP (K_dash, 0);
+  for (i = 1; i < 86; i++)
+    {
+      int vk_next, is_even;
+
+      vk_next = get_vk_kP (K_dash, i);
+      is_even = ((vk_next & 1) == 0);
+      index[i-1] = (is_even << 7) | ((is_even?7-vk:vk-1) >> 1);
+      vk = vk_next + is_even;
+    }
+  index[85] = ((vk - 1) >> 1);
+
+  memset (Q->z, 0, sizeof (bn256)); /* infinity */
+  for (i = 85; i >= 0; i--)
+    {
+      FUNC(jpc_double) (Q, Q);
+      FUNC(jpc_double) (Q, Q);
+      FUNC(jpc_double) (Q, Q);
+      FUNC(jpc_add_ac_signed) (Q, Q, p_Pi[index[i]&0x03], index[i] >> 7);
+    }
+
+  dst = k_is_even ? Q : tmp;
+  FUNC(jpc_add_ac) (dst, Q, P);
+
+  return FUNC(jpc_to_ac) (X, Q);
+}
+
+
+/**
+ * @brief Compute signature (r,s) of hash string z with secret key d
+ */
+void
+FUNC(ecdsa) (bn256 *r, bn256 *s, const bn256 *z, const bn256 *d)
+{
+  bn256 k[1];
+  ac KG[1];
+  bn512 tmp[1];
+  bn256 k_inv[1];
+  uint32_t carry;
+#define borrow carry
+#define tmp_k k_inv
+
+  do
+    {
+      do
+	{
+	  bn256_random (k);
+	  if (bn256_add_uint (k, k, 1))
+	    continue;
+	  if (bn256_sub (tmp_k, k, N) == 0)	/* >= N, it's too big.  */
+	    continue;
+	  /* 1 <= k <= N - 1 */
+	  FUNC(compute_kG) (KG, k);
+	  borrow = bn256_sub (r, KG->x, N);
+	  if (borrow)
+	    memcpy (r, KG->x, sizeof (bn256));
+	  else
+	    memcpy (KG->x, r, sizeof (bn256));
+	}
+      while (bn256_is_zero (r));
+
+      mod_inv (k_inv, k, N);
+      bn256_mul (tmp, r, d);
+      mod_reduce (s, tmp, N, MU_lower);
+      carry = bn256_add (s, s, z);
+      if (carry)
+	bn256_sub (s, s, N);
+      else
+	bn256_sub ((bn256 *)tmp, s, N);
+      bn256_mul (tmp, s, k_inv);
+      mod_reduce (s, tmp, N, MU_lower);
+    }
+  while (bn256_is_zero (s));
+
+#undef tmp_k
+#undef borrow
+}
+
+
+/**
+ * @brief Check if a secret d0 is valid or not
+ *
+ * @param D0	scalar D0: secret
+ * @param D1	scalar D1: secret candidate N-D0
+ *
+ * Return 0 on error.
+ * Return -1 when D1 should be used as the secret
+ * Return 1 when D0 should be used as the secret
+ */
+int
+FUNC(check_secret) (const bn256 *d0, bn256 *d1)
+{
+  ac Q0[1], Q1[1];
+
+  if (bn256_is_zero (d0) || bn256_sub (d1, N, d0) <= 0)
+    /* == 0 or >= N, it's not valid.  */
+    return 0;
+
+  FUNC(compute_kG) (Q0, d0);
+  FUNC(compute_kG) (Q1, d1);
+
+  /*
+   * Jivsov compliant key check
+   */
+  return bn256_cmp (Q1[0].y, Q0[0].y);
+}

src/field-group-select.h

@@ -0,0 +1,7 @@
+#define CONCAT0(a,b) a##b
+#define CONCAT1(a,b) CONCAT0(a,b)
+#define CONCAT2(a,b,c) CONCAT1(a,b##c)
+#define CONCAT3(a,b,c) CONCAT2(a,b,c)
+
+#define FUNC(func) CONCAT1(func##_,FIELD)
+#define MFNC(func) CONCAT3(mod,FIELD,_##func)

src/flash.c

@@ -1,7 +1,7 @@
 /*
  * flash.c -- Data Objects (DO) and GPG Key handling on Flash ROM
  *
- * Copyright (C) 2010, 2011, 2012, 2013
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015
  *               Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
@@ -35,7 +35,6 @@
 
 #include "config.h"
 
-#include "board.h"
 #include "sys.h"
 #include "gnuk.h"
 
@@ -57,13 +56,17 @@
  * _data_pool
  *	   <two pages>
  * _keystore_pool
- *         three flash pages for keystore (single: 512-byte (p, q and N))
+ *         Three flash pages for keystore
+ *         a page contains a key data of:
+ *              For RSA-2048: 512-byte (p, q and N)
+ *              For RSA-4096: 1024-byte (p, q and N)
+ *              For ECDSA/ECDH and EdDSA, there are padding after public key
  */
-#define KEY_SIZE	512	/* P, Q and N */
 
 #define FLASH_DATA_POOL_HEADER_SIZE	2
-#define FLASH_DATA_POOL_SIZE		(FLASH_PAGE_SIZE*2)
-#define FLASH_KEYSTORE_SIZE		(FLASH_PAGE_SIZE*3)
+#define FLASH_DATA_POOL_SIZE		(flash_page_size*2)
+
+static uint16_t flash_page_size;
 
 static const uint8_t *data_pool;
 extern uint8_t _keystore_pool;
@@ -78,28 +81,82 @@ const uint8_t const flash_data[4] __attribute__ ((section (".gnuk_data"))) = {
 /* Linker set this symbol */
 extern uint8_t _data_pool;
 
+static int key_available_at (const uint8_t *k, int key_size)
+{
+  int i;
+
+  for (i = 0; i < key_size; i++)
+    if (k[i])
+      break;
+  if (i == key_size)	/* It's ZERO.  Released key.  */
+    return 0;
+
+  for (i = 0; i < key_size; i++)
+    if (k[i] != 0xff)
+      break;
+  if (i == key_size)	/* It's FULL.  Unused key.  */
+    return 0;
+
+  return 1;
+}
+
+
+#define CHIP_ID_REG      ((uint32_t *)0xe0042000)
 const uint8_t *
 flash_init (void)
 {
   uint16_t gen0, gen1;
   uint16_t *gen0_p = (uint16_t *)&_data_pool;
-  uint16_t *gen1_p = (uint16_t *)(&_data_pool + FLASH_PAGE_SIZE);
+  uint16_t *gen1_p;
+
+  flash_page_size = 1024;
+  if (((*CHIP_ID_REG) & 0xfff) == 0x0414)
+    flash_page_size = 2048;
+
+  gen1_p = (uint16_t *)(&_data_pool + flash_page_size);
 
   /* Check data pool generation and choose the page */
   gen0 = *gen0_p;
   gen1 = *gen1_p;
   if (gen0 == 0xffff)
-    data_pool = &_data_pool + FLASH_PAGE_SIZE;
+    data_pool = &_data_pool + flash_page_size;
   else if (gen1 == 0xffff)
     data_pool = &_data_pool;
   else if (gen1 > gen0)
-    data_pool = &_data_pool + FLASH_PAGE_SIZE;
+    data_pool = &_data_pool + flash_page_size;
   else
     data_pool = &_data_pool;
 
   return data_pool + FLASH_DATA_POOL_HEADER_SIZE;
 }
 
+void
+flash_init_keys (void)
+{
+  const uint8_t *p;
+  int i;
+
+  /* For each key, find its address.  */
+  p = &_keystore_pool;
+  for (i = 0; i < 3; i++)
+    {
+      const uint8_t *k;
+      int key_size = gpg_get_algo_attr_key_size (i, GPG_KEY_STORAGE);
+
+      kd[i].pubkey = NULL;
+      for (k = p; k < p + flash_page_size; k += key_size)
+	if (key_available_at (k, key_size))
+	  {
+	    int prv_len = gpg_get_algo_attr_key_size (i, GPG_KEY_PRIVATE);
+
+	    kd[i].pubkey = k + prv_len;
+	    break;
+	  }
+
+      p += flash_page_size;
+    }
+}
+
 /*
  * Flash data pool managenent
  *
@@ -114,6 +171,7 @@ flash_init (void)
  *     123-counter
  *     14-bit counter
  *     bool object
+ *     small enum
  *
  * Format of a Data Object:
  *    NR:   8-bit tag_number
@@ -140,11 +198,11 @@ flash_copying_gc (void)
   if (data_pool == &_data_pool)
     {
       src = &_data_pool;
-      dst = &_data_pool + FLASH_PAGE_SIZE;
+      dst = &_data_pool + flash_page_size;
     }
   else
     {
-      src = &_data_pool + FLASH_PAGE_SIZE;
+      src = &_data_pool + flash_page_size;
       dst = &_data_pool;
     }
 
@@ -159,7 +217,7 @@ flash_copying_gc (void)
 static int
 is_data_pool_full (size_t size)
 {
-  return last_p + size > data_pool + FLASH_PAGE_SIZE;
+  return last_p + size > data_pool + flash_page_size;
 }
 
 static uint8_t *
@@ -269,34 +327,41 @@ flash_do_release (const uint8_t *do_data)
 }
 
 
-uint8_t *
-flash_key_alloc (void)
+static uint8_t *
+flash_key_getpage (enum kind_of_key kk)
 {
-  uint8_t *k;
-  int i; 
+  /* There is a page for each KK.  */
+  return &_keystore_pool + (flash_page_size * kk);
+}
 
-  /* Seek empty keystore.  */
-  k = &_keystore_pool;
-  while (k < &_keystore_pool + FLASH_KEYSTORE_SIZE)
+uint8_t *
+flash_key_alloc (enum kind_of_key kk)
+{
+  uint8_t *k, *k0 = flash_key_getpage (kk);
+  int i; 
+  int key_size = gpg_get_algo_attr_key_size (kk, GPG_KEY_STORAGE);
+
+  /* Seek free space in the page.  */
+  for (k = k0; k < k0 + flash_page_size; k += key_size)
     {
       const uint32_t *p = (const uint32_t *)k;
 
-      for (i = 0; i < KEY_SIZE/4; i++)
+      for (i = 0; i < key_size/4; i++)
 	if (p[i] != 0xffffffff)
 	  break;
 
-      if (i == KEY_SIZE/4)	/* Yes, it's empty.  */
+      if (i == key_size/4)	/* Yes, it's empty.  */
 	return k;
-
-      k += KEY_SIZE;
     }
 
-  /* Should not happen as we have enough space, but just in case.  */
+  /* Should not happen as we have enough free space all time, but just
+     in case.  */
   return NULL;
 }
 
 int
-flash_key_write (uint8_t *key_addr, const uint8_t *key_data,
+flash_key_write (uint8_t *key_addr,
+		 const uint8_t *key_data, int key_data_len,
 		 const uint8_t *pubkey, int pubkey_len)
 {
   uint16_t hw;
@@ -304,7 +369,7 @@ flash_key_write (uint8_t *key_addr, const uint8_t *key_data,
   int i;
 
   addr = (uint32_t)key_addr;
-  for (i = 0; i < KEY_CONTENT_LEN/2; i ++)
+  for (i = 0; i < key_data_len/2; i ++)
     {
       hw = key_data[i*2] | (key_data[i*2+1]<<8);
       if (flash_program_halfword (addr, hw) != 0)
@@ -324,14 +389,14 @@ flash_key_write (uint8_t *key_addr, const uint8_t *key_data,
 }
 
 static int
-flash_check_all_other_keys_released (const uint8_t *key_addr)
+flash_check_all_other_keys_released (const uint8_t *key_addr, int key_size)
 {
-  uint32_t start = (uint32_t)key_addr & ~(FLASH_PAGE_SIZE - 1);
+  uint32_t start = (uint32_t)key_addr & ~(flash_page_size - 1);
   const uint32_t *p = (const uint32_t *)start;
 
-  while (p < (const uint32_t *)(start + FLASH_PAGE_SIZE))
+  while (p < (const uint32_t *)(start + flash_page_size))
     if (p == (const uint32_t *)key_addr)
-      p += KEY_SIZE/4;
+      p += key_size/4;
     else
       if (*p)
 	return 0;
@@ -342,22 +407,28 @@ flash_check_all_other_keys_released (const uint8_t *key_addr)
 }
 
 static void
-flash_key_fill_zero_as_released (uint8_t *key_addr)
+flash_key_fill_zero_as_released (uint8_t *key_addr, int key_size)
 {
   int i;
   uint32_t addr = (uint32_t)key_addr;
 
-  for (i = 0; i < KEY_SIZE/2; i++)
+  for (i = 0; i < key_size/2; i++)
     flash_program_halfword (addr + i*2, 0);
 }
 
 void
-flash_key_release (uint8_t *key_addr)
+flash_key_release (uint8_t *key_addr, int key_size)
 {
-  if (flash_check_all_other_keys_released (key_addr))
-    flash_erase_page (((uint32_t)key_addr & ~(FLASH_PAGE_SIZE - 1)));
+  if (flash_check_all_other_keys_released (key_addr, key_size))
+    flash_erase_page (((uint32_t)key_addr & ~(flash_page_size - 1)));
   else
-    flash_key_fill_zero_as_released (key_addr);
+    flash_key_fill_zero_as_released (key_addr, key_size);
+}
+
+void
+flash_key_release_page (enum kind_of_key kk)
+{
+  flash_erase_page ((uint32_t)flash_key_getpage (kk));
 }
 
 
@@ -425,6 +496,38 @@ flash_bool_write (uint8_t nr)
 }
 
 
+void
+flash_enum_clear (const uint8_t **addr_p)
+{
+  flash_bool_clear (addr_p);
+}
+
+void
+flash_enum_write_internal (const uint8_t *p, int nr, uint8_t v)
+{
+  uint16_t hw = nr | (v << 8);
+
+  flash_program_halfword ((uint32_t)p, hw);
+}
+
+const uint8_t *
+flash_enum_write (uint8_t nr, uint8_t v)
+{
+  uint8_t *p;
+  uint16_t hw = nr | (v << 8);
+
+  p = flash_data_pool_allocate (2);
+  if (p == NULL)
+    {
+      DEBUG_INFO ("enum allocation failure.\r\n");
+      return NULL;
+    }
+
+  flash_program_halfword ((uint32_t)p, hw);
+  return p;
+}
+
+
 int
 flash_cnt123_get_value (const uint8_t *p)
 {
@@ -525,9 +628,8 @@ flash_erase_binary (uint8_t file_id)
       if (flash_check_blank (p, FLASH_CH_CERTIFICATE_SIZE) == 0)
 	{
 	  flash_erase_page ((uint32_t)p);
-#if FLASH_CH_CERTIFICATE_SIZE > FLASH_PAGE_SIZE
-	  flash_erase_page ((uint32_t)p + FLASH_PAGE_SIZE);
-#endif
+	  if (FLASH_CH_CERTIFICATE_SIZE > flash_page_size)
+	    flash_erase_page ((uint32_t)p + flash_page_size);
 	}
 
       return 0;
@@ -552,7 +654,7 @@ flash_write_binary (uint8_t file_id, const uint8_t *data,
     }
   else if (file_id >= FILEID_UPDATE_KEY_0 && file_id <= FILEID_UPDATE_KEY_3)
     {
-      maxsize = KEY_CONTENT_LEN;
+      maxsize = FIRMWARE_UPDATE_KEY_CONTENT_LEN;
       p = gpg_get_firmware_update_key (file_id - FILEID_UPDATE_KEY_0);
       if (len == 0 && offset == 0)
 	{ /* This means removal of update key.  */

src/gnuk.h

@@ -36,10 +36,10 @@ void ccid_card_change_signal (int how);
 #define EV_VERIFY_CMD_AVAILABLE (8)
 #define EV_MODIFY_CMD_AVAILABLE (16)
 
-/* Maximum cmd apdu data is key import 22+4+128+128 (proc_key_import) */
-#define MAX_CMD_APDU_DATA_SIZE (22+4+128+128) /* without header */
-/* Maximum res apdu data is public key 5+9+256 (gpg_do_public_key) */
-#define MAX_RES_APDU_DATA_SIZE (5+9+256) /* without trailer */
+/* Maximum cmd apdu data is key import 24+4+256+256 (proc_key_import) */
+#define MAX_CMD_APDU_DATA_SIZE (24+4+256+256) /* without header */
+/* Maximum res apdu data is public key 5+9+512 (gpg_do_public_key) */
+#define MAX_RES_APDU_DATA_SIZE (5+9+512) /* without trailer */
 
 #define ICC_MSG_HEADER_SIZE	10
 
@@ -49,8 +49,7 @@ void ccid_card_change_signal (int how);
 /* USB buffer size of LL (Low-level): size of single Bulk transaction */
 #define USB_LL_BUF_SIZE 64
 
-enum icc_state
-{
+enum icc_state {
   ICC_STATE_NOCARD,		/* No card available */
   ICC_STATE_START,		/* Initial */
   ICC_STATE_WAIT,		/* Waiting APDU */
@@ -63,6 +62,8 @@ enum icc_state
   ICC_STATE_EXEC_REQUESTED,	/* Exec requested */
 };
 
+#define CCID_CARD_INIT CARD_CHANGE_INSERT
+
 extern enum icc_state *icc_state_p;
 
 extern volatile uint8_t auth_status;
@@ -76,40 +77,47 @@ extern volatile uint8_t auth_status;
 #define PW_ERR_PW1 0
 #define PW_ERR_RC  1
 #define PW_ERR_PW3 2
-extern int gpg_pw_get_retry_counter (int who);
-extern int gpg_pw_locked (uint8_t which);
-extern void gpg_pw_reset_err_counter (uint8_t which);
-extern void gpg_pw_increment_err_counter (uint8_t which);
+int gpg_pw_get_retry_counter (int who);
+int gpg_pw_locked (uint8_t which);
+void gpg_pw_reset_err_counter (uint8_t which);
+void gpg_pw_increment_err_counter (uint8_t which);
 
-extern int ac_check_status (uint8_t ac_flag);
-extern int verify_pso_cds (const uint8_t *pw, int pw_len);
-extern int verify_other (const uint8_t *pw, int pw_len);
-extern int verify_user_0 (uint8_t access, const uint8_t *pw, int buf_len,
-			  int pw_len_known, const uint8_t *ks_pw1, int saveks);
-extern int verify_admin (const uint8_t *pw, int pw_len);
-extern int verify_admin_0 (const uint8_t *pw, int buf_len, int pw_len_known,
-			   const uint8_t *ks_pw3, int saveks);
+int ac_check_status (uint8_t ac_flag);
+int verify_pso_cds (const uint8_t *pw, int pw_len);
+int verify_other (const uint8_t *pw, int pw_len);
+int verify_user_0 (uint8_t access, const uint8_t *pw, int buf_len,
+		   int pw_len_known, const uint8_t *ks_pw1, int saveks);
+int verify_admin (const uint8_t *pw, int pw_len);
+int verify_admin_0 (const uint8_t *pw, int buf_len, int pw_len_known,
+		    const uint8_t *ks_pw3, int saveks);
 
-extern void ac_reset_pso_cds (void);
-extern void ac_reset_other (void);
-extern void ac_reset_admin (void);
-extern void ac_fini (void);
+void ac_reset_pso_cds (void);
+void ac_reset_other (void);
+void ac_reset_admin (void);
+void ac_fini (void);
 
 
-extern void set_res_sw (uint8_t sw1, uint8_t sw2);
+void set_res_sw (uint8_t sw1, uint8_t sw2);
 extern uint16_t data_objects_number_of_bytes;
 
 #define CHALLENGE_LEN	32
 
-extern void gpg_data_scan (const uint8_t *p);
-extern void gpg_data_copy (const uint8_t *p);
-extern void gpg_do_get_data (uint16_t tag, int with_tag);
-extern void gpg_do_put_data (uint16_t tag, const uint8_t *data, int len);
-extern void gpg_do_public_key (uint8_t kk_byte);
-extern void gpg_do_keygen (uint8_t kk_byte);
+void gpg_data_scan (const uint8_t *p);
+void gpg_data_copy (const uint8_t *p);
+void gpg_do_get_data (uint16_t tag, int with_tag);
+void gpg_do_put_data (uint16_t tag, const uint8_t *data, int len);
+void gpg_do_public_key (uint8_t kk_byte);
+void gpg_do_keygen (uint8_t kk_byte);
 
-extern const uint8_t *gpg_get_firmware_update_key (uint8_t keyno);
+const uint8_t *gpg_get_firmware_update_key (uint8_t keyno);
 
+/* Constants: algo+size */
+#define ALGO_RSA4K      0
+#define ALGO_NISTP256R1 1
+#define ALGO_SECP256K1  2
+#define ALGO_ED25519    3
+#define ALGO_CURVE25519 4
+#define ALGO_RSA2K      255
 
 enum kind_of_key {
   GPG_KEY_FOR_SIGNING = 0,
@@ -117,17 +125,29 @@ enum kind_of_key {
   GPG_KEY_FOR_AUTHENTICATION,
 };
 
-extern const uint8_t *flash_init (void);
-extern void flash_do_release (const uint8_t *);
-extern const uint8_t *flash_do_write (uint8_t nr, const uint8_t *data, int len);
-extern uint8_t *flash_key_alloc (void);
-extern void flash_key_release (uint8_t *);
-extern int flash_key_write (uint8_t *key_addr, const uint8_t *key_data,
-			    const uint8_t *pubkey, int pubkey_len);
-extern void flash_set_data_pool_last (const uint8_t *p);
-extern void flash_clear_halfword (uint32_t addr);
-extern void flash_increment_counter (uint8_t counter_tag_nr);
-extern void flash_reset_counter (uint8_t counter_tag_nr);
+enum size_of_key {
+  GPG_KEY_STORAGE = 0,		/* PUBKEY + PRVKEY rounded to 2^N */
+  GPG_KEY_PUBLIC,
+  GPG_KEY_PRIVATE,
+};
+
+int gpg_get_algo_attr (enum kind_of_key kk);
+int gpg_get_algo_attr_key_size (enum kind_of_key kk, enum size_of_key s);
+
+const uint8_t *flash_init (void);
+void flash_init_keys (void);
+void flash_do_release (const uint8_t *);
+const uint8_t *flash_do_write (uint8_t nr, const uint8_t *data, int len);
+uint8_t *flash_key_alloc (enum kind_of_key);
+void flash_key_release (uint8_t *, int);
+void flash_key_release_page (enum kind_of_key);
+int flash_key_write (uint8_t *key_addr,
+		     const uint8_t *key_data, int key_data_len,
+		     const uint8_t *pubkey, int pubkey_len);
+void flash_set_data_pool_last (const uint8_t *p);
+void flash_clear_halfword (uint32_t addr);
+void flash_increment_counter (uint8_t counter_tag_nr);
+void flash_reset_counter (uint8_t counter_tag_nr);
 
 #define FILEID_SERIAL_NO	0
 #define FILEID_UPDATE_KEY_0	1
@@ -135,31 +155,28 @@ extern void flash_reset_counter (uint8_t counter_tag_nr);
 #define FILEID_UPDATE_KEY_2	3
 #define FILEID_UPDATE_KEY_3	4
 #define FILEID_CH_CERTIFICATE	5
-extern int flash_erase_binary (uint8_t file_id);
-extern int flash_write_binary (uint8_t file_id, const uint8_t *data, uint16_t len, uint16_t offset);
+int flash_erase_binary (uint8_t file_id);
+int flash_write_binary (uint8_t file_id, const uint8_t *data,
+			uint16_t len, uint16_t offset);
 
 #define FLASH_CH_CERTIFICATE_SIZE 2048
 
 /* Linker set these two symbols */
 extern uint8_t ch_certificate_start;
-extern uint8_t random_bits_start;
 
-#define KEY_CONTENT_LEN 256	/* p and q */
+#define FIRMWARE_UPDATE_KEY_CONTENT_LEN 256	/* RSA-2048 (p and q) */
+
 #define INITIAL_VECTOR_SIZE 16
 #define DATA_ENCRYPTION_KEY_SIZE 16
 
-/* encrypted data content */
-struct key_data {
-  uint8_t data[KEY_CONTENT_LEN]; /* p and q */
-};
+#define MAX_PRVKEY_LEN 512	/* Maximum is the case for RSA 4096-bit.  */
 
-struct key_data_internal {
-  uint32_t data[KEY_CONTENT_LEN/4]; /* p and q */
-  uint32_t checksum[DATA_ENCRYPTION_KEY_SIZE/4];
+struct key_data {
+  const uint8_t *pubkey;	/* Pointer to public key */
+  uint8_t data[MAX_PRVKEY_LEN]; /* decrypted private key data content */
 };
 
 struct prvkey_data {
-  const uint8_t *key_addr;
   /*
    * IV: Initial Vector
    */
@@ -202,14 +219,14 @@ void s2k (const unsigned char *salt, size_t slen,
 #define KS_GET_SALT(ks)       (ks + KEYSTRING_PASSLEN_SIZE)
 #define KS_GET_KEYSTRING(ks)  (ks + KS_META_SIZE)
 
-extern void gpg_do_clear_prvkey (enum kind_of_key kk);
-extern int gpg_do_load_prvkey (enum kind_of_key kk, int who, const uint8_t *keystring);
-extern int gpg_do_chks_prvkey (enum kind_of_key kk,
-			       int who_old, const uint8_t *old_ks,
-			       int who_new, const uint8_t *new_ks);
+void gpg_do_clear_prvkey (enum kind_of_key kk);
+int gpg_do_load_prvkey (enum kind_of_key kk, int who, const uint8_t *keystring);
+int gpg_do_chks_prvkey (enum kind_of_key kk,
+			int who_old, const uint8_t *old_ks,
+			int who_new, const uint8_t *new_ks);
 
-extern int gpg_change_keystring (int who_old, const uint8_t *old_ks,
-				 int who_new, const uint8_t *new_ks);
+int gpg_change_keystring (int who_old, const uint8_t *old_ks,
+			  int who_new, const uint8_t *new_ks);
 
 extern struct key_data kd[3];
 
@@ -218,13 +235,13 @@ extern struct key_data kd[3];
 /*
  * Debug functions in debug.c
  */
-extern void put_byte (uint8_t b);
-extern void put_byte_with_no_nl (uint8_t b);
-extern void put_short (uint16_t x);
-extern void put_word (uint32_t x);
-extern void put_int (uint32_t x);
-extern void put_string (const char *s);
-extern void put_binary (const char *s, int len);
+void put_byte (uint8_t b);
+void put_byte_with_no_nl (uint8_t b);
+void put_short (uint16_t x);
+void put_word (uint32_t x);
+void put_int (uint32_t x);
+void put_string (const char *s);
+void put_binary (const char *s, int len);
 
 #define DEBUG_INFO(msg)	    put_string (msg)
 #define DEBUG_WORD(w)	    put_word (w)
@@ -239,23 +256,41 @@ extern void put_binary (const char *s, int len);
 #define DEBUG_BINARY(s,len)
 #endif
 
-extern int rsa_sign (const uint8_t *, uint8_t *, int, struct key_data *);
-extern uint8_t *modulus_calc (const uint8_t *, int);
-extern int rsa_decrypt (const uint8_t *, uint8_t *, int, struct key_data *);
-extern int rsa_verify (const uint8_t *pubkey, const uint8_t *hash,
-		       const uint8_t *signature);
-extern uint8_t *rsa_genkey (void);
+int rsa_sign (const uint8_t *, uint8_t *, int, struct key_data *, int);
+uint8_t *modulus_calc (const uint8_t *, int);
+int rsa_decrypt (const uint8_t *, uint8_t *, int, struct key_data *,
+		 unsigned int *);
+int rsa_verify (const uint8_t *, int, const uint8_t *, const uint8_t *);
+uint8_t *rsa_genkey (int);
 
-extern int ecdsa_sign  (const uint8_t *hash, uint8_t *output,
-			const struct key_data *kd);
-extern uint8_t *ecdsa_compute_public (const uint8_t *key_data);
+int ecdsa_sign_p256r1 (const uint8_t *hash, uint8_t *output,
+		       const uint8_t *key_data);
+uint8_t *ecc_compute_public_p256r1 (const uint8_t *key_data);
+int ecc_check_secret_p256r1 (const uint8_t *d0, uint8_t *d1);
+int ecdh_decrypt_p256r1 (const uint8_t *input, uint8_t *output,
+			 const uint8_t *key_data);
 
-extern const uint8_t *gpg_do_read_simple (uint8_t);
-extern void gpg_do_write_simple (uint8_t, const uint8_t *, int);
-extern void gpg_increment_digital_signature_counter (void);
+int ecdsa_sign_p256k1 (const uint8_t *hash, uint8_t *output,
+		       const uint8_t *key_data);
+uint8_t *ecc_compute_public_p256k1 (const uint8_t *key_data);
+int ecc_check_secret_p256k1 (const uint8_t *d0, uint8_t  *d1);
+int ecdh_decrypt_p256k1 (const uint8_t *input, uint8_t *output,
+			 const uint8_t *key_data);
+
+int eddsa_sign_25519 (const uint8_t *input, size_t ilen, uint32_t *output,
+		      const uint8_t *sk_a, const uint8_t *seed,
+		      const uint8_t *pk);
+uint8_t *eddsa_compute_public_25519 (const uint8_t *a);
+uint8_t *ecdh_compute_public_25519 (const uint8_t *a);
+int ecdh_decrypt_curve25519 (const uint8_t *input, uint8_t *output,
+			     const uint8_t *key_data);
+
+const uint8_t *gpg_do_read_simple (uint8_t);
+void gpg_do_write_simple (uint8_t, const uint8_t *, int);
+void gpg_increment_digital_signature_counter (void);
 
 
-extern void fatal (uint8_t code) __attribute__ ((noreturn));
+void fatal (uint8_t code) __attribute__ ((noreturn));
 #define FATAL_FLASH  1
 #define FATAL_RANDOM 2
 
@@ -263,7 +298,6 @@ extern uint8_t keystring_md_pw3[KEYSTRING_MD_SIZE];
 extern uint8_t admin_authorized;
 
 /*** Flash memory tag values ***/
-#define NR_NONE			0x00
 /* Data objects */
 /*
  * Representation of data object:
@@ -271,28 +305,27 @@ extern uint8_t admin_authorized;
  *   <-1 halfword-> <--len/2 halfwords->
  *   <-tag-><-len-> <---data content--->
  */
-#define NR_DO__FIRST__		0x01
-#define NR_DO_SEX		0x01
-#define NR_DO_FP_SIG		0x02
-#define NR_DO_FP_DEC		0x03
-#define NR_DO_FP_AUT		0x04
-#define NR_DO_CAFP_1		0x05
-#define NR_DO_CAFP_2		0x06
-#define NR_DO_CAFP_3		0x07
-#define NR_DO_KGTIME_SIG	0x08
-#define NR_DO_KGTIME_DEC	0x09
-#define NR_DO_KGTIME_AUT	0x0a
-#define NR_DO_LOGIN_DATA	0x0b
-#define NR_DO_URL		0x0c
-#define NR_DO_NAME		0x0d
-#define NR_DO_LANGUAGE		0x0e
-#define NR_DO_PRVKEY_SIG	0x0f
-#define NR_DO_PRVKEY_DEC	0x10
-#define NR_DO_PRVKEY_AUT	0x11
-#define NR_DO_KEYSTRING_PW1	0x12
-#define NR_DO_KEYSTRING_RC	0x13
-#define NR_DO_KEYSTRING_PW3	0x14
-#define NR_DO__LAST__		21   /* == 0x15 */
+#define NR_DO_SEX		0x00
+#define NR_DO_FP_SIG		0x01
+#define NR_DO_FP_DEC		0x02
+#define NR_DO_FP_AUT		0x03
+#define NR_DO_CAFP_1		0x04
+#define NR_DO_CAFP_2		0x05
+#define NR_DO_CAFP_3		0x06
+#define NR_DO_KGTIME_SIG	0x07
+#define NR_DO_KGTIME_DEC	0x08
+#define NR_DO_KGTIME_AUT	0x09
+#define NR_DO_LOGIN_DATA	0x0a
+#define NR_DO_URL		0x0b
+#define NR_DO_NAME		0x0c
+#define NR_DO_LANGUAGE		0x0d
+#define NR_DO_PRVKEY_SIG	0x0e
+#define NR_DO_PRVKEY_DEC	0x0f
+#define NR_DO_PRVKEY_AUT	0x10
+#define NR_DO_KEYSTRING_PW1	0x11
+#define NR_DO_KEYSTRING_RC	0x12
+#define NR_DO_KEYSTRING_PW3	0x13
+#define NR_DO__LAST__		20   /* == 0x14 */
 /* 14-bit counter for DS: Recorded in flash memory by 1-halfword (2-byte).  */
 /*
  * Representation of 14-bit counter:
@@ -311,7 +344,10 @@ extern uint8_t admin_authorized;
  *   1023: 0xc3ff
  */
 #define NR_COUNTER_DS_LSB	0xc0 /* ..0xc3 */
-/* 8-bit int or Boolean objects: Recorded in flash memory by 1-halfword (2-byte) */
+/*
+ * Boolean object, small enum, or 8-bit integer:
+ * Recorded in flash memory by 1-halfword (2-byte)
+ */
 /*
  * Representation of Boolean object:
  *   0: No record in flash memory
@@ -319,7 +355,20 @@ extern uint8_t admin_authorized;
  */
 #define NR_BOOL_PW1_LIFETIME	0xf0
 /*
- * NR_BOOL_SOMETHING, NR_UINT_SOMETHING could be here...  Use 0xf?
+ * Representation of algorithm attribute object:
+ *   RSA-2048:       No record in flash memory
+ *   RSA-4096:       0xf?00
+ *   ECC p256r1:     0xf?01
+ *   ECC p256k1:     0xf?02
+ *   ECC Ed25519:    0xf?03
+ *   ECC Curve25519: 0xf?04
+ * where <?> == 1 (signature), 2 (decryption) or 3 (authentication)
+ */
+#define NR_KEY_ALGO_ATTR_SIG	0xf1
+#define NR_KEY_ALGO_ATTR_DEC	0xf2
+#define NR_KEY_ALGO_ATTR_AUT	0xf3
+/*
+ * NR_UINT_SOMETHING could be here...  Use 0xf[456789abcd]
  */
 /* 123-counters: Recorded in flash memory by 2-halfword (4-byte).  */
 /*
@@ -348,20 +397,24 @@ extern uint8_t admin_authorized;
 
 extern const uint8_t openpgpcard_aid[14];
 
-extern void flash_bool_clear (const uint8_t **addr_p);
-extern const uint8_t *flash_bool_write (uint8_t nr);
-extern int flash_cnt123_get_value (const uint8_t *p);
-extern void flash_cnt123_increment (uint8_t which, const uint8_t **addr_p);
-extern void flash_cnt123_clear (const uint8_t **addr_p);
-extern void flash_put_data (uint16_t hw);
-extern void flash_warning (const char *msg);
+void flash_bool_clear (const uint8_t **addr_p);
+const uint8_t *flash_bool_write (uint8_t nr);
+void flash_enum_clear (const uint8_t **addr_p);
+const uint8_t *flash_enum_write (uint8_t nr, uint8_t v);
+int flash_cnt123_get_value (const uint8_t *p);
+void flash_cnt123_increment (uint8_t which, const uint8_t **addr_p);
+void flash_cnt123_clear (const uint8_t **addr_p);
+void flash_put_data (uint16_t hw);
+void flash_warning (const char *msg);
 
-extern void flash_put_data_internal (const uint8_t *p, uint16_t hw);
-extern void flash_bool_write_internal (const uint8_t *p, int nr);
-extern void flash_cnt123_write_internal (const uint8_t *p, int which, int v);
-extern void flash_do_write_internal (const uint8_t *p, int nr, const uint8_t *data, int len);
+void flash_put_data_internal (const uint8_t *p, uint16_t hw);
+void flash_bool_write_internal (const uint8_t *p, int nr);
+void flash_enum_write_internal (const uint8_t *p, int nr, uint8_t v);
+void flash_cnt123_write_internal (const uint8_t *p, int which, int v);
+void flash_do_write_internal (const uint8_t *p, int nr,
+			      const uint8_t *data, int len);
 
-extern const uint8_t gnukStringSerial[];
+extern const uint8_t gnuk_string_serial[];
 
 #define LED_ONESHOT		(1)
 #define LED_TWOSHOTS		(2)
@@ -369,20 +422,20 @@ extern const uint8_t gnukStringSerial[];
 #define LED_START_COMMAND	(8)
 #define LED_FINISH_COMMAND	(16)
 #define LED_FATAL		(32)
-extern void led_blink (int spec);
+void led_blink (int spec);
 
 #if defined(PINPAD_SUPPORT)
 # if defined(PINPAD_CIR_SUPPORT)
-extern void cir_init (void);
+void cir_init (void);
 # elif defined(PINPAD_DIAL_SUPPORT)
-extern void dial_sw_disable (void);
-extern void dial_sw_enable (void);
+void dial_sw_disable (void);
+void dial_sw_enable (void);
 # elif defined(PINPAD_DND_SUPPORT)
-extern void msc_init (void);
-extern void msc_media_insert_change (int available);
-extern int msc_scsi_write (uint32_t lba, const uint8_t *buf, size_t size);
-extern int msc_scsi_read (uint32_t lba, const uint8_t **sector_p);
-extern void msc_scsi_stop (uint8_t code);
+void msc_init (void);
+void msc_media_insert_change (int available);
+int msc_scsi_write (uint32_t lba, const uint8_t *buf, size_t size);
+int msc_scsi_read (uint32_t lba, const uint8_t **sector_p);
+void msc_scsi_stop (uint8_t code);
 # endif
 #define PIN_INPUT_CURRENT 1
 #define PIN_INPUT_NEW     2
@@ -391,7 +444,7 @@ extern void msc_scsi_stop (uint8_t code);
 extern uint8_t pin_input_buffer[MAX_PIN_CHARS];
 extern uint8_t pin_input_len;
 
-extern int pinpad_getline (int msg_code, uint32_t timeout_usec);
+int pinpad_getline (int msg_code, uint32_t timeout_usec);
 
 #endif
 

src/gnuk.ld.in

@@ -18,10 +18,6 @@ MEMORY
     ram : org = 0x20000000, len = @MEMORY_SIZE@k
 }
 
-/* __flash_start__: flash ROM start address regardless of DFU_SUPPORT */
-__flash_start__         = 0x08001000;
-__flash_end__           = ORIGIN(flash) + LENGTH(flash);
-
 __ram_start__           = ORIGIN(ram);
 __ram_size__            = LENGTH(ram);
 __ram_end__             = __ram_start__ + __ram_size__;
@@ -32,18 +28,20 @@ SECTIONS
 
     .sys : ALIGN(4) SUBALIGN(4)
     {
-        _sys = .;
-        KEEP(*(.vectors))
-        . = ALIGN(16);
-        *(.sys.version)
-        build/sys.o(.text)
-        build/sys.o(.text.*)
-        build/sys.o(.rodata)
-        build/sys.o(.rodata.*)
-        . = ALIGN(1024);
-        *(.sys.0)
-        *(.sys.1)
-        *(.sys.2)
+	_sys = .;
+	KEEP(*(.vectors))
+	. = ALIGN(16);
+	KEEP(*(.sys.version))
+	KEEP(*(.sys.board_id))
+	KEEP(*(.sys.board_name))
+	build/sys.o(.text)
+	build/sys.o(.text.*)
+	build/sys.o(.rodata)
+	build/sys.o(.rodata.*)
+	. = ALIGN(1024);
+	*(.sys.0)
+	*(.sys.1)
+	*(.sys.2)
     } > flash0
 
     _text = .;
@@ -64,6 +62,7 @@ SECTIONS
         *(.glue_7t)
         *(.glue_7)
         *(.gcc*)
+	. = ALIGN(8);
     } > flash
 
     .ARM.extab : {*(.ARM.extab* .gnu.linkonce.armextab.*)} > flash

src/halconf.h

@@ -1,29 +0,0 @@
-/* HAL configuration file for ChibiOS/RT */
-
-#ifndef _HALCONF_H_
-#define _HALCONF_H_
-
-#include "mcuconf.h"
-
-#define HAL_USE_PAL              TRUE
-#define HAL_USE_ADC              FALSE
-#define HAL_USE_CAN              FALSE
-#define HAL_USE_EXT              FALSE
-#define HAL_USE_GPT              FALSE
-#define HAL_USE_I2C              FALSE
-#define HAL_USE_ICU              FALSE
-#define HAL_USE_MAC              FALSE
-#define HAL_USE_MMC_SPI          FALSE
-#define HAL_USE_PWM              FALSE
-#define HAL_USE_RTC              FALSE
-#define HAL_USE_SDC              FALSE
-#define HAL_USE_SERIAL           FALSE
-#define HAL_USE_SERIAL_USB       FALSE
-#define HAL_USE_SPI              FALSE
-#define HAL_USE_UART             FALSE
-#define HAL_USE_USB              FALSE
-
-/* Define manually, as we implement ADC driver by ourselves.  */
-#define STM32_DMA_REQUIRED	1
-
-#endif /* _HALCONF_H_ */

src/jpc-ac.h

@@ -1,23 +0,0 @@
-/**
- * @brief	Jacobian projective coordinates
- */
-typedef struct
-{
-  bn256 x[1];
-  bn256 y[1];
-  bn256 z[1];
-} jpc;
-
-/**
- * @brief	Affin coordinates
- */
-typedef struct
-{
-  bn256 x[1];
-  bn256 y[1];
-} ac;
-
-void jpc_double (jpc *X, const jpc *A);
-void jpc_add_ac (jpc *X, const jpc *A, const ac *B);
-void jpc_add_ac_signed (jpc *X, const jpc *A, const ac *B, int minus);
-int jpc_to_ac (ac *X, const jpc *A);

src/jpc-ac_p256k1.h

@@ -0,0 +1,14 @@
+/**
+ * @brief	Jacobian projective coordinates
+ */
+typedef struct
+{
+  bn256 x[1];
+  bn256 y[1];
+  bn256 z[1];
+} jpc;
+
+void jpc_double_p256k1 (jpc *X, const jpc *A);
+void jpc_add_ac_p256k1 (jpc *X, const jpc *A, const ac *B);
+void jpc_add_ac_signed_p256k1 (jpc *X, const jpc *A, const ac *B, int minus);
+int jpc_to_ac_p256k1 (ac *X, const jpc *A);

src/jpc-ac_p256r1.h

@@ -0,0 +1,14 @@
+/**
+ * @brief	Jacobian projective coordinates
+ */
+typedef struct
+{
+  bn256 x[1];
+  bn256 y[1];
+  bn256 z[1];
+} jpc;
+
+void jpc_double_p256r1 (jpc *X, const jpc *A);
+void jpc_add_ac_p256r1 (jpc *X, const jpc *A, const ac *B);
+void jpc_add_ac_signed_p256r1 (jpc *X, const jpc *A, const ac *B, int minus);
+int jpc_to_ac_p256r1 (ac *X, const jpc *A);

src/jpc.c

@@ -1,5 +1,5 @@
 /*
- * jpc.c -- arithmetic on Jacobian projective coordinates and Affin coordinates
+ * jpc.c -- arithmetic on Jacobian projective coordinates.
  *
  * Copyright (C) 2011, 2013 Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
@@ -21,11 +21,7 @@
  *
  */
 
-#include <stdint.h>
-#include <string.h>
-#include "bn.h"
-#include "modp256.h"
-#include "jpc-ac.h"
+#include "field-group-select.h"
 
 /**
  * @brief	X = 2 * A
@@ -34,36 +30,48 @@
  * @param A	JPC
  */
 void
-jpc_double (jpc *X, const jpc *A)
+FUNC(jpc_double) (jpc *X, const jpc *A)
 {
   bn256 a[1], b[1], c[1], tmp0[1];
-  bn256 *d = X->x;
+  bn256 *d;
 
-  modp256_sqr (a, A->y);
+  if (bn256_is_zero (A->z))		/* A is infinite */
+    return;
+
+  d = X->x;
+  MFNC(sqr) (a, A->y);
   memcpy (b, a, sizeof (bn256));
-  modp256_mul (a, a, A->x);
-  modp256_shift (a, a, 2);
+  MFNC(mul) (a, a, A->x);
+  MFNC(shift) (a, a, 2);
 
-  modp256_sqr (b, b);
-  modp256_shift (b, b, 3);
+  MFNC(sqr) (b, b);
+  MFNC(shift) (b, b, 3);
 
-  modp256_sqr (tmp0, A->z);
-  modp256_sub (c, A->x, tmp0);
-  modp256_add (tmp0, tmp0, A->x);
-  modp256_mul (tmp0, tmp0, c);
-  modp256_shift (c, tmp0, 1);
-  modp256_add (c, c, tmp0);
+#if defined(COEFFICIENT_A_IS_MINUS_3)
+  MFNC(sqr) (tmp0, A->z);
+  MFNC(sub) (c, A->x, tmp0);
+  MFNC(add) (tmp0, tmp0, A->x);
+  MFNC(mul) (tmp0, tmp0, c);
+  MFNC(shift) (c, tmp0, 1);
+  MFNC(add) (c, c, tmp0);
+#elif defined (COEFFICIENT_A_IS_ZERO)
+  MFNC(sqr) (tmp0, A->x);
+  MFNC(shift) (c, tmp0, 1);
+  MFNC(add) (c, c, tmp0);
+#else
+#error "not supported."
+#endif
 
-  modp256_sqr (d, c);
-  modp256_shift (tmp0, a, 1);
-  modp256_sub (d, d, tmp0);
+  MFNC(sqr) (d, c);
+  MFNC(shift) (tmp0, a, 1);
+  MFNC(sub) (d, d, tmp0);
 
-  modp256_mul (X->z, A->y, A->z);
-  modp256_shift (X->z, X->z, 1);
+  MFNC(mul) (X->z, A->y, A->z);
+  MFNC(shift) (X->z, X->z, 1);
 
-  modp256_sub (tmp0, a, d);
-  modp256_mul (tmp0, c, tmp0);
-  modp256_sub (X->y, tmp0, b);
+  MFNC(sub) (tmp0, a, d);
+  MFNC(mul) (tmp0, c, tmp0);
+  MFNC(sub) (X->y, tmp0, b);
 }
 
 /**
@@ -75,9 +83,9 @@ jpc_double (jpc *X, const jpc *A)
  * @param MINUS if 1 subtraction, addition otherwise.
  */
 void
-jpc_add_ac_signed (jpc *X, const jpc *A, const ac *B, int minus)
+FUNC(jpc_add_ac_signed) (jpc *X, const jpc *A, const ac *B, int minus)
 {
-  bn256 a[1], b[1], c[1], d[1];
+  bn256 a[1], b[1], c[1], d[1], tmp[1];
 #define minus_B_y c
 #define c_sqr a
 #define c_cube b
@@ -88,58 +96,66 @@ jpc_add_ac_signed (jpc *X, const jpc *A, const ac *B, int minus)
 #define y3_tmp c
 #define y1_c_cube a
 
-  if (A->z == 0)		/* A is infinite */
+  if (bn256_is_zero (A->z))		/* A is infinite */
     {
       memcpy (X->x, B->x, sizeof (bn256));
       if (minus)
-	bn256_sub (X->y, P256, B->y);
+	{
+	  memcpy (tmp, B->y, sizeof (bn256));
+	  bn256_sub (X->y, CONST_P256, B->y);
+	}
       else
-	memcpy (X->y, B->y, sizeof (bn256));
+	{
+	  memcpy (X->y, B->y, sizeof (bn256));
+	  bn256_sub (tmp, CONST_P256, B->y);
+	}
       memset (X->z, 0, sizeof (bn256));
-      X->z->words[0] = 1;
+      X->z->word[0] = 1;
       return;
     }
 
-  modp256_sqr (a, A->z);
+  MFNC(sqr) (a, A->z);
   memcpy (b, a, sizeof (bn256));
-  modp256_mul (a, a, B->x);
+  MFNC(mul) (a, a, B->x);
 
-  modp256_mul (b, b, A->z);
+  MFNC(mul) (b, b, A->z);
   if (minus)
     {
-      bn256_sub (minus_B_y, P256, B->y);
-      modp256_mul (b, b, minus_B_y);
+      bn256_sub (minus_B_y, CONST_P256, B->y);
+      MFNC(mul) (b, b, minus_B_y);
     }
   else
-    modp256_mul (b, b, B->y);
+    {
+      bn256_sub (tmp, CONST_P256, B->y);
+      MFNC(mul) (b, b, B->y);
+    }
 
-  if (bn256_cmp (A->x, a) == 0)
-    if (bn256_cmp (A->y, b) == 0)
-      {
-	jpc_double (X, A);
-	return;
-      }
+  if (bn256_cmp (A->x, a) == 0 && bn256_cmp (A->y, b) == 0)
+    {
+      FUNC(jpc_double) (X, A);
+      return;
+    }
 
-  modp256_sub (c, a, A->x);
-  modp256_sub (d, b, A->y);
+  MFNC(sub) (c, a, A->x);
+  MFNC(sub) (d, b, A->y);
 
-  modp256_mul (X->z, A->z, c);
+  MFNC(mul) (X->z, A->z, c);
 
-  modp256_sqr (c_sqr, c);
-  modp256_mul (c_cube, c_sqr, c);
+  MFNC(sqr) (c_sqr, c);
+  MFNC(mul) (c_cube, c_sqr, c);
 
-  modp256_mul (x1_c_sqr, A->x, c_sqr);
+  MFNC(mul) (x1_c_sqr, A->x, c_sqr);
 
-  modp256_sqr (X->x, d);
+  MFNC(sqr) (X->x, d);
   memcpy (x1_c_sqr_copy, x1_c_sqr, sizeof (bn256));
-  modp256_shift (x1_c_sqr_2, x1_c_sqr, 1);
-  modp256_add (c_cube_plus_x1_c_sqr_2, x1_c_sqr_2, c_cube);
-  modp256_sub (X->x, X->x, c_cube_plus_x1_c_sqr_2);
+  MFNC(shift) (x1_c_sqr_2, x1_c_sqr, 1);
+  MFNC(add) (c_cube_plus_x1_c_sqr_2, x1_c_sqr_2, c_cube);
+  MFNC(sub) (X->x, X->x, c_cube_plus_x1_c_sqr_2);
 
-  modp256_sub (y3_tmp, x1_c_sqr_copy, X->x);
-  modp256_mul (y3_tmp, y3_tmp, d);
-  modp256_mul (y1_c_cube, A->y, c_cube);
-  modp256_sub (X->y, y3_tmp, y1_c_cube);
+  MFNC(sub) (y3_tmp, x1_c_sqr_copy, X->x);
+  MFNC(mul) (y3_tmp, y3_tmp, d);
+  MFNC(mul) (y1_c_cube, A->y, c_cube);
+  MFNC(sub) (X->y, y3_tmp, y1_c_cube);
 }
 
 /**
@@ -150,9 +166,9 @@ jpc_add_ac_signed (jpc *X, const jpc *A, const ac *B, int minus)
  * @param B	AC
  */
 void
-jpc_add_ac (jpc *X, const jpc *A, const ac *B)
+FUNC(jpc_add_ac) (jpc *X, const jpc *A, const ac *B)
 {
-  jpc_add_ac_signed (X, A, B, 0);
+  FUNC(jpc_add_ac_signed) (X, A, B, 0);
 }
 
 /**
@@ -165,17 +181,19 @@ jpc_add_ac (jpc *X, const jpc *A, const ac *B)
  * Return 0 on success.
  */
 int
-jpc_to_ac (ac *X, const jpc *A)
+FUNC(jpc_to_ac) (ac *X, const jpc *A)
 {
   bn256 z_inv[1], z_inv_sqr[1];
 
-  if (modp256_inv (z_inv, A->z) < 0)
+  if (bn256_is_zero (A->z))
     return -1;
 
-  modp256_sqr (z_inv_sqr, z_inv);
-  modp256_mul (z_inv, z_inv, z_inv_sqr);
+  mod_inv (z_inv, A->z, CONST_P256);
 
-  modp256_mul (X->x, A->x, z_inv_sqr);
-  modp256_mul (X->y, A->y, z_inv);
+  MFNC(sqr) (z_inv_sqr, z_inv);
+  MFNC(mul) (z_inv, z_inv, z_inv_sqr);
+
+  MFNC(mul) (X->x, A->x, z_inv_sqr);
+  MFNC(mul) (X->y, A->y, z_inv);
   return 0;
 }

src/jpc_p256k1.c

@@ -0,0 +1,36 @@
+/*
+ * jpc_p256k1.c -- arithmetic on Jacobian projective coordinates for p256k1.
+ *
+ * Copyright (C) 2014 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/>.
+ *
+ */
+
+#include <stdint.h>
+#include <string.h>
+#include "bn.h"
+#include "mod.h"
+#include "modp256k1.h"
+#include "affine.h"
+#include "jpc-ac_p256k1.h"
+
+#define FIELD p256k1
+#define CONST_P256 P256K1
+#define COEFFICIENT_A_IS_ZERO    1
+
+#include "jpc.c"

src/jpc_p256r1.c

@@ -0,0 +1,36 @@
+/*
+ * jpc_p256r1.c -- arithmetic on Jacobian projective coordinates for p256r1.
+ *
+ * Copyright (C) 2014 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/>.
+ *
+ */
+
+#include <stdint.h>
+#include <string.h>
+#include "bn.h"
+#include "mod.h"
+#include "modp256r1.h"
+#include "affine.h"
+#include "jpc-ac_p256r1.h"
+
+#define FIELD p256r1
+#define CONST_P256 P256R1
+#define COEFFICIENT_A_IS_MINUS_3 1
+
+#include "jpc.c"

src/main.c

@@ -1,7 +1,8 @@
 /*
  * main.c - main routine of Gnuk
  *
- * Copyright (C) 2010, 2011, 2012, 2013 Free Software Initiative of Japan
+ * Copyright (C) 2010, 2011, 2012, 2013, 2015
+ *               Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -27,7 +28,6 @@
 #include <eventflag.h>
 
 #include "config.h"
-#include "board.h"
 
 #include "sys.h"
 #include "adc.h"
@@ -126,7 +126,7 @@ extern void *USBthread (void *arg);
 static void
 device_initialize_once (void)
 {
-  const uint8_t *p = &gnukStringSerial[ID_OFFSET];
+  const uint8_t *p = &gnuk_string_serial[ID_OFFSET];
 
   if (p[0] == 0xff && p[1] == 0xff && p[2] == 0xff && p[3] == 0xff)
     {
@@ -134,12 +134,12 @@ device_initialize_once (void)
        * This is the first time invocation.
        * Setup serial number by unique device ID.
        */
-      const uint8_t *u = unique_device_id ();
+      const uint8_t *u = unique_device_id () + 8;
       int i;
 
       for (i = 0; i < 4; i++)
 	{
-	  uint8_t b = u[i];
+	  uint8_t b = u[3-i];
 	  uint8_t nibble;
 
 	  nibble = (b >> 4);
@@ -290,6 +290,7 @@ const size_t __stacksize_usb = (size_t)&__process4_stack_size__;
 
 #define PRIO_CCID 3
 #define PRIO_USB  4
+#define PRIO_MAIN 5 
 
 extern void *usb_intr (void *arg);
 
@@ -343,6 +344,8 @@ main (int argc, char *argv[])
   usb_thd = chopstx_create (PRIO_USB, __stackaddr_usb, __stacksize_usb,
 			    usb_intr, NULL);
 
+  chopstx_main_init (PRIO_MAIN);
+
   while (1)
     {
       if (bDeviceState != UNCONNECTED)
@@ -422,15 +425,20 @@ main (int argc, char *argv[])
 #ifdef DFU_SUPPORT
 #define FLASH_SYS_START_ADDR 0x08000000
 #define FLASH_SYS_END_ADDR (0x08000000+0x1000)
+#define CHIP_ID_REG ((uint32_t *)0xE0042000)
   {
     extern uint8_t _sys;
     uint32_t addr;
     handler *new_vector = (handler *)FLASH_SYS_START_ADDR;
     void (*func) (void (*)(void)) = (void (*)(void (*)(void)))new_vector[9];
+    uint32_t flash_page_size = 1024; /* 1KiB default */
+
+   if ((*CHIP_ID_ADDR)&0x07 == 0x04) /* High dencity device.  */
+     flash_page_size = 2048; /* It's 2KiB. */
 
     /* Kill DFU */
     for (addr = FLASH_SYS_START_ADDR; addr < FLASH_SYS_END_ADDR;
-	 addr += FLASH_PAGE_SIZE)
+	 addr += flash_page_size)
       flash_erase_page (addr);
 
     /* copy system service routines */

src/mod.c

@@ -1,7 +1,7 @@
 /*
  * mod.c -- modulo arithmetic
  *
- * Copyright (C) 2011 Free Software Initiative of Japan
+ * Copyright (C) 2011, 2014 Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -39,157 +39,316 @@ mod_reduce (bn256 *X, const bn512 *A, const bn256 *B, const bn256 *MU_lower)
   uint32_t borrow_next;
 
   memset (q, 0, sizeof (bn256));
-  q->words[0] = A->words[15];
+  q->word[0] = A->word[15];
   bn256_mul (tmp, q, MU_lower);
-  tmp->words[8] += A->words[15];
-  carry = (tmp->words[8] < A->words[15]);
-  tmp->words[9] += carry;
+  tmp->word[8] += A->word[15];
+  carry = (tmp->word[8] < A->word[15]);
+  tmp->word[9] += carry;
 
-  q->words[7] = A->words[14];
-  q->words[6] = A->words[13];
-  q->words[5] = A->words[12];
-  q->words[4] = A->words[11];
-  q->words[3] = A->words[10];
-  q->words[2] = A->words[9];
-  q->words[1] = A->words[8];
-  q->words[0] = A->words[7];
+  q->word[7] = A->word[14];
+  q->word[6] = A->word[13];
+  q->word[5] = A->word[12];
+  q->word[4] = A->word[11];
+  q->word[3] = A->word[10];
+  q->word[2] = A->word[9];
+  q->word[1] = A->word[8];
+  q->word[0] = A->word[7];
   bn256_mul (q_big, q, MU_lower);
-  bn256_add ((bn256 *)&q_big->words[8], (bn256 *)&q_big->words[8], q);
+  bn256_add ((bn256 *)&q_big->word[8], (bn256 *)&q_big->word[8], q);
 
-  q->words[0] = q_big->words[9] + tmp->words[1];
-  carry = (q->words[0] < tmp->words[1]);
+  q->word[0] = q_big->word[9] + tmp->word[1];
+  carry = (q->word[0] < tmp->word[1]);
 
-  q->words[1] = q_big->words[10] + carry;
-  carry = (q->words[1] < carry);
-  q->words[1] += tmp->words[2];
-  carry += (q->words[1] < tmp->words[2]);
+  q->word[1] = q_big->word[10] + carry;
+  carry = (q->word[1] < carry);
+  q->word[1] += tmp->word[2];
+  carry += (q->word[1] < tmp->word[2]);
 
-  q->words[2] = q_big->words[11] + carry;
-  carry = (q->words[2] < carry);
-  q->words[2] += tmp->words[3];
-  carry += (q->words[2] < tmp->words[3]);
+  q->word[2] = q_big->word[11] + carry;
+  carry = (q->word[2] < carry);
+  q->word[2] += tmp->word[3];
+  carry += (q->word[2] < tmp->word[3]);
 
-  q->words[3] = q_big->words[12] + carry;
-  carry = (q->words[3] < carry);
-  q->words[3] += tmp->words[4];
-  carry += (q->words[3] < tmp->words[4]);
+  q->word[3] = q_big->word[12] + carry;
+  carry = (q->word[3] < carry);
+  q->word[3] += tmp->word[4];
+  carry += (q->word[3] < tmp->word[4]);
 
-  q->words[4] = q_big->words[13] + carry;
-  carry = (q->words[4] < carry);
-  q->words[4] += tmp->words[5];
-  carry += (q->words[4] < tmp->words[5]);
+  q->word[4] = q_big->word[13] + carry;
+  carry = (q->word[4] < carry);
+  q->word[4] += tmp->word[5];
+  carry += (q->word[4] < tmp->word[5]);
 
-  q->words[5] = q_big->words[14] + carry;
-  carry = (q->words[5] < carry);
-  q->words[5] += tmp->words[6];
-  carry += (q->words[5] < tmp->words[6]);
+  q->word[5] = q_big->word[14] + carry;
+  carry = (q->word[5] < carry);
+  q->word[5] += tmp->word[6];
+  carry += (q->word[5] < tmp->word[6]);
 
-  q->words[6] = q_big->words[15] + carry;
-  carry = (q->words[6] < carry);
-  q->words[6] += tmp->words[7];
-  carry += (q->words[6] < tmp->words[7]);
+  q->word[6] = q_big->word[15] + carry;
+  carry = (q->word[6] < carry);
+  q->word[6] += tmp->word[7];
+  carry += (q->word[6] < tmp->word[7]);
 
-  q->words[7] = carry;
-  q->words[7] += tmp->words[8];
-  carry = (q->words[7] < tmp->words[8]);
+  q->word[7] = carry;
+  q->word[7] += tmp->word[8];
+  carry = (q->word[7] < tmp->word[8]);
 
   memset (q_big, 0, sizeof (bn512));
-  q_big->words[8] = A->words[8];
-  q_big->words[7] = A->words[7];
-  q_big->words[6] = A->words[6];
-  q_big->words[5] = A->words[5];
-  q_big->words[4] = A->words[4];
-  q_big->words[3] = A->words[3];
-  q_big->words[2] = A->words[2];
-  q_big->words[1] = A->words[1];
-  q_big->words[0] = A->words[0];
+  q_big->word[8] = A->word[8];
+  q_big->word[7] = A->word[7];
+  q_big->word[6] = A->word[6];
+  q_big->word[5] = A->word[5];
+  q_big->word[4] = A->word[4];
+  q_big->word[3] = A->word[3];
+  q_big->word[2] = A->word[2];
+  q_big->word[1] = A->word[1];
+  q_big->word[0] = A->word[0];
 
   bn256_mul (tmp, q, B);
+  tmp->word[8] += carry * B->word[0];
+  tmp->word[15] = tmp->word[14] = tmp->word[13] = tmp->word[12]
+    = tmp->word[11] = tmp->word[10] = tmp->word[9] = 0;
+
+  borrow = bn256_sub (X, (bn256 *)&q_big->word[0], (bn256 *)&tmp->word[0]);
+  borrow_next = (q_big->word[8] < borrow);
+  q_big->word[8] -= borrow;
+  borrow_next += (q_big->word[8] < tmp->word[8]);
+  q_big->word[8] -= tmp->word[8];
+
+  carry = q_big->word[8];
   if (carry)
-    tmp->words[8] += B->words[0];
-  tmp->words[15] = tmp->words[14] = tmp->words[13] = tmp->words[12]
-    = tmp->words[11] = tmp->words[10] = tmp->words[9] = 0;
+    carry -= bn256_sub (X, X, B);
+  else
+    bn256_sub (q, X, B);
 
-  borrow = bn256_sub (X, (bn256 *)&q_big->words[0], (bn256 *)&tmp->words[0]);
-  borrow_next = (q_big->words[8] < borrow);
-  q_big->words[8] -= borrow;
-  borrow_next += (q_big->words[8] < tmp->words[8]);
-  q_big->words[8] -= tmp->words[8];
+  if (carry)
+    carry -= bn256_sub (X, X, B);
+  else
+    bn256_sub (q, X, B);
 
-  carry = q_big->words[8];
-  while (carry)
-    {
-      borrow_next = bn256_sub (X, X, B);
-      carry -= borrow_next;
-    }
-
-  if (bn256_is_ge (X, B))
-    bn256_sub (X, X, B);
+  borrow = bn256_sub (q, X, B);
+  if (borrow)
+    memcpy (q, X, sizeof (bn256));
+  else
+    memcpy (X, q, sizeof (bn256));
+#undef borrow
 }
 
+/*
+ * Reference:
+ * Donald E. Knuth, The Art of Computer Programming, Vol. 2:
+ * Seminumerical Algorithms, 3rd ed. Reading, MA: Addison-Wesley, 1998
+ *
+ * Max loop: X=0x8000...0000 and N=0xffff...ffff
+ */
+#define MAX_GCD_STEPS_BN256 (3*256-2)
+
 /**
  * @brief C = X^(-1) mod N
  * 
+ * Assume X and N are co-prime (or N is prime).
+ * NOTE: If X==0, it return 0.
+ *
  */
 void
 mod_inv (bn256 *C, const bn256 *X, const bn256 *N)
 {
-  bn256 u[1], v[1];
+  bn256 u[1], v[1], tmp[1];
   bn256 A[1] = { { { 1, 0, 0, 0, 0, 0, 0, 0 } } };
+  uint32_t carry;
+#define borrow carry
+  int n = MAX_GCD_STEPS_BN256;
 
   memset (C, 0, sizeof (bn256));
   memcpy (u, X, sizeof (bn256));
   memcpy (v, N, sizeof (bn256));
 
-  while (!bn256_is_zero (u))
+  while (n--)
     {
-      while (bn256_is_even (u))
+      int c = (bn256_is_even (u) << 1) + bn256_is_even (v);
+
+      switch (c)
 	{
+	case 3:
 	  bn256_shift (u, u, -1);
 	  if (bn256_is_even (A))
-	    bn256_shift (A, A, -1);
-	  else
 	    {
-	      int carry = bn256_add (A, A, N);
-
-	      bn256_shift (A, A, -1);
-	      if (carry)
-		A->words[7] |= 0x80000000;
+	      bn256_add (tmp, A, N);
+	      carry = 0;
 	    }
-	}
+	  else
+	    carry = bn256_add (A, A, N);
+
+	  bn256_shift (A, A, -1);
+	  A->word[7] |= carry * 0x80000000;
 
-      while (bn256_is_even (v))
-	{
 	  bn256_shift (v, v, -1);
 	  if (bn256_is_even (C))
-	    bn256_shift (C, C, -1);
+	    {
+	      bn256_add (tmp, C, N);
+	      carry = 0;
+	    }
+	  else
+	    carry = bn256_add (C, C, N);
+
+	  bn256_shift (C, C, -1);
+	  C->word[7] |= carry * 0x80000000;
+
+	  if (bn256_is_ge (tmp, tmp))
+	    {
+	      bn256_sub (tmp, tmp, tmp);
+	      borrow = bn256_sub (tmp, tmp, tmp);
+	      if (borrow)
+		bn256_add (tmp, tmp, tmp);
+	      else
+		bn256_add (tmp, A, N);
+	    }
 	  else
 	    {
-	      int carry = bn256_add (C, C, N);
-
-	      bn256_shift (C, C, -1);
-	      if (carry)
-		C->words[7] |= 0x80000000;
+	      bn256_sub (tmp, tmp, tmp);
+	      borrow = bn256_sub (tmp, tmp, tmp);
+	      if (borrow)
+		bn256_add (tmp, tmp, tmp);
+	      else
+		bn256_add (tmp, tmp, N);
 	    }
-	}
+	  break;
 
-      if (bn256_is_ge (u, v))
-	{
-	  int borrow;
+	case 1:
+	  bn256_shift (tmp, tmp, -1);
+	  if (bn256_is_even (tmp))
+	    {
+	      bn256_add (tmp, tmp, N);
+	      carry = 0;
+	    }
+	  else
+	    carry = bn256_add (tmp, tmp, N);
 
-	  bn256_sub (u, u, v);
-	  borrow = bn256_sub (A, A, C);
-	  if (borrow)
-	    bn256_add (A, A, N);
-	}
-      else
-	{
-	  int borrow;
+	  bn256_shift (tmp, tmp, -1);
+	  tmp->word[7] |= carry * 0x80000000;
 
-	  bn256_sub (v, v, u);
-	  borrow = bn256_sub (C, C, A);
-	  if (borrow)
-	    bn256_add (C, C, N);
+	  bn256_shift (v, v, -1);
+	  if (bn256_is_even (C))
+	    {
+	      bn256_add (tmp, C, N);
+	      carry = 0;
+	    }
+	  else
+	    carry = bn256_add (C, C, N);
+
+	  bn256_shift (C, C, -1);
+	  C->word[7] |= carry * 0x80000000;
+
+	  if (bn256_is_ge (tmp, tmp))
+	    {
+	      bn256_sub (tmp, tmp, tmp);
+	      borrow = bn256_sub (tmp, tmp, tmp);
+	      if (borrow)
+		bn256_add (tmp, tmp, tmp);
+	      else
+		bn256_add (tmp, A, N);
+	    }
+	  else
+	    {
+	      bn256_sub (tmp, tmp, tmp);
+	      borrow = bn256_sub (tmp, tmp, tmp);
+	      if (borrow)
+		bn256_add (tmp, tmp, tmp);
+	      else
+		bn256_add (tmp, tmp, N);
+	    }
+	  break;
+
+	case 2:
+	  bn256_shift (u, u, -1);
+	  if (bn256_is_even (A))
+	    {
+	      bn256_add (tmp, A, N);
+	      carry = 0;
+	    }
+	  else
+	    carry = bn256_add (A, A, N);
+
+	  bn256_shift (A, A, -1);
+	  A->word[7] |= carry * 0x80000000;
+
+	  bn256_shift (tmp, tmp, -1);
+	  if (bn256_is_even (tmp))
+	    {
+	      bn256_add (tmp, tmp, N);
+	      carry = 0;
+	    }
+	  else
+	    carry = bn256_add (tmp, tmp, N);
+
+	  bn256_shift (tmp, tmp, -1);
+	  tmp->word[7] |= carry * 0x80000000;
+
+	  if (bn256_is_ge (tmp, tmp))
+	    {
+	      bn256_sub (tmp, tmp, tmp);
+	      borrow = bn256_sub (tmp, tmp, tmp);
+	      if (borrow)
+		bn256_add (tmp, tmp, tmp);
+	      else
+		bn256_add (tmp, A, N);
+	    }
+	  else
+	    {
+	      bn256_sub (tmp, tmp, tmp);
+	      borrow = bn256_sub (tmp, tmp, tmp);
+	      if (borrow)
+		bn256_add (tmp, tmp, tmp);
+	      else
+		bn256_add (tmp, tmp, N);
+	    }
+	  break;
+
+	case 0:
+	  bn256_shift (tmp, tmp, -1);
+	  if (bn256_is_even (tmp))
+	    {
+	      bn256_add (tmp, tmp, N);
+	      carry = 0;
+	    }
+	  else
+	    carry = bn256_add (tmp, tmp, N);
+
+	  bn256_shift (tmp, tmp, -1);
+	  tmp->word[7] |= carry * 0x80000000;
+
+	  bn256_shift (tmp, tmp, -1);
+	  if (bn256_is_even (tmp))
+	    {
+	      bn256_add (tmp, tmp, N);
+	      carry = 0;
+	    }
+	  else
+	    carry = bn256_add (tmp, tmp, N);
+
+	  bn256_shift (tmp, tmp, -1);
+	  tmp->word[7] |= carry * 0x80000000;
+
+	  if (bn256_is_ge (u, v))
+	    {
+	      bn256_sub (u, u, v);
+	      borrow = bn256_sub (A, A, C);
+	      if (borrow)
+		bn256_add (A, A, N);
+	      else
+		bn256_add (tmp, A, N);
+	    }
+	  else
+	    {
+	      bn256_sub (v, v, u);
+	      borrow = bn256_sub (C, C, A);
+	      if (borrow)
+		bn256_add (C, C, N);
+	      else
+		bn256_add (tmp, C, N);
+	    }
+	  break;
 	}
     }
+#undef borrow
 }

src/mod25638.c

@@ -0,0 +1,287 @@
+/*
+ * mod25638.c -- modulo arithmetic of 2^256-38 for 2^255-19 field
+ *
+ * Copyright (C) 2014 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/>.
+ *
+ */
+
+/*
+ * The field is \Z/(2^255-19)
+ *
+ * We use radix-32.  During computation, it's not reduced to 2^255-19,
+ * but it is represented in 256-bit (it is redundant representation),
+ * that is, something like 2^256-38.
+ *
+ * The idea is, keeping within 256-bit until it will be converted to
+ * affine coordinates.
+ */
+
+#include <stdint.h>
+#include <string.h>
+
+#include "bn.h"
+#include "mod25638.h"
+
+#ifndef BN256_C_IMPLEMENTATION
+#define ASM_IMPLEMENTATION 1
+#endif
+
+#if ASM_IMPLEMENTATION
+#include "muladd_256.h"
+#define ADDWORD_256(d_,s_,w_,c_)		        \
+ asm ( "ldmia  %[s]!, { r4, r5, r6, r7 } \n\t"          \
+       "adds   r4, r4, %[w]             \n\t"           \
+       "adcs   r5, r5, #0               \n\t"           \
+       "adcs   r6, r6, #0               \n\t"           \
+       "adcs   r7, r7, #0               \n\t"           \
+       "stmia  %[d]!, { r4, r5, r6, r7 }\n\t"           \
+       "ldmia  %[s]!, { r4, r5, r6, r7 } \n\t"          \
+       "adcs   r4, r4, #0               \n\t"           \
+       "adcs   r5, r5, #0               \n\t"           \
+       "adcs   r6, r6, #0               \n\t"           \
+       "adcs   r7, r7, #0               \n\t"           \
+       "stmia  %[d]!, { r4, r5, r6, r7 }\n\t"           \
+       "mov    %[c], #0                 \n\t"           \
+       "adc    %[c], %[c], #0"                          \
+       : [s] "=&r" (s_), [d] "=&r" (d_), [c] "=&r" (c_)	\
+       : "[s]" (s_), "[d]" (d_), [w] "r" (w_)		\
+       : "r4", "r5", "r6", "r7", "memory", "cc" )
+#endif
+
+/*
+256      224      192      160      128       96       64       32        0
+2^256
+  1 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+2^256 - 16
+  0 ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff fffffff0
+2^256 - 16 - 2
+  0 ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff ffffffee
+2^256 - 16 - 2 - 1
+  0 ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff ffffffed
+*/
+const bn256 p25519[1] = {
+  {{ 0xffffffed, 0xffffffff, 0xffffffff, 0xffffffff,
+     0xffffffff, 0xffffffff, 0xffffffff, 0x7fffffff }} };
+
+
+/*
+ * Implementation Note.
+ *
+ * It's not always modulo n25638.  The representation is redundant
+ * during computation.  For example, when we add the number - 1 and 1,
+ * it won't overflow to 2^256, and the result is represented within
+ * 256-bit.
+ */
+
+
+/**
+ * @brief  X = (A + B) mod 2^256-38
+ */
+void
+mod25638_add (bn256 *X, const bn256 *A, const bn256 *B)
+{
+  uint32_t carry;
+
+  carry = bn256_add (X, A, B);
+  carry = bn256_add_uint (X, X, carry*38);
+  X->word[0] += carry * 38;
+}
+
+/**
+ * @brief  X = (A - B) mod 2^256-38
+ */
+void
+mod25638_sub (bn256 *X, const bn256 *A, const bn256 *B)
+{
+  uint32_t borrow;
+
+  borrow = bn256_sub (X, A, B);
+  borrow = bn256_sub_uint (X, X, borrow*38);
+  X->word[0] -= borrow * 38;
+}
+
+
+/**
+ * @brief  X = A mod 2^256-38
+ *
+ * Note that the second argument is not "const bn512 *".
+ * A is modified during the computation of modulo.
+ *
+ * It's not precisely modulo 2^256-38 for all cases,
+ * but result may be redundant.
+ */
+static void
+mod25638_reduce (bn256 *X, bn512 *A)
+{
+  const uint32_t *s;
+  uint32_t *d;
+  uint32_t w;
+
+#if ASM_IMPLEMENTATION
+  uint32_t c, c0;
+
+  s = &A->word[8]; d = &A->word[0]; w = 38; MULADD_256 (s, d, w, c);
+  c0 = A->word[8] * 38;
+  d = &X->word[0];
+  s = &A->word[0];
+  ADDWORD_256 (d, s, c0, c);
+  X->word[0] += c * 38;
+#else
+  s = &A->word[8]; d = &A->word[0]; w = 38;
+  {
+    int i;
+    uint64_t r;
+    uint32_t carry;
+
+    r = 0;
+    for (i = 0; i < BN256_WORDS; i++)
+      {
+	uint64_t uv;
+
+	r += d[i];
+	carry = (r < d[i]);
+
+	uv = ((uint64_t)s[i])*w;
+	r += uv;
+	carry += (r < uv);
+
+	d[i] = (uint32_t)r;
+	r = ((r >> 32) | ((uint64_t)carry << 32));
+      }
+
+    carry = bn256_add_uint (X, (bn256 *)A, r * 38);
+    X->word[0] += carry * 38;
+  }
+#endif
+}
+
+/**
+ * @brief  X = (A * B) mod 2^256-38
+ */
+void
+mod25638_mul (bn256 *X, const bn256 *A, const bn256 *B)
+{
+  bn512 tmp[1];
+
+  bn256_mul (tmp, A, B);
+  mod25638_reduce (X, tmp);
+}
+
+/**
+ * @brief  X = A * A mod 2^256-38
+ */
+void
+mod25638_sqr (bn256 *X, const bn256 *A)
+{
+  bn512 tmp[1];
+
+  bn256_sqr (tmp, A);
+  mod25638_reduce (X, tmp);
+}
+
+
+/**
+ * @brief  X = (A << shift) mod 2^256-38
+ * @note   shift < 32
+ */
+void
+mod25638_shift (bn256 *X, const bn256 *A, int shift)
+{
+  uint32_t carry;
+  bn256 tmp[1];
+
+  carry = bn256_shift (X, A, shift);
+  if (shift < 0)
+    return;
+
+  memset (tmp, 0, sizeof (bn256));
+  tmp->word[0] = (carry << 1);
+  /* tmp->word[1] = (carry >> 31);  always zero.  */
+  tmp->word[0] = tmp->word[0] + (carry << 2);
+  tmp->word[1] = (tmp->word[0] < (carry << 2)) + (carry >> 30);
+  tmp->word[0] = tmp->word[0] + (carry << 5);
+  tmp->word[1] = tmp->word[1] + (tmp->word[0] < (carry << 5)) + (carry >> 27);
+
+  mod25638_add (X, X, tmp);
+}
+
+
+/*
+ * @brief  X = A mod 2^255-19
+ *
+ * It's precisely modulo 2^255-19 (unlike mod25638_reduce).
+ */
+void
+mod25519_reduce (bn256 *X)
+{
+  uint32_t q;
+  bn256 r0[1], r1[1];
+  int flag;
+
+  memcpy (r0, X, sizeof (bn256));
+  q = (r0->word[7] >> 31);
+  r0->word[7] &= 0x7fffffff;
+  if (q)
+    {
+      bn256_add_uint (r0, r0, 19);
+      q = (r0->word[7] >> 31);
+      r0->word[7] &= 0x7fffffff;
+      if (q)
+	{
+	  bn256_add_uint (r1, r0, 19);
+	  q = (r1->word[7] >> 31);
+	  r1->word[7] &= 0x7fffffff;
+	  flag = 0;
+	}
+      else
+	flag = 1;
+    }
+  else
+    {
+      bn256_add_uint (r1, r0, 19);
+      q = (r1->word[7] >> 31);	 /* dummy */
+      r1->word[7] &= 0x7fffffff; /* dummy */
+      if (q)
+	flag = 2;
+      else
+	flag = 3;
+    }
+
+  if (flag)
+    {
+      bn256_add_uint (r1, r0, 19);
+      q = (r1->word[7] >> 31);
+      r1->word[7] &= 0x7fffffff;
+      if (q)
+	memcpy (X, r1, sizeof (bn256));
+      else
+	memcpy (X, r0, sizeof (bn256));
+    }
+  else
+    {
+      if (q)
+	{
+	  asm volatile ("" : : "r" (q) : "memory");
+	  memcpy (X, r1, sizeof (bn256));
+	  asm volatile ("" : : "r" (q) : "memory");
+	}
+      else
+	memcpy (X, r1, sizeof (bn256));
+    }
+}

src/mod25638.h

@@ -0,0 +1,7 @@
+extern const bn256 p25519[1];
+
+void mod25638_add (bn256 *X, const bn256 *A, const bn256 *B);
+void mod25638_sub (bn256 *X, const bn256 *A, const bn256 *B);
+void mod25638_mul (bn256 *X, const bn256 *A, const bn256 *B);
+void mod25638_sqr (bn256 *X, const bn256 *A);
+void mod25519_reduce (bn256 *X);

src/modp256.c

@@ -1,305 +0,0 @@
-/*
- * modp256.c -- modulo P256 arithmetic
- *
- * Copyright (C) 2011, 2013 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/>.
- *
- */
-
-/*
- * p256 =  2^256 - 2^224 + 2^192 + 2^96 - 1
- */
-#include <stdint.h>
-#include <string.h>
-
-#include "bn.h"
-#include "modp256.h"
-
-/*
-256      224      192      160      128       96       64       32        0
-2^256
-  1 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
-2^256 - 2^224
-  0 ffffffff 00000000 00000000 00000000 00000000 00000000 00000000 00000000
-2^256 - 2^224 + 2^192
-  0 ffffffff 00000001 00000000 00000000 00000000 00000000 00000000 00000000
-2^256 - 2^224 + 2^192 + 2^96
-  0 ffffffff 00000001 00000000 00000000 00000001 00000000 00000000 00000000
-2^256 - 2^224 + 2^192 + 2^96 - 1
-  0 ffffffff 00000001 00000000 00000000 00000000 ffffffff ffffffff ffffffff
-*/
-const bn256 p256 = { {0xffffffff, 0xffffffff, 0xffffffff, 0x00000000,
-		      0x00000000, 0x00000000, 0x00000001, 0xffffffff} };
-
-/**
- * @brief  X = (A + B) mod p256
- */
-void
-modp256_add (bn256 *X, const bn256 *A, const bn256 *B)
-{
-  int carry;
-
-  carry = bn256_add (X, A, B);
-  if (carry)
-    bn256_sub (X, X, P256);
-}
-
-/**
- * @brief  X = (A - B) mod p256
- */
-void
-modp256_sub (bn256 *X, const bn256 *A, const bn256 *B)
-{
-  int borrow;
-
-  borrow = bn256_sub (X, A, B);
-  if (borrow)
-    bn256_add (X, X, P256);
-}
-
-/**
- * @brief  X = A mod p256
- */
-void
-modp256_reduce (bn256 *X, const bn512 *A)
-{
-  bn256 tmp[1];
-
-#define S1 X
-#define S2 tmp
-#define S3 tmp
-#define S4 tmp
-#define S5 tmp
-#define S6 tmp
-#define S7 tmp
-#define S8 tmp
-#define S9 tmp
-
-  S1->words[7] = A->words[7];
-  S1->words[6] = A->words[6];
-  S1->words[5] = A->words[5];
-  S1->words[4] = A->words[4];
-  S1->words[3] = A->words[3];
-  S1->words[2] = A->words[2];
-  S1->words[1] = A->words[1];
-  S1->words[0] = A->words[0];
-  /* X = S1 */
-
-  S2->words[7] = A->words[15];
-  S2->words[6] = A->words[14];
-  S2->words[5] = A->words[13];
-  S2->words[4] = A->words[12];
-  S2->words[3] = A->words[11];
-  S2->words[2] = S2->words[1] = S2->words[0] = 0;
-  /* X += 2 * S2 */
-  modp256_add (X, X, S2);
-  modp256_add (X, X, S2);
-
-  S3->words[7] = 0;
-  S3->words[6] = A->words[15];
-  S3->words[5] = A->words[14];
-  S3->words[4] = A->words[13];
-  S3->words[3] = A->words[12];
-  S3->words[2] = S3->words[1] = S3->words[0] = 0;
-  /* X += 2 * S3 */
-  modp256_add (X, X, S3);
-  modp256_add (X, X, S3);
-
-  S4->words[7] = A->words[15];
-  S4->words[6] = A->words[14];
-  S4->words[5] = S4->words[4] = S4->words[3] = 0;
-  S4->words[2] = A->words[10];
-  S4->words[1] = A->words[9];
-  S4->words[0] = A->words[8];
-  /* X += S4 */
-  modp256_add (X, X, S4);
-
-  S5->words[7] = A->words[8];
-  S5->words[6] = A->words[13];
-  S5->words[5] = A->words[15];
-  S5->words[4] = A->words[14];
-  S5->words[3] = A->words[13];
-  S5->words[2] = A->words[11];
-  S5->words[1] = A->words[10];
-  S5->words[0] = A->words[9];
-  /* X += S5 */
-  modp256_add (X, X, S5);
-
-  S6->words[7] = A->words[10];
-  S6->words[6] = A->words[8];
-  S6->words[5] = S6->words[4] = S6->words[3] = 0;
-  S6->words[2] = A->words[13];
-  S6->words[1] = A->words[12];
-  S6->words[0] = A->words[11];
-  /* X -= S6 */
-  modp256_sub (X, X, S6);
-
-  S7->words[7] = A->words[11];
-  S7->words[6] = A->words[9];
-  S7->words[5] = S7->words[4] = 0;
-  S7->words[3] = A->words[15];
-  S7->words[2] = A->words[14];
-  S7->words[1] = A->words[13];
-  S7->words[0] = A->words[12];
-  /* X -= S7 */
-  modp256_sub (X, X, S7);
-
-  S8->words[7] = A->words[12];
-  S8->words[6] = 0;
-  S8->words[5] = A->words[10];
-  S8->words[4] = A->words[9];
-  S8->words[3] = A->words[8];
-  S8->words[2] = A->words[15];
-  S8->words[1] = A->words[14];
-  S8->words[0] = A->words[13];
-  /* X -= S8 */
-  modp256_sub (X, X, S8);
-
-  S9->words[7] = A->words[13];
-  S9->words[6] = 0;
-  S9->words[5] = A->words[11];
-  S9->words[4] = A->words[10];
-  S9->words[3] = A->words[9];
-  S9->words[2] = 0;
-  S9->words[1] = A->words[15];
-  S9->words[0] = A->words[14];
-  /* X -= S9 */
-  modp256_sub (X, X, S9);
-
-  if (bn256_is_ge (X, P256))
-    bn256_sub (X, X, P256);
-}
-
-/**
- * @brief  X = (A * B) mod p256
- */
-void
-modp256_mul (bn256 *X, const bn256 *A, const bn256 *B)
-{
-  bn512 AB[1];
-
-  bn256_mul (AB, A, B);
-  modp256_reduce (X, AB);
-}
-
-/**
- * @brief  X = A * A mod p256
- */
-void
-modp256_sqr (bn256 *X, const bn256 *A)
-{
-  bn512 AA[1];
-
-  bn256_sqr (AA, A);
-  modp256_reduce (X, AA);
-}
-
-/**
- * @brief  C = (1 / a)  mod p256
- *
- * Return -1 on error.
- * Return 0 on success.
- */
-int
-modp256_inv (bn256 *C, const bn256 *a)
-{
-  bn256 u[1], v[1];
-  bn256 A[1] = { { { 1, 0, 0, 0, 0, 0, 0, 0 } } };
-
-  if (bn256_is_zero (a))
-    return -1;
-
-  memset (C, 0, sizeof (bn256));
-  memcpy (u, a, sizeof (bn256));
-  memcpy (v, P256, sizeof (bn256));
-
-  while (!bn256_is_zero (u))
-    {
-      while (bn256_is_even (u))
-	{
-	  bn256_shift (u, u, -1);
-	  if (bn256_is_even (A))
-	    bn256_shift (A, A, -1);
-	  else
-	    {
-	      int carry = bn256_add (A, A, P256);
-
-	      bn256_shift (A, A, -1);
-	      if (carry)
-		A->words[7] |= 0x80000000;
-	    }
-	}
-
-      while (bn256_is_even (v))
-	{
-	  bn256_shift (v, v, -1);
-	  if (bn256_is_even (C))
-	    bn256_shift (C, C, -1);
-	  else
-	    {
-	      int carry = bn256_add (C, C, P256);
-
-	      bn256_shift (C, C, -1);
-	      if (carry)
-		C->words[7] |= 0x80000000;
-	    }
-	}
-
-      if (bn256_is_ge (u, v))
-	{
-	  bn256_sub (u, u, v);
-	  modp256_sub (A, A, C);
-	}
-      else
-	{
-	  bn256_sub (v, v, u);
-	  modp256_sub (C, C, A);
-	}
-    }
-
-  return 0;
-}
-
-/**
- * @brief  X = (A << shift) mod p256
- * @note   shift <= 32
- */
-void
-modp256_shift (bn256 *X, const bn256 *A, int shift)
-{
-  uint32_t carry;
-  bn256 tmp[1];
-
-  carry = bn256_shift (X, A, shift);
-  if (shift < 0)
-    return;
-
-  memset (tmp, 0, sizeof (bn256));
-  tmp->words[7] = carry;
-  tmp->words[0] = carry;
-  modp256_add (X, X, tmp);
-
-  tmp->words[7] = 0;
-  tmp->words[0] = 0;
-  tmp->words[6] = carry;
-  tmp->words[3] = carry;
-  modp256_sub (X, X, tmp);
-
-  if (bn256_is_ge (X, P256))
-    bn256_sub (X, X, P256);
-}

src/modp256.h

@@ -1,10 +0,0 @@
-extern const bn256 p256;
-#define P256 (&p256)
-
-void modp256_add (bn256 *X, const bn256 *A, const bn256 *B);
-void modp256_sub (bn256 *X, const bn256 *A, const bn256 *B);
-void modp256_reduce (bn256 *X, const bn512 *A);
-void modp256_mul (bn256 *X, const bn256 *A, const bn256 *B);
-void modp256_sqr (bn256 *X, const bn256 *A);
-void modp256_shift (bn256 *X, const bn256 *A, int shift);
-int modp256_inv (bn256 *C, const bn256 *a);

src/modp256k1.c

@@ -0,0 +1,315 @@
+/*
+ * modp256k1.c -- modulo arithmetic for p256k1
+ *
+ * Copyright (C) 2014 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/>.
+ *
+ */
+
+/*
+ * p256k1 =  2^256 - 2^32 - 2^9 - 2^8 - 2^7 - 2^6 - 2^4 - 1
+ */
+#include <stdint.h>
+#include <string.h>
+
+#include "bn.h"
+#include "modp256k1.h"
+
+/*
+256      224      192      160      128       96       64       32        0
+2^256
+  1 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+2^256 - 2^32
+  0 ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff 00000000
+2^256 - 2^32 - 2^9
+  0 ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff fffffffe fffffe00
+2^256 - 2^32 - 2^9 - 2^8
+  0 ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff fffffffe fffffd00
+2^256 - 2^32 - 2^9 - 2^8 - 2^7
+  0 ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff fffffffe fffffc80
+2^256 - 2^32 - 2^9 - 2^8 - 2^7 - 2^6
+  0 ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff fffffffe fffffc40
+2^256 - 2^32 - 2^9 - 2^8 - 2^7 - 2^6 - 2^4
+  0 ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff fffffffe fffffc30
+2^256 - 2^32 - 2^9 - 2^8 - 2^7 - 2^6 - 2^4 - 1
+  0 ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff fffffffe fffffc2f
+*/
+const bn256 p256k1 = { {0xfffffc2f, 0xfffffffe, 0xffffffff, 0xffffffff,
+			0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff } };
+
+/*
+ * Implementation Note.
+ *
+ * It's not always modulo p256k1.  The representation is redundant
+ * during computation.  For example, when we add the prime - 1 and 1,
+ * it won't overflow to 2^256, and the result is represented within
+ * 256-bit.
+ *
+ * It is guaranteed that modp256k1_reduce reduces to modulo p256k1.
+ */
+
+/**
+ * @brief  X = (A + B) mod p256k1
+ */
+void
+modp256k1_add (bn256 *X, const bn256 *A, const bn256 *B)
+{
+  uint32_t carry;
+  bn256 tmp[1];
+
+  carry = bn256_add (X, A, B);
+  if (carry)
+    bn256_sub (X, X, P256K1);
+  else
+    bn256_sub (tmp, X, P256K1);
+}
+
+/**
+ * @brief  X = (A - B) mod p256
+ */
+void
+modp256k1_sub (bn256 *X, const bn256 *A, const bn256 *B)
+{
+  uint32_t borrow;
+  bn256 tmp[1];
+
+  borrow = bn256_sub (X, A, B);
+  if (borrow)
+    bn256_add (X, X, P256K1);
+  else
+    bn256_add (tmp, X, P256K1);
+}
+
+/**
+ * @brief  X = A mod p256k1
+ */
+void
+modp256k1_reduce (bn256 *X, const bn512 *A)
+{
+  bn256 tmp[1];
+  uint32_t carry;
+#define borrow carry
+  uint32_t s0, s1;
+#define s00 tmp->word[0]
+#define s01 tmp->word[1]
+#define s02 tmp->word[2]
+
+#define W0 X
+#define W1 tmp
+#define W2 tmp
+#define W3 tmp
+#define W4 tmp
+#define W5 tmp
+#define W6 tmp
+#define W7 tmp
+#define S  tmp
+
+  /*
+   * Suppose: P256K1 = 2^256 - CONST
+   * Then, compute: W = A_low + A_high * CONST
+   *                256-bit W0 = W mod 2^256
+   *                64-bit (S1, S0) = W / 2^256
+   * where: CONST = 2^32 + 2^9 + 2^8 + 2^7 + 2^6 + 2^4 + 1
+   */
+
+  /* W0 = A_low   */
+  /* W7 = A_high  */
+  /* W0 += W7 */
+  carry = bn256_add (W0, (const bn256 *)&A->word[8], (const bn256 *)A);
+
+  /* W6 = W7 << 4 */
+  /* W0 += W6 */
+  bn256_shift (W6, (const bn256 *)&A->word[8], 4);
+  carry += bn256_add (W0, W0, W6);
+
+  /* W5 = W6 << 2 */
+  /* W0 += W5 */
+  bn256_shift (W5, W6, 2);
+  carry += bn256_add (W0, W0, W5);
+
+  /* W4 = W5 << 1 */
+  /* W0 += W4 */
+  bn256_shift (W4, W5, 1);
+  carry += bn256_add (W0, W0, W4);
+
+  /* W3 = W4 << 1 */
+  /* W0 += W3 */
+  bn256_shift (W3, W4, 1);
+  carry += bn256_add (W0, W0, W3);
+
+  /* W2 = W3 << 1 */
+  /* W0 += W2 */
+  bn256_shift (W2, W3, 1);
+  carry += bn256_add (W0, W0, W2);
+
+  /* W1 = A_high << 32 */
+  /* W0 += W1 */
+  W1->word[7] = A->word[14];
+  W1->word[6] = A->word[13];
+  W1->word[5] = A->word[12];
+  W1->word[4] = A->word[11];
+  W1->word[3] = A->word[10];
+  W1->word[2] = A->word[9];
+  W1->word[1] = A->word[8];
+  W1->word[0] = 0;
+  carry += bn256_add (W0, W0, W1);
+
+  /* (S1, S0) = W / 2^256 */
+  s0 = A->word[15];
+  carry += (s0 >> 28) + (s0 >> 26) + (s0 >> 25) + (s0 >> 24) + (s0 >> 23);
+  carry += s0;
+  s1 = (carry < s0) ? 1 : 0;
+  s0 = carry;
+
+  /*
+   * Compute: S:=(S02, S01, S00), S = (S1,S0)*CONST
+   */
+  S->word[7] = S->word[6] = S->word[5] = S->word[4] = S->word[3] = 0;
+
+  /* (S02, S01, S00) = (S1, S0) + (S1, S0)*2^32 */ 
+  s00 = s0;
+  s01 = s0 + s1;
+  s02 = s1 + ((s01 < s0)? 1 : 0);
+
+  /* (S02, S01, S00) += (S1, S0)*2^9 */ 
+  carry = (s0 >> 23) + s01;
+  s02 += (s1 >> 23) + ((carry < s01)? 1 : 0);
+  s01 = (s1 << 9) + carry;
+  s02 += ((s01 < carry)? 1 : 0);
+  s00 += (s0 << 9);
+  carry = ((s00 < (s0 << 9))? 1 : 0);
+  s01 += carry;
+  s02 += ((s01 < carry)? 1 : 0);
+
+  /* (S02, S01, S00) += (S1, S0)*2^8 */ 
+  carry = (s0 >> 24) + s01;
+  s02 += (s1 >> 24) + ((carry < s01)? 1 : 0);
+  s01 = (s1 << 8) + carry;
+  s02 += ((s01 < carry)? 1 : 0);
+  s00 += (s0 << 8);
+  carry = ((s00 < (s0 << 8))? 1 : 0);
+  s01 += carry;
+  s02 += ((s01 < carry)? 1 : 0);
+
+  /* (S02, S01, S00) += (S1, S0)*2^7 */ 
+  carry = (s0 >> 25) + s01;
+  s02 += (s1 >> 25) + ((carry < s01)? 1 : 0);
+  s01 = (s1 << 7) + carry;
+  s02 += ((s01 < carry)? 1 : 0);
+  s00 += (s0 << 7);
+  carry = ((s00 < (s0 << 7))? 1 : 0);
+  s01 += carry;
+  s02 += ((s01 < carry)? 1 : 0);
+
+  /* (S02, S01, S00) += (S1, S0)*2^6 */ 
+  carry = (s0 >> 26) + s01;
+  s02 += (s1 >> 26) + ((carry < s01)? 1 : 0);
+  s01 = (s1 << 6) + carry;
+  s02 += ((s01 < carry)? 1 : 0);
+  s00 += (s0 << 6);
+  carry = ((s00 < (s0 << 6))? 1 : 0);
+  s01 += carry;
+  s02 += ((s01 < carry)? 1 : 0);
+
+  /* (S02, S01, S00) += (S1, S0)*2^4 */ 
+  carry = (s0 >> 28) + s01;
+  s02 += (s1 >> 28) + ((carry < s01)? 1 : 0);
+  s01 = (s1 << 4) + carry;
+  s02 += ((s01 < carry)? 1 : 0);
+  s00 += (s0 << 4);
+  carry = ((s00 < (s0 << 4))? 1 : 0);
+  s01 += carry;
+  s02 += ((s01 < carry)? 1 : 0);
+
+  /* W0 += S */
+  modp256k1_add (W0, W0, S);
+
+  borrow = bn256_sub (tmp, W0, P256K1);
+  if (borrow)
+    memcpy (tmp, W0, sizeof (bn256));
+  else
+    memcpy (W0, tmp, sizeof (bn256));
+
+#undef W0
+#undef W1
+#undef W2
+#undef W3
+#undef W4
+#undef W5
+#undef W6
+#undef W7
+#undef S
+#undef s00
+#undef s01
+#undef s02
+#undef borrow
+}
+
+/**
+ * @brief  X = (A * B) mod p256k1
+ */
+void
+modp256k1_mul (bn256 *X, const bn256 *A, const bn256 *B)
+{
+  bn512 AB[1];
+
+  bn256_mul (AB, A, B);
+  modp256k1_reduce (X, AB);
+}
+
+/**
+ * @brief  X = A * A mod p256k1
+ */
+void
+modp256k1_sqr (bn256 *X, const bn256 *A)
+{
+  bn512 AA[1];
+
+  bn256_sqr (AA, A);
+  modp256k1_reduce (X, AA);
+}
+
+
+/**
+ * @brief  X = (A << shift) mod p256k1
+ * @note   shift < 32
+ */
+void
+modp256k1_shift (bn256 *X, const bn256 *A, int shift)
+{
+  uint32_t carry;
+  bn256 tmp[1];
+
+  carry = bn256_shift (X, A, shift);
+  if (shift < 0)
+    return;
+
+  memset (tmp, 0, sizeof (bn256));
+  tmp->word[0] = carry + (carry << 9);
+  tmp->word[1] = carry + (tmp->word[0] < (carry << 9)) + (carry >> 23);
+  tmp->word[0] = tmp->word[0] + (carry << 8);
+  tmp->word[1] = tmp->word[1] + (tmp->word[0] < (carry << 8)) + (carry >> 24);
+  tmp->word[0] = tmp->word[0] + (carry << 7);
+  tmp->word[1] = tmp->word[1] + (tmp->word[0] < (carry << 7)) + (carry >> 25);
+  tmp->word[0] = tmp->word[0] + (carry << 6);
+  tmp->word[1] = tmp->word[1] + (tmp->word[0] < (carry << 6)) + (carry >> 26);
+  tmp->word[0] = tmp->word[0] + (carry << 4);
+  tmp->word[1] = tmp->word[1] + (tmp->word[0] < (carry << 4)) + (carry >> 28);
+
+  modp256k1_add (X, X, tmp);
+}

src/modp256k1.h

@@ -0,0 +1,9 @@
+extern const bn256 p256k1;
+#define P256K1 (&p256k1)
+
+void modp256k1_add (bn256 *X, const bn256 *A, const bn256 *B);
+void modp256k1_sub (bn256 *X, const bn256 *A, const bn256 *B);
+void modp256k1_reduce (bn256 *X, const bn512 *A);
+void modp256k1_mul (bn256 *X, const bn256 *A, const bn256 *B);
+void modp256k1_sqr (bn256 *X, const bn256 *A);
+void modp256k1_shift (bn256 *X, const bn256 *A, int shift);

src/modp256r1.c

@@ -0,0 +1,276 @@
+/*
+ * modp256r1.c -- modulo arithmetic for p256r1
+ *
+ * Copyright (C) 2011, 2013, 2014 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/>.
+ *
+ */
+
+/*
+ * p256 =  2^256 - 2^224 + 2^192 + 2^96 - 1
+ */
+#include <stdint.h>
+#include <string.h>
+
+#include "bn.h"
+#include "modp256r1.h"
+
+/*
+256      224      192      160      128       96       64       32        0
+2^256
+  1 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+2^256 - 2^224
+  0 ffffffff 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+2^256 - 2^224 + 2^192
+  0 ffffffff 00000001 00000000 00000000 00000000 00000000 00000000 00000000
+2^256 - 2^224 + 2^192 + 2^96
+  0 ffffffff 00000001 00000000 00000000 00000001 00000000 00000000 00000000
+2^256 - 2^224 + 2^192 + 2^96 - 1
+  0 ffffffff 00000001 00000000 00000000 00000000 ffffffff ffffffff ffffffff
+*/
+const bn256 p256r1 = { {0xffffffff, 0xffffffff, 0xffffffff, 0x00000000,
+			0x00000000, 0x00000000, 0x00000001, 0xffffffff} };
+
+/*
+ * Implementation Note.
+ *
+ * It's not always modulo p256r1.  The representation is redundant
+ * during computation.  For example, when we add the prime - 1 and 1,
+ * it won't overflow to 2^256, and the result is represented within
+ * 256-bit.
+ *
+ * It is guaranteed that modp256r1_reduce reduces to modulo p256r1.
+ */
+
+/**
+ * @brief  X = (A + B) mod p256r1
+ */
+void
+modp256r1_add (bn256 *X, const bn256 *A, const bn256 *B)
+{
+  uint32_t carry;
+  bn256 tmp[1];
+
+  carry = bn256_add (X, A, B);
+  if (carry)
+    bn256_sub (X, X, P256R1);
+  else
+    bn256_sub (tmp, X, P256R1);
+}
+
+/**
+ * @brief  X = (A - B) mod p256r1
+ */
+void
+modp256r1_sub (bn256 *X, const bn256 *A, const bn256 *B)
+{
+  uint32_t borrow;
+  bn256 tmp[1];
+
+  borrow = bn256_sub (X, A, B);
+  if (borrow)
+    bn256_add (X, X, P256R1);
+  else
+    bn256_add (tmp, X, P256R1);
+}
+
+/**
+ * @brief  X = A mod p256r1
+ */
+void
+modp256r1_reduce (bn256 *X, const bn512 *A)
+{
+  bn256 tmp[1];
+  uint32_t borrow;
+
+#define S1 X
+#define S2 tmp
+#define S3 tmp
+#define S4 tmp
+#define S5 tmp
+#define S6 tmp
+#define S7 tmp
+#define S8 tmp
+#define S9 tmp
+
+  S1->word[7] = A->word[7];
+  S1->word[6] = A->word[6];
+  S1->word[5] = A->word[5];
+  S1->word[4] = A->word[4];
+  S1->word[3] = A->word[3];
+  S1->word[2] = A->word[2];
+  S1->word[1] = A->word[1];
+  S1->word[0] = A->word[0];
+  /* X = S1 */
+
+  S2->word[7] = A->word[15];
+  S2->word[6] = A->word[14];
+  S2->word[5] = A->word[13];
+  S2->word[4] = A->word[12];
+  S2->word[3] = A->word[11];
+  S2->word[2] = S2->word[1] = S2->word[0] = 0;
+  /* X += 2 * S2 */
+  modp256r1_add (X, X, S2);
+  modp256r1_add (X, X, S2);
+
+  S3->word[7] = 0;
+  S3->word[6] = A->word[15];
+  S3->word[5] = A->word[14];
+  S3->word[4] = A->word[13];
+  S3->word[3] = A->word[12];
+  S3->word[2] = S3->word[1] = S3->word[0] = 0;
+  /* X += 2 * S3 */
+  modp256r1_add (X, X, S3);
+  modp256r1_add (X, X, S3);
+
+  S4->word[7] = A->word[15];
+  S4->word[6] = A->word[14];
+  S4->word[5] = S4->word[4] = S4->word[3] = 0;
+  S4->word[2] = A->word[10];
+  S4->word[1] = A->word[9];
+  S4->word[0] = A->word[8];
+  /* X += S4 */
+  modp256r1_add (X, X, S4);
+
+  S5->word[7] = A->word[8];
+  S5->word[6] = A->word[13];
+  S5->word[5] = A->word[15];
+  S5->word[4] = A->word[14];
+  S5->word[3] = A->word[13];
+  S5->word[2] = A->word[11];
+  S5->word[1] = A->word[10];
+  S5->word[0] = A->word[9];
+  /* X += S5 */
+  modp256r1_add (X, X, S5);
+
+  S6->word[7] = A->word[10];
+  S6->word[6] = A->word[8];
+  S6->word[5] = S6->word[4] = S6->word[3] = 0;
+  S6->word[2] = A->word[13];
+  S6->word[1] = A->word[12];
+  S6->word[0] = A->word[11];
+  /* X -= S6 */
+  modp256r1_sub (X, X, S6);
+
+  S7->word[7] = A->word[11];
+  S7->word[6] = A->word[9];
+  S7->word[5] = S7->word[4] = 0;
+  S7->word[3] = A->word[15];
+  S7->word[2] = A->word[14];
+  S7->word[1] = A->word[13];
+  S7->word[0] = A->word[12];
+  /* X -= S7 */
+  modp256r1_sub (X, X, S7);
+
+  S8->word[7] = A->word[12];
+  S8->word[6] = 0;
+  S8->word[5] = A->word[10];
+  S8->word[4] = A->word[9];
+  S8->word[3] = A->word[8];
+  S8->word[2] = A->word[15];
+  S8->word[1] = A->word[14];
+  S8->word[0] = A->word[13];
+  /* X -= S8 */
+  modp256r1_sub (X, X, S8);
+
+  S9->word[7] = A->word[13];
+  S9->word[6] = 0;
+  S9->word[5] = A->word[11];
+  S9->word[4] = A->word[10];
+  S9->word[3] = A->word[9];
+  S9->word[2] = 0;
+  S9->word[1] = A->word[15];
+  S9->word[0] = A->word[14];
+  /* X -= S9 */
+  modp256r1_sub (X, X, S9);
+
+  borrow = bn256_sub (tmp, X, P256R1);
+  if (borrow)
+    memcpy (tmp, X, sizeof (bn256));
+  else
+    memcpy (X, tmp, sizeof (bn256));
+
+#undef S1
+#undef S2
+#undef S3
+#undef S4
+#undef S5
+#undef S6
+#undef S7
+#undef S8
+#undef S9
+}
+
+/**
+ * @brief  X = (A * B) mod p256r1
+ */
+void
+modp256r1_mul (bn256 *X, const bn256 *A, const bn256 *B)
+{
+  bn512 AB[1];
+
+  bn256_mul (AB, A, B);
+  modp256r1_reduce (X, AB);
+}
+
+/**
+ * @brief  X = A * A mod p256r1
+ */
+void
+modp256r1_sqr (bn256 *X, const bn256 *A)
+{
+  bn512 AA[1];
+
+  bn256_sqr (AA, A);
+  modp256r1_reduce (X, AA);
+}
+
+
+/**
+ * @brief  X = (A << shift) mod p256r1
+ * @note   shift < 32
+ */
+void
+modp256r1_shift (bn256 *X, const bn256 *A, int shift)
+{
+  uint32_t carry;
+#define borrow carry
+  bn256 tmp[1];
+
+  carry = bn256_shift (X, A, shift);
+  if (shift < 0)
+    return;
+
+  memset (tmp, 0, sizeof (bn256));
+  tmp->word[7] = carry;
+  tmp->word[0] = carry;
+  modp256r1_add (X, X, tmp);
+
+  tmp->word[7] = 0;
+  tmp->word[0] = 0;
+  tmp->word[6] = carry;
+  tmp->word[3] = carry;
+  modp256r1_sub (X, X, tmp);
+
+  borrow = bn256_sub (tmp, X, P256R1);
+  if (borrow)
+    memcpy (tmp, X, sizeof (bn256));
+  else
+    memcpy (X, tmp, sizeof (bn256));
+#undef borrow
+}

src/modp256r1.h

@@ -0,0 +1,9 @@
+extern const bn256 p256r1;
+#define P256R1 (&p256r1)
+
+void modp256r1_add (bn256 *X, const bn256 *A, const bn256 *B);
+void modp256r1_sub (bn256 *X, const bn256 *A, const bn256 *B);
+void modp256r1_reduce (bn256 *X, const bn512 *A);
+void modp256r1_mul (bn256 *X, const bn256 *A, const bn256 *B);
+void modp256r1_sqr (bn256 *X, const bn256 *A);
+void modp256r1_shift (bn256 *X, const bn256 *A, int shift);

src/muladd_256.h

@@ -0,0 +1,50 @@
+#define MULADD_256_ASM(s_,d_,w_,c_)                      \
+ asm ( "ldmia  %[s]!, { r8, r9, r10 } \n\t"              \
+       "ldmia  %[d], { r5, r6, r7 }   \n\t"              \
+       "umull  r4, r8, %[w], r8       \n\t"              \
+       "adds   r5, r5, r4             \n\t"              \
+       "adcs   r6, r6, r8             \n\t"              \
+       "umull  r4, r8, %[w], r9       \n\t"              \
+       "adc    %[c], r8, #0           \n\t"              \
+       "adds   r6, r6, r4             \n\t"              \
+       "adcs   r7, r7, %[c]           \n\t"              \
+       "umull  r4, r8, %[w], r10      \n\t"              \
+       "adc    %[c], r8, #0           \n\t"              \
+       "adds   r7, r7, r4             \n\t"              \
+       "stmia  %[d]!, { r5, r6, r7 }  \n\t"              \
+       "ldmia  %[s]!, { r8, r9, r10 } \n\t"              \
+       "ldmia  %[d], { r5, r6, r7 }   \n\t"              \
+       "adcs   r5, r5, %[c]           \n\t"              \
+       "umull  r4, r8, %[w], r8       \n\t"              \
+       "adc    %[c], r8, #0           \n\t"              \
+       "adds   r5, r5, r4             \n\t"              \
+       "adcs   r6, r6, %[c]           \n\t"              \
+       "umull  r4, r8, %[w], r9       \n\t"              \
+       "adc    %[c], r8, #0           \n\t"              \
+       "adds   r6, r6, r4             \n\t"              \
+       "adcs   r7, r7, %[c]           \n\t"              \
+       "umull  r4, r8, %[w], r10      \n\t"              \
+       "adc    %[c], r8, #0           \n\t"              \
+       "adds   r7, r7, r4             \n\t"              \
+       "stmia  %[d]!, { r5, r6, r7 }  \n\t"              \
+       "ldmia  %[s]!, { r8, r9 }      \n\t"              \
+       "ldmia  %[d], { r5, r6 }       \n\t"              \
+       "adcs   r5, r5, %[c]           \n\t"              \
+       "umull  r4, r8, %[w], r8       \n\t"              \
+       "adc    %[c], r8, #0           \n\t"              \
+       "adds   r5, r5, r4             \n\t"              \
+       "adcs   r6, r6, %[c]           \n\t"              \
+       "umull  r4, r8, %[w], r9       \n\t"              \
+       "adc    %[c], r8, #0           \n\t"              \
+       "adds   r6, r6, r4             \n\t"              \
+       "adc    %[c], %[c], #0         \n\t"              \
+       "stmia  %[d]!, { r5, r6 }"                        \
+       : [s] "=&r" (s_), [d] "=&r" (d_), [c] "=&r" (c_)  \
+       : "[s]" (s_), "[d]" (d_), [w] "r" (w_)            \
+       : "r4", "r5", "r6", "r7", "r8", "r9", "r10",      \
+         "memory", "cc" )
+
+#define MULADD_256(s__,d__,w__,c__) do { \
+  MULADD_256_ASM(s__,d__,w__,c__);	 \
+  *d__ = c__;                            \
+} while (0)

src/neug.c

@@ -215,7 +215,7 @@ static int ep_process (int mode)
       CRC->DR = adc_buf[i*4 + 1];
       CRC->DR = adc_buf[i*4 + 2];
       CRC->DR = adc_buf[i*4 + 3];
-      v = CRC->DR & 0xff;
+      v = CRC->DR & 0xff;   /* First byte of CRC->DR is used here.  */
       noise_source_continuous_test (v);
       sha256_ctx_data.wbuf[i] = v;
       ep_init (NEUG_MODE_CONDITIONED); /* The rest three-byte of
@@ -280,8 +280,6 @@ uint16_t neug_rc_max;
 uint16_t neug_p64_max;
 uint16_t neug_p4k_max;
 
-#include "board.h"
-
 static void noise_source_cnt_max_reset (void)
 {
   neug_err_cnt = neug_err_cnt_rc = neug_err_cnt_p64 = neug_err_cnt_p4k = 0;

src/neug.h

@@ -3,9 +3,9 @@
 
 #define NEUG_PRE_LOOP 32
 
-#define NEUG_MODE_CONDITIONED 0
-#define NEUG_MODE_RAW         1
-#define NEUG_MODE_RAW_DATA    2
+#define NEUG_MODE_CONDITIONED 0	/* Conditioned data.             */
+#define NEUG_MODE_RAW         1	/* CRC-32 filtered sample data.  */
+#define NEUG_MODE_RAW_DATA    2	/* Sample data directly.         */
 
 extern uint8_t neug_mode;
 extern uint16_t neug_err_cnt;

src/openpgp.c

@@ -1,7 +1,7 @@
 /*
  * openpgp.c -- OpenPGP card protocol support
  *
- * Copyright (C) 2010, 2011, 2012, 2013
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015
  *               Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
@@ -107,6 +107,7 @@ gpg_init (void)
   file_selection = FILE_NONE;
   flash_data_start = flash_init ();
   gpg_data_scan (flash_data_start);
+  flash_init_keys ();
 }
 
 static void
@@ -619,12 +620,7 @@ cmd_pgp_gakp (void)
     {
       if (!ac_check_status (AC_ADMIN_AUTHORIZED))
 	GPG_SECURITY_FAILURE ();
-#ifdef KEYGEN_SUPPORT
-      /* Generate key pair */
       gpg_do_keygen (apdu.cmd_apdu_data[0]);
-#else
-      GPG_FUNCTION_NOT_SUPPORTED ();
-#endif
     }
 }
 
@@ -634,7 +630,7 @@ gpg_get_firmware_update_key (uint8_t keyno)
   extern uint8_t _updatekey_store;
   const uint8_t *p;
 
-  p = &_updatekey_store + keyno * KEY_CONTENT_LEN;
+  p = &_updatekey_store + keyno * FIRMWARE_UPDATE_KEY_CONTENT_LEN;
   return p;
 }
 
@@ -693,8 +689,8 @@ cmd_read_binary (void)
       else
 	{
 	  p = gpg_get_firmware_update_key (file_id - FILEID_UPDATE_KEY_0);
-	  res_APDU_size = KEY_CONTENT_LEN;
-	  memcpy (res_APDU, p, KEY_CONTENT_LEN);
+	  res_APDU_size = FIRMWARE_UPDATE_KEY_CONTENT_LEN;
+	  memcpy (res_APDU, p, FIRMWARE_UPDATE_KEY_CONTENT_LEN);
 	  GPG_SUCCESS ();
 	}
     }
@@ -805,18 +801,34 @@ cmd_get_data (void)
   gpg_do_get_data (tag, 0);
 }
 
+#define ECDSA_HASH_LEN 32
+#define ECDSA_SIGNATURE_LENGTH 64
+
+#define EDDSA_HASH_LEN_MAX 256
+#define EDDSA_SIGNATURE_LENGTH 64
+
+#define ECC_CIPHER_DO_HEADER_SIZE 7
+
 static void
 cmd_pso (void)
 {
   int len = apdu.cmd_apdu_data_len;
-  int r;
+  int r = -1;
+  int attr;
+  int pubkey_len;
+  unsigned int result_len = 0;
 
   DEBUG_INFO (" - PSO: ");
   DEBUG_WORD ((uint32_t)&r);
   DEBUG_BINARY (apdu.cmd_apdu_data, apdu.cmd_apdu_data_len);
+  DEBUG_SHORT (len);
 
   if (P1 (apdu) == 0x9e && P2 (apdu) == 0x9a)
     {
+      attr = gpg_get_algo_attr (GPG_KEY_FOR_SIGNING);
+      pubkey_len = gpg_get_algo_attr_key_size (GPG_KEY_FOR_SIGNING,
+					       GPG_KEY_PUBLIC);
+
       if (!ac_check_status (AC_PSO_CDS_AUTHORIZED))
 	{
 	  DEBUG_INFO ("security error.");
@@ -824,39 +836,85 @@ cmd_pso (void)
 	  return;
 	}
 
-      /* Check size of digestInfo */
-      if (len != 34		/* MD5 */
-	  && len != 35		/* SHA1 / RIPEMD-160 */
-	  && len != 47		/* SHA224 */
-	  && len != 51		/* SHA256 */
-	  && len != 67		/* SHA384 */
-	  && len != 83)		/* SHA512 */
+      if (attr == ALGO_RSA2K || attr == ALGO_RSA4K)
 	{
-	  DEBUG_INFO (" wrong length: ");
-	  DEBUG_SHORT (len);
-	  GPG_ERROR ();
+	  /* Check size of digestInfo */
+	  if (len != 34		/* MD5 */
+	      && len != 35		/* SHA1 / RIPEMD-160 */
+	      && len != 47		/* SHA224 */
+	      && len != 51		/* SHA256 */
+	      && len != 67		/* SHA384 */
+	      && len != 83)		/* SHA512 */
+	    {
+	      DEBUG_INFO (" wrong length");
+	      GPG_CONDITION_NOT_SATISFIED ();
+	      return;
+	    }
+
+	  DEBUG_BINARY (kd[GPG_KEY_FOR_SIGNING].data, pubkey_len);
+
+	  result_len = pubkey_len;
+	  r = rsa_sign (apdu.cmd_apdu_data, res_APDU, len,
+			&kd[GPG_KEY_FOR_SIGNING], pubkey_len);
+	}
+      else if (attr == ALGO_NISTP256R1 || attr == ALGO_SECP256K1)
+	{
+	  /* ECDSA with p256r1/p256k1 for signature */
+	  if (len != ECDSA_HASH_LEN)
+	    {
+	      DEBUG_INFO (" wrong length");
+	      GPG_CONDITION_NOT_SATISFIED ();
+	      return;
+	    }
+
+	  result_len = ECDSA_SIGNATURE_LENGTH;
+	  if (attr == ALGO_NISTP256R1)
+	    r = ecdsa_sign_p256r1 (apdu.cmd_apdu_data, res_APDU,
+				   kd[GPG_KEY_FOR_SIGNING].data);
+	  else			/* ALGO_SECP256K1 */
+	    r = ecdsa_sign_p256k1 (apdu.cmd_apdu_data, res_APDU,
+				   kd[GPG_KEY_FOR_SIGNING].data);
+	}
+      else if (attr == ALGO_ED25519)
+	{
+	  uint32_t output[64/4];	/* Require 4-byte alignment. */
+
+	  if (len > EDDSA_HASH_LEN_MAX)
+	    {
+	      DEBUG_INFO ("wrong hash length.");
+	      GPG_CONDITION_NOT_SATISFIED ();
+	      return;
+	    }
+
+	  result_len = EDDSA_SIGNATURE_LENGTH;
+	  r = eddsa_sign_25519 (apdu.cmd_apdu_data, len, output,
+				kd[GPG_KEY_FOR_SIGNING].data,
+				kd[GPG_KEY_FOR_SIGNING].data+32,
+				kd[GPG_KEY_FOR_SIGNING].pubkey);
+	  memcpy (res_APDU, output, EDDSA_SIGNATURE_LENGTH);
 	}
       else
 	{
-	  DEBUG_SHORT (len);
-	  DEBUG_BINARY (&kd[GPG_KEY_FOR_SIGNING], KEY_CONTENT_LEN);
-
-	  r = rsa_sign (apdu.cmd_apdu_data, res_APDU, len,
-			&kd[GPG_KEY_FOR_SIGNING]);
-	  if (r < 0)
-	    {
-	      ac_reset_pso_cds ();
-	      GPG_ERROR ();
-	    }
-	  else
-	    /* Success */
-	    gpg_increment_digital_signature_counter ();
+	  DEBUG_INFO ("unknown algo.");
+	  GPG_FUNCTION_NOT_SUPPORTED ();
+	  return;
 	}
+
+      if (r == 0)
+	{
+	  res_APDU_size = result_len;
+	  gpg_increment_digital_signature_counter ();
+	}
+      else   /* Failure */
+	ac_reset_pso_cds ();
     }
   else if (P1 (apdu) == 0x80 && P2 (apdu) == 0x86)
     {
-      DEBUG_SHORT (len);
-      DEBUG_BINARY (&kd[GPG_KEY_FOR_DECRYPTION], KEY_CONTENT_LEN);
+      attr = gpg_get_algo_attr (GPG_KEY_FOR_DECRYPTION);
+      pubkey_len = gpg_get_algo_attr_key_size (GPG_KEY_FOR_DECRYPTION,
+					       GPG_KEY_PUBLIC);
+
+      DEBUG_BINARY (kd[GPG_KEY_FOR_DECRYPTION].data, pubkey_len);
 
       if (!ac_check_status (AC_OTHER_AUTHORIZED))
 	{
@@ -865,19 +923,64 @@ cmd_pso (void)
 	  return;
 	}
 
-      /* Skip padding 0x00 */
-      len--;
-      if (len != KEY_CONTENT_LEN)
-	GPG_CONDITION_NOT_SATISFIED ();
+      if (attr == ALGO_RSA2K || attr == ALGO_RSA4K)
+	{
+	  /* Skip padding 0x00 */
+	  len--;
+	  if (len != pubkey_len)
+	    {
+	      GPG_CONDITION_NOT_SATISFIED ();
+	      return;
+	    }
+	  r = rsa_decrypt (apdu.cmd_apdu_data+1, res_APDU, len,
+			   &kd[GPG_KEY_FOR_DECRYPTION], &result_len);
+	}
+      else if (attr == ALGO_NISTP256R1 || attr == ALGO_SECP256K1)
+	{
+	  int header = ECC_CIPHER_DO_HEADER_SIZE;
+
+	  /* Format is in big endian MPI: 04 || x || y */
+	  if (len != 65 + ECC_CIPHER_DO_HEADER_SIZE
+	      || apdu.cmd_apdu_data[header] != 0x04)
+	    {
+	      GPG_CONDITION_NOT_SATISFIED ();
+	      return;
+	    }
+
+	  result_len = 65;
+	  if (attr == ALGO_NISTP256R1)
+	    r = ecdh_decrypt_p256r1 (apdu.cmd_apdu_data + header, res_APDU,
+				     kd[GPG_KEY_FOR_DECRYPTION].data);
+	  else
+	    r = ecdh_decrypt_p256k1 (apdu.cmd_apdu_data + header, res_APDU,
+				     kd[GPG_KEY_FOR_DECRYPTION].data);
+	}
+      else if (attr == ALGO_CURVE25519)
+	{
+	  int header = ECC_CIPHER_DO_HEADER_SIZE;
+
+	  if (len != 32 + ECC_CIPHER_DO_HEADER_SIZE)
+	    {
+	      GPG_CONDITION_NOT_SATISFIED ();
+	      return;
+	    }
+
+	  result_len = 32;
+	  r = ecdh_decrypt_curve25519 (apdu.cmd_apdu_data + header, res_APDU,
+				       kd[GPG_KEY_FOR_DECRYPTION].data);
+	}
       else
 	{
-	  r = rsa_decrypt (apdu.cmd_apdu_data+1, res_APDU, len,
-			   &kd[GPG_KEY_FOR_DECRYPTION]);
-	  if (r < 0)
-	    GPG_ERROR ();
+	  DEBUG_INFO ("unknown algo.");
+	  GPG_FUNCTION_NOT_SUPPORTED ();
+	  return;
 	}
+
+      if (r == 0)
+	res_APDU_size = result_len;
     }
-  else
+
+  if (r < 0)
     {
       DEBUG_INFO (" - ??");
       DEBUG_BYTE (P1 (apdu));
@@ -890,98 +993,103 @@ cmd_pso (void)
 }
 
 
-#ifdef RSA_AUTH
-#define MAX_DIGEST_INFO_LEN 102 /* 40% */
+#define MAX_RSA_DIGEST_INFO_LEN 102 /* 40% */
 static void
 cmd_internal_authenticate (void)
 {
+  int attr = gpg_get_algo_attr (GPG_KEY_FOR_AUTHENTICATION);
+  int pubkey_len = gpg_get_algo_attr_key_size (GPG_KEY_FOR_AUTHENTICATION,
+					       GPG_KEY_PUBLIC);
   int len = apdu.cmd_apdu_data_len;
-  int r;
+  int r = -1;
+  unsigned int result_len = 0;
 
   DEBUG_INFO (" - INTERNAL AUTHENTICATE\r\n");
 
-  if (P1 (apdu) == 0x00 && P2 (apdu) == 0x00)
+  if (P1 (apdu) != 0x00 || P2 (apdu) != 0x00)
     {
-      DEBUG_SHORT (len);
+      DEBUG_INFO (" - ??");
+      DEBUG_BYTE (P1 (apdu));
+      DEBUG_INFO (" - ??");
+      DEBUG_BYTE (P2 (apdu));
+      GPG_CONDITION_NOT_SATISFIED ();
+      return;
+    }
 
-      if (!ac_check_status (AC_OTHER_AUTHORIZED))
-	{
-	  DEBUG_INFO ("security error.");
-	  GPG_SECURITY_FAILURE ();
-	  return;
-	}
+  DEBUG_SHORT (len);
+  if (!ac_check_status (AC_OTHER_AUTHORIZED))
+    {
+      DEBUG_INFO ("security error.");
+      GPG_SECURITY_FAILURE ();
+      return;
+    }
 
-      if (len > MAX_DIGEST_INFO_LEN)
+  if (attr == ALGO_RSA2K || attr == ALGO_RSA4K)
+    {
+      if (len > MAX_RSA_DIGEST_INFO_LEN)
 	{
 	  DEBUG_INFO ("input is too long.");
 	  GPG_CONDITION_NOT_SATISFIED ();
 	  return;
 	}
 
+      result_len = pubkey_len;
       r = rsa_sign (apdu.cmd_apdu_data, res_APDU, len,
-		    &kd[GPG_KEY_FOR_AUTHENTICATION]);
-      if (r < 0)
-	GPG_ERROR ();
-    }
-  else
+		    &kd[GPG_KEY_FOR_AUTHENTICATION], pubkey_len);
+    }	  
+  else if (attr == ALGO_NISTP256R1)
     {
-      DEBUG_INFO (" - ??");
-      DEBUG_BYTE (P1 (apdu));
-      DEBUG_INFO (" - ??");
-      DEBUG_BYTE (P2 (apdu));
-      GPG_ERROR ();
-    }
-
-  DEBUG_INFO ("INTERNAL AUTHENTICATE done.\r\n");
-}
-#else
-#define ECDSA_P256_HASH_LEN 32
-#define ECDSA_SIGNATURE_LENGTH 64
-
-static void
-cmd_internal_authenticate (void)
-{
-  int len = apdu.cmd_apdu_data_len;
-  int r;
-
-  DEBUG_INFO (" - INTERNAL AUTHENTICATE\r\n");
-
-  if (P1 (apdu) == 0x00 && P2 (apdu) == 0x00)
-    {
-      DEBUG_SHORT (len);
-
-      if (!ac_check_status (AC_OTHER_AUTHORIZED))
-	{
-	  DEBUG_INFO ("security error.");
-	  GPG_SECURITY_FAILURE ();
-	  return;
-	}
-
-      if (len != ECDSA_P256_HASH_LEN)
+      if (len != ECDSA_HASH_LEN)
 	{
 	  DEBUG_INFO ("wrong hash length.");
 	  GPG_CONDITION_NOT_SATISFIED ();
 	  return;
 	}
 
-      res_APDU_size = ECDSA_SIGNATURE_LENGTH;
-      r = ecdsa_sign (apdu.cmd_apdu_data, res_APDU,
-		      &kd[GPG_KEY_FOR_AUTHENTICATION]);
-      if (r < 0)
-	GPG_ERROR ();
+      result_len = ECDSA_SIGNATURE_LENGTH;
+      r = ecdsa_sign_p256r1 (apdu.cmd_apdu_data, res_APDU,
+			     kd[GPG_KEY_FOR_AUTHENTICATION].data);
     }
-  else
+  else if (attr == ALGO_SECP256K1)
     {
-      DEBUG_INFO (" - ??");
-      DEBUG_BYTE (P1 (apdu));
-      DEBUG_INFO (" - ??");
-      DEBUG_BYTE (P2 (apdu));
-      GPG_ERROR ();
+      if (len != ECDSA_HASH_LEN)
+	{
+	  DEBUG_INFO ("wrong hash length.");
+	  GPG_CONDITION_NOT_SATISFIED ();
+	  return;
+	}
+
+      result_len = ECDSA_SIGNATURE_LENGTH;
+      r = ecdsa_sign_p256k1 (apdu.cmd_apdu_data, res_APDU,
+			     kd[GPG_KEY_FOR_AUTHENTICATION].data);
     }
+  else if (attr == ALGO_ED25519)
+    {
+      uint32_t output[64/4];	/* Require 4-byte alignment. */
+
+      if (len > EDDSA_HASH_LEN_MAX)
+	{
+	  DEBUG_INFO ("wrong hash length.");
+	  GPG_CONDITION_NOT_SATISFIED ();
+	  return;
+	}
+
+      result_len = EDDSA_SIGNATURE_LENGTH;
+      r = eddsa_sign_25519 (apdu.cmd_apdu_data, len, output,
+			    kd[GPG_KEY_FOR_AUTHENTICATION].data,
+			    kd[GPG_KEY_FOR_AUTHENTICATION].data+32,
+			    kd[GPG_KEY_FOR_AUTHENTICATION].pubkey);
+      memcpy (res_APDU, output, EDDSA_SIGNATURE_LENGTH);
+    }
+
+  if (r == 0)
+    res_APDU_size = result_len;
+  else
+    GPG_ERROR ();
 
   DEBUG_INFO ("INTERNAL AUTHENTICATE done.\r\n");
 }
-#endif
+
 
 #define MBD_OPRATION_WRITE  0
 #define MBD_OPRATION_UPDATE 1
@@ -1132,7 +1240,8 @@ cmd_external_authenticate (void)
       return;
     }
 
-  r = rsa_verify (pubkey, challenge, signature);
+  r = rsa_verify (pubkey, FIRMWARE_UPDATE_KEY_CONTENT_LEN,
+		  challenge, signature);
   random_bytes_free (challenge);
   challenge = NULL;
 

src/random.c

@@ -1,7 +1,8 @@
 /*
  * random.c -- get random bytes
  *
- * Copyright (C) 2010, 2011, 2012, 2013 Free Software Initiative of Japan
+ * Copyright (C) 2010, 2011, 2012, 2013, 2015
+ *               Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -24,8 +25,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "config.h"
-
 #include "gnuk.h"
 #include "neug.h"
 
@@ -85,7 +84,6 @@ random_get_salt (uint8_t *p)
 }
 
 
-#ifdef KEYGEN_SUPPORT
 /*
  * Random byte iterator
  */
@@ -120,4 +118,3 @@ random_gen (void *arg, unsigned char *out, size_t out_len)
 
   return 0;
 }
-#endif

src/sha256.c

@@ -52,13 +52,17 @@
 
 #define SHA256_MASK (SHA256_BLOCK_SIZE - 1)
 
-static void memcpy_bswap32 (void *dst, const uint32_t *p, int n)
+static void memcpy_output_bswap32 (unsigned char *dst, const uint32_t *p)
 {
-  uint32_t *q = (uint32_t *)dst;
+  int i;
+  uint32_t q = 0;
 
-  n >>= 2;
-  while (n--)
-    q[n] = __builtin_bswap32 (p[n]); /* bswap32 is GCC extention */
+  for (i = 0; i < 32; i++)
+    {
+      if ((i & 3) == 0)
+	q = __builtin_bswap32 (p[i >> 2]); /* bswap32 is GCC extention */
+      dst[i] = q >> ((i & 3) * 8);
+    }
 }
 
 #define rotr32(x,n)   (((x) >> n) | ((x) << (32 - n)))
@@ -193,11 +197,11 @@ sha256_finish (sha256_context *ctx, unsigned char output[32])
   ctx->wbuf[15] = __builtin_bswap32 (ctx->total[0] << 3);
   sha256_process (ctx);
 
-  memcpy_bswap32 (output, ctx->state, SHA256_DIGEST_SIZE);
+  memcpy_output_bswap32 (output, ctx->state);
   memset (ctx, 0, sizeof (sha256_context));
 }
 
-const uint32_t initial_state[8] =
+static const uint32_t initial_state[8] =
 {
   0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a,
   0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19

src/sha512.c

@@ -0,0 +1,216 @@
+/*
+ * sha512.c -- Compute SHA-512 hash (for little endian architecture).
+ *
+ * This module is written by gniibe, following the API of sha256.c. 
+ *
+ * Copyright (C) 2014 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/>.
+ *
+ */
+
+/*
+ * Reference:
+ *
+ * [1] FIPS PUB 180-4: Secure hash Standard (SHS), March, 2012.
+ *
+ */
+
+#include <string.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include "sha512.h"
+
+#define SHA512_MASK (SHA512_BLOCK_SIZE - 1)
+
+static void memcpy_output_bswap64 (unsigned char dst[64], const uint64_t *p)
+{
+  int i;
+  uint64_t q = 0;
+
+  for (i = 0; i < 64; i++)
+    {
+      if ((i & 7) == 0)
+	q = __builtin_bswap64 (p[i >> 3]); /* bswap64 is GCC extention */
+      dst[i] = q >> ((i & 7) * 8);
+    }
+}
+
+#define rotr64(x,n)   (((x) >> n) | ((x) << (64 - n)))
+
+#define ch(x,y,z)       ((z) ^ ((x) & ((y) ^ (z))))
+#define maj(x,y,z)      (((x) & (y)) | ((z) & ((x) ^ (y))))
+
+/* round transforms for SHA512 compression functions */
+#define vf(n,i) v[(n - i) & 7]
+
+#define hf(i) (p[i & 15] += \
+    g_1(p[(i + 14) & 15]) + p[(i + 9) & 15] + g_0(p[(i + 1) & 15]))
+
+#define v_cycle0(i)                                 \
+    p[i] = __builtin_bswap64 (p[i]);                \
+    vf(7,i) += p[i] + k_0[i]                        \
+    + s_1(vf(4,i)) + ch(vf(4,i),vf(5,i),vf(6,i));   \
+    vf(3,i) += vf(7,i);                             \
+    vf(7,i) += s_0(vf(0,i))+ maj(vf(0,i),vf(1,i),vf(2,i))
+
+#define v_cycle(i, j)                               \
+    vf(7,i) += hf(i) + k_0[i+j]                     \
+    + s_1(vf(4,i)) + ch(vf(4,i),vf(5,i),vf(6,i));   \
+    vf(3,i) += vf(7,i);                             \
+    vf(7,i) += s_0(vf(0,i))+ maj(vf(0,i),vf(1,i),vf(2,i))
+
+#define s_0(x)  (rotr64((x), 28) ^ rotr64((x), 34) ^ rotr64((x), 39))
+#define s_1(x)  (rotr64((x), 14) ^ rotr64((x), 18) ^ rotr64((x), 41))
+#define g_0(x)  (rotr64((x),  1) ^ rotr64((x),  8) ^ ((x) >>  7))
+#define g_1(x)  (rotr64((x), 19) ^ rotr64((x), 61) ^ ((x) >>  6))
+#define k_0     k512
+
+/* Taken from section 4.2.3 of [1].  */
+static const uint64_t k512[80] = {
+0x428a2f98d728ae22, 0x7137449123ef65cd, 0xb5c0fbcfec4d3b2f, 0xe9b5dba58189dbbc,
+0x3956c25bf348b538, 0x59f111f1b605d019, 0x923f82a4af194f9b, 0xab1c5ed5da6d8118,
+0xd807aa98a3030242, 0x12835b0145706fbe, 0x243185be4ee4b28c, 0x550c7dc3d5ffb4e2,
+0x72be5d74f27b896f, 0x80deb1fe3b1696b1, 0x9bdc06a725c71235, 0xc19bf174cf692694,
+0xe49b69c19ef14ad2, 0xefbe4786384f25e3, 0x0fc19dc68b8cd5b5, 0x240ca1cc77ac9c65,
+0x2de92c6f592b0275, 0x4a7484aa6ea6e483, 0x5cb0a9dcbd41fbd4, 0x76f988da831153b5,
+0x983e5152ee66dfab, 0xa831c66d2db43210, 0xb00327c898fb213f, 0xbf597fc7beef0ee4,
+0xc6e00bf33da88fc2, 0xd5a79147930aa725, 0x06ca6351e003826f, 0x142929670a0e6e70,
+0x27b70a8546d22ffc, 0x2e1b21385c26c926, 0x4d2c6dfc5ac42aed, 0x53380d139d95b3df,
+0x650a73548baf63de, 0x766a0abb3c77b2a8, 0x81c2c92e47edaee6, 0x92722c851482353b,
+0xa2bfe8a14cf10364, 0xa81a664bbc423001, 0xc24b8b70d0f89791, 0xc76c51a30654be30,
+0xd192e819d6ef5218, 0xd69906245565a910, 0xf40e35855771202a, 0x106aa07032bbd1b8,
+0x19a4c116b8d2d0c8, 0x1e376c085141ab53, 0x2748774cdf8eeb99, 0x34b0bcb5e19b48a8,
+0x391c0cb3c5c95a63, 0x4ed8aa4ae3418acb, 0x5b9cca4f7763e373, 0x682e6ff3d6b2b8a3,
+0x748f82ee5defb2fc, 0x78a5636f43172f60, 0x84c87814a1f0ab72, 0x8cc702081a6439ec,
+0x90befffa23631e28, 0xa4506cebde82bde9, 0xbef9a3f7b2c67915, 0xc67178f2e372532b,
+0xca273eceea26619c, 0xd186b8c721c0c207, 0xeada7dd6cde0eb1e, 0xf57d4f7fee6ed178,
+0x06f067aa72176fba, 0x0a637dc5a2c898a6, 0x113f9804bef90dae, 0x1b710b35131c471b,
+0x28db77f523047d84, 0x32caab7b40c72493, 0x3c9ebe0a15c9bebc, 0x431d67c49c100d4c,
+0x4cc5d4becb3e42b6, 0x597f299cfc657e2a, 0x5fcb6fab3ad6faec, 0x6c44198c4a475817
+};
+
+void
+sha512_process (sha512_context *ctx)
+{
+  uint32_t i;
+  uint64_t *p = ctx->wbuf;
+  uint64_t v[8];
+
+  memcpy (v, ctx->state, 8 * sizeof (uint64_t));
+
+  v_cycle0 ( 0); v_cycle0 ( 1); v_cycle0 ( 2); v_cycle0 ( 3);
+  v_cycle0 ( 4); v_cycle0 ( 5); v_cycle0 ( 6); v_cycle0 ( 7);
+  v_cycle0 ( 8); v_cycle0 ( 9); v_cycle0 (10); v_cycle0 (11);
+  v_cycle0 (12); v_cycle0 (13); v_cycle0 (14); v_cycle0 (15);
+
+  for (i = 16; i < 80; i += 16)
+    {
+      v_cycle ( 0, i); v_cycle ( 1, i); v_cycle ( 2, i); v_cycle ( 3, i);
+      v_cycle ( 4, i); v_cycle ( 5, i); v_cycle ( 6, i); v_cycle ( 7, i);
+      v_cycle ( 8, i); v_cycle ( 9, i); v_cycle (10, i); v_cycle (11, i);
+      v_cycle (12, i); v_cycle (13, i); v_cycle (14, i); v_cycle (15, i);
+    }
+
+  ctx->state[0] += v[0];
+  ctx->state[1] += v[1];
+  ctx->state[2] += v[2];
+  ctx->state[3] += v[3];
+  ctx->state[4] += v[4];
+  ctx->state[5] += v[5];
+  ctx->state[6] += v[6];
+  ctx->state[7] += v[7];
+}
+
+void
+sha512_update (sha512_context *ctx, const unsigned char *input,
+               unsigned int ilen)
+{
+  uint32_t left = (ctx->total[0] & SHA512_MASK);
+  uint32_t fill = SHA512_BLOCK_SIZE - left;
+
+  ctx->total[0] += ilen;
+  if (ctx->total[0] < ilen)
+    ctx->total[1]++;
+
+  while (ilen >= fill)
+    {
+      memcpy (((unsigned char*)ctx->wbuf) + left, input, fill);
+      sha512_process (ctx);
+      input += fill;
+      ilen -= fill;
+      left = 0;
+      fill = SHA512_BLOCK_SIZE;
+    }
+
+  memcpy (((unsigned char*)ctx->wbuf) + left, input, ilen);
+}
+
+void
+sha512_finish (sha512_context *ctx, unsigned char output[64])
+{
+  uint32_t last = (ctx->total[0] & SHA512_MASK);
+
+  ctx->wbuf[last >> 3] = __builtin_bswap64 (ctx->wbuf[last >> 3]);
+  ctx->wbuf[last >> 3] &= 0xffffffffffffff80LL << (8 * (~last & 7));
+  ctx->wbuf[last >> 3] |= 0x0000000000000080LL << (8 * (~last & 7));
+  ctx->wbuf[last >> 3] = __builtin_bswap64 (ctx->wbuf[last >> 3]);
+
+  if (last > SHA512_BLOCK_SIZE - 17)
+    {
+      if (last < 120)
+        ctx->wbuf[15] = 0;
+      sha512_process (ctx);
+      last = 0;
+    }
+  else
+    last = (last >> 3) + 1;
+
+  while (last < 14)
+    ctx->wbuf[last++] = 0;
+
+  ctx->wbuf[14] = __builtin_bswap64 ((ctx->total[0] >> 61) | (ctx->total[1] << 3));
+  ctx->wbuf[15] = __builtin_bswap64 (ctx->total[0] << 3);
+  sha512_process (ctx);
+
+  memcpy_output_bswap64 (output, ctx->state);
+  memset (ctx, 0, sizeof (sha512_context));
+}
+
+/* Taken from section 5.3.5 of [1].  */
+static const uint64_t initial_state[8] = {
+0x6a09e667f3bcc908, 0xbb67ae8584caa73b, 0x3c6ef372fe94f82b, 0xa54ff53a5f1d36f1,
+0x510e527fade682d1, 0x9b05688c2b3e6c1f, 0x1f83d9abfb41bd6b, 0x5be0cd19137e2179
+};
+
+void
+sha512_start (sha512_context *ctx)
+{
+  ctx->total[0] = ctx->total[1] = 0;
+  memcpy (ctx->state, initial_state, 8 * sizeof(uint64_t));
+}
+
+void
+sha512 (const unsigned char *input, unsigned int ilen,
+        unsigned char output[64])
+{
+  sha512_context ctx;
+
+  sha512_start (&ctx);
+  sha512_update (&ctx, input, ilen);
+  sha512_finish (&ctx, output);
+}

src/sha512.h

@@ -0,0 +1,17 @@
+#define SHA512_DIGEST_SIZE  64
+#define SHA512_BLOCK_SIZE   128
+
+typedef struct
+{
+  uint64_t total[2];
+  uint64_t state[8];
+  uint64_t wbuf[16];
+} sha512_context;
+
+void sha512 (const unsigned char *input, unsigned int ilen,
+	     unsigned char output[64]);
+void sha512_start (sha512_context *ctx);
+void sha512_finish (sha512_context *ctx, unsigned char output[64]);
+void sha512_update (sha512_context *ctx, const unsigned char *input,
+		    unsigned int ilen);
+void sha512_process (sha512_context *ctx);

src/sys.c

@@ -1,7 +1,7 @@
 /*
  * sys.c - system routines for the initial page for STM32F103.
  *
- * Copyright (C) 2013 Flying Stone Technology
+ * Copyright (C) 2013, 2014, 2015 Flying Stone Technology
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * Copying and distribution of this file, with or without modification,
@@ -17,50 +17,13 @@
 #include <stdlib.h>
 #include "board.h"
 
+#include "clk_gpio_init.c"
 
 #define CORTEX_PRIORITY_BITS    4
 #define CORTEX_PRIORITY_MASK(n)  ((n) << (8 - CORTEX_PRIORITY_BITS))
 #define USB_LP_CAN1_RX0_IRQn	 20
 #define STM32_USB_IRQ_PRIORITY   11
 
-
-#define STM32_SW_PLL		(2 << 0)
-#define STM32_PLLSRC_HSE	(1 << 16)
-
-#define STM32_PLLXTPRE_DIV1	(0 << 17)
-#define STM32_PLLXTPRE_DIV2	(1 << 17)
-
-#define STM32_HPRE_DIV1		(0 << 4)
-
-#define STM32_PPRE1_DIV2	(4 << 8)
-
-#define STM32_PPRE2_DIV1        (0 << 11)
-#define STM32_PPRE2_DIV2	(4 << 11)
-
-#define STM32_ADCPRE_DIV4	(1 << 14)
-#define STM32_ADCPRE_DIV6       (2 << 14)
-
-#define STM32_USBPRE_DIV1P5     (0 << 22)
-
-#define STM32_MCO_NOCLOCK	(0 << 24)
-
-#define STM32_SW		STM32_SW_PLL
-#define STM32_PLLSRC		STM32_PLLSRC_HSE
-#define STM32_HPRE		STM32_HPRE_DIV1
-#define STM32_PPRE1		STM32_PPRE1_DIV2
-#define STM32_PPRE2		STM32_PPRE2_DIV1
-#define STM32_ADCPRE		STM32_ADCPRE_DIV6
-#define STM32_MCOSEL		STM32_MCO_NOCLOCK
-#define STM32_USBPRE            STM32_USBPRE_DIV1P5
-
-#define STM32_PLLCLKIN		(STM32_HSECLK / 1)
-#define STM32_PLLMUL		((STM32_PLLMUL_VALUE - 2) << 18)
-#define STM32_PLLCLKOUT		(STM32_PLLCLKIN * STM32_PLLMUL_VALUE)
-#define STM32_SYSCLK		STM32_PLLCLKOUT
-#define STM32_HCLK		(STM32_SYSCLK / 1)
-
-#define STM32_FLASHBITS		0x00000012
-
 struct NVIC {
   uint32_t ISER[8];
   uint32_t unused1[24];
@@ -90,182 +53,6 @@ nvic_enable_vector (uint32_t n, uint32_t prio)
   NVIC_ISER (n) = 1 << (n & 0x1F);
 }
 
-
-#define PERIPH_BASE	0x40000000
-#define APB2PERIPH_BASE	(PERIPH_BASE + 0x10000)
-#define AHBPERIPH_BASE	(PERIPH_BASE + 0x20000)
-
-struct RCC {
-  volatile uint32_t CR;
-  volatile uint32_t CFGR;
-  volatile uint32_t CIR;
-  volatile uint32_t APB2RSTR;
-  volatile uint32_t APB1RSTR;
-  volatile uint32_t AHBENR;
-  volatile uint32_t APB2ENR;
-  volatile uint32_t APB1ENR;
-  volatile uint32_t BDCR;
-  volatile uint32_t CSR;
-};
-
-#define RCC_BASE		(AHBPERIPH_BASE + 0x1000)
-static struct RCC *const RCC = ((struct RCC *const)RCC_BASE);
-
-#define RCC_APB1ENR_USBEN	0x00800000
-#define RCC_APB1RSTR_USBRST	0x00800000
-
-#define RCC_CR_HSION		0x00000001
-#define RCC_CR_HSIRDY		0x00000002
-#define RCC_CR_HSITRIM		0x000000F8
-#define RCC_CR_HSEON		0x00010000
-#define RCC_CR_HSERDY		0x00020000
-#define RCC_CR_PLLON		0x01000000
-#define RCC_CR_PLLRDY		0x02000000
-
-#define RCC_CFGR_SWS		0x0000000C
-#define RCC_CFGR_SWS_HSI	0x00000000
-
-#define RCC_AHBENR_CRCEN        0x0040
-
-struct FLASH {
-  volatile uint32_t ACR;
-  volatile uint32_t KEYR;
-  volatile uint32_t OPTKEYR;
-  volatile uint32_t SR;
-  volatile uint32_t CR;
-  volatile uint32_t AR;
-  volatile uint32_t RESERVED;
-  volatile uint32_t OBR;
-  volatile uint32_t WRPR;
-};
-
-#define FLASH_R_BASE	(AHBPERIPH_BASE + 0x2000)
-static struct FLASH *const FLASH = ((struct FLASH *const) FLASH_R_BASE);
-
-static void
-clock_init (void)
-{
-  /* HSI setup */
-  RCC->CR |= RCC_CR_HSION;
-  while (!(RCC->CR & RCC_CR_HSIRDY))
-    ;
-  RCC->CR &= RCC_CR_HSITRIM | RCC_CR_HSION;
-  RCC->CFGR = 0;
-  while ((RCC->CFGR & RCC_CFGR_SWS) != RCC_CFGR_SWS_HSI)
-    ;
-
-  /* HSE setup */
-  RCC->CR |= RCC_CR_HSEON;
-  while (!(RCC->CR & RCC_CR_HSERDY))
-    ;
-
-  /* PLL setup */
-  RCC->CFGR |= STM32_PLLMUL | STM32_PLLXTPRE | STM32_PLLSRC;
-  RCC->CR   |= RCC_CR_PLLON;
-  while (!(RCC->CR & RCC_CR_PLLRDY))
-    ;
-
-  /* Clock settings */
-  RCC->CFGR = STM32_MCOSEL | STM32_USBPRE | STM32_PLLMUL | STM32_PLLXTPRE
-    | STM32_PLLSRC | STM32_ADCPRE | STM32_PPRE2 | STM32_PPRE1 | STM32_HPRE;
-
-  /* Flash setup */
-  FLASH->ACR = STM32_FLASHBITS;
-
-  /* CRC */
-  RCC->AHBENR |= RCC_AHBENR_CRCEN;
-
-  /* Switching on the configured clock source. */
-  RCC->CFGR |= STM32_SW;
-  while ((RCC->CFGR & RCC_CFGR_SWS) != (STM32_SW << 2))
-    ;
-}
-
-#define RCC_APB2RSTR_AFIORST    0x00000001
-#define RCC_APB2RSTR_IOPARST	0x00000004
-#define RCC_APB2RSTR_IOPBRST	0x00000008
-#define RCC_APB2RSTR_IOPCRST	0x00000010
-#define RCC_APB2RSTR_IOPDRST	0x00000020
-
-#define RCC_APB2ENR_AFIOEN      0x00000001
-#define RCC_APB2ENR_IOPAEN	0x00000004
-#define RCC_APB2ENR_IOPBEN	0x00000008
-#define RCC_APB2ENR_IOPCEN	0x00000010
-#define RCC_APB2ENR_IOPDEN	0x00000020
-
-
-struct AFIO
-{
-  volatile uint32_t EVCR;
-  volatile uint32_t MAPR;
-  volatile uint32_t EXTICR[4];
-  uint32_t RESERVED0;
-  volatile uint32_t MAPR2;
-};
-
-#define AFIO_BASE 0x40010000
-static struct AFIO *const AFIO = (struct AFIO *const)AFIO_BASE;
-
-#define AFIO_MAPR_TIM3_REMAP_PARTIALREMAP 0x00000800
-#define AFIO_MAPR_SWJ_CFG_DISABLE         0x04000000
-
-
-struct GPIO {
-  volatile uint32_t CRL;
-  volatile uint32_t CRH;
-  volatile uint32_t IDR;
-  volatile uint32_t ODR;
-  volatile uint32_t BSRR;
-  volatile uint32_t BRR;
-  volatile uint32_t LCKR;
-};
-
-#define GPIOA_BASE	(APB2PERIPH_BASE + 0x0800)
-#define GPIOA		((struct GPIO *) GPIOA_BASE)
-#define GPIOB_BASE	(APB2PERIPH_BASE + 0x0C00)
-#define GPIOB		((struct GPIO *) GPIOB_BASE)
-#define GPIOC_BASE	(APB2PERIPH_BASE + 0x1000)
-#define GPIOC		((struct GPIO *) GPIOC_BASE)
-#define GPIOD_BASE	(APB2PERIPH_BASE + 0x1400)
-#define GPIOD		((struct GPIO *) GPIOD_BASE)
-#define GPIOE_BASE	(APB2PERIPH_BASE + 0x1800)
-#define GPIOE		((struct GPIO *) GPIOE_BASE)
-
-static struct GPIO *const GPIO_USB = ((struct GPIO *const) GPIO_USB_BASE);
-static struct GPIO *const GPIO_LED = ((struct GPIO *const) GPIO_LED_BASE);
-#ifdef GPIO_OTHER_BASE
-static struct GPIO *const GPIO_OTHER = ((struct GPIO *const) GPIO_OTHER_BASE);
-#endif
-
-static void
-gpio_init (void)
-{
-  /* Enable GPIO clock. */
-  RCC->APB2ENR |= RCC_APB2ENR_IOP_EN;
-  RCC->APB2RSTR = RCC_APB2RSTR_IOP_RST;
-  RCC->APB2RSTR = 0;
-
-#ifdef AFIO_MAPR_SOMETHING
-  AFIO->MAPR |= AFIO_MAPR_SOMETHING;
-#endif
-
-  GPIO_USB->ODR = VAL_GPIO_ODR;
-  GPIO_USB->CRH = VAL_GPIO_CRH;
-  GPIO_USB->CRL = VAL_GPIO_CRL;
-
-#if GPIO_USB_BASE != GPIO_LED_BASE
-  GPIO_LED->ODR = VAL_GPIO_LED_ODR;
-  GPIO_LED->CRH = VAL_GPIO_LED_CRH;
-  GPIO_LED->CRL = VAL_GPIO_LED_CRL;
-#endif
-
-#ifdef GPIO_OTHER_BASE
-  GPIO_OTHER->ODR = VAL_GPIO_OTHER_ODR;
-  GPIO_OTHER->CRH = VAL_GPIO_OTHER_CRH;
-  GPIO_OTHER->CRL = VAL_GPIO_OTHER_CRL;
-#endif
-}
-
 static void
 usb_cable_config (int enable)
 {
@@ -456,16 +243,19 @@ flash_check_blank (const uint8_t *p_start, size_t size)
   return 1;
 }
 
-extern uint8_t __flash_start__, __flash_end__;
+#define FLASH_START_ADDR 0x08000000 /* Fixed for all STM32F1.  */
+#define FLASH_OFFSET     0x1000     /* First pages are not-writable.  */
+#define FLASH_START      (FLASH_START_ADDR+FLASH_OFFSET)
+#define CHIP_ID_REG      ((uint32_t *)0xe0042000)
+#define FLASH_SIZE_REG   ((uint16_t *)0x1ffff7e0)
 
 static int
 flash_write (uint32_t dst_addr, const uint8_t *src, size_t len)
 {
   int status;
-  uint32_t flash_start = (uint32_t)&__flash_start__;
-  uint32_t flash_end = (uint32_t)&__flash_end__;
+  uint32_t flash_end = FLASH_START_ADDR + (*FLASH_SIZE_REG)*1024;
 
-  if (dst_addr < flash_start || dst_addr + len > flash_end)
+  if (dst_addr < FLASH_START || dst_addr + len > flash_end)
     return 0;
 
   while (len)
@@ -518,17 +308,21 @@ flash_protect (void)
 static void __attribute__((naked))
 flash_erase_all_and_exec (void (*entry)(void))
 {
-  uint32_t addr = (uint32_t)&__flash_start__;
-  uint32_t end = (uint32_t)&__flash_end__;
+  uint32_t addr = FLASH_START;
+  uint32_t end = FLASH_START_ADDR + (*FLASH_SIZE_REG)*1024;
+  uint32_t page_size = 1024;
   int r;
 
+  if (((*CHIP_ID_REG) & 0xfff) == 0x0414)
+    page_size = 2048;
+
   while (addr < end)
     {
       r = flash_erase_page (addr);
       if (r != 0)
 	break;
 
-      addr += FLASH_PAGE_SIZE;
+      addr += page_size;
     }
 
   if (addr >= end)
@@ -578,10 +372,13 @@ reset (void)
 {
   extern const unsigned long *FT0, *FT1, *FT2;
 
+  /*
+   * This code may not be at the start of flash ROM, because of DFU.
+   * So, we take the address from PC.
+   */
   asm volatile ("cpsid	i\n\t"		/* Mask all interrupts. */
-		"mov.w	r0, #0xed00\n\t" /* r0 = SCR */
-		"movt	r0, #0xe000\n\t"
-		"mov	r1, pc\n\t"	 /* r1 = (PC + 0x1000) & ~0x0fff */
+		"ldr	r0, 1f\n\t"     /* r0 = SCR */
+		"mov	r1, pc\n\t"	/* r1 = (PC + 0x1000) & ~0x0fff */
 		"mov	r2, #0x1000\n\t"
 		"add	r1, r1, r2\n\t"
 		"sub	r2, r2, #1\n\t"
@@ -590,7 +387,9 @@ reset (void)
 		"ldr	r0, [r1], #4\n\t"
 		"msr	MSP, r0\n\t"	/* Main (exception handler) stack. */
 		"ldr	r0, [r1]\n\t"	/* Reset handler.                  */
-		"bx	r0\n"
+		"bx	r0\n\t"
+		".align	2\n"
+	"1:	.word	0xe000ed00"
 		: /* no output */ : /* no input */ : "memory");
 
   /* Never reach here. */
@@ -623,7 +422,13 @@ handler vector[] __attribute__ ((section(".vectors"))) = {
 
 const uint8_t sys_version[8] __attribute__((section(".sys.version"))) = {
   3*2+2,	     /* bLength */
-  0x03,		     /* bDescriptorType = USB_STRING_DESCRIPTOR_TYPE*/
-  /* sys version: "2.0" */
-  '2', 0, '.', 0, '0', 0,
+  0x03,		     /* bDescriptorType = USB_STRING_DESCRIPTOR_TYPE */
+  /* sys version: "2.1" */
+  '2', 0, '.', 0, '1', 0,
 };
+
+const uint32_t __attribute__((section(".sys.board_id")))
+sys_board_id = BOARD_ID;
+
+const uint8_t __attribute__((section(".sys.board_name")))
+sys_board_name[] = BOARD_NAME;

src/sys.h

@@ -1,4 +1,18 @@
+#define BOARD_ID_CQ_STARM          0xc5480875
+#define BOARD_ID_FST_01_00         0x613870a9
+#define BOARD_ID_FST_01            0x696886af
+#define BOARD_ID_MAPLE_MINI        0x7a445272
+#define BOARD_ID_OLIMEX_STM32_H103 0xf92bb594
+#define BOARD_ID_STBEE_MINI        0x1f341961
+#define BOARD_ID_STBEE             0x945c37e8
+#define BOARD_ID_STM32_PRIMER2     0x21e5798d
+#define BOARD_ID_STM8S_DISCOVERY   0x2f0976bb
+#define BOARD_ID_ST_DONGLE         0x2cd4e471
+#define BOARD_ID_ST_NUCLEO_F103    0x9b87c16d
+
 extern const uint8_t sys_version[8];
+extern const uint32_t sys_board_id;
+extern const uint8_t sys_board_name[];
 
 typedef void (*handler)(void);
 extern handler vector[16];

src/usb-icc.c

@@ -1,7 +1,8 @@
 /*
  * usb-icc.c -- USB CCID protocol handling
  *
- * Copyright (C) 2010, 2011, 2012, 2013 Free Software Initiative of Japan
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014
+ *               Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -138,6 +139,7 @@ static uint8_t icc_buffer[USB_BUF_SIZE];
 #define ICC_SLOT_STATUS		0x65 /* non-ICCD command */
 #define ICC_SECURE		0x69 /* non-ICCD command */
 #define ICC_GET_PARAMS		0x6C /* non-ICCD command */
+#define ICC_RESET_PARAMS	0x6D /* non-ICCD command */
 #define ICC_XFR_BLOCK		0x6F
 #define ICC_DATA_BLOCK_RET	0x80
 #define ICC_SLOT_STATUS_RET	0x81 /* non-ICCD result */
@@ -252,7 +254,7 @@ static void ccid_init (struct ccid *c, struct ep_in *epi, struct ep_out *epo,
 {
   icc_state_p = &c->icc_state;
 
-  c->icc_state = ICC_STATE_START;
+  c->icc_state = ICC_STATE_NOCARD;
   c->state = APDU_STATE_WAIT_COMMAND;
   /*
    * Note: a is not yet initialized yet, we can't use c->a->cmd_apdu_data here.
@@ -467,21 +469,18 @@ static int end_cmd_apdu_head (struct ep_out *epo, size_t orig_len)
     }
 
   if (epo->cnt == 4)
-    {
-      /* No Lc and Le */
-      c->a->cmd_apdu_data_len = 0;
-      c->a->expected_res_size = 0;
-    }
+    /* No Lc and Le */
+    c->a->expected_res_size = 0;
   else if (epo->cnt == 5)
     {
       /* No Lc but Le */
-      c->a->cmd_apdu_data_len = 0;
       c->a->expected_res_size = c->a->cmd_apdu_head[4];
       if (c->a->expected_res_size == 0)
 	c->a->expected_res_size = 256;
       c->a->cmd_apdu_head[4] = 0;
     }
 
+  c->a->cmd_apdu_data_len = 0;
   return 0;
 }
 
@@ -516,6 +515,8 @@ static int end_cmd_apdu_data (struct ep_out *epo, size_t orig_len)
     {
       /* it has Le field*/
       c->a->expected_res_size = epo->buf[-1];
+      if (c->a->expected_res_size == 0)
+	c->a->expected_res_size = 256;
       len--;
     }
   else
@@ -1178,7 +1179,8 @@ icc_handle_data (struct ccid *c)
 	    }
 	}
       else if (c->icc_header.msg_type == ICC_SET_PARAMS
-	       || c->icc_header.msg_type == ICC_GET_PARAMS)
+	       || c->icc_header.msg_type == ICC_GET_PARAMS
+	       || c->icc_header.msg_type == ICC_RESET_PARAMS)
 	icc_send_params (c);
       else if (c->icc_header.msg_type == ICC_SECURE)
 	{
@@ -1297,6 +1299,8 @@ icc_handle_timeout (struct ccid *c)
   return next_state;
 }
 
+static struct ccid ccid;
+
 /*
  * Another Tx done callback
  */
@@ -1308,8 +1312,6 @@ EP2_IN_Callback (void)
 
 #define USB_ICC_TIMEOUT (1950*1000)
 
-static struct ccid ccid;
-
 #define GPG_THREAD_TERMINATED 0xffff
 
 static void *ccid_thread (chopstx_t) __attribute__ ((noinline));
@@ -1336,6 +1338,8 @@ ccid_card_change_signal (int how)
 }
 
 
+#define NOTIFY_SLOT_CHANGE 0x50
+
 static void * __attribute__ ((noinline))
 ccid_thread (chopstx_t thd)
 {
@@ -1343,7 +1347,9 @@ ccid_thread (chopstx_t thd)
   struct ep_out *epo = &endpoint_out;
   struct ccid *c = &ccid;
   struct apdu *a = &apdu;
-  int card_change_requested = 0;
+  uint8_t int_msg[2];
+
+  int_msg[0] = NOTIFY_SLOT_CHANGE;
 
   epi_init (epi, ENDP1, notify_tx, c);
   epo_init (epo, ENDP1, notify_icc, c);
@@ -1359,34 +1365,26 @@ ccid_thread (chopstx_t thd)
 
       if (m == EV_CARD_CHANGE)
 	{
-	  if (card_change_requested)
-	    {
-	      uint8_t notify_slot_change[2] = { 0x50, 0x02 };
-
-	      led_blink (LED_TWOSHOTS);
-
-	      if (c->icc_state == ICC_STATE_NOCARD)
-		{		/* Inserted!  */
-		  c->icc_state = ICC_STATE_START;
-		  notify_slot_change[1] |= 1;
-		}
-	      else
-		{
-		  if (c->application)
-		    {
-		      eventflag_signal (&c->openpgp_comm, EV_EXIT);
-		      chopstx_join (c->application, NULL);
-		      c->application = 0;
-		    }
-
-		  c->icc_state = ICC_STATE_NOCARD;
-		}
-
-	      card_change_requested = 0;
-	      usb_lld_write (ENDP2, notify_slot_change, 2);
+	  if (c->icc_state == ICC_STATE_NOCARD)
+	    { /* Inserted!  */
+	      c->icc_state = ICC_STATE_START;
+	      int_msg[1] = 0x03;
 	    }
 	  else
-	    card_change_requested = 1;
+	    { /* Removed!  */
+	      if (c->application)
+		{
+		  eventflag_signal (&c->openpgp_comm, EV_EXIT);
+		  chopstx_join (c->application, NULL);
+		  c->application = 0;
+		}
+
+	      c->icc_state = ICC_STATE_NOCARD;
+	      int_msg[1] = 0x02;
+	    }
+
+	  usb_lld_write (ENDP2, int_msg, sizeof int_msg);
+	  led_blink (LED_TWOSHOTS);
 	}
       else if (m == EV_RX_DATA_READY)
 	c->icc_state = icc_handle_data (c);
@@ -1444,10 +1442,7 @@ ccid_thread (chopstx_t thd)
 	    icc_prepare_receive (c);
 	}
       else			/* Timeout */
-	{
-	  c->icc_state = icc_handle_timeout (c);
-	  card_change_requested = 0;
-	}
+	c->icc_state = icc_handle_timeout (c);
     }
 
   if (c->application)

src/usb-msc.c

@@ -1,7 +1,8 @@
 /*
  * usb-msc.c -- USB Mass Storage Class protocol handling
  *
- * Copyright (C) 2011, 2012, 2013 Free Software Initiative of Japan
+ * Copyright (C) 2011, 2012, 2013, 2015
+ *               Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -170,11 +171,13 @@ EP6_OUT_Callback (void)
 }
 
 static const uint8_t scsi_inquiry_data_00[] = { 0, 0, 0, 0, 0 };
+static const uint8_t scsi_inquiry_data_83[] = { 0, 0x83, 0, 0 };
+
 
 static const uint8_t scsi_inquiry_data[] = {
   0x00,				/* Direct Access Device.      */
   0x80,				/* RMB = 1: Removable Medium. */
-  0x05,				/* Version: SPC-3.            */
+  0x00,				/* Version: not claim conformance.  */
   0x02,				/* Response format: SPC-3.    */
   36 - 4,			/* Additional Length.         */
   0x00,
@@ -330,6 +333,11 @@ msc_handle_command (void)
 
   CSW.dCSWTag = CBW.dCBWTag;
   switch (CBW.CBWCB[0]) {
+  case SCSI_REPORT_LUN:
+    buf[0]  = buf[1] = buf[2] = buf[3] = 0;
+    buf[4]  = buf[5] = buf[6] = buf[7] = 0;
+    msc_send_result (buf, 8);
+    goto done;
   case SCSI_REQUEST_SENSE:
     if (CBW.CBWCB[1] & 0x01) /* DESC */
       msc_send_result ((uint8_t *)&scsi_sense_data_desc,
@@ -345,10 +353,18 @@ msc_handle_command (void)
       }
     goto done;
   case SCSI_INQUIRY:
-    if (CBW.CBWCB[1] & 0x01) /* EVPD */
-      /* assume page 00 */
-      msc_send_result ((uint8_t *)&scsi_inquiry_data_00,
-		       sizeof scsi_inquiry_data_00);
+    if (CBW.CBWCB[1] & 0x01)
+      /* EVPD */
+      {
+	if (CBW.CBWCB[2] == 0x83)
+	  /* Handle the case Page Code 0x83 */
+	  msc_send_result ((uint8_t *)&scsi_inquiry_data_83,
+			   sizeof scsi_inquiry_data_83);
+	else
+	  /* Otherwise, assume page 00 */
+	  msc_send_result ((uint8_t *)&scsi_inquiry_data_00,
+			   sizeof scsi_inquiry_data_00);
+      }
     else
       msc_send_result ((uint8_t *)&scsi_inquiry_data,
 		       sizeof scsi_inquiry_data);
@@ -462,6 +478,7 @@ msc_handle_command (void)
 		  if (CBW.CBWCB[8]-- == 0)
 		    CBW.CBWCB[7]--;
 		  CSW.dCSWDataResidue += 512;
+		  lba++;
 		}
 	      else
 		{
@@ -507,6 +524,7 @@ msc_handle_command (void)
 		  if (CBW.CBWCB[8]-- == 0)
 		    CBW.CBWCB[7]--;
 		  CSW.dCSWDataResidue -= 512;
+		  lba++;
 		}
 	      else
 		{

src/usb_conf.h

@@ -3,7 +3,29 @@
 #ifndef __USB_CONF_H
 #define __USB_CONF_H
 
-#define NUM_STRING_DESC 7
+#define ICC_NUM_INTERFACES 1
+#define ICC_INTERFACE 0
+#ifdef HID_CARD_CHANGE_SUPPORT
+#define HID_NUM_INTERFACES 1
+#define HID_INTERFACE 1
+#else
+#define HID_NUM_INTERFACES 0
+#endif
+#ifdef ENABLE_VIRTUAL_COM_PORT
+#define VCOM_NUM_INTERFACES 2
+#define VCOM_INTERFACE_0 (ICC_NUM_INTERFACES + HID_NUM_INTERFACES)
+#define VCOM_INTERFACE_1 (ICC_NUM_INTERFACES + HID_NUM_INTERFACES + 1)
+#else
+#define VCOM_NUM_INTERFACES 0
+#endif
+#ifdef PINPAD_DND_SUPPORT
+#define MSC_NUM_INTERFACES 1
+#define MSC_INTERFACE (ICC_NUM_INTERFACES + HID_NUM_INTERFACES + VCOM_NUM_INTERFACES)
+#else
+#define MSC_NUM_INTERFACES 0
+#endif
+#define NUM_INTERFACES (ICC_NUM_INTERFACES + HID_NUM_INTERFACES \
+			+ VCOM_NUM_INTERFACES + MSC_NUM_INTERFACES)
 
 #if defined(USB_SELF_POWERED)
 #define USB_INITIAL_FEATURE 0xC0   /* bmAttributes: self powered */

src/usb_ctrl.c

@@ -58,15 +58,12 @@ static struct line_coding line_coding = {
 };
 
 static int
-vcom_port_data_setup (uint8_t req, uint8_t req_no, uint16_t value)
+vcom_port_data_setup (uint8_t req, uint8_t req_no, struct control_info *detail)
 {
   if (USB_SETUP_GET (req))
     {
       if (req_no == USB_CDC_REQ_GET_LINE_CODING)
-	{
-	  usb_lld_set_data_to_send (&line_coding, sizeof(line_coding));
-	  return USB_SUCCESS;
-	}
+	return usb_lld_reply_request (&line_coding, sizeof(line_coding), detail);
     }
   else  /* USB_SETUP_SET (req) */
     {
@@ -79,7 +76,7 @@ vcom_port_data_setup (uint8_t req, uint8_t req_no, uint16_t value)
 	{
 	  uint8_t connected_saved = stdout.connected;
 
-	  if (value != 0)
+	  if (detail->value != 0)
 	    {
 	      if (stdout.connected == 0)
 		/* It's Open call */
@@ -103,22 +100,12 @@ vcom_port_data_setup (uint8_t req, uint8_t req_no, uint16_t value)
 
   return USB_UNSUPPORT;
 }
-
-#define VCOM_NUM_INTERFACES 2
-#else
-#define VCOM_NUM_INTERFACES 0
 #endif
 
 #ifdef PINPAD_DND_SUPPORT
 #include "usb-msc.h"
-#define MSC_NUM_INTERFACES 1
-#else
-#define MSC_NUM_INTERFACES 0
 #endif
 
-#define NUM_INTERFACES (2+VCOM_NUM_INTERFACES+MSC_NUM_INTERFACES)
-#define MSC_INTERFACE_NO (2+VCOM_NUM_INTERFACES)
-
 uint32_t bDeviceState = UNCONNECTED; /* USB device status */
 
 #define USB_HID_REQ_GET_REPORT   1
@@ -142,7 +129,7 @@ static uint16_t hid_report;
 static void
 gnuk_setup_endpoints_for_interface (uint16_t interface, int stop)
 {
-  if (interface == 0)
+  if (interface == ICC_INTERFACE)
     {
       if (!stop)
 	{
@@ -158,7 +145,7 @@ gnuk_setup_endpoints_for_interface (uint16_t interface, int stop)
 	}
     }
 #ifdef HID_CARD_CHANGE_SUPPORT
-  else if (interface == 1)
+  else if (interface == HID_INTERFACE)
     {
       if (!stop)
 	usb_lld_setup_endpoint (ENDP7, EP_INTERRUPT, 0, 0, ENDP7_TXADDR, 0);
@@ -167,14 +154,14 @@ gnuk_setup_endpoints_for_interface (uint16_t interface, int stop)
     }
 #endif
 #ifdef ENABLE_VIRTUAL_COM_PORT
-  else if (interface == 2)
+  else if (interface == VCOM_INTERFACE_0)
     {
       if (!stop)
 	usb_lld_setup_endpoint (ENDP4, EP_INTERRUPT, 0, 0, ENDP4_TXADDR, 0);
       else
 	usb_lld_stall_tx (ENDP4);
     }
-  else if (interface == 3)
+  else if (interface == VCOM_INTERFACE_1)
     {
       if (!stop)
 	{
@@ -190,7 +177,7 @@ gnuk_setup_endpoints_for_interface (uint16_t interface, int stop)
     }
 #endif
 #ifdef PINPAD_DND_SUPPORT
-  else if (interface == MSC_INTERFACE_NO)
+  else if (interface == MSC_INTERFACE)
     {
       if (!stop)
 	usb_lld_setup_endpoint (ENDP6, EP_BULK, 0,
@@ -231,8 +218,7 @@ usb_cb_device_reset (void)
 #define USB_CCID_REQ_GET_CLOCK_FREQUENCIES	0x02
 #define USB_CCID_REQ_GET_DATA_RATES		0x03
 
-static const uint8_t freq_table[] = { 0xf3, 0x0d, 0, 0, }; /* dwDefaultClock */
-
+static const uint8_t freq_table[] = { 0xa0, 0x0f, 0, 0, }; /* dwDefaultClock */
 static const uint8_t data_rate_table[] = { 0x80, 0x25, 0, 0, }; /* dwDataRate */
 
 #if defined(PINPAD_DND_SUPPORT)
@@ -273,8 +259,7 @@ static int download_check_crc32 (const uint32_t *end_p)
 }
 
 int
-usb_cb_setup (uint8_t req, uint8_t req_no,
-	      uint16_t value, uint16_t index, uint16_t len)
+usb_cb_setup (uint8_t req, uint8_t req_no, struct control_info *detail)
 {
   uint8_t type_rcp = req & (REQUEST_TYPE|RECIPIENT);
 
@@ -283,30 +268,27 @@ usb_cb_setup (uint8_t req, uint8_t req_no,
       if (USB_SETUP_GET (req))
 	{
 	  if (req_no == USB_FSIJ_GNUK_MEMINFO)
-	    {
-	      usb_lld_set_data_to_send (mem_info, sizeof (mem_info));
-	      return USB_SUCCESS;
-	    }
+	    return usb_lld_reply_request (mem_info, sizeof (mem_info), detail);
 	}
       else /* SETUP_SET */
 	{
-	  uint8_t *addr = (uint8_t *)(0x20000000 + value * 0x100 + index);
+	  uint8_t *addr = (uint8_t *)(0x20000000 + detail->value * 0x100 + detail->index);
 
 	  if (req_no == USB_FSIJ_GNUK_DOWNLOAD)
 	    {
 	      if (icc_state_p == NULL || *icc_state_p != ICC_STATE_EXITED)
 		return USB_UNSUPPORT;
 
-	      if (addr < &_regnual_start || addr + len > __heap_end__)
+	      if (addr < &_regnual_start || addr + detail->len > __heap_end__)
 		return USB_UNSUPPORT;
 
-	      if (index + len < 256)
-		memset (addr + index + len, 0, 256 - (index + len));
+	      if (detail->index + detail->len < 256)
+		memset (addr + detail->index + detail->len, 0, 256 - (detail->index + detail->len));
 
-	      usb_lld_set_data_to_recv (addr, len);
+	      usb_lld_set_data_to_recv (addr, detail->len);
 	      return USB_SUCCESS;
 	    }
-	  else if (req_no == USB_FSIJ_GNUK_EXEC && len == 0)
+	  else if (req_no == USB_FSIJ_GNUK_EXEC && detail->len == 0)
 	    {
 	      if (icc_state_p == NULL || *icc_state_p != ICC_STATE_EXITED)
 		return USB_UNSUPPORT;
@@ -316,33 +298,28 @@ usb_cb_setup (uint8_t req, uint8_t req_no,
 
 	      return download_check_crc32 ((uint32_t *)addr);
 	    }
-	  else if (req_no == USB_FSIJ_GNUK_CARD_CHANGE && len == 0)
+	  else if (req_no == USB_FSIJ_GNUK_CARD_CHANGE && detail->len == 0)
 	    {
-	      if (value != 0 && value != 1 && value != 2)
+	      if (detail->value != 0 && detail->value != 1 && detail->value != 2)
 		return USB_UNSUPPORT;
 
-	      ccid_card_change_signal (value);
+	      ccid_card_change_signal (detail->value);
 	      return USB_SUCCESS;
 	    }
 	}
     }
   else if (type_rcp == (CLASS_REQUEST | INTERFACE_RECIPIENT))
     {
-      if (index == 0)
+      if (detail->index == ICC_INTERFACE)
 	{
 	  if (USB_SETUP_GET (req))
 	    {
 	      if (req_no == USB_CCID_REQ_GET_CLOCK_FREQUENCIES)
-		{
-		  usb_lld_set_data_to_send (freq_table, sizeof (freq_table));
-		  return USB_SUCCESS;
-		}
+		return usb_lld_reply_request (freq_table, sizeof (freq_table),
+					      detail);
 	      else if (req_no == USB_CCID_REQ_GET_DATA_RATES)
-		{
-		  usb_lld_set_data_to_send (data_rate_table,
-					    sizeof (data_rate_table));
-		  return USB_SUCCESS;
-		}
+		return usb_lld_reply_request (data_rate_table,
+					      sizeof (data_rate_table), detail);
 	    }
 	  else
 	    {
@@ -353,26 +330,24 @@ usb_cb_setup (uint8_t req, uint8_t req_no,
 	    }
 	}
 #ifdef HID_CARD_CHANGE_SUPPORT
-      else if (index == 1)
+      else if (index == HID_INTERFACE)
 	{
 	  switch (req_no)
 	    {
 	    case USB_HID_REQ_GET_IDLE:
-	      usb_lld_set_data_to_send (&hid_idle_rate, 1);
-	      return USB_SUCCESS;
+	      return usb_lld_reply_request (&hid_idle_rate, 1, detail);
 	    case USB_HID_REQ_SET_IDLE:
-	      usb_lld_set_data_to_recv (&hid_idle_rate, 1);
+	      usb_lld_set_data_to_recv (&hid_idle_rate, 1, detail);
 	      return USB_SUCCESS;
 
 	    case USB_HID_REQ_GET_REPORT:
 	      /* Request of LED status and key press */
-	      usb_lld_set_data_to_send (&hid_report, 2);
-	      return USB_SUCCESS;
+	      return usb_lld_reply_request (&hid_report, 2, detail);
 
 	    case USB_HID_REQ_SET_REPORT:
 	      /* Received LED set request */
-	      if (len == 1)
-		usb_lld_set_data_to_recv (&hid_report, len);
+	      if (detail->len == 1)
+		usb_lld_set_data_to_recv (&hid_report, detail->len);
 	      return USB_SUCCESS;
 
 	    case USB_HID_REQ_GET_PROTOCOL:
@@ -386,19 +361,17 @@ usb_cb_setup (uint8_t req, uint8_t req_no,
 	}
 #endif
 #ifdef ENABLE_VIRTUAL_COM_PORT
-      else if (index == 2)
-	return vcom_port_data_setup (req, req_no, value);
+      else if (index == VCOM_INTERFACE_0)
+	return vcom_port_data_setup (req, req_no, detail);
 #endif
 #ifdef PINPAD_DND_SUPPORT
-      else if (index == MSC_INTERFACE_NO)
+      else if (index == MSC_INTERFACE)
 	{
 	  if (USB_SETUP_GET (req))
 	    {
 	      if (req_no == MSC_GET_MAX_LUN_COMMAND)
-		{
-		  usb_lld_set_data_to_send (lun_table, sizeof (lun_table));
-		  return USB_SUCCESS;
-		}
+		return usb_lld_reply_request (lun_table, sizeof (lun_table),
+					      detail);
 	    }
 	  else
 	    if (req_no == MSC_MASS_STORAGE_RESET_COMMAND)
@@ -413,14 +386,13 @@ usb_cb_setup (uint8_t req, uint8_t req_no,
 
 
 void
-usb_cb_ctrl_write_finish (uint8_t req, uint8_t req_no, uint16_t value,
-			  uint16_t index, uint16_t len)
+usb_cb_ctrl_write_finish (uint8_t req, uint8_t req_no, uint16_t value)
 {
   uint8_t type_rcp = req & (REQUEST_TYPE|RECIPIENT);
 
   if (type_rcp == (VENDOR_REQUEST | DEVICE_RECIPIENT))
     {
-      if (USB_SETUP_SET (req) && req_no == USB_FSIJ_GNUK_EXEC && len == 0)
+      if (USB_SETUP_SET (req) && req_no == USB_FSIJ_GNUK_EXEC)
 	{
 	  if (icc_state_p == NULL || *icc_state_p != ICC_STATE_EXITED)
 	    return;
@@ -433,7 +405,7 @@ usb_cb_ctrl_write_finish (uint8_t req, uint8_t req_no, uint16_t value,
 #ifdef HID_CARD_CHANGE_SUPPORT
   else if (type_rcp == (CLASS_REQUEST | INTERFACE_RECIPIENT))
     {
-      if (index == 1 && req_no == USB_HID_REQ_SET_REPORT)
+      if (index == HID_INTERFACE && req_no == USB_HID_REQ_SET_REPORT)
 	{
 	  if ((hid_report ^ hid_report_saved) & HID_LED_STATUS_CARDCHANGE)
 	    ccid_card_change_signal (CARD_CHANGE_TOGGLE);
@@ -465,6 +437,7 @@ int usb_cb_handle_event (uint8_t event_type, uint16_t value)
 	  usb_lld_set_configuration (value);
 	  for (i = 0; i < NUM_INTERFACES; i++)
 	    gnuk_setup_endpoints_for_interface (i, 0);
+	  ccid_card_change_signal (CCID_CARD_INIT);
 	  bDeviceState = CONFIGURED;
 	}
       else if (current_conf != value)
@@ -486,9 +459,11 @@ int usb_cb_handle_event (uint8_t event_type, uint16_t value)
   return USB_UNSUPPORT;
 }
 
-int usb_cb_interface (uint8_t cmd, uint16_t interface, uint16_t alt)
+int usb_cb_interface (uint8_t cmd, struct control_info *detail)
 {
-  static const uint8_t zero = 0;
+  const uint8_t zero = 0;
+  uint16_t interface = detail->index;
+  uint16_t alt = detail->value;
 
   if (interface >= NUM_INTERFACES)
     return USB_UNSUPPORT;
@@ -505,11 +480,10 @@ int usb_cb_interface (uint8_t cmd, uint16_t interface, uint16_t alt)
 	}
 
     case USB_GET_INTERFACE:
-      usb_lld_set_data_to_send (&zero, 1);
-      return USB_SUCCESS;
+      return usb_lld_reply_request (&zero, 1, detail);
 
-    default:
     case USB_QUERY_INTERFACE:
+    default:
       return USB_SUCCESS;
     }
 }

src/usb_desc.c

@@ -59,7 +59,7 @@ static const uint8_t hid_report_desc[] = {
 #define USB_ICC_DATA_SIZE 64
 
 /* USB Standard Device Descriptor */
-static const uint8_t gnukDeviceDescriptor[] = {
+static const uint8_t device_desc[] = {
   18,   /* bLength */
   USB_DEVICE_DESCRIPTOR_TYPE,     /* bDescriptorType */
   0x10, 0x01,   /* bcdUSB = 1.1 */
@@ -75,41 +75,31 @@ static const uint8_t gnukDeviceDescriptor[] = {
 };
 
 #define ICC_TOTAL_LENGTH (9+9+54+7+7+7)
-#define ICC_NUM_INTERFACES 1
 
 #ifdef HID_CARD_CHANGE_SUPPORT
 #define HID_TOTAL_LENGTH (9+9+7)
-#define HID_NUM_INTERFACES 1
 #else
 #define HID_TOTAL_LENGTH   0
-#define HID_NUM_INTERFACES 0
 #endif
 
 #ifdef ENABLE_VIRTUAL_COM_PORT
 #define VCOM_TOTAL_LENGTH (9+5+5+4+5+7+9+7+7)
-#define VCOM_NUM_INTERFACES 2
 #else
 #define VCOM_TOTAL_LENGTH   0
-#define VCOM_NUM_INTERFACES 0
 #endif
 
 #ifdef PINPAD_DND_SUPPORT
 #define MSC_TOTAL_LENGTH (9+7+7)
-#define MSC_NUM_INTERFACES 1
 #else
 #define MSC_TOTAL_LENGTH   0
-#define MSC_NUM_INTERFACES 0
 #endif
 
 #define W_TOTAL_LENGTH (ICC_TOTAL_LENGTH + HID_TOTAL_LENGTH     \
 			+ VCOM_TOTAL_LENGTH + MSC_TOTAL_LENGTH)
-#define NUM_INTERFACES (ICC_NUM_INTERFACES + HID_NUM_INTERFACES \
-			+ VCOM_NUM_INTERFACES + MSC_NUM_INTERFACES)
-
 
 
 /* Configuation Descriptor */
-static const uint8_t gnukConfigDescriptor[] = {
+static const uint8_t config_desc[] = {
   9,			   /* bLength: Configuation Descriptor size */
   USB_CONFIGURATION_DESCRIPTOR_TYPE,      /* bDescriptorType: Configuration */
   W_TOTAL_LENGTH, 0x00,   /* wTotalLength:no of returned bytes */
@@ -122,7 +112,7 @@ static const uint8_t gnukConfigDescriptor[] = {
   /* Interface Descriptor */
   9,			         /* bLength: Interface Descriptor size */
   USB_INTERFACE_DESCRIPTOR_TYPE, /* bDescriptorType: Interface */
-  0,			         /* bInterfaceNumber: Index of this interface */
+  ICC_INTERFACE,	         /* bInterfaceNumber: Index of this interface */
   0,			         /* Alternate setting for this interface */
   3,			         /* bNumEndpoints: Bulk-IN, Bulk-OUT, Intr-IN */
   USB_ICC_INTERFACE_CLASS,
@@ -135,42 +125,36 @@ static const uint8_t gnukConfigDescriptor[] = {
   0x21,			  /* bDescriptorType: USBDESCR_ICC */
   0x10, 0x01,		  /* bcdCCID: revision 1.1 (of CCID) */
   0,			  /* bMaxSlotIndex: */
-  1,			  /* bVoltageSupport: FIXED VALUE */
+  1,			  /* bVoltageSupport: 5V-only */
   0x02, 0, 0, 0,	  /* dwProtocols: T=1 */
-  0xf3, 0x0d, 0, 0,	  /* dwDefaultClock: 3571 (non-ICCD): 3580 (ICCD) */
-  0xf3, 0x0d, 0, 0,	  /* dwMaximumClock: 3571 (non-ICCD): 3580 (ICCD) */
-  1,			  /* bNumClockSupported: FIXED VALUE */
-  0x80, 0x25, 0, 0,	  /* dwDataRate: 9600: FIXED VALUE */
-  0x80, 0x25, 0, 0,	  /* dwMaxDataRate: 9600: FIXED VALUE */
-  1,			  /* bNumDataRateSupported: FIXED VALUE */
+  0xa0, 0x0f, 0, 0,	  /* dwDefaultClock: 4000 */
+  0xa0, 0x0f, 0, 0,	  /* dwMaximumClock: 4000 */
+  0,			  /* bNumClockSupported: 0x00 */
+  0x80, 0x25, 0, 0,	  /* dwDataRate: 9600 */
+  0x80, 0x25, 0, 0,	  /* dwMaxDataRate: 9600 */
+  0,			  /* bNumDataRateSupported: 0x00 */
   0xfe, 0, 0, 0,	  /* dwMaxIFSD: 254 */
-  0, 0, 0, 0,		  /* dwSynchProtocols: FIXED VALUE */
-  0, 0, 0, 0,		  /* dwMechanical: FIXED VALUE */
-  /*
-   * According to Specification for USB ICCD (revision 1.0),
-   * dwFeatures should be 0x00040840.
-   *
-   * It is different now for better interaction to GPG's in-stock
-   * ccid-driver.
-   */
-  0x42, 0x08, 0x02, 0x00, /* dwFeatures (not ICCD):
-			   *  Short APDU level             : 0x20000 *
-			   *  (what? means ICCD?)          : 0x00800 *
-			   *  Automatic IFSD               : 0x00400
+  0, 0, 0, 0,		  /* dwSynchProtocols: 0 */
+  0, 0, 0, 0,		  /* dwMechanical: 0 */
+  0x7a, 0x04, 0x02, 0x00, /* dwFeatures:
+			   *  Short and extended APDU level: 0x40000 ----
+			   *  Short APDU level             : 0x20000  *
+			   *  (ICCD?)                      : 0x00800 ----
+			   *  Automatic IFSD               : 0x00400   *
 			   *  NAD value other than 0x00    : 0x00200
 			   *  Can set ICC in clock stop    : 0x00100
 			   *  Automatic PPS CUR            : 0x00080
 			   *  Automatic PPS PROP           : 0x00040 *
-			   *  Auto baud rate change	   : 0x00020
-			   *  Auto clock change		   : 0x00010
-			   *  Auto voltage selection	   : 0x00008
+			   *  Auto baud rate change	   : 0x00020   *
+			   *  Auto clock change		   : 0x00010   *
+			   *  Auto voltage selection	   : 0x00008   *
 			   *  Auto activaction of ICC	   : 0x00004
-			   *  Automatic conf. based on ATR : 0x00002  g
+			   *  Automatic conf. based on ATR : 0x00002  *
 			   */
   0x0f, 0x01, 0, 0,	  /* dwMaxCCIDMessageLength: 271 */
-  0xff,			  /* bClassGetResponse: */
-  0xff,			  /* bClassEnvelope: */
-  0, 0,			  /* wLCDLayout: FIXED VALUE */
+  0xff,			  /* bClassGetResponse: 0xff */
+  0x00,			  /* bClassEnvelope: 0 */
+  0, 0,			  /* wLCDLayout: 0 */
 #if defined(PINPAD_SUPPORT)
 #if defined(PINPAD_CIR_SUPPORT) || defined(PINPAD_DND_SUPPORT)
   1,			  /* bPinSupport: with PIN pad (verify) */
@@ -200,14 +184,14 @@ static const uint8_t gnukConfigDescriptor[] = {
   USB_ENDPOINT_DESCRIPTOR_TYPE,	/* bDescriptorType: Endpoint */
   0x82,				/* bEndpointAddress: (IN2) */
   0x03,				/* bmAttributes: Interrupt */
-  4, 0x00,			/* wMaxPacketSize: */
+  0x04, 0x00,			/* wMaxPacketSize: 4 */
   0xFF,				/* bInterval (255ms) */
 
 #ifdef HID_CARD_CHANGE_SUPPORT
   /* Interface Descriptor */
   9,			         /* bLength: Interface Descriptor size */
   USB_INTERFACE_DESCRIPTOR_TYPE, /* bDescriptorType: Interface */
-  0x01,		  /* bInterfaceNumber: Number of Interface */
+  HID_INTERFACE,  /* bInterfaceNumber: Number of Interface */
   0x00,		  /* bAlternateSetting: Alternate setting */
   0x01,		  /* bNumEndpoints: One endpoint used */
   0x03,		  /* bInterfaceClass: HID */
@@ -236,7 +220,7 @@ static const uint8_t gnukConfigDescriptor[] = {
   /* Interface Descriptor */
   9,			      /* bLength: Interface Descriptor size */
   USB_INTERFACE_DESCRIPTOR_TYPE, /* bDescriptorType: Interface */
-  0x02,		  /* bInterfaceNumber: Number of Interface */
+  VCOM_INTERFACE_0,	 /* bInterfaceNumber: Index of Interface */
   0x00,		  /* bAlternateSetting: Alternate setting */
   0x01,		  /* bNumEndpoints: One endpoints used */
   0x02,		  /* bInterfaceClass: Communication Interface Class */
@@ -247,14 +231,13 @@ static const uint8_t gnukConfigDescriptor[] = {
   5,			    /* bLength: Endpoint Descriptor size */
   0x24,			    /* bDescriptorType: CS_INTERFACE */
   0x00,			    /* bDescriptorSubtype: Header Func Desc */
-  0x10,			    /* bcdCDC: spec release number */
-  0x01,
+  0x10, 0x01,		    /* bcdCDC: spec release number */
   /*Call Managment Functional Descriptor*/
   5,	    /* bFunctionLength */
   0x24,	    /* bDescriptorType: CS_INTERFACE */
   0x01,	    /* bDescriptorSubtype: Call Management Func Desc */
   0x03,	    /* bmCapabilities: D0+D1 */
-  0x02,	    /* bDataInterface: 2 */
+  VCOM_INTERFACE_1,	    /* bDataInterface */
   /*ACM Functional Descriptor*/
   4,	    /* bFunctionLength */
   0x24,	    /* bDescriptorType: CS_INTERFACE */
@@ -264,8 +247,8 @@ static const uint8_t gnukConfigDescriptor[] = {
   5,		 /* bFunctionLength */
   0x24,		 /* bDescriptorType: CS_INTERFACE */
   0x06,		 /* bDescriptorSubtype: Union func desc */
-  0x01,		 /* bMasterInterface: Communication class interface */
-  0x02,		 /* bSlaveInterface0: Data Class Interface */
+  VCOM_INTERFACE_0,	 /* bMasterInterface: Communication class interface */
+  VCOM_INTERFACE_1,	 /* bSlaveInterface0: Data Class Interface */
   /*Endpoint 4 Descriptor*/
   7,			       /* bLength: Endpoint Descriptor size */
   USB_ENDPOINT_DESCRIPTOR_TYPE,	   /* bDescriptorType: Endpoint */
@@ -277,7 +260,7 @@ static const uint8_t gnukConfigDescriptor[] = {
   /*Data class interface descriptor*/
   9,			       /* bLength: Endpoint Descriptor size */
   USB_INTERFACE_DESCRIPTOR_TYPE, /* bDescriptorType: */
-  0x03,			   /* bInterfaceNumber: Number of Interface */
+  VCOM_INTERFACE_1,	 /* bInterfaceNumber: Index of Interface */
   0x00,			   /* bAlternateSetting: Alternate setting */
   0x02,			   /* bNumEndpoints: Two endpoints used */
   0x0A,			   /* bInterfaceClass: CDC */
@@ -303,11 +286,7 @@ static const uint8_t gnukConfigDescriptor[] = {
   /* Interface Descriptor.*/
   9,			      /* bLength: Interface Descriptor size */
   USB_INTERFACE_DESCRIPTOR_TYPE, /* bDescriptorType: Interface */
-#ifdef ENABLE_VIRTUAL_COM_PORT
-  0x04,				/* bInterfaceNumber.                */
-#else
-  0x02,				/* bInterfaceNumber.                */
-#endif
+  MSC_INTERFACE,		/* bInterfaceNumber. */
   0x00,				/* bAlternateSetting.               */
   0x02,				/* bNumEndpoints.                   */
   0x08,				/* bInterfaceClass (Mass Stprage).  */
@@ -336,7 +315,7 @@ static const uint8_t gnukConfigDescriptor[] = {
 
 
 /* USB String Descriptors */
-static const uint8_t gnukStringLangID[] = {
+static const uint8_t gnuk_string_lang_id[] = {
   4,				/* bLength */
   USB_STRING_DESCRIPTOR_TYPE,
   0x09, 0x04			/* LangID = 0x0409: US-English */
@@ -351,78 +330,70 @@ struct desc
   uint16_t size;
 };
 
-static const struct desc String_Descriptors[NUM_STRING_DESC] = {
-  {gnukStringLangID, sizeof (gnukStringLangID)},
-  {gnukStringVendor, sizeof (gnukStringVendor)},
-  {gnukStringProduct, sizeof (gnukStringProduct)},
-  {gnukStringSerial, sizeof (gnukStringSerial)},
+static const struct desc string_descriptors[] = {
+  {gnuk_string_lang_id, sizeof (gnuk_string_lang_id)},
+  {gnuk_string_vendor, sizeof (gnuk_string_vendor)},
+  {gnuk_string_product, sizeof (gnuk_string_product)},
+  {gnuk_string_serial, sizeof (gnuk_string_serial)},
   {gnuk_revision_detail, sizeof (gnuk_revision_detail)},
   {gnuk_config_options, sizeof (gnuk_config_options)},
   {sys_version, sizeof (sys_version)},
 };
+#define NUM_STRING_DESC (sizeof (string_descriptors) / sizeof (struct desc))
 
 #define USB_DT_HID			0x21
 #define USB_DT_REPORT			0x22
 
 int
 usb_cb_get_descriptor (uint8_t rcp, uint8_t desc_type, uint8_t desc_index,
-		       uint16_t index)
+		       struct control_info *detail)
 {
   if (rcp == DEVICE_RECIPIENT)
     {
       if (desc_type == DEVICE_DESCRIPTOR)
-	{
-	  usb_lld_set_data_to_send (gnukDeviceDescriptor,
-				    sizeof (gnukDeviceDescriptor));
-	  return USB_SUCCESS;
-	}
+	return usb_lld_reply_request (device_desc, sizeof (device_desc), detail);
       else if (desc_type == CONFIG_DESCRIPTOR)
-	{
-	  usb_lld_set_data_to_send (gnukConfigDescriptor,
-				    sizeof (gnukConfigDescriptor));
-	  return USB_SUCCESS;
-	}
+	return usb_lld_reply_request (config_desc, sizeof (config_desc), detail);
       else if (desc_type == STRING_DESCRIPTOR)
 	{
 	  if (desc_index < NUM_STRING_DESC)
+	    return usb_lld_reply_request (string_descriptors[desc_index].desc,
+					  string_descriptors[desc_index].size,
+					  detail);
+	  else if (desc_index == NUM_STRING_DESC)
 	    {
-	      usb_lld_set_data_to_send (String_Descriptors[desc_index].desc,
-					String_Descriptors[desc_index].size);
-	      return USB_SUCCESS;
+	      uint8_t usbbuf[64];
+	      int i;
+	      size_t len;
+
+	      for (i = 0; i < (int)sizeof (usbbuf)/2 - 2; i++)
+		{
+		  if (sys_board_name[i] == 0)
+		    break;
+
+		  usbbuf[i*2+2] = sys_board_name[i];
+		  usbbuf[i*2+3] = 0;
+		}
+	      usbbuf[0] = len = i*2 + 2;
+	      usbbuf[1] = USB_STRING_DESCRIPTOR_TYPE;
+	      return usb_lld_reply_request (usbbuf, len, detail);
 	    }
 	}
     }
+#ifdef HID_CARD_CHANGE_SUPPORT
   else if (rcp == INTERFACE_RECIPIENT)
     {
-#ifdef HID_CARD_CHANGE_SUPPORT
-      if (index == 1)
+      if (detail->index == 1)
 	{
 	  if (desc_type == USB_DT_HID)
-	    {
-	      usb_lld_set_data_to_send (gnukConfigDescriptor+ICC_TOTAL_LENGTH+9,
-					9);
-	      return USB_SUCCESS;
-	    }
+	    return usb_lld_reply_request (config_desc+ICC_TOTAL_LENGTH+9, 9,
+					  detail);
 	  else if (desc_type == USB_DT_REPORT)
-	    {
-	      usb_lld_set_data_to_send (hid_report_desc, HID_REPORT_DESC_SIZE);
-	      return USB_SUCCESS;
-	    }
-	}
-      else
-#else
-      (void)index;
-#endif
-      if (desc_type == STRING_DESCRIPTOR)
-	{
-	  if (desc_index < NUM_STRING_DESC)
-	    {
-	      usb_lld_set_data_to_send (String_Descriptors[desc_index].desc,
-					String_Descriptors[desc_index].size);
-	      return USB_SUCCESS;
-	    }
+	    return usb_lld_reply_request (hid_report_desc, HID_REPORT_DESC_SIZE,
+					  detail);
 	}
     }
+#endif
 
   return USB_UNSUPPORT;
 }

src/usb_lld.h

@@ -55,15 +55,19 @@ enum
   USB_SUCCESS = 1,
 };
 
+struct control_info {
+  uint16_t value;
+  uint16_t index;
+  uint16_t len;
+};
+
 void usb_cb_device_reset (void);
-void usb_cb_ctrl_write_finish (uint8_t req, uint8_t req_no,
-			       uint16_t value, uint16_t index, uint16_t len);
-int usb_cb_setup (uint8_t req, uint8_t req_no, uint16_t value,
-		  uint16_t index, uint16_t len);
+int usb_cb_setup (uint8_t req, uint8_t req_no, struct control_info *detail);
+int usb_cb_interface (uint8_t cmd, struct control_info *detail);
 int usb_cb_get_descriptor (uint8_t rcp, uint8_t desc_type, uint8_t desc_index,
-			   uint16_t index);
+			   struct control_info *detail);
 int usb_cb_handle_event (uint8_t event_type, uint16_t value);
-int usb_cb_interface (uint8_t cmd, uint16_t interface, uint16_t value);
+void usb_cb_ctrl_write_finish (uint8_t req, uint8_t req_no, uint16_t value);
 
 enum {
   USB_EVENT_ADDRESS,
@@ -89,51 +93,30 @@ enum DEVICE_STATE
   CONFIGURED
 };
 
+void usb_lld_init (uint8_t feature);
+void usb_lld_to_pmabuf (const void *src, uint16_t addr, size_t n);
+void usb_lld_from_pmabuf (void *dst, uint16_t addr, size_t n);
+void usb_lld_stall_tx (int ep_num);
+void usb_lld_stall_rx (int ep_num);
+int usb_lld_tx_data_len (int ep_num);
+void usb_lld_txcpy (const void *src, int ep_num, int offset, size_t len);
+void usb_lld_tx_enable (int ep_num, size_t len);
+void usb_lld_write (uint8_t ep_num, const void *buf, size_t len);
+int usb_lld_reply_request (const void *buf, size_t buflen,
+			   struct control_info *ctrl);
+void usb_lld_rx_enable (int ep_num);
+int usb_lld_rx_data_len (int ep_num);
+void usb_lld_rxcpy (uint8_t *dst, int ep_num, int offset, size_t len);
+void usb_lld_reset (void);
+void usb_lld_setup_endpoint (int ep_num, int ep_type, int ep_kind,
+			     int ep_rx_addr, int ep_tx_addr,
+			     int ep_rx_memory_size);
+void usb_lld_set_configuration (uint8_t config);
+uint8_t usb_lld_current_configuration (void);
+void usb_lld_set_feature (uint8_t feature);
+void usb_lld_set_data_to_recv (const void *p, size_t len);
 
-extern void usb_lld_init (uint8_t feature);
+void usb_lld_prepare_shutdown (void);
+void usb_lld_shutdown (void);
 
-extern void usb_lld_to_pmabuf (const void *src, uint16_t addr, size_t n);
-
-extern void usb_lld_from_pmabuf (void *dst, uint16_t addr, size_t n);
-
-extern void usb_lld_stall_tx (int ep_num);
-
-extern void usb_lld_stall_rx (int ep_num);
-
-extern int usb_lld_tx_data_len (int ep_num);
-
-extern void usb_lld_txcpy (const void *src, int ep_num, int offset, size_t len);
-
-extern void usb_lld_tx_enable (int ep_num, size_t len);
-
-extern void usb_lld_write (uint8_t ep_num, const void *buf, size_t len);
-
-extern void usb_lld_rx_enable (int ep_num);
-
-extern int usb_lld_rx_data_len (int ep_num);
-
-extern void usb_lld_rxcpy (uint8_t *dst, int ep_num, int offset, size_t len);
-
-extern void usb_lld_reset (void);
-
-extern void usb_lld_setup_endpoint (int ep_num, int ep_type, int ep_kind,
-				    int ep_rx_addr, int ep_tx_addr,
-				    int ep_rx_memory_size);
-
-extern void usb_lld_set_configuration (uint8_t config);
-
-extern uint8_t usb_lld_current_configuration (void);
-
-extern void usb_lld_set_feature (uint8_t feature);
-
-extern void usb_lld_set_data_to_send (const void *p, size_t len);
-
-extern inline void usb_lld_set_data_to_recv (void *p, size_t len)
-{
-  usb_lld_set_data_to_send ((const void *)p, len);
-}
-
-extern void usb_lld_prepare_shutdown (void);
-extern void usb_lld_shutdown (void);
-
-extern void usb_interrupt_handler (void);
+void usb_interrupt_handler (void);

src/usb_stm32f103.c

@@ -1,9 +1,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define TRUE  1
-#define FALSE 0
-
 #include "sys.h"
 #include "usb_lld.h"
 
@@ -49,33 +46,27 @@ enum FEATURE_SELECTOR
 
 struct DATA_INFO
 {
-  uint16_t len;
-  uint16_t offset;
   uint8_t *addr;
+  uint16_t len;
   uint8_t require_zlp;
 };
 
-struct CONTROL_INFO
-{
-  uint8_t bmRequestType;
-  uint8_t bRequest;
-  uint16_t wValue;
-  uint16_t wIndex;
-  uint16_t wLength;
-};
 
 struct DEVICE_INFO
 {
   uint8_t current_configuration;
   uint8_t current_feature;
   uint8_t state;
+  /**/
+  uint8_t bmRequestType;
+  uint8_t bRequest;
+  /**/
+  uint16_t value;
 };
 
-static struct CONTROL_INFO control_info;
 static struct DEVICE_INFO device_info;
 static struct DATA_INFO data_info;
 
-static struct CONTROL_INFO *const ctrl_p = &control_info;
 static struct DEVICE_INFO *const dev_p = &device_info;
 static struct DATA_INFO *const data_p = &data_info;
 
@@ -412,16 +403,14 @@ static void handle_datastage_out (void)
 {
   if (data_p->addr && data_p->len)
     {
-      uint8_t *buf;
       uint32_t len = st103_get_rx_count (ENDP0);
 
       if (len > data_p->len)
 	len = data_p->len;
 
-      buf = data_p->addr + data_p->offset;
-      usb_lld_from_pmabuf (buf, st103_get_rx_addr (ENDP0), len);
+      usb_lld_from_pmabuf (data_p->addr, st103_get_rx_addr (ENDP0), len);
       data_p->len -= len;
-      data_p->offset += len;
+      data_p->addr += len;
     }
 
   if (data_p->len == 0)
@@ -440,13 +429,12 @@ static void handle_datastage_out (void)
 static void handle_datastage_in (void)
 {
   uint32_t len = USB_MAX_PACKET_SIZE;;
-  const uint8_t *buf;
 
   if ((data_p->len == 0) && (dev_p->state == LAST_IN_DATA))
     {
-      if (data_p->require_zlp == TRUE)
+      if (data_p->require_zlp)
 	{
-	  data_p->require_zlp = FALSE;
+	  data_p->require_zlp = 0;
 
 	  /* No more data to send.  Send empty packet */
 	  st103_set_tx_count (ENDP0, 0);
@@ -467,40 +455,33 @@ static void handle_datastage_in (void)
   if (len > data_p->len)
     len = data_p->len;
 
-  buf = (const uint8_t *)data_p->addr + data_p->offset;
-  usb_lld_to_pmabuf (buf, st103_get_tx_addr (ENDP0), len);
+  usb_lld_to_pmabuf (data_p->addr, st103_get_tx_addr (ENDP0), len);
   data_p->len -= len;
-  data_p->offset += len;
+  data_p->addr += len;
   st103_set_tx_count (ENDP0, len);
   st103_ep_set_tx_status (ENDP0, EP_TX_VALID);
 }
 
-typedef int (*HANDLER) (uint8_t req,
-			uint16_t value, uint16_t index, uint16_t length);
+typedef int (*HANDLER) (uint8_t req, struct control_info *detail);
 
-static int std_none (uint8_t req,
-		     uint16_t value, uint16_t index, uint16_t length)
+static int std_none (uint8_t req, struct control_info *detail)
 {
-  (void)req; (void)value; (void)index; (void)length;
+  (void)req; (void)detail;
   return USB_UNSUPPORT;
 }
 
-static int std_get_status (uint8_t req,
-			   uint16_t value, uint16_t index, uint16_t length)
+static int std_get_status (uint8_t req, struct control_info *detail)
 {
-  static uint16_t status_info;
   uint8_t rcp = req & RECIPIENT;
+  uint16_t status_info = 0;
 
-  status_info = 0;		/* Reset Status Information */
-  data_p->addr = (uint8_t *)&status_info;
-
-  if (value != 0 || length != 2 || (index >> 8) != 0
+  if (detail->value != 0 || detail->len != 2 || (detail->index >> 8) != 0
       || (req & REQUEST_DIR) == 0)
     return USB_UNSUPPORT;
 
   if (rcp == DEVICE_RECIPIENT)
     {
-      if (index == 0)
+      if (detail->index == 0)
 	{
 	  /* Get Device Status */
 	  uint8_t feature = dev_p->current_feature;
@@ -517,8 +498,7 @@ static int std_get_status (uint8_t req,
 	  else /* Self-powered */
 	    status_info &= ~1;
 
-	  data_p->len = 2;
-	  return USB_SUCCESS;
+	  return usb_lld_reply_request (&status_info, 2, detail);
 	}
     }
   else if (rcp == INTERFACE_RECIPIENT)
@@ -528,22 +508,21 @@ static int std_get_status (uint8_t req,
       if (dev_p->current_configuration == 0)
 	return USB_UNSUPPORT;
 
-      r = usb_cb_interface (USB_QUERY_INTERFACE, index, 0);
+      r = usb_cb_interface (USB_QUERY_INTERFACE, detail);
       if (r != USB_SUCCESS)
 	return USB_UNSUPPORT;
 
-      data_p->len = 2;
-      return USB_SUCCESS;
+      return usb_lld_reply_request (&status_info, 2, detail);
     }
   else if (rcp == ENDPOINT_RECIPIENT)
     {
-      uint8_t endpoint = (index & 0x0f);
+      uint8_t endpoint = (detail->index & 0x0f);
       uint16_t status;
 
-      if ((index & 0x70) || endpoint == ENDP0)
+      if ((detail->index & 0x70) || endpoint == ENDP0)
 	return USB_UNSUPPORT;
 
-      if ((index & 0x80))
+      if ((detail->index & 0x80))
 	{
 	  status = st103_ep_get_tx_status (endpoint);
 	  if (status == 0)		/* Disabled */
@@ -560,15 +539,13 @@ static int std_get_status (uint8_t req,
 	    status_info |= 1; /* OUT Endpoint stalled */
 	}
 
-	data_p->len = 2;
-	return USB_SUCCESS;
+      return usb_lld_reply_request (&status_info, 2, detail);
     }
 
   return USB_UNSUPPORT;
 }
 
-static int std_clear_feature (uint8_t req, uint16_t value,
-			      uint16_t index, uint16_t length)
+static int std_clear_feature (uint8_t req, struct control_info *detail)
 {
   uint8_t rcp = req & RECIPIENT;
 
@@ -577,10 +554,10 @@ static int std_clear_feature (uint8_t req, uint16_t value,
 
   if (rcp == DEVICE_RECIPIENT)
     {
-      if (length != 0 || index != 0)
+      if (detail->len != 0 || detail->index != 0)
 	return USB_UNSUPPORT;
 
-      if (value == DEVICE_REMOTE_WAKEUP)
+      if (detail->value == DEVICE_REMOTE_WAKEUP)
 	{
 	  dev_p->current_feature &= ~(1 << 5);
 	  return USB_SUCCESS;
@@ -588,17 +565,17 @@ static int std_clear_feature (uint8_t req, uint16_t value,
     }
   else if (rcp == ENDPOINT_RECIPIENT)
     {
-      uint8_t endpoint = (index & 0x0f);
+      uint8_t endpoint = (detail->index & 0x0f);
       uint16_t status;
 
       if (dev_p->current_configuration == 0)
 	return USB_UNSUPPORT;
 
-      if (length != 0 || (index >> 8) != 0 || value != ENDPOINT_STALL
-	  || endpoint == ENDP0)
+      if (detail->len != 0 || (detail->index >> 8) != 0
+	  || detail->value != ENDPOINT_STALL || endpoint == ENDP0)
 	return USB_UNSUPPORT;
 
-      if ((index & 0x80))
+      if ((detail->index & 0x80))
 	status = st103_ep_get_tx_status (endpoint);
       else
 	status = st103_ep_get_rx_status (endpoint);
@@ -606,7 +583,7 @@ static int std_clear_feature (uint8_t req, uint16_t value,
       if (status == 0)		/* Disabled */
 	return USB_UNSUPPORT;
 
-      if (index & 0x80)		/* IN endpoint */
+      if (detail->index & 0x80)		/* IN endpoint */
 	st103_ep_clear_dtog_tx (endpoint);
       else			/* OUT endpoint */
 	st103_ep_clear_dtog_rx (endpoint);
@@ -618,8 +595,7 @@ static int std_clear_feature (uint8_t req, uint16_t value,
   return USB_UNSUPPORT;
 }
 
-static int std_set_feature (uint8_t req, uint16_t value,
-			    uint16_t index, uint16_t length)
+static int std_set_feature (uint8_t req, struct control_info *detail)
 {
   uint8_t rcp = req & RECIPIENT;
 
@@ -628,10 +604,10 @@ static int std_set_feature (uint8_t req, uint16_t value,
 
   if (rcp == DEVICE_RECIPIENT)
     {
-      if (length != 0 || index != 0)
+      if (detail->len != 0 || detail->index != 0)
 	return USB_UNSUPPORT;
 
-      if (value == DEVICE_REMOTE_WAKEUP)
+      if (detail->value == DEVICE_REMOTE_WAKEUP)
 	{
 	  dev_p->current_feature |= 1 << 5;
 	  // event??
@@ -640,16 +616,17 @@ static int std_set_feature (uint8_t req, uint16_t value,
     }
   else if (rcp == ENDPOINT_RECIPIENT)
     {
-      uint8_t endpoint = (index & 0x0f);
+      uint8_t endpoint = (detail->index & 0x0f);
       uint32_t status;
 
       if (dev_p->current_configuration == 0)
 	return USB_UNSUPPORT;
 
-      if (length != 0 || (index >> 8) != 0 || value != 0 || endpoint == ENDP0)
+      if (detail->len != 0 || (detail->index >> 8) != 0
+	  || detail->value != 0 || endpoint == ENDP0)
 	return USB_UNSUPPORT;
 
-      if ((index & 0x80))
+      if ((detail->index & 0x80))
 	status = st103_ep_get_tx_status (endpoint);
       else
 	status = st103_ep_get_rx_status (endpoint);
@@ -657,7 +634,7 @@ static int std_set_feature (uint8_t req, uint16_t value,
       if (status == 0)		/* Disabled */
 	return USB_UNSUPPORT;
 
-      if (index & 0x80)
+      if (detail->index & 0x80)
 	/* IN endpoint */
 	st103_ep_set_tx_status (endpoint, EP_TX_STALL);
       else
@@ -671,77 +648,59 @@ static int std_set_feature (uint8_t req, uint16_t value,
   return USB_UNSUPPORT;
 }
 
-static int std_set_address (uint8_t req, uint16_t value,
-			    uint16_t index, uint16_t length)
+static int std_set_address (uint8_t req, struct control_info *detail)
 {
   uint8_t rcp = req & RECIPIENT;
 
   if ((req & REQUEST_DIR) == 1)
     return USB_UNSUPPORT;
 
-  if (rcp == DEVICE_RECIPIENT)
-    {
-      if (length == 0 && value <= 127 && index == 0
-	  && dev_p->current_configuration == 0)
-	return USB_SUCCESS;
-    }
+  if (rcp == DEVICE_RECIPIENT && detail->len == 0 && detail->value <= 127
+      && detail->index == 0 && dev_p->current_configuration == 0)
+    return USB_SUCCESS;
 
   return USB_UNSUPPORT;
 }
 
-static int std_get_descriptor (uint8_t req, uint16_t value,
-			       uint16_t index, uint16_t length)
+static int std_get_descriptor (uint8_t req, struct control_info *detail)
 {
   uint8_t rcp = req & RECIPIENT;
 
   if ((req & REQUEST_DIR) == 0)
     return USB_UNSUPPORT;
 
-  (void)length;
-  return usb_cb_get_descriptor (rcp, (value >> 8), (value & 0xff), index);
+  return usb_cb_get_descriptor (rcp, (detail->value >> 8),
+				(detail->value & 0xff), detail);
 }
 
-static int std_get_configuration (uint8_t req, uint16_t value,
-				  uint16_t index, uint16_t length)
+static int std_get_configuration (uint8_t req,  struct control_info *detail)
 {
   uint8_t rcp = req & RECIPIENT;
 
+  (void)detail;
   if ((req & REQUEST_DIR) == 0)
     return USB_UNSUPPORT;
 
-  (void)value;  (void)index;  (void)length;
   if (rcp == DEVICE_RECIPIENT)
-    {
-      data_p->addr = &dev_p->current_configuration;
-      data_p->len = 1;
-      return USB_SUCCESS;
-    }
+    return usb_lld_reply_request (&dev_p->current_configuration, 1, detail);
 
   return USB_UNSUPPORT;
 }
 
-static int std_set_configuration (uint8_t req, uint16_t value,
-				  uint16_t index, uint16_t length)
+static int std_set_configuration (uint8_t req, struct control_info *detail)
 {
   uint8_t rcp = req & RECIPIENT;
 
   if ((req & REQUEST_DIR) == 1)
     return USB_UNSUPPORT;
 
-  if (rcp == DEVICE_RECIPIENT && index == 0 && length == 0)
-    {
-      int r;
-
-      r = usb_cb_handle_event (USB_EVENT_CONFIG, value);
-      if (r == USB_SUCCESS)
-	return USB_SUCCESS;
-    }
+  if (rcp == DEVICE_RECIPIENT && detail->index == 0 && detail->len == 0)
+    return usb_cb_handle_event (USB_EVENT_CONFIG, detail->value);
 
   return USB_UNSUPPORT;
 }
 
-static int std_get_interface (uint8_t req, uint16_t value,
-			      uint16_t index, uint16_t length)
+static int std_get_interface (uint8_t req, struct control_info *detail)
 {
   uint8_t rcp = req & RECIPIENT;
 
@@ -750,74 +709,61 @@ static int std_get_interface (uint8_t req, uint16_t value,
 
   if (rcp == INTERFACE_RECIPIENT)
     {
-      if (value != 0 || (index >> 8) != 0 || length != 1)
+      if (detail->value != 0 || (detail->index >> 8) != 0 || detail->len != 1)
 	return USB_UNSUPPORT;
 
       if (dev_p->current_configuration == 0)
 	return USB_UNSUPPORT;
 
-      return usb_cb_interface (USB_GET_INTERFACE, index, 0);
+      return usb_cb_interface (USB_GET_INTERFACE, detail);
     }
 
   return USB_UNSUPPORT;
 }
 
-static int std_set_interface (uint8_t req, uint16_t value,
-			      uint16_t index, uint16_t length)
+static int std_set_interface (uint8_t req, struct control_info *detail)
 {
   uint8_t rcp = req & RECIPIENT;
 
-  if ((req & REQUEST_DIR) == 1)
+  if ((req & REQUEST_DIR) == 1 || rcp != INTERFACE_RECIPIENT
+      || detail->len != 0 || (detail->index >> 8) != 0
+      || (detail->value >> 8) != 0 || dev_p->current_configuration != 0)
     return USB_UNSUPPORT;
 
-  if (rcp == INTERFACE_RECIPIENT)
-    {
-      int r;
-
-      if (length != 0 || (index >> 8) != 0 || (value >> 8) != 0)
-	return  USB_UNSUPPORT;
-
-      if (dev_p->current_configuration != 0)
-	return USB_UNSUPPORT;
-
-      r = usb_cb_interface (USB_SET_INTERFACE, index, value);
-      if (r == USB_SUCCESS)
-	return USB_SUCCESS;
-    }
-
-  return USB_UNSUPPORT;
+  return usb_cb_interface (USB_SET_INTERFACE, detail);
 }
 
 
 static void handle_setup0 (void)
 {
   const uint16_t *pw;
+  struct control_info ctrl;
   uint16_t w;
-  uint8_t req;
+  uint8_t req_no;
   int r = USB_UNSUPPORT;
   HANDLER handler;
 
   pw = (uint16_t *)(PMA_ADDR + (uint8_t *)(st103_get_rx_addr (ENDP0) * 2));
   w = *pw++;
 
-  ctrl_p->bmRequestType = w & 0xff;
-  ctrl_p->bRequest = req = w >> 8;
+  dev_p->bmRequestType = w & 0xff;
+  dev_p->bRequest = req_no = w >> 8;
   pw++;
-  ctrl_p->wValue = *pw++;
+  ctrl.value = *pw++;
   pw++;
-  ctrl_p->wIndex  = *pw++;
+  ctrl.index  = *pw++;
   pw++;
-  ctrl_p->wLength = *pw;
+  ctrl.len = *pw;
 
   data_p->addr = NULL;
   data_p->len = 0;
-  data_p->offset = 0;
+  data_p->require_zlp = 0;
 
-  if ((ctrl_p->bmRequestType & REQUEST_TYPE) == STANDARD_REQUEST)
+  if ((dev_p->bmRequestType & REQUEST_TYPE) == STANDARD_REQUEST)
     {
-      if (req < TOTAL_REQUEST)
+      if (req_no < TOTAL_REQUEST)
 	{
-	  switch (req)
+	  switch (req_no)
 	    {
 	    case 0: handler = std_get_status;  break;
 	    case 1: handler = std_clear_feature;  break;
@@ -831,44 +777,30 @@ static void handle_setup0 (void)
 	    default: handler = std_none;  break;
 	    }
 
-	  r = (*handler) (ctrl_p->bmRequestType,
-			  ctrl_p->wValue, ctrl_p->wIndex, ctrl_p->wLength);
+	  r = (*handler) (dev_p->bmRequestType, &ctrl);
 	}
     }
   else
-    r = usb_cb_setup (ctrl_p->bmRequestType, req,
-		      ctrl_p->wValue, ctrl_p->wIndex, ctrl_p->wLength);
+    r = usb_cb_setup (dev_p->bmRequestType, req_no, &ctrl);
 
   if (r != USB_SUCCESS)
     dev_p->state = STALLED;
   else
     {
-      if (USB_SETUP_GET (ctrl_p->bmRequestType))
+      if (USB_SETUP_SET (dev_p->bmRequestType))
 	{
-	  uint32_t len = ctrl_p->wLength;
-
-	  /* Restrict the data length to be the one host asks for */
-	  if (data_p->len > len)
-	    data_p->len = len;
-
-	  if ((data_p->len % USB_MAX_PACKET_SIZE) == 0)
-	    data_p->require_zlp = TRUE;
+	  dev_p->value = ctrl.value;
+	  if (ctrl.len == 0)
+	    {
+	      dev_p->state = WAIT_STATUS_IN;
+	      st103_set_tx_count (ENDP0, 0);
+	      st103_ep_set_rxtx_status (ENDP0, EP_RX_STALL, EP_TX_VALID);
+	    }
 	  else
-	    data_p->require_zlp = FALSE;
-
-	  dev_p->state = IN_DATA;
-	  handle_datastage_in ();
-	}
-      else if (ctrl_p->wLength == 0)
-	{
-	  dev_p->state = WAIT_STATUS_IN;
-	  st103_set_tx_count (ENDP0, 0);
-	  st103_ep_set_rxtx_status (ENDP0, EP_RX_STALL, EP_TX_VALID);
-	}
-      else
-	{
-	  dev_p->state = OUT_DATA;
-	  st103_ep_set_rx_status (ENDP0, EP_RX_VALID);
+	    {
+	      dev_p->state = OUT_DATA;
+	      st103_ep_set_rx_status (ENDP0, EP_RX_VALID);
+	    }
 	}
     }
 }
@@ -879,17 +811,16 @@ static void handle_in0 (void)
     handle_datastage_in ();
   else if (dev_p->state == WAIT_STATUS_IN)
     {
-      if ((ctrl_p->bRequest == SET_ADDRESS) &&
-	  ((ctrl_p->bmRequestType & (REQUEST_TYPE | RECIPIENT))
+      if ((dev_p->bRequest == SET_ADDRESS) &&
+	  ((dev_p->bmRequestType & (REQUEST_TYPE | RECIPIENT))
 	   == (STANDARD_REQUEST | DEVICE_RECIPIENT)))
 	{
-	  st103_set_daddr (ctrl_p->wValue);
-	  usb_cb_handle_event (USB_EVENT_ADDRESS, ctrl_p->wValue);
+	  st103_set_daddr (dev_p->value);
+	  usb_cb_handle_event (USB_EVENT_ADDRESS, dev_p->value);
 	}
       else
-	usb_cb_ctrl_write_finish  (ctrl_p->bmRequestType,
-				   ctrl_p->bRequest, ctrl_p->wValue,
-				   ctrl_p->wIndex, ctrl_p->wLength);
+	usb_cb_ctrl_write_finish  (dev_p->bmRequestType, dev_p->bRequest,
+				   dev_p->value);
 
       dev_p->state = STALLED;
     }
@@ -1111,7 +1042,7 @@ void usb_lld_set_feature (uint8_t feature)
   dev_p->current_feature = feature;
 }
 
-void usb_lld_set_data_to_send (const void *p, size_t len)
+void usb_lld_set_data_to_recv (const void *p, size_t len)
 {
   data_p->addr = (uint8_t *)p;
   data_p->len = len;
@@ -1189,3 +1120,49 @@ void usb_lld_from_pmabuf (void *dst, uint16_t addr, size_t n)
       *d = (w & 0xff);
     }
 }
+
+
+/*
+ * BUF: Pointer to data memory.  Data memory should not be allocated
+ *      on stack when BUFLEN > USB_MAX_PACKET_SIZE.
+ *
+ * BUFLEN: size of the data.
+ */
+int
+usb_lld_reply_request (const void *buf, size_t buflen, struct control_info *ctl)
+{
+  uint32_t len_asked = ctl->len;
+  uint32_t len;
+
+  data_p->addr = (void *)buf;
+  data_p->len = buflen;
+
+  /* Restrict the data length to be the one host asks for */
+  if (data_p->len > len_asked)
+    data_p->len = len_asked;
+
+  if (data_p->len != 0 && (data_p->len % USB_MAX_PACKET_SIZE) == 0)
+    data_p->require_zlp = 1;
+
+  if (data_p->len < USB_MAX_PACKET_SIZE)
+    {
+      len = data_p->len;
+      dev_p->state = LAST_IN_DATA;
+    }
+  else
+    {
+      len = USB_MAX_PACKET_SIZE;
+      dev_p->state = IN_DATA;
+    }
+
+  if (len)
+    {
+      usb_lld_to_pmabuf (data_p->addr, st103_get_tx_addr (ENDP0), len);
+      data_p->len -= len;
+      data_p->addr += len;
+    }
+
+  st103_set_tx_count (ENDP0, len);
+  st103_ep_set_tx_status (ENDP0, EP_TX_VALID);
+  return USB_SUCCESS;
+}

test/ecc_nistp256_keys.py

@@ -0,0 +1,31 @@
+# Data taken from: 
+#    A. Jivsov, Sample Keys and Messages:
+#    https://sites.google.com/site/brainhub/pgpecckeys
+
+# uid       ec_dsa_dh_256 <openpgp@brainhub.org>
+# sign key:
+# nistp256/BAA59D9C 2010-09-17
+# keygrip: 8E06A180EFFE4C65B812150CAF19BF30C0689A4C
+#
+# q=(x, y) and d
+key[0] = (0x0bc7a7baebd5f08c74c77b71ee44e7bb0b5a18317b996da5393e33acc52932c6,
+          0xd2f60f4d1efe35a0b9fb8d3787ed4bee97ca012d07b8f5835be7093545d532e6,
+          0xd8f28c530c99821faa5ee2ff4dd8d1df01995d4e98fb45f8768cb65abd4adaa9)
+
+# decryption key:
+# sub   nistp256/4089AB73 2010-09-17 nistp256
+# keygrip: E4403F3FD7A443FAC29FEF288FA0D20AC212851E
+#
+# q=(x, y) and d
+key[1] = (0x7f70c0a8184cdcaea5db20ba8fed17e47bdefb744d575ec449130af37edade65,
+          0x8ae7ee35d20e8897911c9f564be33d9a94bc1e5c927b1aa07ff750d2d11c2971,
+          0xa05cd14749bea3f3d14c92dc438e45e351efe860360c431705b7d42410581843)
+
+# auth key from: uid       ec_dsa_dh_256_no_pass <openpgp@brainhub.org>
+#
+# q=(x, y) and d
+key[2] = (0x81fbbc20eea9e8d1c3ceabb0a8185925b113d1ac42cd5c78403bd83da19235c6,
+          0x5ed6db13d91db34507d0129bf88981878d29adbf8fcd1720afdb767bb3fcaaff,
+          0xa355916f8665eb99c1af48d9560b5c6889e5287bc75aa693aaae9bdb15e8b3fd)
+
+# This file is here to extend the test suite for ECC.

test/features/002_get_data_static.feature

@@ -8,7 +8,7 @@ Feature: command GET DATA
 
   Scenario: data object extended capabilities
      When requesting extended capabilities: c0
-     Then data should match: \x70\x00\x00\x20[\x00\x08]\x00\x00\xff\x01\x00
+     Then data should match: [\x70\x74]\x00\x00\x20[\x00\x08]\x00\x00\xff\x01\x00
 
   Scenario: data object algorithm attributes 1
      When requesting algorithm attributes 1: c1

test/features/003_keyattr_change.feature

@@ -0,0 +1,28 @@
+@keyattr
+Feature: key attribute change
+  In order to use a token with multiple different kind of key algorighm
+  A token should support key attribute change
+
+  Scenario: key attribute data object write: algorithm for signature (RSA-4K)
+     Given cmd_put_data with c1 and "\x01\x10\x00\x00\x20\x00"
+     Then it should get success
+
+  Scenario: key attribute data object write: algorithm for signature (RSA-2K)
+     Given cmd_put_data with c1 and "\x01\x08\x00\x00\x20\x00"
+     Then it should get success
+
+  Scenario: key attribute data object write: algorithm for decryption (RSA-4K)
+     Given cmd_put_data with c2 and "\x01\x10\x00\x00\x20\x00"
+     Then it should get success
+
+  Scenario: key attribute data object write: algorithm for decryption (RSA-2K)
+     Given cmd_put_data with c2 and "\x01\x08\x00\x00\x20\x00"
+     Then it should get success
+
+  Scenario: key attribute data object write: algorithm for authentication (RSA-4K)
+     Given cmd_put_data with c3 and "\x01\x10\x00\x00\x20\x00"
+     Then it should get success
+
+  Scenario: key attribute data object write: algorithm for authentication (RSA-2K)
+     Given cmd_put_data with c3 and "\x01\x08\x00\x00\x20\x00"
+     Then it should get success

test/features/402_get_data_static.feature

@@ -8,7 +8,7 @@ Feature: command GET DATA
 
   Scenario: data object extended capabilities
      When requesting extended capabilities: c0
-     Then data should match: \x70\x00\x00\x20[\x00\x08]\x00\x00\xff\x01\x00
+     Then data should match: [\x70\x74]\x00\x00\x20[\x00\x08]\x00\x00\xff\x01\x00
 
   Scenario: data object algorithm attributes 1
      When requesting algorithm attributes 1: c1

test/features/802_get_data_static.feature

@@ -8,7 +8,7 @@ Feature: command GET DATA
 
   Scenario: data object extended capabilities
      When requesting extended capabilities: c0
-     Then data should match: \x70\x00\x00\x20[\x00\x08]\x00\x00\xff\x01\x00
+     Then data should match: [\x70\x74]\x00\x00\x20[\x00\x08]\x00\x00\xff\x01\x00
 
   Scenario: data object algorithm attributes 1
      When requesting algorithm attributes 1: c1