use checksum & encryption macrtos

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

diff --git a/src/lib/krb5/krb/encode_kdc.c b/src/lib/krb5/krb/encode_kdc.c
index 9e2f7b27eeb1e89822960dfbd38f5faecf5e04ba..fa51fef4085736881318c50e20f9373245cb9d49 100644 (file)
--- a/src/lib/krb5/krb/encode_kdc.c
+++ b/src/lib/krb5/krb/encode_kdc.c
@@ -71,7 +71,7 @@ krb5_free_data(scratch); }
 
     /* put together an eblock for this encryption */
 
-    eblock.crypto_entry = krb5_csarray[dec_rep->enc_part.etype]->system;
+    krb5_use_cstype(&eblock, dec_rep->enc_part.etype);
     dec_rep->enc_part.ciphertext.length =
        krb5_encrypt_size(scratch->length, eblock.crypto_entry);
     /* add padding area, and zero it */

diff --git a/src/lib/krb5/krb/send_tgs.c b/src/lib/krb5/krb/send_tgs.c
index 224e99c30535c09c73d57b35ab00abeefb786030..c78e11ab7d8bd72de0a3381ef4db39b5e3a8daaa 100644 (file)
--- a/src/lib/krb5/krb/send_tgs.c
+++ b/src/lib/krb5/krb/send_tgs.c
@@ -170,7 +170,7 @@ OLDDECLARG(krb5_response *,rep)
     }
 
     if (!(ap_checksum.contents = (krb5_octet *)
-         malloc(krb5_cksumarray[sumtype]->checksum_length))) {
+         malloc(krb5_checsum_size(sumtype)))) {
        if (sec_ticket)
            krb5_free_ticket(sec_ticket);
        krb5_free_data(scratch);
@@ -178,12 +178,12 @@ OLDDECLARG(krb5_response *,rep)
        return ENOMEM;
     }
 
-    if (retval = (*(krb5_cksumarray[sumtype]->
-                   sum_func))(scratch->data,
-                              scratch->length,
-                              (krb5_pointer) usecred->keyblock.contents,
-                              usecred->keyblock.length,
-                              &ap_checksum)) {
+    if (retval = krb5_calculate_checksum(sumtype,
+                                        scratch->data,
+                                        scratch->length,
+                                        (krb5_pointer) usecred->keyblock.contents,
+                                        usecred->keyblock.length,
+                                        &ap_checksum)) {
        if (sec_ticket)
            krb5_free_ticket(sec_ticket);
        xfree(ap_checksum.contents);