From: Sam Hartman <hartmans@mit.edu>
Date: Sat, 24 May 2003 00:59:25 +0000 (+0000)
Subject: Populate etype_info_entry.s2kparams.data
X-Git-Tag: krb5-1.4-beta1~927
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fd14217c0335db3591078911d49d6e5094f2606e;p=krb5.git

Populate etype_info_entry.s2kparams.data

The ASN.1 decoder for etype_info_entry accidentally throws away the
pointer to s2kparams data.  Don't Correctly store the pointer.

Ticket: new
Target_Version: 1.3
Tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15488 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index 8bd807662..ebb31f673 100644
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-23  Sam Hartman  <hartmans@mit.edu>
+
+	* asn1_k_decode.c (asn1_decode_etype_info_entry): Fix logic error
+	that incorrectly set up s2kparams.data 
+
 2003-05-20  Ezra Peisach  <epeisach@bu.edu>
 
 	* asn1_k_encode.c (asn1_encode_krb_safe_body): Use
diff --git a/src/lib/krb5/asn.1/asn1_k_decode.c b/src/lib/krb5/asn.1/asn1_k_decode.c
index 28e3e98e9..6da26dd17 100644
--- a/src/lib/krb5/asn.1/asn1_k_decode.c
+++ b/src/lib/krb5/asn.1/asn1_k_decode.c
@@ -819,9 +819,10 @@ asn1_error_code asn1_decode_etype_info_entry(asn1buf *buf, krb5_etype_info_entry
 	    val->salt = 0;
     }
     if ( tagnum ==2) {
-      krb5_octet *params = (krb5_octet *) val->s2kparams.data;
+      krb5_octet *params ;
       get_lenfield( val->s2kparams.length, params,
 		      2, asn1_decode_octetstring);
+      val->s2kparams.data = ( char *) params;
     } else {
 	val->s2kparams.data = NULL;
 	val->s2kparams.length = 0;