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 9061aa9b692d6bbad48758cebb18cc2482c0bd51..d9c076eef57c9671ccf4aa980c587fb542f99bc5 100644 (file)
--- 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 c96f0f5b3c4a33f6b350d0f9664e7a0ae87c3500..e9e5839380061d4201457fdeb2fc6d1779ac70d2 100644 (file)
--- 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);