deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enable KDF-DO available bit.

Browse Source
This commit is contained in:
NIIBE Yutaka
2017-11-02 13:53:06 +09:00
parent b735c02ec2
commit 01b5aa5984
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -4,6 +4,8 @@
(gpg_do_get_initial_pw_setting): New. (gpg_do_get_initial_pw_setting): New.
(gpg_do_write_prvkey): Use gpg_do_get_initial_pw_setting. (gpg_do_write_prvkey): Use gpg_do_get_initial_pw_setting.
(gpg_do_keygen): Likewise. (gpg_do_keygen): Likewise.
(extended_capabilities): Enable KDF-DO available bit.
* src/openpgp.c (cmd_change_password): Use * src/openpgp.c (cmd_change_password): Use
gpg_do_get_initial_pw_setting. gpg_do_get_initial_pw_setting.
* src/ac.c (verify_user_0, verify_admin_0): Likewise. * src/ac.c (verify_user_0, verify_admin_0): Likewise.

4
src/openpgp-do.c
View File

@@ -112,13 +112,15 @@ const uint8_t historical_bytes[] __attribute__ ((aligned (1))) = {
/* Extended Capabilities */ /* Extended Capabilities */
static const uint8_t extended_capabilities[] __attribute__ ((aligned (1))) = { static const uint8_t extended_capabilities[] __attribute__ ((aligned (1))) = {
10, 10,
0x74, /* 0x75, /*
* No Secure Messaging supported * No Secure Messaging supported
* GET CHALLENGE supported * GET CHALLENGE supported
* Key import supported * Key import supported
* PW status byte can be put * PW status byte can be put
* No private_use_DO * No private_use_DO
* Algorithm attrs are changable * Algorithm attrs are changable
* No DEC with AES
* KDF-DO available
*/ */
0, /* Secure Messaging Algorithm: N/A (TDES=0, AES=1) */ 0, /* Secure Messaging Algorithm: N/A (TDES=0, AES=1) */
0x00, CHALLENGE_LEN, /* Max size of GET CHALLENGE */ 0x00, CHALLENGE_LEN, /* Max size of GET CHALLENGE */