From 8be278be17873badfbb6fa1b50c53a2e8ac6adb3 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 10 Jul 2012 13:21:27 +0900 Subject: [PATCH] not PW3 but PW1 --- src/openpgp-do.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/openpgp-do.c b/src/openpgp-do.c index 2be5aed..4194213 100644 --- a/src/openpgp-do.c +++ b/src/openpgp-do.c @@ -800,12 +800,11 @@ gpg_do_write_prvkey (enum kind_of_key kk, const uint8_t *key_data, int key_len, } else { - uint8_t ks123_pw1[KEYSTRING_SIZE_PW1]; + uint8_t ks[KEYSTRING_MD_SIZE]; - ks123_pw1[0] = strlen (OPENPGP_CARD_INITIAL_PW1); - s2k (BY_USER, (uint8_t *)OPENPGP_CARD_INITIAL_PW1, - strlen (OPENPGP_CARD_INITIAL_PW1), ks123_pw1+1); - encrypt_dek (ks123_pw1+1, pd->dek_encrypted_1); + s2k (BY_USER, (const uint8_t *)OPENPGP_CARD_INITIAL_PW1, + strlen (OPENPGP_CARD_INITIAL_PW1), ks); + encrypt_dek (ks, pd->dek_encrypted_1); } if (ks_rc) @@ -1580,7 +1579,7 @@ gpg_do_keygen (uint8_t kk_byte) { const uint8_t * pw = (const uint8_t *)OPENPGP_CARD_INITIAL_PW1; - s2k (BY_USER, pw, strlen (OPENPGP_CARD_INITIAL_PW3), keystring); + s2k (BY_USER, pw, strlen (OPENPGP_CARD_INITIAL_PW1), keystring); ks = keystring; }