svn rev #23111: trunk/src/lib/krb5/krb/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23111
Commit By: ghudson
Log Message:
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.)



Changed Files:
U   trunk/src/lib/krb5/krb/preauth.c
U   trunk/src/lib/krb5/krb/preauth2.c
Modified: trunk/src/lib/krb5/krb/preauth.c
===================================================================
--- trunk/src/lib/krb5/krb/preauth.c	2009-11-01 00:27:21 UTC (rev 23110)
+++ trunk/src/lib/krb5/krb/preauth.c	2009-11-01 02:46:36 UTC (rev 23111)
@@ -531,10 +531,10 @@
 						   &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);

Modified: trunk/src/lib/krb5/krb/preauth2.c
===================================================================
--- trunk/src/lib/krb5/krb/preauth2.c	2009-11-01 00:27:21 UTC (rev 23110)
+++ trunk/src/lib/krb5/krb/preauth2.c	2009-11-01 02:46:36 UTC (rev 23111)
@@ -1010,8 +1010,8 @@
                                                 &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);