security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-20 01:02:44 +02:00
Code Activity

scd: Fix possible uninitialized variables.

Browse Source 
* scd/app-openpgp.c (do_change_pin): Initialize resultlen2.
(do_change_pin): Don't call wipe_and_free on the error path.
Initialize bufferlen2.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2020-08-19 11:39:22 +09:00
parent 0da923a124
commit 4fa0a65676
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scd/app-openpgp.c
View File

@ -3214,7 +3214,7 @@ do_change_pin (app_t app, ctrl_t ctrl, const char *chvnostr,
char *result1 = NULL; char *result1 = NULL;
char *result2 = NULL; char *result2 = NULL;
char *buffer = NULL; char *buffer = NULL;
size_t resultlen1, resultlen2, bufferlen=0; size_t resultlen1, resultlen2=0, bufferlen=0;
rc = pin2hash_if_kdf (app, 0, resetcode, &result1, &resultlen1); rc = pin2hash_if_kdf (app, 0, resetcode, &result1, &resultlen1);
if (!rc) if (!rc)
@ -3240,9 +3240,6 @@ do_change_pin (app_t app, ctrl_t ctrl, const char *chvnostr,
} }
else if (set_resetcode) else if (set_resetcode)
{ {
char *buffer = NULL;
size_t bufferlen;
if (strlen (pinvalue) < 8) if (strlen (pinvalue) < 8)
{ {
log_error (_("Reset Code is too short; minimum length is %d\n"), 8); log_error (_("Reset Code is too short; minimum length is %d\n"), 8);
@ -3250,13 +3247,16 @@ do_change_pin (app_t app, ctrl_t ctrl, const char *chvnostr,
} }
else else
{ {
char *buffer = NULL;
size_t bufferlen;
rc = pin2hash_if_kdf (app, 0, pinvalue, &buffer, &bufferlen); rc = pin2hash_if_kdf (app, 0, pinvalue, &buffer, &bufferlen);
if (!rc) if (!rc)
rc = iso7816_put_data (app_get_slot (app), rc = iso7816_put_data (app_get_slot (app),
0, 0xD3, buffer, bufferlen); 0, 0xD3, buffer, bufferlen);
}
wipe_and_free (buffer, bufferlen); wipe_and_free (buffer, bufferlen);
}
} }
else if (reset_mode) else if (reset_mode)
{ {
@ -3319,7 +3319,7 @@ do_change_pin (app_t app, ctrl_t ctrl, const char *chvnostr,
{ {
char *buffer1 = NULL; char *buffer1 = NULL;
char *buffer2 = NULL; char *buffer2 = NULL;
size_t bufferlen1, bufferlen2; size_t bufferlen1, bufferlen2 = 0;
rc = pin2hash_if_kdf (app, chvno, oldpinvalue, &buffer1, &bufferlen1); rc = pin2hash_if_kdf (app, chvno, oldpinvalue, &buffer1, &bufferlen1);
if (!rc) if (!rc)

2
scd/command.c
View File

@ -2497,7 +2497,7 @@ void
pincache_put (ctrl_t ctrl, int slot, const char *appname, const char *pinref, pincache_put (ctrl_t ctrl, int slot, const char *appname, const char *pinref,
const char *pin, unsigned int pinlen) const char *pin, unsigned int pinlen)
{ {
gpg_error_t err; gpg_error_t err = 0;
assuan_context_t ctx; assuan_context_t ctx;
char line[950]; char line[950];
gcry_cipher_hd_t cipherhd = NULL; gcry_cipher_hd_t cipherhd = NULL;