From 6982ad8930d57823aa4785f9ed48674d6a478115 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Mon, 22 Sep 1997 15:55:03 +0000
Subject: [PATCH] Add CKSUMTYPE_HMAC_SHA1_DES3, CKSUMTYPE_SHA1, and
 KEYTYPE_DES3. Rename krb5_time to krb5_timestamp, add krb5_deltat.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3521 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/krb5/krb5.h | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h
index e82ea00ad..ec3f32db0 100644
--- a/lib/krb5/krb5.h
+++ b/lib/krb5/krb5.h
@@ -82,7 +82,8 @@ typedef enum krb5_cksumtype {
   CKSUMTYPE_RSA_MD5		= 7,
   CKSUMTYPE_RSA_MD5_DES		= 8,
   CKSUMTYPE_RSA_MD5_DES3	= 9,
-  CKSUMTYPE_HMAC_SHA1_DES3	= 10
+  CKSUMTYPE_HMAC_SHA1_DES3	= 10,
+  CKSUMTYPE_SHA1		= 1000 /* correct value? */
 } krb5_cksumtype;
 
 
@@ -126,7 +127,8 @@ typedef HostAddresses krb5_addresses;
 
 typedef enum krb5_keytype { 
     KEYTYPE_NULL = 0,
-    KEYTYPE_DES = 1 
+    KEYTYPE_DES = 1,
+    KEYTYPE_DES3 = 7
 } krb5_keytype;
 
 typedef EncryptionKey krb5_keyblock;
@@ -158,13 +160,14 @@ typedef Principal krb5_principal_data;
 typedef struct Principal *krb5_principal;
 typedef const struct Principal *krb5_const_principal;
 
-typedef time_t krb5_time;
+typedef time_t krb5_deltat;
+typedef time_t krb5_timestamp;
 
 typedef struct krb5_times{
-  krb5_time authtime;
-  krb5_time starttime;
-  krb5_time endtime;
-  krb5_time renew_till;
+  krb5_timestamp authtime;
+  krb5_timestamp starttime;
+  krb5_timestamp endtime;
+  krb5_timestamp renew_till;
 } krb5_times;
 
 typedef union {
@@ -347,8 +350,6 @@ typedef EncAPRepPart krb5_ap_rep_enc_part;
 extern const char krb5_config_file[];
 extern const char krb5_defkeyname[];
 
-typedef krb5_time krb5_deltat;
-
 typedef struct _krb5_prompt {
     char *prompt;
     int hidden;