From: Theodore Tso <tytso@mit.edu>
Date: Mon, 13 Nov 1995 17:57:00 +0000 (+0000)
Subject: Added typedef for krb5_preauth_proces_proc, and changed the prototype
X-Git-Tag: krb5-1.0-beta6~802
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=54d0d275b6609e52157caec48c9ee3a4d3b9c430;p=krb5.git

Added typedef for krb5_preauth_proces_proc, and changed the prototype
of krb5_process_padata() to take additional arguments for returning
the decryption key to use for decrypting the as_reply, as well as
passing in the decrypt_proc procedure in case some preauth types want
to call decrypt_proc themselves.

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 32ab6f52b..fee9e7b89 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,5 +1,12 @@
 Mon Nov 13 11:49:02 1995  Theodore Y. Ts'o  <tytso@dcl>
 
+	* k5-int.h: Added typedef for krb5_preauth_proces_proc, and
+		changed the prototype of krb5_process_padata() to take
+		additional arguments for returning the decryption key to
+		use for decrypting the as_reply, as well as passing in the
+		decrypt_proc procedure in case some preauth types want to
+		call decrypt_proc themselves.
+
 	* krb5.hin: Add prototypes for krb5_encrypt_data(),
 		krb5_decrypt_data(). 
 
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 91b8db420..0841133e0 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -829,16 +829,32 @@ typedef krb5_error_code (krb5_preauth_obtain_proc)
 		    krb5_kdc_req *,
 		    krb5_pa_data **));
 
-typedef krb5_error_code (krb5_preauth_verify_proc)
-    KRB5_PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr,
-	       krb5_data *data));
+typedef krb5_error_code (krb5_preauth_process_proc)
+    KRB5_PROTOTYPE((krb5_context,
+		    krb5_pa_data *,
+		    krb5_kdc_req *,
+		    krb5_kdc_rep *,
+		    krb5_error_code ( * )(krb5_context,
+					  krb5_const krb5_enctype,
+					  krb5_data *,
+					  krb5_const_pointer,
+					  krb5_keyblock **),
+		    krb5_const_pointer,
+		    krb5_error_code ( * )(krb5_context,
+					  krb5_const krb5_keyblock *,
+					  krb5_const_pointer,
+					  krb5_kdc_rep * ),
+		    krb5_keyblock **,
+		    krb5_creds *, 
+		    krb5_int32 *,
+		    krb5_int32 *));
 
 typedef struct _krb5_preauth_ops {
     krb5_magic magic;
     int     type;
     int	flags;
     krb5_preauth_obtain_proc	*obtain;
-    krb5_preauth_verify_proc	*verify;
+    krb5_preauth_process_proc	*process;
 } krb5_preauth_ops;
 
 krb5_error_code krb5_obtain_padata
@@ -862,7 +878,12 @@ krb5_error_code krb5_process_padata
                                       krb5_data *,
                                       krb5_const_pointer,
                                       krb5_keyblock **),
-		krb5_const_pointer, 
+		krb5_const_pointer,
+		krb5_error_code ( * )(krb5_context,
+				      krb5_const krb5_keyblock *,
+				      krb5_const_pointer,
+				      krb5_kdc_rep * ),
+		krb5_keyblock **, 	
 		krb5_creds *, 
 		krb5_int32 *));