oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Include asn1.h; krb5_data is now an octet_string.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1875 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-06-09 22:51:39 +00:00
parent f2683a95b1
commit dcfdfe6278
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/krb5/krb5.h
View File

@@ -25,6 +25,8 @@
#include <asn1_err.h> #include <asn1_err.h>
#include <krb5_err.h> #include <krb5_err.h>
#include <asn1.h>
#include "config_file.h" #include "config_file.h"
/* simple constants */ /* simple constants */
@@ -45,11 +47,7 @@ typedef u_int32_t krb5_flags;
typedef void *krb5_pointer; typedef void *krb5_pointer;
typedef const void *krb5_const_pointer; typedef const void *krb5_const_pointer;
typedef struct krb5_data{ typedef octet_string krb5_data;
size_t length;
krb5_pointer data;
} krb5_data;
typedef enum krb5_cksumtype { typedef enum krb5_cksumtype {
CKSUMTYPE_NONE = 0, CKSUMTYPE_NONE = 0,
@@ -102,10 +100,14 @@ typedef struct krb5_addresses {
typedef enum krb5_keytype { KEYTYPE_DES = 1 } krb5_keytype; typedef enum krb5_keytype { KEYTYPE_DES = 1 } krb5_keytype;
#ifndef yet
typedef struct krb5_keyblock{ typedef struct krb5_keyblock{
krb5_keytype keytype; krb5_keytype keytype;
krb5_data contents; krb5_data contents;
} krb5_keyblock; } krb5_keyblock;
#else
typedef EncryptionKey krb5_keyblock;
#endif
struct krb5_cc_ops; struct krb5_cc_ops;
@@ -189,6 +191,14 @@ enum{
KRB5_NT_UID = 5 KRB5_NT_UID = 5
}; };
typedef krb5_data krb5_realm;
#ifdef USE_PRINCIPALNAME
typedef struct krb5_principal_data {
PrincipalName pn;
krb5_realm realm;
} krb5_principal_data;
#else
typedef struct krb5_principal_data{ typedef struct krb5_principal_data{
int type; int type;
krb5_data realm; krb5_data realm;
@@ -196,10 +206,7 @@ typedef struct krb5_principal_data{
int ncomp; int ncomp;
}krb5_principal_data; }krb5_principal_data;
typedef krb5_data krb5_realm; #endif
/* XXX This does not belong here! */
#include <asn1.h>
typedef struct krb5_ticket { typedef struct krb5_ticket {
#if 0 #if 0
@@ -213,9 +220,6 @@ typedef struct krb5_ticket {
} enc_part2; } enc_part2;
} krb5_ticket; } krb5_ticket;
typedef struct krb5_authenticator_data{ typedef struct krb5_authenticator_data{
int vno; int vno;
krb5_principal cname; krb5_principal cname;