From 4e609bf313a80dbc2247a73d1303b2068eec9acd Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartmans@mit.edu>
Date: Fri, 3 Apr 2009 04:03:45 +0000
Subject: Merge fast branch at 22166 onto trunk

ticket: 6436

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22167 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/include/k5-int.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/include')

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index db3976057..5e159d9a4 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -982,7 +982,7 @@ typedef struct _krb5_fast_armored_req {
 
 typedef struct _krb5_fast_req {
     krb5_magic magic;
-    krb5_int32 fast_options;
+    krb5_flags fast_options;
     /* padata from req_body is used*/
    krb5_kdc_req *req_body;
 } krb5_fast_req;
@@ -1001,7 +1001,7 @@ typedef struct _krb5_fast_finished {
 typedef struct _krb5_fast_response {
     krb5_magic magic;
     krb5_pa_data **padata;
-    krb5_keyblock *rep_key;
+    krb5_keyblock *strengthen_key;
     krb5_fast_finished *finished;
     krb5_int32 nonce;
 } krb5_fast_response;
-- 
cgit