From: Greg Hudson <ghudson@mit.edu>
Date: Sun, 1 Nov 2009 02:46:36 +0000 (+0000)
Subject: Stop using deprecated krb5_encrypt_data in preauth code.  Use
X-Git-Tag: krb5-1.8-alpha1~228
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=22a7e94a6a63d852c63f992fcfcb9e71d5714feb;p=krb5.git

Stop using deprecated krb5_encrypt_data in preauth code.  Use
krb5_encrypt_helper instead.  (encrypt_helper takes a key usage
instead of an ivec, but that's okay since the invocations were using
null ivecs anyway.)

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

diff --git a/src/lib/krb5/krb/preauth.c b/src/lib/krb5/krb/preauth.c
index 9061aa9b6..d9c076eef 100644
--- a/src/lib/krb5/krb/preauth.c
+++ b/src/lib/krb5/krb/preauth.c
@@ -531,10 +531,10 @@ obtain_sam_padata(krb5_context context, krb5_pa_data *in_padata, krb5_etype_info
 						   &scratch)) != 0)
       goto cleanup;
 
-    if ((retval = krb5_encrypt_data(context,
-				    sam_use_key?sam_use_key:def_enc_key,
-				    0, scratch,
-				    &sam_response.sam_enc_nonce_or_ts)))
+    if ((retval = krb5_encrypt_helper(context,
+				      sam_use_key?sam_use_key:def_enc_key,
+				      0, scratch,
+				      &sam_response.sam_enc_nonce_or_ts)))
       goto cleanup;
 
     krb5_free_data(context, scratch);
diff --git a/src/lib/krb5/krb/preauth2.c b/src/lib/krb5/krb/preauth2.c
index c96f0f5b3..e9e583938 100644
--- a/src/lib/krb5/krb/preauth2.c
+++ b/src/lib/krb5/krb/preauth2.c
@@ -1010,8 +1010,8 @@ pa_sam(krb5_context context, krb5_kdc_req *request, krb5_pa_data *in_padata,
                                                 &scratch)))
         return(ret);
 
-    ret = krb5_encrypt_data(context, as_key, 0, scratch,
-                            &sam_response.sam_enc_nonce_or_ts);
+    ret = krb5_encrypt_helper(context, as_key, 0, scratch,
+                              &sam_response.sam_enc_nonce_or_ts);
 
     krb5_free_data(context, scratch);