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 8bd80766290b06278b42b5ad09a89985b2d3fee0..ebb31f6733712f8d122c9312cf93cf8e571d176e 100644 (file)
--- 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 28e3e98e9cb8a3a712cb4d5b412cfc8aa9f977e1..6da26dd176e17129dc759258ff04cb14d6d67316 100644 (file)
--- 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;