diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | NEWS | 9 | ||||
| -rw-r--r-- | README | 8 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | src/openpgp-do.c | 9 |
6 files changed, 27 insertions, 9 deletions
@@ -1,3 +1,10 @@ +2015-09-18 Niibe Yutaka <gniibe@fsij.org> + + * VERSION: 1.1.9. + + * src/openpgp-do.c (proc_key_import): Fix error return. + (rw_algorithm_attr): Check it's not ALGO_RSA2K. + 2015-09-17 Niibe Yutaka <gniibe@fsij.org> * VERSION: 1.1.8. @@ -1,5 +1,14 @@ Gnuk NEWS - User visible changes +* Major changes in Gnuk 1.1.9 + + Released 2015-09-18, by NIIBE Yutaka + +** Bug fix for Ed25519 and Curve25519 +When registering key, wrong operations were not detected correctly. +This is fixed. + + * Major changes in Gnuk 1.1.8 Released 2015-09-17, by NIIBE Yutaka @@ -1,14 +1,14 @@ Gnuk - An Implementation of USB Cryptographic Token for GnuPG - Version 1.1.8 - 2015-09-17 + Version 1.1.9 + 2015-09-18 Niibe Yutaka Free Software Initiative of Japan Warning ======= -This is another experimental release of Gnuk, version 1.1.8, which has +This is another experimental release of Gnuk, version 1.1.9, 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 @@ -145,7 +145,7 @@ Ad: ST-Link/V2 is cheap one. We have a tool/stlinkv2.py as flash ROM Release notes ============= -This is eighth experimental release in version 1.1 series of Gnuk. +This is ninth experimental release in version 1.1 series of Gnuk. While it is daily use by its developer, some newly introduced features (including ECDSA/EdDSA/ECDH, key generation and firmware upgrade) @@ -16,6 +16,7 @@ Clint Adams clint@softwarefreedom.org Daniel Kahn Gillmor dkg@fifthhorseman.net Hironobu SUZUKI hironobu@h2np.net Jan Suhr jan@suhr.info +Jonathan McDowell noodles@earth.li Kaz Kojima kkojima@rr.iij4u.or.jp Ludovic Rousseau ludovic.rousseau@free.fr Luis Felipe R. Murillo luisfelipe@ucla.edu @@ -1 +1 @@ -release/1.1.8 +release/1.1.9 diff --git a/src/openpgp-do.c b/src/openpgp-do.c index e18f42d..dcaec7e 100644 --- a/src/openpgp-do.c +++ b/src/openpgp-do.c @@ -758,7 +758,7 @@ rw_algorithm_attr (uint16_t tag, int with_tag, algo = ALGO_CURVE25519; if (algo < 0) - return 0; /* Error */ + return 0; /* Error. */ else if (algo == ALGO_RSA2K && *algo_attr_pp != NULL) { gpg_do_delete_prvkey (kk, CLEAN_PAGE_FULL); @@ -766,7 +766,8 @@ rw_algorithm_attr (uint16_t tag, int with_tag, if (*algo_attr_pp != NULL) return 0; } - else if (*algo_attr_pp == NULL || (*algo_attr_pp)[1] != algo) + else if ((algo != ALGO_RSA2K && *algo_attr_pp == NULL) + || (*algo_attr_pp)[1] != algo) { gpg_do_delete_prvkey (kk, CLEAN_PAGE_FULL); *algo_attr_pp = flash_enum_write (kk_to_nr (kk), algo); @@ -1388,7 +1389,7 @@ proc_key_import (const uint8_t *data, int len) uint8_t hash[64]; if (len - 12 != 32) - return 1; /* Error. */ + return 0; /* Error. */ sha512 (&data[12], 32, hash); hash[0] &= 248; @@ -1402,7 +1403,7 @@ proc_key_import (const uint8_t *data, int len) int i; if (len - 12 != 32) - return 1; /* Error. */ + return 0; /* Error. */ for (i = 0; i < 32; i++) priv[31-i] = data[12+i]; |