X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fgss%2Fgss_krb5.h;h=611160458d9b13a01097555b863d160917884690;hb=00ef8d08a9edc88f8b50d5761a8f96583fc39591;hp=fa5db1a6f223becee9e154bf230b0b0b120ef3bd;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/gss/gss_krb5.h b/lustre/ptlrpc/gss/gss_krb5.h
index fa5db1a..6111604 100644
--- a/lustre/ptlrpc/gss/gss_krb5.h
+++ b/lustre/ptlrpc/gss/gss_krb5.h
@@ -1,9 +1,7 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * Modifications for Lustre
  *
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  *
  * Author: Eric Mei <ericm@clusterfs.com>
  */
@@ -49,7 +47,7 @@
 #ifndef PTLRPC_GSS_KRB5_H
 #define PTLRPC_GSS_KRB5_H
 
-extern spinlock_t krb5_seq_lock;
+#include "gss_crypto.h"
 
 /*
  * RFC 4142
@@ -77,25 +75,20 @@ struct krb5_header {
         __u8            kh_cksum[0];    /* checksum */
 };
 
-struct krb5_keyblock {
-        rawobj_t                 kb_key;
-        struct ll_crypto_cipher *kb_tfm;
-};
-
 struct krb5_ctx {
-        unsigned int            kc_initiate:1,
-                                kc_cfx:1,
-                                kc_seed_init:1,
-                                kc_have_acceptor_subkey:1;
-        __s32                   kc_endtime;
-        __u8                    kc_seed[16];
-        __u64                   kc_seq_send;
-        __u64                   kc_seq_recv;
-        __u32                   kc_enctype;
-        struct krb5_keyblock    kc_keye;        /* encryption */
-        struct krb5_keyblock    kc_keyi;        /* integrity */
-        struct krb5_keyblock    kc_keyc;        /* checksum */
-        rawobj_t                kc_mech_used;
+	unsigned int		kc_initiate:1,
+				kc_cfx:1,
+				kc_seed_init:1,
+				kc_have_acceptor_subkey:1;
+	time64_t		kc_endtime;
+	__u8			kc_seed[16];
+	__u64			kc_seq_send;
+	__u64			kc_seq_recv;
+	__u32			kc_enctype;
+	struct gss_keyblock	kc_keye;	/* encryption */
+	struct gss_keyblock	kc_keyi;	/* integrity */
+	struct gss_keyblock	kc_keyc;	/* checksum */
+	rawobj_t		kc_mech_used;
 };
 
 enum sgn_alg {