From 4e609bf313a80dbc2247a73d1303b2068eec9acd Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Fri, 3 Apr 2009 04:03:45 +0000 Subject: Merge fast branch at 22166 onto trunk ticket: 6436 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22167 dc483132-0cff-0310-8789-dd5450dbe970 --- src/plugins/preauth/encrypted_challenge/encrypted_challenge_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/plugins/preauth') diff --git a/src/plugins/preauth/encrypted_challenge/encrypted_challenge_main.c b/src/plugins/preauth/encrypted_challenge/encrypted_challenge_main.c index 3fad7ccd3..692449150 100644 --- a/src/plugins/preauth/encrypted_challenge/encrypted_challenge_main.c +++ b/src/plugins/preauth/encrypted_challenge/encrypted_challenge_main.c @@ -116,6 +116,7 @@ static krb5_error_code process_preauth krb5_pa_data **pa_array = NULL; krb5_data *encoded_ts = NULL; krb5_pa_enc_ts ts; + enc.ciphertext.data = NULL; if (retval == 0) retval = krb5_us_timeofday(context, &ts.patimestamp, &ts.pausec); if (retval == 0) @@ -300,8 +301,6 @@ static krb5_error_code kdc_verify_preauth } if (armor_key) krb5_free_keyblock(context, armor_key); - if (challenge_key) - krb5_free_keyblock(context, challenge_key); if (plain.data) free(plain.data); if (enc) -- cgit