From e500b96716a6d27f01ecb2f369eb08b0c24eef48 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Sun, 9 Mar 1997 20:03:12 +0000
Subject: [PATCH] Use krb5_decrypt

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1328 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/krb5/rd_req.c | 60 ++++++++++++++++-------------------------------
 1 file changed, 20 insertions(+), 40 deletions(-)

diff --git a/lib/krb5/rd_req.c b/lib/krb5/rd_req.c
index ec1908723..fcc26ebfb 100644
--- a/lib/krb5/rd_req.c
+++ b/lib/krb5/rd_req.c
@@ -8,27 +8,17 @@ decrypt_tkt_enc_part (krb5_context context,
 		      EncryptedData *enc_part,
 		      EncTicketPart *decr_part)
 {
-    des_key_schedule sched;
-    char *buf;
-    int i;
-    int len = enc_part->cipher.length;
+    krb5_error_code ret;
+    krb5_data plain;
+    int len;
 
-    des_set_key (key->contents.data, sched);
-    buf = malloc (len);
-    if (buf == NULL)
-	return ENOMEM;
-    des_cbc_encrypt ((des_cblock *)enc_part->cipher.data,
-		     (des_cblock *)buf,
-		     len,
-		     sched,
-		     key->contents.data,
-		     DES_DECRYPT);
-    /* XXX: Check CRC */
+    ret = krb5_decrypt (context, enc_part->cipher.data, enc_part->cipher.length, key, &plain);
+    if (ret)
+	return ret;
 
-    i = decode_EncTicketPart((unsigned char*)buf + 12, len - 12,
-			     decr_part);
-    free (buf);
-    if (i < 0)
+    len = decode_EncTicketPart(plain.data, plain.length, decr_part);
+    krb5_data_free (&plain);
+    if (len < 0)
       return ASN1_PARSE_ERROR;
     return 0;
 }
@@ -39,30 +29,20 @@ decrypt_authenticator (krb5_context context,
 		       EncryptedData *enc_part,
 		       Authenticator *authenticator)
 {
-    des_key_schedule sched;
-    char *buf;
-    int i;
-    int len = enc_part->cipher.length;
+    krb5_error_code ret;
+    krb5_data plain;
+    int len;
 
-    des_set_key (key->keyvalue.data, sched);
-    buf = malloc (len);
-    if (buf == NULL)
-	return ENOMEM;
-    des_cbc_encrypt ((des_cblock *)enc_part->cipher.data,
-		     (des_cblock *)buf,
-		     len,
-		     sched,
-		     key->keyvalue.data,
-		     DES_DECRYPT);
-    /* XXX: Check CRC */
+    ret = krb5_decrypt (context, enc_part->cipher.data, enc_part->cipher.length, key, &plain);
+    if (ret)
+	return ret;
 
-    i = decode_Authenticator((unsigned char*)buf + 12, len - 12,
-			     authenticator);
-    free(buf);
-    if (i < 0)
+    len = decode_Authenticator(plain.data, plain.length, authenticator);
+    krb5_data_free (&plain);
+    if (len < 0)
       return ASN1_PARSE_ERROR;
     return 0;
-}
+}    
 
 krb5_error_code
 krb5_rd_req(krb5_context context,
@@ -162,7 +142,7 @@ krb5_rd_req(krb5_context context,
 	*ap_req_options |= AP_OPTS_MUTUAL_REQUIRED;
     }
 
-    /* Check adress and time */
+    /* Check address and time */
 
     return 0;
   }