From: Keith Vetter Date: Fri, 14 Apr 1995 00:56:21 +0000 (+0000) Subject: Windows global stuff: X-Git-Tag: krb5-1.0-beta5~382 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=48e59557cdff501a25c809cda3f1dd34a27cc52f;p=krb5.git Windows global stuff: o removed INTERFACE from non-api functions o add FAR to pointers visible to the world o made the tests for __STDC__ also check for _WINDOWS o creates GSSAPI.DLL & GSSAPI.LIB as per spec. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5354 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 0e5c6b2a7..483466453 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,8 @@ +Thu Apr 13 16:20:28 1995 Keith Vetter (keithv@fusion.com) + + * windows.in: compile with stdc extensions enabled versus + strict stdc adherence. + Tue Mar 28 17:58:55 1995 John Gilmore (gnu at toad.com) * mac-config.cache: Correct some entries. diff --git a/src/config/windows.in b/src/config/windows.in index e101a3c9e..14e496cd9 100644 --- a/src/config/windows.in +++ b/src/config/windows.in @@ -14,8 +14,8 @@ srcdir = . # /* The name of the C compiler for the target */ CC=cl /nologo CL= -CCOPTS=/ALw /Zpa /GD2s /Os /Zi /Od /W3 $(XTRA) -CCOPTS2=/AL /Zpa /G2s /Os /Zi /Od /W3 -DINTERFACE= -DINTERFACE_C= $(XTRA) +CCOPTS=/ALw /Zp /GD2s /Os /Zi /Od /W3 $(XTRA) +CCOPTS2=/AL /Zp /G2s /Os /Zi /Od /W3 -DINTERFACE= -DINTERFACE_C= $(XTRA) CPPFLAGS = -I$(SRCTOP)/include -I$(SRCTOP)/include/krb5 DEFS = $(CPPFLAGS) CFLAGS2 = $(CCOPTS2) $(DEFS) diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 2de0f8fb0..70c42d3b6 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 13 16:05:08 1995 Keith Vetter (keithv@fusion.com) + + * bsdlib.h, bstring.h, fake-std.h, syslog.h: __STDC__ conditionals + also check for the _WINDOWS define. + * krb5.h: added FAR to pointers visible to the world. + Tue Mar 28 18:12:32 1995 John Gilmore (gnu at toad.com) * Makefile.in (KRB5_HEADERS, install): `Make install' now works. diff --git a/src/include/bsdlib.h b/src/include/bsdlib.h index 60e203e57..8ee3d40cf 100644 --- a/src/include/bsdlib.h +++ b/src/include/bsdlib.h @@ -4,7 +4,7 @@ */ #ifndef __BSDLIB__ #define __BSDLIB__ -#ifdef __STDC__ +#if defined(__STDC__) || defined(_WINDOWS) /* compat-4.3 */ extern char *ecvt (double , int , int *, int *); extern char *fcvt (double , int , int *, int *); diff --git a/src/include/bstring.h b/src/include/bstring.h index 33d0ba606..c7d0d6137 100644 --- a/src/include/bstring.h +++ b/src/include/bstring.h @@ -4,7 +4,7 @@ */ #ifndef __BSTRING__ #define __BSTRING__ -#ifdef __STDC__ +#if defined(__STDC__) || defined(_WINDOWS) /* compat-sys5 */ /* these are in */ extern int bcmp (const char *, const char *, int ); diff --git a/src/include/fake-stdlib.h b/src/include/fake-stdlib.h index 77dfe4019..5f021a228 100644 --- a/src/include/fake-stdlib.h +++ b/src/include/fake-stdlib.h @@ -1,5 +1,4 @@ -#ifdef __STDC__ -# define P(s) s +#if defined(__STDC__) || defined(_WINDOWS) #else # define P(s) () #endif @@ -201,7 +200,7 @@ char *initstate P((unsigned , char *, int )); int isatty P((int )); double ldexp P((double , int )); int longjmperror P((void )); -#ifdef __STDC__ +#if defined(__STDC__) || defined(_WINDOWS) void *malloc P((size_t )); #else char *malloc P((unsigned )); @@ -466,7 +465,7 @@ struct ttyent *getttyent P((void )); struct ttyent *getttynam P((const char * )); unsigned long inet_network P((const char * )); int initgroups P((char * , int )); -#ifdef __STDC__ +#if defined(__STDC__) || defined(_WINDOWS) void *malloc P((unsigned )); #else char *malloc P((unsigned )); diff --git a/src/include/krb5.h b/src/include/krb5.h index f322bac9c..239ff4ebc 100644 --- a/src/include/krb5.h +++ b/src/include/krb5.h @@ -34,10 +34,10 @@ typedef struct _krb5_context { krb5_magic magic; - krb5_enctype * etypes; + krb5_enctype FAR *etypes; int etype_count; - void * os_context; -} * krb5_context; + void FAR *os_context; +} FAR * krb5_context; struct _krb5_auth_context; typedef struct _krb5_auth_context krb5_auth_context; @@ -64,7 +64,7 @@ typedef struct _krb5_authdata { krb5_magic magic; krb5_authdatatype ad_type; int length; - krb5_octet *contents; + krb5_octet FAR *contents; } krb5_authdata; /* structure for transited encoding */ @@ -78,12 +78,12 @@ typedef struct _krb5_enc_tkt_part { krb5_magic magic; /* to-be-encrypted portion */ krb5_flags flags; /* flags */ - krb5_keyblock *session; /* session key: includes keytype */ + krb5_keyblock FAR *session; /* session key: includes keytype */ krb5_principal client; /* client name/realm */ krb5_transited transited; /* list of transited realms */ krb5_ticket_times times; /* auth, start, end, renew_till */ - krb5_address **caddrs; /* array of ptrs to addresses */ - krb5_authdata **authorization_data; /* auth data */ + krb5_address FAR * FAR *caddrs; /* array of ptrs to addresses */ + krb5_authdata FAR * FAR *authorization_data; /* auth data */ } krb5_enc_tkt_part; typedef struct _krb5_ticket { @@ -92,7 +92,7 @@ typedef struct _krb5_ticket { krb5_principal server; /* server name/realm */ krb5_enc_data enc_part; /* encryption type, kvno, encrypted encoding */ - krb5_enc_tkt_part *enc_part2; /* ptr to decrypted version, if + krb5_enc_tkt_part FAR *enc_part2; /* ptr to decrypted version, if available */ } krb5_ticket; @@ -100,18 +100,18 @@ typedef struct _krb5_ticket { typedef struct _krb5_authenticator { krb5_magic magic; krb5_principal client; /* client name/realm */ - krb5_checksum *checksum; /* checksum, includes type, optional */ + krb5_checksum FAR *checksum; /* checksum, includes type, optional */ krb5_int32 cusec; /* client usec portion */ krb5_timestamp ctime; /* client sec portion */ - krb5_keyblock *subkey; /* true session key, optional */ + krb5_keyblock FAR *subkey; /* true session key, optional */ krb5_int32 seq_number; /* sequence #, optional */ - krb5_authdata **authorization_data; /* New add by Ari, auth data */ + krb5_authdata FAR * FAR *authorization_data; /* New add by Ari, auth data */ } krb5_authenticator; typedef struct _krb5_tkt_authent { krb5_magic magic; - krb5_ticket *ticket; - krb5_authenticator *authenticator; + krb5_ticket FAR *ticket; + krb5_authenticator FAR *authenticator; krb5_flags ap_options; } krb5_tkt_authent; @@ -125,12 +125,12 @@ typedef struct _krb5_creds { krb5_boolean is_skey; /* true if ticket is encrypted in another ticket's skey */ krb5_flags ticket_flags; /* flags in ticket */ - krb5_address **addresses; /* addrs in ticket */ + krb5_address FAR * FAR *addresses; /* addrs in ticket */ krb5_data ticket; /* ticket string itself */ krb5_data second_ticket; /* second ticket, if related to ticket (via DUPLICATE-SKEY or ENC-TKT-IN-SKEY) */ - krb5_authdata **authdata; /* authorization data */ + krb5_authdata FAR * FAR *authdata; /* authorization data */ } krb5_creds; /* Last request fields */ @@ -145,13 +145,13 @@ typedef struct _krb5_pa_data { krb5_magic magic; krb5_ui_2 pa_type; int length; - krb5_octet *contents; + krb5_octet FAR *contents; } krb5_pa_data; typedef struct _krb5_kdc_req { krb5_magic magic; krb5_msgtype msg_type; /* AS_REQ or TGS_REQ? */ - krb5_pa_data **padata; /* e.g. encoded AP_REQ */ + krb5_pa_data FAR * FAR *padata; /* e.g. encoded AP_REQ */ /* real body */ krb5_flags kdc_options; /* requested options */ krb5_principal client; /* includes realm; optional */ @@ -162,26 +162,26 @@ typedef struct _krb5_kdc_req { krb5_timestamp rtime; /* (optional) requested renew_till */ krb5_int32 nonce; /* nonce to match request/response */ int netypes; /* # of etypes, must be positive */ - krb5_enctype *etype; /* requested encryption type(s) */ - krb5_address **addresses; /* requested addresses, optional */ + krb5_enctype FAR *etype; /* requested encryption type(s) */ + krb5_address FAR * FAR *addresses; /* requested addresses, optional */ krb5_enc_data authorization_data; /* encrypted auth data; OPTIONAL */ - krb5_authdata **unenc_authdata; /* unencrypted auth data, + krb5_authdata FAR * FAR *unenc_authdata; /* unencrypted auth data, if available */ - krb5_ticket **second_ticket; /* second ticket array; OPTIONAL */ + krb5_ticket FAR * FAR *second_ticket;/* second ticket array; OPTIONAL */ } krb5_kdc_req; typedef struct _krb5_enc_kdc_rep_part { krb5_magic magic; /* encrypted part: */ krb5_msgtype msg_type; /* krb5 message type */ - krb5_keyblock *session; /* session key */ - krb5_last_req_entry **last_req; /* array of ptrs to entries */ + krb5_keyblock FAR *session; /* session key */ + krb5_last_req_entry FAR * FAR *last_req; /* array of ptrs to entries */ krb5_int32 nonce; /* nonce from request */ krb5_timestamp key_exp; /* expiration date */ krb5_flags flags; /* ticket flags */ krb5_ticket_times times; /* lifetime info */ krb5_principal server; /* server's principal identifier */ - krb5_address **caddrs; /* array of ptrs to addresses, + krb5_address FAR * FAR *caddrs; /* array of ptrs to addresses, optional */ } krb5_enc_kdc_rep_part; @@ -189,12 +189,12 @@ typedef struct _krb5_kdc_rep { krb5_magic magic; /* cleartext part: */ krb5_msgtype msg_type; /* AS_REP or KDC_REP? */ - krb5_pa_data **padata; /* preauthentication data from KDC */ + krb5_pa_data FAR * FAR *padata; /* preauthentication data from KDC */ krb5_principal client; /* client's principal identifier */ - krb5_ticket *ticket; /* ticket */ + krb5_ticket FAR *ticket; /* ticket */ krb5_enc_data enc_part; /* encryption type, kvno, encrypted encoding */ - krb5_enc_kdc_rep_part *enc_part2; /* unencrypted version, if available */ + krb5_enc_kdc_rep_part FAR *enc_part2;/* unencrypted version, if available */ } krb5_kdc_rep; /* error message structure */ @@ -216,7 +216,7 @@ typedef struct _krb5_error { typedef struct _krb5_ap_req { krb5_magic magic; krb5_flags ap_options; /* requested options */ - krb5_ticket *ticket; /* ticket */ + krb5_ticket FAR *ticket; /* ticket */ krb5_enc_data authenticator; /* authenticator (already encrypted) */ } krb5_ap_req; @@ -229,7 +229,7 @@ typedef struct _krb5_ap_rep_enc_part { krb5_magic magic; krb5_timestamp ctime; /* client time, seconds portion */ krb5_int32 cusec; /* client time, microseconds portion */ - krb5_keyblock *subkey; /* true session key, optional */ + krb5_keyblock FAR *subkey; /* true session key, optional */ krb5_int32 seq_number; /* sequence #, optional */ } krb5_ap_rep_enc_part; @@ -246,9 +246,9 @@ typedef struct _krb5_safe { krb5_int32 usec; /* microsecond portion of time, optional */ krb5_int32 seq_number; /* sequence #, optional */ - krb5_address *s_address; /* sender address */ - krb5_address *r_address; /* recipient address, optional */ - krb5_checksum *checksum; /* data integrity checksum */ + krb5_address FAR *s_address; /* sender address */ + krb5_address FAR *r_address; /* recipient address, optional */ + krb5_checksum FAR *checksum; /* data integrity checksum */ } krb5_safe; typedef struct _krb5_priv { @@ -262,20 +262,20 @@ typedef struct _krb5_priv_enc_part { krb5_timestamp timestamp; /* client time, optional */ krb5_int32 usec; /* microsecond portion of time, opt. */ krb5_int32 seq_number; /* sequence #, optional */ - krb5_address *s_address; /* sender address */ - krb5_address *r_address; /* recipient address, optional */ + krb5_address FAR *s_address; /* sender address */ + krb5_address FAR *r_address; /* recipient address, optional */ } krb5_priv_enc_part; typedef struct _krb5_cred_info { krb5_magic magic; - krb5_keyblock* session; /* session key used to encrypt */ + krb5_keyblock FAR *session; /* session key used to encrypt */ /* ticket */ krb5_principal client; /* client name/realm, optional */ krb5_principal server; /* server name/realm, optional */ krb5_flags flags; /* ticket flags, optional */ krb5_ticket_times times; /* auth, start, end, renew_till, */ /* optional */ - krb5_address **caddrs; /* array of ptrs to addresses */ + krb5_address FAR * FAR *caddrs; /* array of ptrs to addresses */ } krb5_cred_info; typedef struct _krb5_cred_enc_part { @@ -283,29 +283,29 @@ typedef struct _krb5_cred_enc_part { krb5_int32 nonce; /* nonce, optional */ krb5_timestamp timestamp; /* client time */ krb5_int32 usec; /* microsecond portion of time */ - krb5_address *s_address; /* sender address, optional */ - krb5_address *r_address; /* recipient address, optional */ - krb5_cred_info **ticket_info; + krb5_address FAR *s_address; /* sender address, optional */ + krb5_address FAR *r_address; /* recipient address, optional */ + krb5_cred_info FAR * FAR *ticket_info; } krb5_cred_enc_part; typedef struct _krb5_cred { krb5_magic magic; - krb5_ticket **tickets; /* tickets */ + krb5_ticket FAR * FAR *tickets; /* tickets */ krb5_enc_data enc_part; /* encrypted part */ - krb5_cred_enc_part *enc_part2; /* unencrypted version, if available*/ + krb5_cred_enc_part FAR *enc_part2; /* unencrypted version, if available*/ } krb5_cred; /* Sandia password generation structures */ typedef struct _passwd_phrase_element { krb5_magic magic; - krb5_data *passwd; - krb5_data *phrase; + krb5_data FAR *passwd; + krb5_data FAR *phrase; } passwd_phrase_element; typedef struct _krb5_pwd_data { krb5_magic magic; int sequence_count; - passwd_phrase_element **element; + passwd_phrase_element FAR * FAR *element; } krb5_pwd_data; /* these need to be here so the typedefs are available for the prototypes */ diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index bdafb01f6..023c2b663 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,14 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * asn1.h, ccache.h, encryption.h, func-pro.h, hostaddr.h, keytab.h, + los-prot.h, preauth.h, rcache.h: + removed unneeded INTERFACE from non-api functions. + * adm_defs.h, ccache.h, encryption.h, hostaddr.h, k5-free.h, keytab.h, + macros.h, rcache.h: + Added FAR to pointers visible to the world. + * base-def.h, ext-prot.h, rsa-md5.h: __STDC__ condition also + checks for the _WINDOWS define. + Wed Apr 5 16:41:41 1995 Keith Vetter (keithv@fusion.com) * los-proto.h, func-proto.h: moved krb5_us_timeofday and diff --git a/src/include/krb5/adm_defs.h b/src/include/krb5/adm_defs.h index 6bca9c0b7..0c4ed05c3 100644 --- a/src/include/krb5/adm_defs.h +++ b/src/include/krb5/adm_defs.h @@ -92,11 +92,11 @@ typedef struct { char appl_code; char oper_code; char retn_code; - char *message; + char FAR *message; } kadmin_requests; #if 0 -static char *oper_type[] = { +static char FAR *oper_type[] = { "complete", /* 0 */ "addition", /* 1 */ "deletion", /* 2 */ @@ -111,7 +111,7 @@ static char *oper_type[] = { #if 0 -static char *ksrvutil_message[] = { +static char FAR *ksrvutil_message[] = { "Service Key Changed", /* 0 */ "New Key and Version Received" /* 1 */ }; @@ -121,7 +121,7 @@ static char *ksrvutil_message[] = { #define KADMSAG 0x01 #if 0 -static char *kadmind_general_response[] = { +static char FAR *kadmind_general_response[] = { "Success", /* 0 */ "Service Access Granted" /* 1 */ }; @@ -132,7 +132,7 @@ static char *kadmind_general_response[] = { #define KPASSBAD 0x01 #if 0 -static char *kadmind_kpasswd_response[] = { +static char FAR *kadmind_kpasswd_response[] = { "Password Changed", /* 0 */ "Password NOT Changed!" /* 1 */ }; @@ -143,7 +143,7 @@ static char *kadmind_kpasswd_response[] = { #define KSRVCATASTROPHE 0x02 #if 0 -static char *kadmind_ksrvutil_response[] = { +static char FAR *kadmind_ksrvutil_response[] = { "Service Password Change Complete", /* 0 */ "One or More Service Password Change(s) Failed!", /* 1 */ "Database Update Failure - Possible Catastrophe!!" /* 2 */ @@ -154,7 +154,7 @@ static char *kadmind_ksrvutil_response[] = { #define KADMBAD 0x01 #if 0 -static char *kadmind_kadmin_response[] = { +static char FAR *kadmind_kadmin_response[] = { "Administrative Service Completed", /* 0 */ "Principal Unknown!", /* 1 */ "Principal Already Exists!", /* 2 */ diff --git a/src/include/krb5/asn1.h b/src/include/krb5/asn1.h index f142179f8..89efd4cda 100644 --- a/src/include/krb5/asn1.h +++ b/src/include/krb5/asn1.h @@ -115,72 +115,72 @@ Returns ENOMEM if memory runs out. */ -krb5_error_code INTERFACE encode_krb5_authenticator +krb5_error_code encode_krb5_authenticator PROTOTYPE((const krb5_authenticator *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_ticket +krb5_error_code encode_krb5_ticket PROTOTYPE((const krb5_ticket *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_encryption_key +krb5_error_code encode_krb5_encryption_key PROTOTYPE((const krb5_keyblock *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_enc_tkt_part +krb5_error_code encode_krb5_enc_tkt_part PROTOTYPE((const krb5_enc_tkt_part *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_enc_kdc_rep_part +krb5_error_code encode_krb5_enc_kdc_rep_part PROTOTYPE((const krb5_enc_kdc_rep_part *rep, krb5_data **code)); /* yes, the translation is identical to that used for KDC__REP */ -krb5_error_code INTERFACE encode_krb5_as_rep +krb5_error_code encode_krb5_as_rep PROTOTYPE((const krb5_kdc_rep *rep, krb5_data **code)); /* yes, the translation is identical to that used for KDC__REP */ -krb5_error_code INTERFACE encode_krb5_tgs_rep +krb5_error_code encode_krb5_tgs_rep PROTOTYPE((const krb5_kdc_rep *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_ap_req +krb5_error_code encode_krb5_ap_req PROTOTYPE((const krb5_ap_req *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_ap_rep +krb5_error_code encode_krb5_ap_rep PROTOTYPE((const krb5_ap_rep *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_ap_rep_enc_part +krb5_error_code encode_krb5_ap_rep_enc_part PROTOTYPE((const krb5_ap_rep_enc_part *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_as_req +krb5_error_code encode_krb5_as_req PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_tgs_req +krb5_error_code encode_krb5_tgs_req PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_kdc_req_body +krb5_error_code encode_krb5_kdc_req_body PROTOTYPE((const krb5_kdc_req *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_safe +krb5_error_code encode_krb5_safe PROTOTYPE((const krb5_safe *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_priv +krb5_error_code encode_krb5_priv PROTOTYPE((const krb5_priv *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_enc_priv_part +krb5_error_code encode_krb5_enc_priv_part PROTOTYPE((const krb5_priv_enc_part *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_cred +krb5_error_code encode_krb5_cred PROTOTYPE((const krb5_cred *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_enc_cred_part +krb5_error_code encode_krb5_enc_cred_part PROTOTYPE((const krb5_cred_enc_part *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_error +krb5_error_code encode_krb5_error PROTOTYPE((const krb5_error *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_authdata +krb5_error_code encode_krb5_authdata PROTOTYPE((const krb5_authdata **rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_pwd_sequence +krb5_error_code encode_krb5_pwd_sequence PROTOTYPE((const passwd_phrase_element *rep, krb5_data **code)); -krb5_error_code INTERFACE encode_krb5_pwd_data +krb5_error_code encode_krb5_pwd_data PROTOTYPE((const krb5_pwd_data *rep, krb5_data **code)); /************************************************************************* @@ -203,70 +203,70 @@ krb5_error_code INTERFACE encode_krb5_pwd_data Returns asn1 and krb5 errors. */ -krb5_error_code INTERFACE decode_krb5_authenticator +krb5_error_code decode_krb5_authenticator PROTOTYPE((const krb5_data *code, krb5_authenticator **rep)); -krb5_error_code INTERFACE decode_krb5_ticket +krb5_error_code decode_krb5_ticket PROTOTYPE((const krb5_data *code, krb5_ticket **rep)); -krb5_error_code INTERFACE decode_krb5_encryption_key +krb5_error_code decode_krb5_encryption_key PROTOTYPE((const krb5_data *output, krb5_keyblock **rep)); -krb5_error_code INTERFACE decode_krb5_enc_tkt_part +krb5_error_code decode_krb5_enc_tkt_part PROTOTYPE((const krb5_data *output, krb5_enc_tkt_part **rep)); -krb5_error_code INTERFACE decode_krb5_enc_kdc_rep_part +krb5_error_code decode_krb5_enc_kdc_rep_part PROTOTYPE((const krb5_data *output, krb5_enc_kdc_rep_part **rep)); -krb5_error_code INTERFACE decode_krb5_as_rep +krb5_error_code decode_krb5_as_rep PROTOTYPE((const krb5_data *output, krb5_kdc_rep **rep)); -krb5_error_code INTERFACE decode_krb5_tgs_rep +krb5_error_code decode_krb5_tgs_rep PROTOTYPE((const krb5_data *output, krb5_kdc_rep **rep)); -krb5_error_code INTERFACE decode_krb5_ap_req +krb5_error_code decode_krb5_ap_req PROTOTYPE((const krb5_data *output, krb5_ap_req **rep)); -krb5_error_code INTERFACE decode_krb5_ap_rep +krb5_error_code decode_krb5_ap_rep PROTOTYPE((const krb5_data *output, krb5_ap_rep **rep)); -krb5_error_code INTERFACE decode_krb5_ap_rep_enc_part +krb5_error_code decode_krb5_ap_rep_enc_part PROTOTYPE((const krb5_data *output, krb5_ap_rep_enc_part **rep)); -krb5_error_code INTERFACE decode_krb5_as_req +krb5_error_code decode_krb5_as_req PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep)); -krb5_error_code INTERFACE decode_krb5_tgs_req +krb5_error_code decode_krb5_tgs_req PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep)); -krb5_error_code INTERFACE decode_krb5_kdc_req_body +krb5_error_code decode_krb5_kdc_req_body PROTOTYPE((const krb5_data *output, krb5_kdc_req **rep)); -krb5_error_code INTERFACE decode_krb5_safe +krb5_error_code decode_krb5_safe PROTOTYPE((const krb5_data *output, krb5_safe **rep)); -krb5_error_code INTERFACE decode_krb5_priv +krb5_error_code decode_krb5_priv PROTOTYPE((const krb5_data *output, krb5_priv **rep)); -krb5_error_code INTERFACE decode_krb5_enc_priv_part +krb5_error_code decode_krb5_enc_priv_part PROTOTYPE((const krb5_data *output, krb5_priv_enc_part **rep)); -krb5_error_code INTERFACE decode_krb5_cred +krb5_error_code decode_krb5_cred PROTOTYPE((const krb5_data *output, krb5_cred **rep)); -krb5_error_code INTERFACE decode_krb5_enc_cred_part +krb5_error_code decode_krb5_enc_cred_part PROTOTYPE((const krb5_data *output, krb5_cred_enc_part **rep)); -krb5_error_code INTERFACE decode_krb5_error +krb5_error_code decode_krb5_error PROTOTYPE((const krb5_data *output, krb5_error **rep)); -krb5_error_code INTERFACE decode_krb5_authdata +krb5_error_code decode_krb5_authdata PROTOTYPE((const krb5_data *output, krb5_authdata ***rep)); -krb5_error_code INTERFACE decode_krb5_pwd_sequence +krb5_error_code decode_krb5_pwd_sequence PROTOTYPE((const krb5_data *output, passwd_phrase_element **rep)); -krb5_error_code INTERFACE decode_krb5_pwd_data +krb5_error_code decode_krb5_pwd_data PROTOTYPE((const krb5_data *output, krb5_pwd_data **rep)); /************************************************************************* diff --git a/src/include/krb5/base-defs.h b/src/include/krb5/base-defs.h index 2929c7cab..52ce3d5c9 100644 --- a/src/include/krb5/base-defs.h +++ b/src/include/krb5/base-defs.h @@ -62,14 +62,14 @@ typedef struct _krb5_data { /* make const & volatile available without effect */ -#if !defined(__STDC__) && !defined(HAS_ANSI_CONST) +#if !defined(__STDC__) && !defined(HAS_ANSI_CONST) && !defined(_WINDOWS) #define const #endif -#if !defined(__STDC__) && !defined(HAS_ANSI_VOLATILE) +#if !defined(__STDC__) && !defined(HAS_ANSI_VOLATILE) && !defined(_WINDOWS) #define volatile #endif -#if defined(__STDC__) || defined(HAS_VOID_TYPE) +#if defined(__STDC__) || defined(HAS_VOID_TYPE) || defined(_WINDOWS) typedef void FAR * krb5_pointer; typedef void const FAR * krb5_const_pointer; #else @@ -77,9 +77,9 @@ typedef char FAR * krb5_pointer; typedef char const FAR * krb5_const_pointer; #endif -#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) +#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS) #define PROTOTYPE(x) x -#if defined(__STDC__) || defined(HAVE_STDARG_H) +#if defined(__STDC__) || defined(HAVE_STDARG_H) || defined(_WINDOWS) #define STDARG_P(x) x #else #define STDARG_P(x) () diff --git a/src/include/krb5/ccache.h b/src/include/krb5/ccache.h index 90d855da3..988ec731b 100644 --- a/src/include/krb5/ccache.h +++ b/src/include/krb5/ccache.h @@ -32,36 +32,36 @@ typedef krb5_pointer krb5_cc_cursor; /* cursor for sequential lookup */ typedef struct _krb5_ccache { krb5_magic magic; - struct _krb5_cc_ops *ops; + struct _krb5_cc_ops FAR *ops; krb5_pointer data; -} *krb5_ccache; +} FAR *krb5_ccache; typedef struct _krb5_cc_ops { krb5_magic magic; - char *prefix; - char *(INTERFACE *get_name) NPROTOTYPE((krb5_context, krb5_ccache)); - krb5_error_code (INTERFACE *resolve) NPROTOTYPE((krb5_context, krb5_ccache *, - char *)); - krb5_error_code (INTERFACE *gen_new) NPROTOTYPE((krb5_context, krb5_ccache *)); + char FAR *prefix; + char FAR * (INTERFACE *get_name) NPROTOTYPE((krb5_context, krb5_ccache)); + krb5_error_code (INTERFACE *resolve) NPROTOTYPE((krb5_context, krb5_ccache FAR *, + char FAR *)); + krb5_error_code (INTERFACE *gen_new) NPROTOTYPE((krb5_context, krb5_ccache FAR *)); krb5_error_code (INTERFACE *init) NPROTOTYPE((krb5_context, krb5_ccache, krb5_principal)); krb5_error_code (INTERFACE *destroy) NPROTOTYPE((krb5_context, krb5_ccache)); krb5_error_code (INTERFACE *close) NPROTOTYPE((krb5_context, krb5_ccache)); krb5_error_code (INTERFACE *store) NPROTOTYPE((krb5_context, krb5_ccache, - krb5_creds *)); + krb5_creds FAR *)); krb5_error_code (INTERFACE *retrieve) NPROTOTYPE((krb5_context, krb5_ccache, - krb5_flags, krb5_creds *, - krb5_creds *)); + krb5_flags, krb5_creds FAR *, + krb5_creds FAR *)); krb5_error_code (INTERFACE *get_princ) NPROTOTYPE((krb5_context, krb5_ccache, - krb5_principal *)); + krb5_principal FAR *)); krb5_error_code (INTERFACE *get_first) NPROTOTYPE((krb5_context, krb5_ccache, - krb5_cc_cursor *)); + krb5_cc_cursor FAR *)); krb5_error_code (INTERFACE *get_next) NPROTOTYPE((krb5_context, krb5_ccache, - krb5_cc_cursor *, krb5_creds *)); + krb5_cc_cursor FAR *, krb5_creds FAR *)); krb5_error_code (INTERFACE *end_get) NPROTOTYPE((krb5_context, krb5_ccache, - krb5_cc_cursor *)); + krb5_cc_cursor FAR *)); krb5_error_code (INTERFACE *remove_cred) NPROTOTYPE((krb5_context, krb5_ccache, - krb5_flags, krb5_creds *)); + krb5_flags, krb5_creds FAR *)); krb5_error_code (INTERFACE *set_flags) NPROTOTYPE((krb5_context, krb5_ccache, krb5_flags)); } krb5_cc_ops; @@ -93,6 +93,6 @@ typedef struct _krb5_cc_ops { #define krb5_cc_set_flags(context, cache, flags) (*(cache)->ops->set_flags)(context, cache, flags) #define krb5_cc_get_name(context, cache) (*(cache)->ops->get_name)(context, cache) -extern krb5_cc_ops *krb5_cc_dfl_ops; +extern krb5_cc_ops FAR *krb5_cc_dfl_ops; #endif /* KRB5_CCACHE__ */ diff --git a/src/include/krb5/encryption.h b/src/include/krb5/encryption.h index c54630e38..0b72c2050 100644 --- a/src/include/krb5/encryption.h +++ b/src/include/krb5/encryption.h @@ -33,20 +33,20 @@ typedef struct _krb5_keyblock { krb5_keytype keytype; krb5_enctype etype; /* hint of what encryption type to use */ int length; - krb5_octet *contents; + krb5_octet FAR *contents; } krb5_keyblock; typedef struct _krb5_checksum { krb5_magic magic; krb5_cksumtype checksum_type; /* checksum type */ int length; - krb5_octet *contents; + krb5_octet FAR *contents; } krb5_checksum; typedef struct _krb5_encrypt_block { krb5_magic magic; - struct _krb5_cryptosystem_entry *crypto_entry; - krb5_keyblock *key; + struct _krb5_cryptosystem_entry FAR *crypto_entry; + krb5_keyblock FAR *key; krb5_pointer priv; /* for private use, e.g. DES key schedules */ } krb5_encrypt_block; @@ -61,30 +61,30 @@ typedef struct _krb5_enc_data { /* could be used in a table to find an etype and initialize a block */ typedef struct _krb5_cryptosystem_entry { krb5_magic magic; - krb5_error_code (INTERFACE *encrypt_func) NPROTOTYPE(( krb5_const_pointer /* in */, + krb5_error_code (*encrypt_func) NPROTOTYPE(( krb5_const_pointer /* in */, krb5_pointer /* out */, const size_t, - krb5_encrypt_block *, + krb5_encrypt_block FAR *, krb5_pointer)); - krb5_error_code (INTERFACE *decrypt_func) NPROTOTYPE(( krb5_const_pointer /* in */, + krb5_error_code (*decrypt_func) NPROTOTYPE(( krb5_const_pointer /* in */, krb5_pointer /* out */, const size_t, - krb5_encrypt_block *, + krb5_encrypt_block FAR *, krb5_pointer)); - krb5_error_code (INTERFACE *process_key) NPROTOTYPE(( krb5_encrypt_block *, - const krb5_keyblock *)); - krb5_error_code (INTERFACE *finish_key) NPROTOTYPE(( krb5_encrypt_block *)); - krb5_error_code (INTERFACE *string_to_key) NPROTOTYPE(( const krb5_encrypt_block *, + krb5_error_code (*process_key) NPROTOTYPE(( krb5_encrypt_block FAR *, + const krb5_keyblock FAR *)); + krb5_error_code (*finish_key) NPROTOTYPE(( krb5_encrypt_block FAR *)); + krb5_error_code (*string_to_key) NPROTOTYPE((const krb5_encrypt_block FAR *, const krb5_keytype, - krb5_keyblock *, - const krb5_data *, - const krb5_data *)); - krb5_error_code (INTERFACE *init_random_key) NPROTOTYPE(( const krb5_keyblock *, - krb5_pointer *)); - krb5_error_code (INTERFACE *finish_random_key) NPROTOTYPE(( krb5_pointer *)); - krb5_error_code (INTERFACE *random_key) NPROTOTYPE(( const krb5_encrypt_block *, + krb5_keyblock FAR *, + const krb5_data FAR *, + const krb5_data FAR *)); + krb5_error_code (*init_random_key) NPROTOTYPE((const krb5_keyblock FAR *, + krb5_pointer FAR *)); + krb5_error_code (*finish_random_key) NPROTOTYPE(( krb5_pointer FAR *)); + krb5_error_code (*random_key) NPROTOTYPE(( const krb5_encrypt_block FAR *, krb5_pointer, - krb5_keyblock **)); + krb5_keyblock FAR * FAR *)); int block_length; int pad_minimum; /* needed for cksum size computation */ int keysize; @@ -98,12 +98,12 @@ typedef struct _krb5_cryptosystem_entry { typedef struct _krb5_cs_table_entry { krb5_magic magic; - krb5_cryptosystem_entry *system; + krb5_cryptosystem_entry FAR *system; krb5_pointer random_sequence; /* from init_random_key() */ } krb5_cs_table_entry; /* could be used in a table to find a sumtype */ -typedef krb5_error_code (INTERFACE *SUM_FUNC) NPROTOTYPE ( +typedef krb5_error_code (*SUM_FUNC) NPROTOTYPE ( (krb5_pointer /* in */, size_t /* in_length */, krb5_pointer /* key/seed */, diff --git a/src/include/krb5/ext-proto.h b/src/include/krb5/ext-proto.h index e916fa000..d6919dc1a 100644 --- a/src/include/krb5/ext-proto.h +++ b/src/include/krb5/ext-proto.h @@ -31,7 +31,7 @@ #ifdef HAS_STDLIB_H #include #else -#ifdef __STDC__ +#if defined(__STDC__) || defined(_WINDOWS) #ifdef NO_STDLIB_H #include #else diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h index ce1c9280b..f7fb11b21 100644 --- a/src/include/krb5/func-proto.h +++ b/src/include/krb5/func-proto.h @@ -29,13 +29,13 @@ krb5_error_code INTERFACE krb5_init_context PROTOTYPE((krb5_context FAR *)); -void INTERFACE krb5_free_context +void krb5_free_context PROTOTYPE((krb5_context)); -krb5_error_code INTERFACE krb5_set_default_in_tkt_etypes +krb5_error_code krb5_set_default_in_tkt_etypes PROTOTYPE((krb5_context, const krb5_enctype *)); -krb5_error_code INTERFACE krb5_get_default_in_tkt_etypes +krb5_error_code krb5_get_default_in_tkt_etypes PROTOTYPE((krb5_context, krb5_enctype **)); @@ -44,32 +44,32 @@ krb5_error_code INTERFACE krb5_get_default_in_tkt_etypes extern krb5_context global_context; /* libkrb.spec */ -krb5_error_code INTERFACE krb5_kdc_rep_decrypt_proc +krb5_error_code krb5_kdc_rep_decrypt_proc PROTOTYPE((krb5_context, const krb5_keyblock *, krb5_const_pointer, krb5_kdc_rep * )); -krb5_error_code INTERFACE krb5_encode_ticket +krb5_error_code krb5_encode_ticket PROTOTYPE((krb5_context, const krb5_ticket *, krb5_data ** )); -krb5_error_code INTERFACE krb5_encrypt_tkt_part +krb5_error_code krb5_encrypt_tkt_part PROTOTYPE((krb5_context, krb5_encrypt_block *, const krb5_keyblock *, krb5_ticket * )); -krb5_error_code INTERFACE krb5_decrypt_tkt_part +krb5_error_code krb5_decrypt_tkt_part PROTOTYPE((krb5_context, const krb5_keyblock *, krb5_ticket * )); -krb5_error_code INTERFACE krb5_get_cred_from_kdc +krb5_error_code krb5_get_cred_from_kdc PROTOTYPE((krb5_context, krb5_ccache, /* not const, as reading may save state */ krb5_creds *, krb5_creds **, krb5_creds *** )); -void INTERFACE krb5_free_tgt_creds +void krb5_free_tgt_creds PROTOTYPE((krb5_context, krb5_creds ** )); /* XXX too hard to do with const */ @@ -82,7 +82,7 @@ krb5_error_code INTERFACE krb5_get_credentials krb5_ccache, krb5_creds FAR *, krb5_creds FAR * FAR *)); -krb5_error_code INTERFACE krb5_get_for_creds +krb5_error_code krb5_get_for_creds PROTOTYPE((krb5_context, const krb5_cksumtype, char *, @@ -90,7 +90,7 @@ krb5_error_code INTERFACE krb5_get_for_creds krb5_keyblock *, int, krb5_data * )); -krb5_error_code INTERFACE krb5_mk_req +krb5_error_code krb5_mk_req PROTOTYPE((krb5_context, krb5_auth_context **, const krb5_flags, @@ -106,7 +106,7 @@ krb5_error_code INTERFACE krb5_mk_req_extended krb5_data FAR *, krb5_creds FAR *, krb5_data FAR * )); -krb5_error_code INTERFACE krb5_mk_rep +krb5_error_code krb5_mk_rep PROTOTYPE((krb5_context, krb5_auth_context *, krb5_data *)); @@ -115,21 +115,21 @@ krb5_error_code INTERFACE krb5_rd_rep krb5_auth_context FAR *, const krb5_data FAR *, krb5_ap_rep_enc_part FAR * FAR *)); -krb5_error_code INTERFACE krb5_mk_error +krb5_error_code krb5_mk_error PROTOTYPE((krb5_context, const krb5_error *, krb5_data * )); -krb5_error_code INTERFACE krb5_rd_error +krb5_error_code krb5_rd_error PROTOTYPE((krb5_context, const krb5_data *, krb5_error ** )); -krb5_error_code INTERFACE krb5_rd_safe +krb5_error_code krb5_rd_safe PROTOTYPE((krb5_context, krb5_auth_context *, const krb5_data *, krb5_data *, krb5_replay_data *)); -krb5_error_code INTERFACE krb5_rd_priv +krb5_error_code krb5_rd_priv PROTOTYPE((krb5_context, krb5_auth_context *, const krb5_data *, @@ -143,158 +143,158 @@ krb5_error_code INTERFACE krb5_unparse_name PROTOTYPE((krb5_context, krb5_const_principal, char FAR * FAR * )); -krb5_error_code INTERFACE krb5_unparse_name_ext +krb5_error_code krb5_unparse_name_ext PROTOTYPE((krb5_context, krb5_const_principal, char **, int *)); -krb5_boolean INTERFACE krb5_address_search +krb5_boolean krb5_address_search PROTOTYPE((krb5_context, const krb5_address *, krb5_address * const *)); -krb5_boolean INTERFACE krb5_address_compare +krb5_boolean krb5_address_compare PROTOTYPE((krb5_context, const krb5_address *, const krb5_address *)); -int INTERFACE krb5_address_order +int krb5_address_order PROTOTYPE((krb5_context, const krb5_address *, const krb5_address *)); -krb5_boolean INTERFACE krb5_realm_compare +krb5_boolean krb5_realm_compare PROTOTYPE((krb5_context, krb5_const_principal, krb5_const_principal)); -krb5_boolean INTERFACE krb5_principal_compare +krb5_boolean krb5_principal_compare PROTOTYPE((krb5_context, krb5_const_principal, krb5_const_principal)); -int INTERFACE krb5_fulladdr_order +int krb5_fulladdr_order PROTOTYPE((krb5_context, const krb5_fulladdr *, const krb5_fulladdr *)); -krb5_error_code INTERFACE krb5_copy_keyblock +krb5_error_code krb5_copy_keyblock PROTOTYPE((krb5_context, const krb5_keyblock *, krb5_keyblock **)); -krb5_error_code INTERFACE krb5_copy_keyblock_contents +krb5_error_code krb5_copy_keyblock_contents PROTOTYPE((krb5_context, const krb5_keyblock *, krb5_keyblock *)); -krb5_error_code INTERFACE krb5_copy_creds +krb5_error_code krb5_copy_creds PROTOTYPE((krb5_context, const krb5_creds *, krb5_creds **)); -krb5_error_code INTERFACE krb5_copy_data +krb5_error_code krb5_copy_data PROTOTYPE((krb5_context, const krb5_data *, krb5_data **)); -krb5_error_code INTERFACE krb5_copy_principal +krb5_error_code krb5_copy_principal PROTOTYPE((krb5_context, krb5_const_principal, krb5_principal *)); -krb5_error_code INTERFACE krb5_copy_addresses +krb5_error_code krb5_copy_addresses PROTOTYPE((krb5_context, krb5_address * const *, krb5_address ***)); -krb5_error_code INTERFACE krb5_copy_ticket +krb5_error_code krb5_copy_ticket PROTOTYPE((krb5_context, const krb5_ticket *, krb5_ticket **)); -krb5_error_code INTERFACE krb5_copy_authdata +krb5_error_code krb5_copy_authdata PROTOTYPE((krb5_context, krb5_authdata * const *, krb5_authdata ***)); -krb5_error_code INTERFACE krb5_copy_authenticator +krb5_error_code krb5_copy_authenticator PROTOTYPE((krb5_context, const krb5_authenticator *, krb5_authenticator **)); -krb5_error_code INTERFACE krb5_copy_checksum +krb5_error_code krb5_copy_checksum PROTOTYPE((krb5_context, const krb5_checksum *, krb5_checksum **)); void INTERFACE krb5_init_ets PROTOTYPE((krb5_context)); -krb5_error_code INTERFACE krb5_generate_subkey +krb5_error_code krb5_generate_subkey PROTOTYPE((krb5_context, const krb5_keyblock *, krb5_keyblock **)); -krb5_error_code INTERFACE krb5_generate_seq_number +krb5_error_code krb5_generate_seq_number PROTOTYPE((krb5_context, const krb5_keyblock *, krb5_int32 *)); -krb5_error_code INTERFACE krb5_get_server_rcache +krb5_error_code krb5_get_server_rcache PROTOTYPE((krb5_context, const krb5_data *, krb5_rcache *)); krb5_error_code INTERFACE_C krb5_build_principal_ext STDARG_P((krb5_context, krb5_principal FAR *, int, const char FAR *, ...)); -krb5_error_code INTERFACE_C krb5_build_principal +krb5_error_code krb5_build_principal STDARG_P((krb5_context, krb5_principal *, int, const char *, ...)); #ifdef va_start /* XXX depending on varargs include file defining va_start... */ -krb5_error_code INTERFACE_C krb5_build_principal_va +krb5_error_code krb5_build_principal_va PROTOTYPE((krb5_context, krb5_principal *, int, const char *, va_list)); #endif -krb5_error_code INTERFACE krb5_425_conv_principal +krb5_error_code krb5_425_conv_principal PROTOTYPE((krb5_context, const char *name, const char *instance, const char *realm, krb5_principal *princ)); -krb5_error_code INTERFACE krb5_obtain_padata +krb5_error_code krb5_obtain_padata PROTOTYPE((krb5_context, int type, krb5_principal client, krb5_address **src_addr, krb5_keyblock *encrypt_key, krb5_pa_data **data)); -krb5_error_code INTERFACE krb5_verify_padata +krb5_error_code krb5_verify_padata PROTOTYPE((krb5_context, krb5_pa_data * data, krb5_principal client, krb5_address **src_addr, krb5_keyblock *decrypt_key, int *req_id, int *flags)); /* libkt.spec */ -krb5_error_code INTERFACE krb5_kt_register +krb5_error_code krb5_kt_register PROTOTYPE((krb5_context, krb5_kt_ops * )); -krb5_error_code INTERFACE krb5_kt_resolve +krb5_error_code krb5_kt_resolve PROTOTYPE((krb5_context, const char *, krb5_keytab * )); -krb5_error_code INTERFACE krb5_kt_default_name +krb5_error_code krb5_kt_default_name PROTOTYPE((krb5_context, char *, int )); -krb5_error_code INTERFACE krb5_kt_default +krb5_error_code krb5_kt_default PROTOTYPE((krb5_context, krb5_keytab * )); -krb5_error_code INTERFACE krb5_kt_free_entry +krb5_error_code krb5_kt_free_entry PROTOTYPE((krb5_context, krb5_keytab_entry * )); /* remove and add are functions, so that they can return NOWRITE if not a writable keytab */ -krb5_error_code INTERFACE krb5_kt_remove_entry +krb5_error_code krb5_kt_remove_entry PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry * )); -krb5_error_code INTERFACE krb5_kt_add_entry +krb5_error_code krb5_kt_add_entry PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry * )); -krb5_error_code INTERFACE krb5_principal2salt +krb5_error_code krb5_principal2salt PROTOTYPE((krb5_context, krb5_const_principal, krb5_data *)); -krb5_error_code INTERFACE krb5_principal2salt_norealm +krb5_error_code krb5_principal2salt_norealm PROTOTYPE((krb5_context, krb5_const_principal, krb5_data *)); /* librc.spec--see rcache.h */ /* libcc.spec */ -krb5_error_code INTERFACE krb5_cc_resolve +krb5_error_code krb5_cc_resolve PROTOTYPE((krb5_context, char *, krb5_ccache * )); -krb5_error_code INTERFACE krb5_cc_generate_new +krb5_error_code krb5_cc_generate_new PROTOTYPE((krb5_context, krb5_cc_ops *, krb5_ccache * )); -char * INTERFACE krb5_cc_default_name +char * krb5_cc_default_name PROTOTYPE((krb5_context)); krb5_error_code INTERFACE krb5_cc_default PROTOTYPE((krb5_context, @@ -303,12 +303,12 @@ unsigned int INTERFACE krb5_get_notification_message PROTOTYPE((void)); /* chk_trans.c */ -krb5_error_code INTERFACE krb5_check_transited_list +krb5_error_code krb5_check_transited_list PROTOTYPE((krb5_context, krb5_data *trans, krb5_data *realm1, krb5_data *realm2)); /* free_rtree.c */ -void INTERFACE krb5_free_realm_tree +void krb5_free_realm_tree PROTOTYPE((krb5_context, krb5_principal *)); @@ -316,64 +316,64 @@ void INTERFACE krb5_free_realm_tree void INTERFACE krb5_free_principal PROTOTYPE((krb5_context, krb5_principal )); -void INTERFACE krb5_free_authenticator +void krb5_free_authenticator PROTOTYPE((krb5_context, krb5_authenticator * )); -void INTERFACE krb5_free_authenticator_contents +void krb5_free_authenticator_contents PROTOTYPE((krb5_context, krb5_authenticator * )); void INTERFACE krb5_free_addresses PROTOTYPE((krb5_context, krb5_address FAR * FAR * )); -void INTERFACE krb5_free_address +void krb5_free_address PROTOTYPE((krb5_context, krb5_address * )); -void INTERFACE krb5_free_authdata +void krb5_free_authdata PROTOTYPE((krb5_context, krb5_authdata ** )); -void INTERFACE krb5_free_enc_tkt_part +void krb5_free_enc_tkt_part PROTOTYPE((krb5_context, krb5_enc_tkt_part * )); -void INTERFACE krb5_free_ticket +void krb5_free_ticket PROTOTYPE((krb5_context, krb5_ticket * )); -void INTERFACE krb5_free_tickets +void krb5_free_tickets PROTOTYPE((krb5_context, krb5_ticket ** )); -void INTERFACE krb5_free_kdc_req +void krb5_free_kdc_req PROTOTYPE((krb5_context, krb5_kdc_req * )); -void INTERFACE krb5_free_kdc_rep +void krb5_free_kdc_rep PROTOTYPE((krb5_context, krb5_kdc_rep * )); -void INTERFACE krb5_free_last_req +void krb5_free_last_req PROTOTYPE((krb5_context, krb5_last_req_entry ** )); -void INTERFACE krb5_free_enc_kdc_rep_part +void krb5_free_enc_kdc_rep_part PROTOTYPE((krb5_context, krb5_enc_kdc_rep_part * )); -void INTERFACE krb5_free_error +void krb5_free_error PROTOTYPE((krb5_context, krb5_error * )); -void INTERFACE krb5_free_ap_req +void krb5_free_ap_req PROTOTYPE((krb5_context, krb5_ap_req * )); -void INTERFACE krb5_free_ap_rep +void krb5_free_ap_rep PROTOTYPE((krb5_context, krb5_ap_rep * )); -void INTERFACE krb5_free_safe +void krb5_free_safe PROTOTYPE((krb5_context, krb5_safe * )); -void INTERFACE krb5_free_priv +void krb5_free_priv PROTOTYPE((krb5_context, krb5_priv * )); -void INTERFACE krb5_free_priv_enc_part +void krb5_free_priv_enc_part PROTOTYPE((krb5_context, krb5_priv_enc_part * )); -void INTERFACE krb5_free_kdc_req +void krb5_free_kdc_req PROTOTYPE((krb5_context, krb5_kdc_req * )); -void INTERFACE krb5_free_cred +void krb5_free_cred PROTOTYPE((krb5_context, krb5_cred *)); void INTERFACE krb5_free_creds @@ -382,28 +382,28 @@ void INTERFACE krb5_free_creds void INTERFACE krb5_free_cred_contents PROTOTYPE((krb5_context, krb5_creds FAR *)); -void INTERFACE krb5_free_cred_enc_part +void krb5_free_cred_enc_part PROTOTYPE((krb5_context, krb5_cred_enc_part *)); -void INTERFACE krb5_free_checksum +void krb5_free_checksum PROTOTYPE((krb5_context, krb5_checksum *)); -void INTERFACE krb5_free_keyblock +void krb5_free_keyblock PROTOTYPE((krb5_context, krb5_keyblock *)); -void INTERFACE krb5_free_pa_data +void krb5_free_pa_data PROTOTYPE((krb5_context, krb5_pa_data **)); void INTERFACE krb5_free_ap_rep_enc_part PROTOTYPE((krb5_context, krb5_ap_rep_enc_part FAR *)); -void INTERFACE krb5_free_tkt_authent +void krb5_free_tkt_authent PROTOTYPE((krb5_context, krb5_tkt_authent *)); -void INTERFACE krb5_free_pwd_data +void krb5_free_pwd_data PROTOTYPE((krb5_context, krb5_pwd_data *)); -void INTERFACE krb5_free_pwd_sequences +void krb5_free_pwd_sequences PROTOTYPE((krb5_context, passwd_phrase_element **)); @@ -431,7 +431,7 @@ krb5_error_code INTERFACE krb5_sname_to_principal /* Only put things which don't have pointers to the narrow types in this section */ -krb5_error_code INTERFACE krb5_encode_kdc_rep +krb5_error_code krb5_encode_kdc_rep PROTOTYPE((krb5_context, const krb5_msgtype, const krb5_enc_kdc_rep_part *, @@ -440,7 +440,7 @@ krb5_error_code INTERFACE krb5_encode_kdc_rep krb5_kdc_rep *, krb5_data ** )); -krb5_error_code INTERFACE krb5_send_tgs +krb5_error_code krb5_send_tgs PROTOTYPE((krb5_context, const krb5_flags, const krb5_ticket_times *, @@ -454,19 +454,19 @@ krb5_error_code INTERFACE krb5_send_tgs krb5_creds *, krb5_response * )); -krb5_error_code INTERFACE krb5_get_in_tkt +krb5_error_code krb5_get_in_tkt PROTOTYPE((krb5_context, const krb5_flags, krb5_address * const *, krb5_enctype *, krb5_preauthtype *, - krb5_error_code (INTERFACE * )(krb5_context, + krb5_error_code ( * )(krb5_context, const krb5_keytype, krb5_data *, krb5_const_pointer, krb5_keyblock **), krb5_const_pointer, - krb5_error_code (INTERFACE * )(krb5_context, + krb5_error_code ( * )(krb5_context, const krb5_keyblock *, krb5_const_pointer, krb5_kdc_rep * ), @@ -486,7 +486,7 @@ krb5_error_code INTERFACE krb5_get_in_tkt_with_password krb5_creds FAR *, krb5_kdc_rep FAR * FAR * )); -krb5_error_code INTERFACE krb5_get_in_tkt_with_skey +krb5_error_code krb5_get_in_tkt_with_skey PROTOTYPE((krb5_context, const krb5_flags, krb5_address * const *, @@ -497,7 +497,7 @@ krb5_error_code INTERFACE krb5_get_in_tkt_with_skey krb5_creds *, krb5_kdc_rep ** )); -krb5_error_code INTERFACE krb5_get_in_tkt_with_keytab +krb5_error_code krb5_get_in_tkt_with_keytab PROTOTYPE((krb5_context, const krb5_flags, krb5_address * const *, @@ -509,14 +509,14 @@ krb5_error_code INTERFACE krb5_get_in_tkt_with_keytab krb5_kdc_rep ** )); -krb5_error_code INTERFACE krb5_decode_kdc_rep +krb5_error_code krb5_decode_kdc_rep PROTOTYPE((krb5_context, krb5_data *, const krb5_keyblock *, const krb5_enctype, krb5_kdc_rep ** )); -krb5_error_code INTERFACE krb5_rd_req +krb5_error_code krb5_rd_req PROTOTYPE((krb5_context, krb5_auth_context **, const krb5_data *, @@ -525,7 +525,7 @@ krb5_error_code INTERFACE krb5_rd_req krb5_flags *, krb5_ticket **)); -krb5_error_code INTERFACE krb5_rd_req_decoded +krb5_error_code krb5_rd_req_decoded PROTOTYPE((krb5_context, krb5_auth_context **, const krb5_ap_req *, @@ -534,31 +534,31 @@ krb5_error_code INTERFACE krb5_rd_req_decoded krb5_flags *, krb5_ticket **)); -krb5_error_code INTERFACE krb5_kt_read_service_key +krb5_error_code krb5_kt_read_service_key PROTOTYPE((krb5_context, krb5_pointer, krb5_principal, krb5_kvno, krb5_keytype, krb5_keyblock **)); -krb5_error_code INTERFACE krb5_mk_safe +krb5_error_code krb5_mk_safe PROTOTYPE((krb5_context, krb5_auth_context *, const krb5_data *, krb5_data *, krb5_replay_data *)); -krb5_error_code INTERFACE krb5_mk_priv +krb5_error_code krb5_mk_priv PROTOTYPE((krb5_context, krb5_auth_context *, const krb5_data *, krb5_data *, krb5_replay_data *)); -krb5_error_code INTERFACE krb5_cc_register +krb5_error_code krb5_cc_register PROTOTYPE((krb5_context, krb5_cc_ops *, krb5_boolean )); -krb5_error_code INTERFACE krb5_sendauth +krb5_error_code krb5_sendauth PROTOTYPE((krb5_context, krb5_auth_context **, krb5_pointer, @@ -573,7 +573,7 @@ krb5_error_code INTERFACE krb5_sendauth krb5_ap_rep_enc_part **, krb5_creds **)); -krb5_error_code INTERFACE krb5_recvauth PROTOTYPE((krb5_context, +krb5_error_code krb5_recvauth PROTOTYPE((krb5_context, krb5_auth_context **, krb5_pointer, char *, @@ -583,14 +583,14 @@ krb5_error_code INTERFACE krb5_recvauth PROTOTYPE((krb5_context, krb5_keytab, krb5_ticket **)); -krb5_error_code INTERFACE krb5_walk_realm_tree +krb5_error_code krb5_walk_realm_tree PROTOTYPE((krb5_context, const krb5_data *, const krb5_data *, krb5_principal **, int)); -krb5_error_code INTERFACE krb5_mk_cred +krb5_error_code krb5_mk_cred PROTOTYPE((krb5_context, krb5_kdc_rep *, krb5_enctype, @@ -599,92 +599,92 @@ krb5_error_code INTERFACE krb5_mk_cred krb5_address *, krb5_data *)); -krb5_error_code INTERFACE krb5_auth_con_init +krb5_error_code krb5_auth_con_init PROTOTYPE((krb5_context, krb5_auth_context **)); -krb5_error_code INTERFACE krb5_auth_con_free +krb5_error_code krb5_auth_con_free PROTOTYPE((krb5_context, krb5_auth_context *)); -krb5_error_code INTERFACE krb5_auth_con_setflags +krb5_error_code krb5_auth_con_setflags PROTOTYPE((krb5_context, krb5_auth_context *, krb5_int32)); -krb5_error_code INTERFACE krb5_auth_con_getflags +krb5_error_code krb5_auth_con_getflags PROTOTYPE((krb5_context, krb5_auth_context *, krb5_int32 *)); -krb5_error_code INTERFACE krb5_auth_con_setaddrs +krb5_error_code krb5_auth_con_setaddrs PROTOTYPE((krb5_context, krb5_auth_context *, krb5_address *, krb5_address *)); -krb5_error_code INTERFACE krb5_auth_con_getaddrs +krb5_error_code krb5_auth_con_getaddrs PROTOTYPE((krb5_context, krb5_auth_context *, krb5_address **, krb5_address **)); -krb5_error_code INTERFACE krb5_auth_con_setuseruserkey +krb5_error_code krb5_auth_con_setuseruserkey PROTOTYPE((krb5_context, krb5_auth_context *, krb5_keyblock *)); -krb5_error_code INTERFACE krb5_auth_con_getlocalsubkey +krb5_error_code krb5_auth_con_getlocalsubkey PROTOTYPE((krb5_context, krb5_auth_context *, krb5_keyblock **)); -krb5_error_code INTERFACE krb5_auth_con_setcksumtype +krb5_error_code krb5_auth_con_setcksumtype PROTOTYPE((krb5_context, krb5_auth_context *, krb5_cksumtype)); -krb5_error_code INTERFACE krb5_auth_con_getcksumtype +krb5_error_code krb5_auth_con_getcksumtype PROTOTYPE((krb5_context, krb5_auth_context *, krb5_cksumtype *)); -krb5_error_code INTERFACE krb5_auth_con_getlocalseqnumber +krb5_error_code krb5_auth_con_getlocalseqnumber PROTOTYPE((krb5_context, krb5_auth_context *, krb5_int32 *)); -krb5_error_code INTERFACE krb5_auth_con_getremoteseqnumber +krb5_error_code krb5_auth_con_getremoteseqnumber PROTOTYPE((krb5_context, krb5_auth_context *, krb5_int32 *)); -krb5_error_code INTERFACE krb5_auth_con_setivector +krb5_error_code krb5_auth_con_setivector PROTOTYPE((krb5_context, krb5_auth_context *, krb5_pointer)); -krb5_error_code INTERFACE krb5_auth_con_getivector +krb5_error_code krb5_auth_con_getivector PROTOTYPE((krb5_context, krb5_auth_context *, krb5_pointer *)); -krb5_error_code INTERFACE krb5_auth_con_setrcache +krb5_error_code krb5_auth_con_setrcache PROTOTYPE((krb5_context, krb5_auth_context *, krb5_rcache)); -krb5_error_code INTERFACE krb5_auth_con_getrcache +krb5_error_code krb5_auth_con_getrcache PROTOTYPE((krb5_context, krb5_auth_context *, krb5_rcache *)); -krb5_error_code INTERFACE krb5_auth_con_getauthenticator +krb5_error_code krb5_auth_con_getauthenticator PROTOTYPE((krb5_context, krb5_auth_context *, krb5_authenticator **)); -krb5_error_code INTERFACE krb5_auth_con_getremotesubkey +krb5_error_code krb5_auth_con_getremotesubkey PROTOTYPE((krb5_context, krb5_auth_context *, krb5_keyblock **)); diff --git a/src/include/krb5/hostaddr.h b/src/include/krb5/hostaddr.h index a7a8b9922..ff420164f 100644 --- a/src/include/krb5/hostaddr.h +++ b/src/include/krb5/hostaddr.h @@ -32,7 +32,7 @@ typedef struct _krb5_address { krb5_magic magic; krb5_addrtype addrtype; int length; - krb5_octet *contents; + krb5_octet FAR *contents; } krb5_address; /* per Kerberos v5 protocol spec */ @@ -50,7 +50,7 @@ typedef struct _krb5_address { /* implementation-specific stuff: */ typedef struct _krb5_fulladdr { - krb5_address *address; + krb5_address FAR *address; unsigned long port; /* port, for some address types. large enough for most protos? */ } krb5_fulladdr; diff --git a/src/include/krb5/k5-free.h b/src/include/krb5/k5-free.h index 600f3cd7c..e45abdfa9 100644 --- a/src/include/krb5/k5-free.h +++ b/src/include/krb5/k5-free.h @@ -29,7 +29,7 @@ #define KRB5_FREE__ /* to keep lint happy */ -#define krb5_xfree(val) free((char *)(val)) +#define krb5_xfree(val) free((char FAR *)(val)) #define krb5_free_data(context, val) { krb5_xfree((val)->data); krb5_xfree(val);} diff --git a/src/include/krb5/keytab.h b/src/include/krb5/keytab.h index c9e138c14..5135f3eee 100644 --- a/src/include/krb5/keytab.h +++ b/src/include/krb5/keytab.h @@ -45,56 +45,56 @@ typedef struct krb5_keytab_entry_st { typedef struct _krb5_kt { krb5_magic magic; - struct _krb5_kt_ops *ops; + struct _krb5_kt_ops FAR *ops; krb5_pointer data; -} *krb5_keytab; +} FAR *krb5_keytab; typedef struct _krb5_kt_ops { krb5_magic magic; - char *prefix; + char FAR *prefix; /* routines always present */ - krb5_error_code (INTERFACE *resolve) + krb5_error_code (*resolve) NPROTOTYPE((krb5_context, - const char *, - krb5_keytab *)); - krb5_error_code (INTERFACE *get_name) + const char FAR *, + krb5_keytab FAR *)); + krb5_error_code (*get_name) NPROTOTYPE((krb5_context, krb5_keytab, - char *, + char FAR *, int)); - krb5_error_code (INTERFACE *close) + krb5_error_code (*close) NPROTOTYPE((krb5_context, krb5_keytab)); - krb5_error_code (INTERFACE *get) + krb5_error_code (*get) NPROTOTYPE((krb5_context, krb5_keytab, krb5_principal, krb5_kvno, krb5_keytype, - krb5_keytab_entry *)); - krb5_error_code (INTERFACE *start_seq_get) + krb5_keytab_entry FAR *)); + krb5_error_code (*start_seq_get) NPROTOTYPE((krb5_context, krb5_keytab, - krb5_kt_cursor *)); - krb5_error_code (INTERFACE *get_next) + krb5_kt_cursor FAR *)); + krb5_error_code (*get_next) NPROTOTYPE((krb5_context, krb5_keytab, - krb5_keytab_entry *, - krb5_kt_cursor *)); - krb5_error_code (INTERFACE *end_get) + krb5_keytab_entry FAR *, + krb5_kt_cursor FAR *)); + krb5_error_code (*end_get) NPROTOTYPE((krb5_context, krb5_keytab, - krb5_kt_cursor *)); + krb5_kt_cursor FAR *)); /* routines to be included on extended version (write routines) */ - krb5_error_code (INTERFACE *add) + krb5_error_code (*add) NPROTOTYPE((krb5_context, krb5_keytab, - krb5_keytab_entry *)); - krb5_error_code (INTERFACE *remove) + krb5_keytab_entry FAR *)); + krb5_error_code (*remove) NPROTOTYPE((krb5_context, krb5_keytab, - krb5_keytab_entry *)); + krb5_keytab_entry FAR *)); } krb5_kt_ops; #define krb5_kt_get_name(context, keytab, name, namelen) (*(keytab)->ops->get_name)(context, keytab,name,namelen) diff --git a/src/include/krb5/los-proto.h b/src/include/krb5/los-proto.h index 202f6a140..d0f4f361a 100644 --- a/src/include/krb5/los-proto.h +++ b/src/include/krb5/los-proto.h @@ -29,102 +29,102 @@ #include -krb5_error_code INTERFACE krb5_init_os_context +krb5_error_code krb5_init_os_context PROTOTYPE((krb5_context)); -void INTERFACE krb5_free_os_context +void krb5_free_os_context PROTOTYPE((krb5_context)); /* libos.spec */ -krb5_error_code INTERFACE krb5_read_password +krb5_error_code krb5_read_password PROTOTYPE((krb5_context, char *, char *, char *, int * )); -krb5_error_code INTERFACE krb5_lock_file +krb5_error_code krb5_lock_file PROTOTYPE((krb5_context, FILE *, char *, int )); -krb5_error_code INTERFACE krb5_unlock_file +krb5_error_code krb5_unlock_file PROTOTYPE((krb5_context, FILE *, char * )); -int INTERFACE krb5_net_read +int krb5_net_read PROTOTYPE((krb5_context, int , char *, int )); -int INTERFACE krb5_net_write +int krb5_net_write PROTOTYPE((krb5_context, int , const char *, int )); -krb5_error_code INTERFACE krb5_sendto_kdc +krb5_error_code krb5_sendto_kdc PROTOTYPE((krb5_context, const krb5_data *, const krb5_data *, krb5_data * )); -krb5_error_code INTERFACE krb5_get_krbhst +krb5_error_code krb5_get_krbhst PROTOTYPE((krb5_context, const krb5_data *, char *** )); -krb5_error_code INTERFACE krb5_free_krbhst +krb5_error_code krb5_free_krbhst PROTOTYPE((krb5_context, char * const * )); -krb5_error_code INTERFACE krb5_aname_to_localname +krb5_error_code krb5_aname_to_localname PROTOTYPE((krb5_context, krb5_const_principal, const int, char * )); -krb5_error_code INTERFACE krb5_get_host_realm +krb5_error_code krb5_get_host_realm PROTOTYPE((krb5_context, const char *, char *** )); -krb5_error_code INTERFACE krb5_free_host_realm +krb5_error_code krb5_free_host_realm PROTOTYPE((krb5_context, char * const * )); -krb5_error_code INTERFACE krb5_get_realm_domain +krb5_error_code krb5_get_realm_domain PROTOTYPE((krb5_context, const char *, char ** )); -krb5_boolean INTERFACE krb5_kuserok +krb5_boolean krb5_kuserok PROTOTYPE((krb5_context, krb5_principal, const char *)); -krb5_error_code INTERFACE krb5_random_confounder +krb5_error_code krb5_random_confounder PROTOTYPE((int, krb5_pointer )); -krb5_error_code INTERFACE krb5_gen_replay_name +krb5_error_code krb5_gen_replay_name PROTOTYPE((krb5_context, const krb5_address *, const char *, char **)); -krb5_error_code INTERFACE krb5_gen_portaddr +krb5_error_code krb5_gen_portaddr PROTOTYPE((krb5_context, const krb5_address *, krb5_const_pointer, krb5_address **)); -krb5_error_code INTERFACE krb5_create_secure_file +krb5_error_code krb5_create_secure_file PROTOTYPE((krb5_context, const char * pathname)); -krb5_error_code INTERFACE krb5_sync_disk_file +krb5_error_code krb5_sync_disk_file PROTOTYPE((krb5_context, FILE *fp)); -krb5_error_code INTERFACE krb5_read_message +krb5_error_code krb5_read_message PROTOTYPE((krb5_context, krb5_pointer, krb5_data *)); -krb5_error_code INTERFACE krb5_write_message +krb5_error_code krb5_write_message PROTOTYPE((krb5_context, krb5_pointer, krb5_data *)); -krb5_error_code INTERFACE krb5_os_init_context +krb5_error_code krb5_os_init_context PROTOTYPE((krb5_context)); -void INTERFACE krb5_os_free_context +void krb5_os_free_context PROTOTYPE((krb5_context)); krb5_error_code krb5_find_config_files diff --git a/src/include/krb5/macros.h b/src/include/krb5/macros.h index 263a25c17..e4085c194 100644 --- a/src/include/krb5/macros.h +++ b/src/include/krb5/macros.h @@ -28,6 +28,6 @@ #ifndef KRB5_MACROS__ #define KRB5_MACROS__ -#define krb5_princ_aref(princ, n, plen) (char *)(*plen = princ[n]->length, princ[n]->data) +#define krb5_princ_aref(princ, n, plen) (char FAR *)(*plen = princ[n]->length, princ[n]->data) #endif /* KRB5_MACROS__ */ diff --git a/src/include/krb5/preauth.h b/src/include/krb5/preauth.h index 3a16ee5cc..a22e196b8 100644 --- a/src/include/krb5/preauth.h +++ b/src/include/krb5/preauth.h @@ -35,11 +35,11 @@ /* * Note: these typedefs are subject to change.... [tytso:19920903.1609EDT] */ -typedef krb5_error_code (INTERFACE krb5_preauth_obtain_proc) +typedef krb5_error_code (krb5_preauth_obtain_proc) PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr, krb5_pa_data *pa_data)); -typedef krb5_error_code (INTERFACE krb5_preauth_verify_proc) +typedef krb5_error_code (krb5_preauth_verify_proc) PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr, krb5_data *data)); @@ -67,19 +67,19 @@ krb5_error_code verify_random_padata krb5_data *data)); #endif -krb5_error_code INTERFACE get_unixtime_padata +krb5_error_code get_unixtime_padata PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr, krb5_pa_data *data)); -krb5_error_code INTERFACE verify_unixtime_padata +krb5_error_code verify_unixtime_padata PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr, krb5_data *data)); -krb5_error_code INTERFACE get_securid_padata +krb5_error_code get_securid_padata PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr, krb5_pa_data *data)); -krb5_error_code INTERFACE verify_securid_padata +krb5_error_code verify_securid_padata PROTOTYPE((krb5_context, krb5_principal client, krb5_address **src_addr, krb5_data *data)); diff --git a/src/include/krb5/rcache.h b/src/include/krb5/rcache.h index 249514e24..93833f7c4 100644 --- a/src/include/krb5/rcache.h +++ b/src/include/krb5/rcache.h @@ -30,55 +30,55 @@ typedef struct krb5_rc_st { krb5_magic magic; - struct _krb5_rc_ops *ops; + struct _krb5_rc_ops FAR *ops; krb5_pointer data; -} *krb5_rcache; +} FAR *krb5_rcache; typedef struct _krb5_donot_replay { krb5_magic magic; - char *server; /* null-terminated */ - char *client; /* null-terminated */ + char FAR *server; /* null-terminated */ + char FAR *client; /* null-terminated */ krb5_int32 cusec; krb5_timestamp ctime; } krb5_donot_replay; typedef struct _krb5_rc_ops { krb5_magic magic; - char *type; - krb5_error_code (INTERFACE *init)NPROTOTYPE((krb5_context, krb5_rcache,krb5_deltat)); /* create */ - krb5_error_code (INTERFACE *recover)NPROTOTYPE((krb5_context, krb5_rcache)); /* open */ - krb5_error_code (INTERFACE *destroy)NPROTOTYPE((krb5_context, krb5_rcache)); - krb5_error_code (INTERFACE *close)NPROTOTYPE((krb5_context, krb5_rcache)); - krb5_error_code (INTERFACE *store)NPROTOTYPE((krb5_context, krb5_rcache,krb5_donot_replay *)); - krb5_error_code (INTERFACE *expunge)NPROTOTYPE((krb5_context, krb5_rcache)); - krb5_error_code (INTERFACE *get_span)NPROTOTYPE((krb5_context, krb5_rcache,krb5_deltat *)); - char *(INTERFACE *get_name)NPROTOTYPE((krb5_context, krb5_rcache)); - krb5_error_code (INTERFACE *resolve)NPROTOTYPE((krb5_context, krb5_rcache, char *)); + char FAR *type; + krb5_error_code (*init)NPROTOTYPE((krb5_context, krb5_rcache,krb5_deltat)); /* create */ + krb5_error_code (*recover)NPROTOTYPE((krb5_context, krb5_rcache)); /* open */ + krb5_error_code (*destroy)NPROTOTYPE((krb5_context, krb5_rcache)); + krb5_error_code (*close)NPROTOTYPE((krb5_context, krb5_rcache)); + krb5_error_code (*store)NPROTOTYPE((krb5_context, krb5_rcache,krb5_donot_replay FAR *)); + krb5_error_code (*expunge)NPROTOTYPE((krb5_context, krb5_rcache)); + krb5_error_code (*get_span)NPROTOTYPE((krb5_context, krb5_rcache,krb5_deltat FAR *)); + char FAR *(*get_name)NPROTOTYPE((krb5_context, krb5_rcache)); + krb5_error_code (*resolve)NPROTOTYPE((krb5_context, krb5_rcache, char FAR *)); } krb5_rc_ops; -krb5_error_code INTERFACE krb5_rc_default +krb5_error_code krb5_rc_default PROTOTYPE((krb5_context, - krb5_rcache *)); -krb5_error_code INTERFACE krb5_rc_register_type + krb5_rcache FAR *)); +krb5_error_code krb5_rc_register_type PROTOTYPE((krb5_context, - krb5_rc_ops *)); -krb5_error_code INTERFACE krb5_rc_resolve_type + krb5_rc_ops FAR *)); +krb5_error_code krb5_rc_resolve_type PROTOTYPE((krb5_context, - krb5_rcache *,char *)); -krb5_error_code INTERFACE krb5_rc_resolve_full + krb5_rcache FAR *,char FAR *)); +krb5_error_code krb5_rc_resolve_full PROTOTYPE((krb5_context, - krb5_rcache *,char *)); -char * INTERFACE krb5_rc_get_type + krb5_rcache FAR *,char FAR *)); +char FAR * krb5_rc_get_type PROTOTYPE((krb5_context, krb5_rcache)); -char * INTERFACE krb5_rc_default_type +char FAR * krb5_rc_default_type PROTOTYPE((krb5_context)); -char * INTERFACE krb5_rc_default_name +char FAR * krb5_rc_default_name PROTOTYPE((krb5_context)); -krb5_error_code INTERFACE krb5_auth_to_rep +krb5_error_code krb5_auth_to_rep PROTOTYPE((krb5_context, - krb5_tkt_authent *, - krb5_donot_replay *)); + krb5_tkt_authent FAR *, + krb5_donot_replay FAR *)); #define krb5_rc_initialize(context, id, span) (*(id)->ops->init)(context, id, span) #define krb5_rc_recover(context, id) (*(id)->ops->recover)(context, id) diff --git a/src/include/krb5/rsa-md5.h b/src/include/krb5/rsa-md5.h index f315df1ba..b962830aa 100644 --- a/src/include/krb5/rsa-md5.h +++ b/src/include/krb5/rsa-md5.h @@ -48,14 +48,14 @@ typedef struct { unsigned char digest[16]; /* actual digest after MD5Final call */ } MD5_CTX; -#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) -extern void INTERFACE MD5Init(MD5_CTX FAR *); -extern void INTERFACE MD5Update (MD5_CTX FAR *, unsigned char FAR *, unsigned int); -extern void INTERFACE MD5Final (MD5_CTX FAR *); +#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS) +extern void MD5Init(MD5_CTX FAR *); +extern void MD5Update (MD5_CTX FAR *, unsigned char FAR *, unsigned int); +extern void MD5Final (MD5_CTX FAR *); #else -extern void INTERFACE MD5Init(); -extern void INTERFACE MD5Update (); -extern void INTERFACE MD5Final (); +extern void MD5Init(); +extern void MD5Update (); +extern void MD5Final (); #endif #define RSA_MD5_CKSUM_LENGTH 16 diff --git a/src/include/sys/ChangeLog b/src/include/sys/ChangeLog new file mode 100644 index 000000000..c8ddad3a6 --- /dev/null +++ b/src/include/sys/ChangeLog @@ -0,0 +1,3 @@ +Thu Apr 13 16:05:08 1995 Keith Vetter (keithv@fusion.com) + + * syslog.h: __STDC__ conditionals also check for the _WINDOWS define. diff --git a/src/include/sys/syslog.h b/src/include/sys/syslog.h index 8e3a80f21..682243e76 100644 --- a/src/include/sys/syslog.h +++ b/src/include/sys/syslog.h @@ -90,7 +90,7 @@ #define LOG_NOWAIT 0x10 /* if forking to log on console, don't wait() */ #ifndef KERNEL -#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) +#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS) extern void syslog (int , const char *, ... ); #ifdef va_start /* XXX depending on #define of va_start in */ diff --git a/src/include/syslog.h b/src/include/syslog.h index dcbda9782..567fc74f3 100644 --- a/src/include/syslog.h +++ b/src/include/syslog.h @@ -90,7 +90,7 @@ #define LOG_NOWAIT 0x10 /* if forking to log on console, don't wait() */ #ifndef KERNEL -#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) +#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS) extern void syslog (int , const char *, ... ); #ifdef va_start /* XXX depending on #define of va_start in */ diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog index 5bb0712bb..9e6e698ba 100644 --- a/src/lib/ChangeLog +++ b/src/lib/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 13 16:56:50 1995 Keith Vetter (keithv@fusion.com) + + * Makefile.in, libkrb5.def, gssapi.def (new): + Spec says we need a gssapi.dll & gssapi.lib. + * Makefile.in: re-inserted make-$(ALL) rule. + Wed Apr 5 16:27:53 1995 Keith Vetter (keithv@fusion.com) * libkrb5.def: added krb5_us_timeofday to export list diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 656b2534f..55a8a8691 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -3,7 +3,7 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = .. ##DOS!include $(BUILDTOP)\config\windows.in -all:: +all:: all-$(WHAT) all-unix:: @@ -22,6 +22,7 @@ clean-mac:: clean-windows:: $(RM) libkrb5.dll libkrb5.lib libkrb5.bak libkrb5.map winsock.lib + $(RM) gssapi.dll gssapi.lib gssapi.bak gssapi.map # # Windows stuff to make libkrb5.dll and libkrb5.lib. Currently it # combines crypto, krb5 and the util/et directories. @@ -33,29 +34,16 @@ ETLIB = $(BUILDTOP)\util\et\comerr.lib WLIB = .\winsock.lib LIBS = $(CLIB) $(KLIB) $(GLIB) $(ETLIB) $(WLIB) -# -# Fast: is a faster way to make things on the PC. Unfortunately it requires -# the unix utility sed so it can't be part of the final production release. -# -fast: win_glue.obj winsock.lib - $(RM) libkrb5.lib libkrb5.dll - cd crypto - $(MAKE) -$(MFLAGS) LIBCMD=rem - libdir crypto.lib - cd ..\krb5 - $(MAKE) -$(MFLAGS) LIBCMD=rem - libdir krb5.lib - cd .. - cd $(BUILDTOP)\util\et - $(MAKE) -$(MFLAGS) - cd ..\..\lib\gssapi - $(MAKE) -$(MFLAGS) - cd .. - link /co /seg:400 /noe /nologo win_glue, libkrb5.dll, libkrb5.map, \ - $(LIBS) ldllcew libw, libkrb5.def - rc /nologo /p /k libkrb5.dll - implib /nologo libkrb5.lib libkrb5.dll - +lib-windows: winsock.lib libkrb5.lib gssapi.lib + +gssapi.lib:: gssapi.dll + implib /nologo gssapi.lib gssapi.dll + +gssapi.dll:: $(GLIB) $(LIBS) gssapi.def + link /co /seg:400 /noe /nol win_glue, gssapi.dll, gssapi.map, \ + $(LIBS) ldllcew libw, gssapi.def + rc /nologo /p /k gssapi.dll + libkrb5.lib:: libkrb5.dll implib /nologo libkrb5.lib libkrb5.dll diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index 3c669e034..a54982194 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,8 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + * *.h added FAR to pointers visible at to the world. + Tue Mar 28 20:00:00 1995 Keith Vetter (keithv@fusion.com) * Makefile.in: more of nmake's strange behavior. Problem goes diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog index 24b0660f4..a0b358fa2 100644 --- a/src/lib/crypto/crc32/ChangeLog +++ b/src/lib/crypto/crc32/ChangeLog @@ -1,3 +1,8 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + * *.h added FAR to pointers visible at to the world. + Thu Mar 16 21:14:15 1995 John Gilmore (gnu at toad.com) * Makefile.in (crctest, crctest.exe): Replace crctest-unix and diff --git a/src/lib/crypto/crc32/crc.c b/src/lib/crypto/crc32/crc.c index cb41e1734..3ecdd75f7 100644 --- a/src/lib/crypto/crc32/crc.c +++ b/src/lib/crypto/crc32/crc.c @@ -143,11 +143,11 @@ static u_long const crc_table[256] = { 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d }; -krb5_error_code INTERFACE +krb5_error_code crc32_sum_func NPROTOTYPE((krb5_pointer in, size_t in_length, krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum)); -krb5_error_code INTERFACE +krb5_error_code crc32_sum_func(in, in_length, seed, seed_length, outcksum) krb5_pointer in; size_t in_length; diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index 4d99e7de5..8b24e7d86 100644 --- a/src/lib/crypto/des/ChangeLog +++ b/src/lib/crypto/des/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + * *.h added FAR to pointers visible at to the world. + * f_tables.h: __STDC__ condition also checks _WINDOWS + Tue Mar 28 15:09:43 1995 John Gilmore (gnu at toad.com) Bring in portability fixes from Cygnus K4 release. diff --git a/src/lib/crypto/des/cbc_cksum.c b/src/lib/crypto/des/cbc_cksum.c index e4868b4a5..dc795f962 100644 --- a/src/lib/crypto/des/cbc_cksum.c +++ b/src/lib/crypto/des/cbc_cksum.c @@ -42,7 +42,7 @@ returns: errors */ -krb5_error_code INTERFACE +krb5_error_code mit_des_cbc_checksum(in, in_length, key, key_size, cksum) krb5_pointer in; size_t in_length; diff --git a/src/lib/crypto/des/cs_entry.c b/src/lib/crypto/des/cs_entry.c index 3004961dd..9bf9d7c02 100644 --- a/src/lib/crypto/des/cs_entry.c +++ b/src/lib/crypto/des/cs_entry.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "des_int.h" -extern krb5_error_code INTERFACE mit_des_cbc_checksum PROTOTYPE (( +extern krb5_error_code mit_des_cbc_checksum PROTOTYPE (( krb5_pointer , size_t , krb5_pointer , diff --git a/src/lib/crypto/des/des_int.h b/src/lib/crypto/des/des_int.h index 8da43335f..b19735f56 100644 --- a/src/lib/crypto/des/des_int.h +++ b/src/lib/crypto/des/des_int.h @@ -31,85 +31,86 @@ #include "mit-des.h" /* From include/krb5 */ /* cbc_cksum.c */ -extern krb5_error_code INTERFACE mit_des_cbc_checksum +extern krb5_error_code mit_des_cbc_checksum PROTOTYPE((krb5_pointer, size_t,krb5_pointer,size_t, krb5_checksum FAR * )); /* cksum.c */ -extern long INTERFACE mit_des_cbc_cksum - PROTOTYPE((krb5_octet *, krb5_octet *, long , mit_des_key_schedule , - krb5_octet *)); +extern long mit_des_cbc_cksum + PROTOTYPE((krb5_octet FAR *, krb5_octet FAR *, long , mit_des_key_schedule , + krb5_octet FAR *)); /* des.c */ -extern int INTERFACE mit_des_ecb_encrypt - PROTOTYPE((unsigned long *, unsigned long *, mit_des_key_schedule , int )); +extern int mit_des_ecb_encrypt + PROTOTYPE((unsigned long FAR *, unsigned long FAR *, mit_des_key_schedule , int )); /* f_cbc.c */ -extern int INTERFACE mit_des_cbc_encrypt - PROTOTYPE((const mit_des_cblock *in, mit_des_cblock *out, long length, +extern int mit_des_cbc_encrypt + PROTOTYPE((const mit_des_cblock FAR *in, mit_des_cblock FAR *out, long length, mit_des_key_schedule schedule, mit_des_cblock ivec, int encrypt)); /* fin_rndkey.c */ -extern krb5_error_code INTERFACE mit_des_finish_random_key - PROTOTYPE(( krb5_pointer *)); +extern krb5_error_code mit_des_finish_random_key + PROTOTYPE(( krb5_pointer FAR *)); /* finish_key.c */ -extern krb5_error_code INTERFACE mit_des_finish_key +extern krb5_error_code mit_des_finish_key PROTOTYPE(( krb5_encrypt_block FAR *)); /* init_rkey.c */ -extern krb5_error_code INTERFACE mit_des_init_random_key - PROTOTYPE(( const krb5_keyblock *, krb5_pointer *)); +extern krb5_error_code mit_des_init_random_key + PROTOTYPE(( const krb5_keyblock FAR *, krb5_pointer FAR *)); /* key_parity.c */ -extern void INTERFACE mit_des_fixup_key_parity PROTOTYPE((mit_des_cblock )); -extern int INTERFACE mit_des_check_key_parity PROTOTYPE((mit_des_cblock )); +extern void mit_des_fixup_key_parity PROTOTYPE((mit_des_cblock )); +extern int mit_des_check_key_parity PROTOTYPE((mit_des_cblock )); /* key_sched.c */ -extern int INTERFACE mit_des_key_sched +extern int mit_des_key_sched PROTOTYPE((mit_des_cblock , mit_des_key_schedule )); /* new_rnd_key.c */ -extern int INTERFACE mit_des_new_random_key - PROTOTYPE((mit_des_cblock , mit_des_random_key_seed *)); -extern void INTERFACE mit_des_init_random_number_generator - PROTOTYPE((mit_des_cblock, mit_des_random_key_seed *)); -extern void INTERFACE mit_des_set_random_generator_seed - PROTOTYPE((mit_des_cblock , mit_des_random_key_seed *)); -extern void INTERFACE mit_des_set_sequence_number - PROTOTYPE((mit_des_cblock , mit_des_random_key_seed *)); -extern void INTERFACE mit_des_generate_random_block - PROTOTYPE((mit_des_cblock , mit_des_random_key_seed *)); +extern int mit_des_new_random_key + PROTOTYPE((mit_des_cblock , mit_des_random_key_seed FAR *)); +extern void mit_des_init_random_number_generator + PROTOTYPE((mit_des_cblock, mit_des_random_key_seed FAR *)); +extern void mit_des_set_random_generator_seed + PROTOTYPE((mit_des_cblock , mit_des_random_key_seed FAR *)); +extern void mit_des_set_sequence_number + PROTOTYPE((mit_des_cblock , mit_des_random_key_seed FAR *)); +extern void mit_des_generate_random_block + PROTOTYPE((mit_des_cblock , mit_des_random_key_seed FAR *)); /* process_ky.c */ -extern krb5_error_code INTERFACE mit_des_process_key - PROTOTYPE(( krb5_encrypt_block *, const krb5_keyblock *)); +extern krb5_error_code mit_des_process_key + PROTOTYPE(( krb5_encrypt_block FAR *, const krb5_keyblock FAR *)); /* random_key.c */ -extern krb5_error_code INTERFACE mit_des_random_key - PROTOTYPE(( const krb5_encrypt_block *, krb5_pointer , krb5_keyblock **)); +extern krb5_error_code mit_des_random_key + PROTOTYPE(( const krb5_encrypt_block FAR *, krb5_pointer , + krb5_keyblock FAR * FAR *)); /* string2key.c */ -extern krb5_error_code INTERFACE mit_des_string_to_key - PROTOTYPE(( const krb5_encrypt_block *, const krb5_keytype, - krb5_keyblock *, const krb5_data *, const krb5_data *)); +extern krb5_error_code mit_des_string_to_key + PROTOTYPE(( const krb5_encrypt_block FAR *, const krb5_keytype, + krb5_keyblock FAR *, const krb5_data FAR *, const krb5_data FAR *)); /* weak_key.c */ -extern int INTERFACE mit_des_is_weak_key PROTOTYPE((mit_des_cblock )); +extern int mit_des_is_weak_key PROTOTYPE((mit_des_cblock )); /* cmb_keys.c */ krb5_error_code mit_des_combine_subkeys - PROTOTYPE((const krb5_keyblock *, const krb5_keyblock *, - krb5_keyblock **)); + PROTOTYPE((const krb5_keyblock FAR *, const krb5_keyblock FAR *, + krb5_keyblock FAR * FAR *)); /* f_pcbc.c */ -int INTERFACE mit_des_pcbc_encrypt (); +int mit_des_pcbc_encrypt (); /* f_sched.c */ -int INTERFACE make_key_sched PROTOTYPE((mit_des_cblock, mit_des_key_schedule)); +int make_key_sched PROTOTYPE((mit_des_cblock, mit_des_key_schedule)); /* misc.c */ -extern void swap_bits PROTOTYPE((char *)); +extern void swap_bits PROTOTYPE((char FAR *)); extern unsigned long long_swap_bits PROTOTYPE((unsigned long )); extern unsigned long swap_six_bits_to_ansi PROTOTYPE((unsigned long )); extern unsigned long swap_four_bits_to_ansi PROTOTYPE((unsigned long )); diff --git a/src/lib/crypto/des/f_cbc.c b/src/lib/crypto/des/f_cbc.c index 8b93174db..0e4ffe41d 100644 --- a/src/lib/crypto/des/f_cbc.c +++ b/src/lib/crypto/des/f_cbc.c @@ -36,7 +36,7 @@ * cleartext. */ -int INTERFACE +int mit_des_cbc_encrypt(in, out, length, schedule, ivec, encrypt) const des_cblock *in; des_cblock *out; diff --git a/src/lib/crypto/des/f_cksum.c b/src/lib/crypto/des/f_cksum.c index 05c94c537..17a5db0c2 100644 --- a/src/lib/crypto/des/f_cksum.c +++ b/src/lib/crypto/des/f_cksum.c @@ -28,7 +28,7 @@ * multiple of eight bytes. */ -unsigned long INTERFACE +unsigned long mit_des_cbc_cksum(in, out, length, schedule, ivec) des_cblock *in; des_cblock *out; diff --git a/src/lib/crypto/des/f_ecb.c b/src/lib/crypto/des/f_ecb.c index 133ba1301..f17073ebf 100644 --- a/src/lib/crypto/des/f_ecb.c +++ b/src/lib/crypto/des/f_ecb.c @@ -16,7 +16,7 @@ /* * des_ecb_encrypt - {en,de}crypt a block in ECB mode */ -int INTERFACE +int mit_des_ecb_encrypt(in, out, schedule, encrypt) des_cblock *in; des_cblock *out; diff --git a/src/lib/crypto/des/f_parity.c b/src/lib/crypto/des/f_parity.c index 4d387f198..7244482d7 100644 --- a/src/lib/crypto/des/f_parity.c +++ b/src/lib/crypto/des/f_parity.c @@ -20,7 +20,7 @@ #define pstep(x,step) (((x)&smask(step))^(((x)>>step)&smask(step))) #define parity_char(x) pstep(pstep(pstep((x),4),2),1) -void INTERFACE +void mit_des_fixup_key_parity(key) register des_cblock key; { @@ -39,7 +39,7 @@ mit_des_fixup_key_parity(key) * See des_fix_key_parity for the definition of * correct des parity. */ -int INTERFACE +int mit_des_check_key_parity(key) register des_cblock key; { diff --git a/src/lib/crypto/des/f_pcbc.c b/src/lib/crypto/des/f_pcbc.c index efc2ce213..8de7d1aaa 100644 --- a/src/lib/crypto/des/f_pcbc.c +++ b/src/lib/crypto/des/f_pcbc.c @@ -16,7 +16,7 @@ /* * des_pcbc_encrypt - {en,de}crypt a stream in PCBC mode */ -int INTERFACE +int mit_des_pcbc_encrypt(in, out, length, schedule, ivec, encrypt) des_cblock *in; des_cblock *out; diff --git a/src/lib/crypto/des/f_sched.c b/src/lib/crypto/des/f_sched.c index 36a44f41f..7b8c36f7a 100644 --- a/src/lib/crypto/des/f_sched.c +++ b/src/lib/crypto/des/f_sched.c @@ -209,7 +209,7 @@ static const unsigned KRB_INT32 PC2_D[4][64] = { /* * Permute the key to give us our key schedule. */ -int INTERFACE +int make_key_sched(key, schedule) mit_des_cblock key; mit_des_key_schedule schedule; diff --git a/src/lib/crypto/des/f_tables.h b/src/lib/crypto/des/f_tables.h index 92ee871af..121fca3aa 100644 --- a/src/lib/crypto/des/f_tables.h +++ b/src/lib/crypto/des/f_tables.h @@ -15,7 +15,7 @@ #define __DES_TABLES_H__ /* nothing */ #ifndef const -#ifndef __STDC__ +#if !defined(__STDC__) && !defined(_WINDOWS) #define const /* nothing */ #endif #endif diff --git a/src/lib/crypto/des/fin_rndkey.c b/src/lib/crypto/des/fin_rndkey.c index 3872cdcb7..ea718b2be 100644 --- a/src/lib/crypto/des/fin_rndkey.c +++ b/src/lib/crypto/des/fin_rndkey.c @@ -29,7 +29,7 @@ free any resources held by "seed" and assigned by init_random_key() */ -krb5_error_code INTERFACE mit_des_finish_random_key (seed) +krb5_error_code mit_des_finish_random_key (seed) krb5_pointer * seed; { memset((char *)*seed, 0, sizeof(mit_des_random_key_seed) ); diff --git a/src/lib/crypto/des/finish_key.c b/src/lib/crypto/des/finish_key.c index d18c7ba3b..0214d1f69 100644 --- a/src/lib/crypto/des/finish_key.c +++ b/src/lib/crypto/des/finish_key.c @@ -32,7 +32,7 @@ returns: errors */ -krb5_error_code INTERFACE +krb5_error_code mit_des_finish_key (eblock) krb5_encrypt_block FAR * eblock; { diff --git a/src/lib/crypto/des/init_rkey.c b/src/lib/crypto/des/init_rkey.c index d70cef1e8..c240b9dce 100644 --- a/src/lib/crypto/des/init_rkey.c +++ b/src/lib/crypto/des/init_rkey.c @@ -32,7 +32,7 @@ sequence information. */ -krb5_error_code INTERFACE +krb5_error_code mit_des_init_random_key (seedblock, seed) const krb5_keyblock * seedblock; krb5_pointer * seed; diff --git a/src/lib/crypto/des/key_sched.c b/src/lib/crypto/des/key_sched.c index 58e5d6d0d..dfe973dcf 100644 --- a/src/lib/crypto/des/key_sched.c +++ b/src/lib/crypto/des/key_sched.c @@ -42,7 +42,7 @@ #include "k5-int.h" #include "des_int.h" -int INTERFACE +int mit_des_key_sched(k,schedule) mit_des_cblock k; mit_des_key_schedule schedule; diff --git a/src/lib/crypto/des/new_rn_key.c b/src/lib/crypto/des/new_rn_key.c index 63f68c472..ac72bb622 100644 --- a/src/lib/crypto/des/new_rn_key.c +++ b/src/lib/crypto/des/new_rn_key.c @@ -47,7 +47,7 @@ * to be a weak des key. Mit_Des_generate_random_block is used to * provide the random bits. */ -int INTERFACE +int mit_des_new_random_key(key, p_seed) mit_des_cblock key; mit_des_random_key_seed *p_seed; @@ -75,7 +75,7 @@ mit_des_new_random_key(key, p_seed) * Note: this routine calls mit_des_set_random_generator_seed. */ -void INTERFACE +void mit_des_init_random_number_generator(key,p_seed) mit_des_cblock key; mit_des_random_key_seed *p_seed; @@ -156,7 +156,7 @@ mit_des_init_random_number_generator(key,p_seed) * Requires: key is a valid des key. I.e., has correct parity and is not a * weak des key. */ -void INTERFACE +void mit_des_set_random_generator_seed(key, p_seed) mit_des_cblock key; mit_des_random_key_seed *p_seed; @@ -179,7 +179,7 @@ mit_des_set_random_generator_seed(key, p_seed) * * Note that mit_des_set_random_generator_seed resets the sequence number to 0. */ -void INTERFACE +void mit_des_set_sequence_number(new_sequence_number, p_seed) mit_des_cblock new_sequence_number; mit_des_random_key_seed *p_seed; @@ -196,7 +196,7 @@ mit_des_set_sequence_number(new_sequence_number, p_seed) * Requires: mit_des_set_random_generator_seed must have been called at least once * before this routine is called. */ -void INTERFACE +void mit_des_generate_random_block(block, p_seed) mit_des_cblock block; mit_des_random_key_seed *p_seed; diff --git a/src/lib/crypto/des/process_ky.c b/src/lib/crypto/des/process_ky.c index d21bd93be..201f0745a 100644 --- a/src/lib/crypto/des/process_ky.c +++ b/src/lib/crypto/des/process_ky.c @@ -38,7 +38,7 @@ returns: errors */ -krb5_error_code INTERFACE +krb5_error_code mit_des_process_key (eblock, keyblock) krb5_encrypt_block * eblock; const krb5_keyblock * keyblock; diff --git a/src/lib/crypto/des/random_key.c b/src/lib/crypto/des/random_key.c index 055b0fa75..bf5f60a6d 100644 --- a/src/lib/crypto/des/random_key.c +++ b/src/lib/crypto/des/random_key.c @@ -29,7 +29,7 @@ filling in the keyblock address in *keyblock */ -krb5_error_code INTERFACE +krb5_error_code mit_des_random_key (eblock, seed, keyblock) const krb5_encrypt_block * eblock; krb5_pointer seed; diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c index b9dd7115d..7eb58affb 100644 --- a/src/lib/crypto/des/string2key.c +++ b/src/lib/crypto/des/string2key.c @@ -40,7 +40,7 @@ returns: errors */ -krb5_error_code INTERFACE +krb5_error_code mit_des_string_to_key (eblock, keytype, keyblock, data, salt) const krb5_encrypt_block FAR * eblock; const krb5_keytype keytype; @@ -61,7 +61,9 @@ const krb5_data FAR * salt; char k_char[64]; mit_des_key_schedule key_sked; +#ifndef min #define min(A, B) ((A) < (B) ? (A): (B)) +#endif if ( keytype != KEYTYPE_DES ) return (KRB5_PROG_KEYTYPE_NOSUPP); diff --git a/src/lib/crypto/des/weak_key.c b/src/lib/crypto/des/weak_key.c index 50f21354d..bc6b20264 100644 --- a/src/lib/crypto/des/weak_key.c +++ b/src/lib/crypto/des/weak_key.c @@ -67,7 +67,7 @@ static mit_des_cblock weak[16] = { * * Requires: key has correct odd parity. */ -int INTERFACE +int mit_des_is_weak_key(key) mit_des_cblock key; { diff --git a/src/lib/crypto/des_crc.c b/src/lib/crypto/des_crc.c index 90bbe87ed..b0f3f1ff4 100644 --- a/src/lib/crypto/des_crc.c +++ b/src/lib/crypto/des_crc.c @@ -25,11 +25,11 @@ #include "crc-32.h" #include "des_int.h" -krb5_error_code INTERFACE mit_des_crc_encrypt_func +krb5_error_code mit_des_crc_encrypt_func PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t, krb5_encrypt_block *, krb5_pointer )); -krb5_error_code INTERFACE mit_des_crc_decrypt_func +krb5_error_code mit_des_crc_decrypt_func PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t, krb5_encrypt_block *, krb5_pointer )); @@ -58,7 +58,7 @@ krb5_cs_table_entry krb5_des_crc_cst_entry = { }; -krb5_error_code INTERFACE +krb5_error_code mit_des_crc_encrypt_func(in, out, size, key, ivec) krb5_const_pointer in; krb5_pointer out; @@ -123,7 +123,7 @@ mit_des_crc_encrypt_func(in, out, size, key, ivec) } -krb5_error_code INTERFACE +krb5_error_code mit_des_crc_decrypt_func(in, out, size, key, ivec) krb5_const_pointer in; krb5_pointer out; diff --git a/src/lib/crypto/des_md5.c b/src/lib/crypto/des_md5.c index 35ef6e514..e0c80a746 100644 --- a/src/lib/crypto/des_md5.c +++ b/src/lib/crypto/des_md5.c @@ -25,11 +25,11 @@ #include "rsa-md5.h" #include "des_int.h" -krb5_error_code INTERFACE mit_des_md5_encrypt_func +krb5_error_code mit_des_md5_encrypt_func PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t, krb5_encrypt_block *, krb5_pointer )); -krb5_error_code INTERFACE mit_des_md5_decrypt_func +krb5_error_code mit_des_md5_decrypt_func PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t, krb5_encrypt_block *, krb5_pointer )); @@ -59,7 +59,7 @@ krb5_cs_table_entry krb5_des_md5_cst_entry = { }; -krb5_error_code INTERFACE +krb5_error_code mit_des_md5_encrypt_func(in, out, size, key, ivec) krb5_const_pointer in; krb5_pointer out; @@ -124,7 +124,7 @@ mit_des_md5_encrypt_func(in, out, size, key, ivec) } -krb5_error_code INTERFACE +krb5_error_code mit_des_md5_decrypt_func(in, out, size, key, ivec) krb5_const_pointer in; krb5_pointer out; diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog index cddab1d7b..e63e68121 100644 --- a/src/lib/crypto/md4/ChangeLog +++ b/src/lib/crypto/md4/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + * *.h added FAR to pointers visible at to the world. + * rsa-md4.h: __STDC__ condition also checks _WINDOWS + Thu Mar 16 21:19:55 1995 John Gilmore (gnu at toad.com) * Makefile.in (CFLAGS): Tweak for Unix->MPW converter. diff --git a/src/lib/crypto/md4/md4.c b/src/lib/crypto/md4/md4.c index 16f6a2b4b..a07c8611a 100644 --- a/src/lib/crypto/md4/md4.c +++ b/src/lib/crypto/md4/md4.c @@ -38,14 +38,14 @@ #include "k5-int.h" #include "rsa-md4.h" -#ifdef __STDC__ +#if defined(__STDC__) || defined(_WINDOWS) #define UL(x) x##UL #else #define UL(x) ((krb5_ui_4) x) #endif /* forward declaration */ -#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) +#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS) static void Transform (krb5_ui_4 FAR *, krb5_ui_4 FAR *); #else static void Transform (); @@ -82,7 +82,7 @@ static unsigned char PADDING[64] = { {(a) += H ((b), (c), (d)) + (x) + UL(015666365641); \ (a) = ROTATE_LEFT ((a), (s));} -void INTERFACE +void MD4Init (mdContext) MD4_CTX FAR *mdContext; { @@ -96,7 +96,7 @@ MD4_CTX FAR *mdContext; mdContext->buf[3] = UL(0x10325476); } -void INTERFACE +void MD4Update (mdContext, inBuf, inLen) MD4_CTX FAR *mdContext; unsigned char FAR *inBuf; @@ -132,7 +132,7 @@ unsigned int inLen; } } -void INTERFACE +void MD4Final (mdContext) MD4_CTX FAR *mdContext; { diff --git a/src/lib/crypto/md4/md4crypto.c b/src/lib/crypto/md4/md4crypto.c index 38a3a4a3b..58301f2bf 100644 --- a/src/lib/crypto/md4/md4crypto.c +++ b/src/lib/crypto/md4/md4crypto.c @@ -28,11 +28,11 @@ #include "rsa-md4.h" #include "des_int.h" /* we cheat a bit and call it directly... */ -krb5_error_code INTERFACE +krb5_error_code md4_crypto_sum_func NPROTOTYPE((krb5_pointer in, size_t in_length, krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum)); -krb5_error_code INTERFACE +krb5_error_code md4_crypto_sum_func(in, in_length, seed, seed_length, outcksum) krb5_pointer in; size_t in_length; diff --git a/src/lib/crypto/md4/md4glue.c b/src/lib/crypto/md4/md4glue.c index deebff54a..3a3d2e7da 100644 --- a/src/lib/crypto/md4/md4glue.c +++ b/src/lib/crypto/md4/md4glue.c @@ -26,11 +26,11 @@ #include "k5-int.h" #include "rsa-md4.h" -krb5_error_code INTERFACE +krb5_error_code md4_sum_func NPROTOTYPE((krb5_pointer in, size_t in_length, krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum)); -krb5_error_code INTERFACE +krb5_error_code md4_sum_func(in, in_length, seed, seed_length, outcksum) krb5_pointer in; size_t in_length; diff --git a/src/lib/crypto/md4/rsa-md4.h b/src/lib/crypto/md4/rsa-md4.h index 0fdf17f15..c03b6cb47 100644 --- a/src/lib/crypto/md4/rsa-md4.h +++ b/src/lib/crypto/md4/rsa-md4.h @@ -84,14 +84,14 @@ typedef struct { unsigned char digest[16]; /* actual digest after MD4Final call */ } MD4_CTX; -#ifdef __STDC__ -extern void INTERFACE MD4Init(MD4_CTX FAR *); -extern void INTERFACE MD4Update(MD4_CTX FAR *, unsigned char FAR *, unsigned int); -extern void INTERFACE MD4Final(MD4_CTX FAR *); +#if defined(__STDC__) || defined(_WINDOWS) +extern void MD4Init(MD4_CTX FAR *); +extern void MD4Update(MD4_CTX FAR *, unsigned char FAR *, unsigned int); +extern void MD4Final(MD4_CTX FAR *); #else -void INTERFACE MD4Init (); -void INTERFACE MD4Update (); -void INTERFACE MD4Final (); +void MD4Init (); +void MD4Update (); +void MD4Final (); #endif /* diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog index 4d791624e..dd52074f8 100644 --- a/src/lib/crypto/md5/ChangeLog +++ b/src/lib/crypto/md5/ChangeLog @@ -1,3 +1,8 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + * *.h added FAR to pointers visible at to the world. + Thu Mar 16 21:23:03 1995 John Gilmore (gnu at toad.com) * Makefile.in (LDFLAGS): Remove, conflicts with pre.in. diff --git a/src/lib/crypto/md5/md5.c b/src/lib/crypto/md5/md5.c index 885bdb426..beff1a2de 100644 --- a/src/lib/crypto/md5/md5.c +++ b/src/lib/crypto/md5/md5.c @@ -38,7 +38,7 @@ #include "k5-int.h" #include "rsa-md5.h" -#ifdef __STDC__ +#if defined(__STDC__) || defined(_WINDOWS) #define UL(x) x##UL #else #define UL(x) ((krb5_ui_4) x) @@ -104,7 +104,7 @@ static unsigned char PADDING[64] = { /* The routine MD5Init initializes the message-digest context mdContext. All fields are set to zero. */ -void INTERFACE +void MD5Init (mdContext) MD5_CTX FAR *mdContext; { @@ -122,7 +122,7 @@ MD5_CTX FAR *mdContext; account for the presence of each of the characters inBuf[0..inLen-1] in the message whose digest is being computed. */ -void INTERFACE +void MD5Update (mdContext, inBuf, inLen) MD5_CTX FAR *mdContext; unsigned char FAR *inBuf; @@ -161,7 +161,7 @@ unsigned int inLen; /* The routine MD5Final terminates the message-digest computation and ends with the desired message digest in mdContext->digest[0...15]. */ -void INTERFACE +void MD5Final (mdContext) MD5_CTX FAR *mdContext; { diff --git a/src/lib/crypto/md5/md5crypto.c b/src/lib/crypto/md5/md5crypto.c index bb2fba504..bacbb97d7 100644 --- a/src/lib/crypto/md5/md5crypto.c +++ b/src/lib/crypto/md5/md5crypto.c @@ -2,11 +2,11 @@ #include "rsa-md5.h" #include "des_int.h" /* we cheat a bit and call it directly... */ -krb5_error_code INTERFACE +krb5_error_code md5_crypto_sum_func NPROTOTYPE((krb5_pointer in, size_t in_length, krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum)); -krb5_error_code INTERFACE +krb5_error_code md5_crypto_sum_func(in, in_length, seed, seed_length, outcksum) krb5_pointer in; size_t in_length; diff --git a/src/lib/crypto/md5/md5glue.c b/src/lib/crypto/md5/md5glue.c index 4514c895f..01282ffaf 100644 --- a/src/lib/crypto/md5/md5glue.c +++ b/src/lib/crypto/md5/md5glue.c @@ -1,11 +1,11 @@ #include "k5-int.h" #include "rsa-md5.h" -krb5_error_code INTERFACE +krb5_error_code md5_sum_func NPROTOTYPE((krb5_pointer in, size_t in_length, krb5_pointer seed, size_t seed_length, krb5_checksum *outcksum)); -krb5_error_code INTERFACE +krb5_error_code md5_sum_func(in, in_length, seed, seed_length, outcksum) krb5_pointer in; size_t in_length; diff --git a/src/lib/crypto/os/ChangeLog b/src/lib/crypto/os/ChangeLog index c6d2bdeb3..465ec902b 100644 --- a/src/lib/crypto/os/ChangeLog +++ b/src/lib/crypto/os/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + Sat Mar 25 15:38:23 1995 Mark Eichin * Makefile.in (memmove.c): memmove.c is in krb5/posix, not krb5/os. diff --git a/src/lib/crypto/os/rnd_confoun.c b/src/lib/crypto/os/rnd_confoun.c index 7021ec7d5..8db32d156 100644 --- a/src/lib/crypto/os/rnd_confoun.c +++ b/src/lib/crypto/os/rnd_confoun.c @@ -60,7 +60,7 @@ You need a random number generator! /* * Generate a random confounder */ -krb5_error_code INTERFACE +krb5_error_code krb5_random_confounder(size, fillin) int size; krb5_pointer fillin; diff --git a/src/lib/crypto/raw_des.c b/src/lib/crypto/raw_des.c index e1a956f77..8bb889abc 100644 --- a/src/lib/crypto/raw_des.c +++ b/src/lib/crypto/raw_des.c @@ -24,11 +24,11 @@ #include "k5-int.h" #include "des_int.h" -krb5_error_code INTERFACE mit_raw_des_encrypt_func +krb5_error_code mit_raw_des_encrypt_func PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t, krb5_encrypt_block *, krb5_pointer )); -krb5_error_code INTERFACE mit_raw_des_decrypt_func +krb5_error_code mit_raw_des_decrypt_func PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t, krb5_encrypt_block *, krb5_pointer )); @@ -55,7 +55,7 @@ krb5_cs_table_entry krb5_raw_des_cst_entry = { 0 }; -krb5_error_code INTERFACE +krb5_error_code mit_raw_des_decrypt_func(in, out, size, key, ivec) krb5_const_pointer in; krb5_pointer out; @@ -71,7 +71,7 @@ mit_raw_des_decrypt_func(in, out, size, key, ivec) MIT_DES_DECRYPT)); } -krb5_error_code INTERFACE +krb5_error_code mit_raw_des_encrypt_func(in, out, size, key, ivec) krb5_const_pointer in; krb5_pointer out; diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog index 3782fc850..bb08ed325 100644 --- a/src/lib/des425/ChangeLog +++ b/src/lib/des425/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + Wed Mar 22 11:21:38 1995 Keith Vetter (keithv@fusion.com) * read_passwd.c: changed return value to krb5_error_code diff --git a/src/lib/des425/cksum.c b/src/lib/des425/cksum.c index 568e706af..abd48c3a2 100644 --- a/src/lib/des425/cksum.c +++ b/src/lib/des425/cksum.c @@ -52,7 +52,7 @@ * multiple of eight bytes. */ -void INTERFACE +void des_cbc_cksum(in,out,length,key,iv) krb5_octet *in; /* >= length bytes of inputtext */ krb5_octet *out; /* >= length bytes of outputtext */ diff --git a/src/lib/des425/des.c b/src/lib/des425/des.c index 289061ae6..b044acc41 100644 --- a/src/lib/des425/des.c +++ b/src/lib/des425/des.c @@ -51,7 +51,7 @@ #include "des.h" -int INTERFACE +int des_ecb_encrypt(clear, cipher, schedule, encrypt) unsigned long *clear; unsigned long *cipher; diff --git a/src/lib/des425/des.h b/src/lib/des425/des.h index df5f0f31d..9ec87ddc3 100644 --- a/src/lib/des425/des.h +++ b/src/lib/des425/des.h @@ -66,22 +66,22 @@ typedef struct des_ks_struct bit_64; /* * Windows needs everything prototyped because we're exporting all the fuctions. */ -void INTERFACE des_cbc_cksum(); -int INTERFACE des_ecb_encrypt(); -int INTERFACE des_cbc_encrypt(); -void INTERFACE des_fixup_key_parity(); -int INTERFACE des_check_key_parity(); -int INTERFACE des_key_sched(); -int INTERFACE des_new_random_key(); -void INTERFACE des_init_random_number_generator(); -void INTERFACE des_set_random_generator_seed(); -void INTERFACE des_set_sequence_number(); -void INTERFACE des_generate_random_block(); -int INTERFACE des_pcbc_encrypt(); -unsigned long INTERFACE des_quad_cksum(); -int INTERFACE des_random_key(); -krb5_error_code INTERFACE des_read_password(); -int INTERFACE des_string_to_key(); -int INTERFACE des_is_weak_key(); +void des_cbc_cksum(); +int des_ecb_encrypt(); +int des_cbc_encrypt(); +void des_fixup_key_parity(); +int des_check_key_parity(); +int des_key_sched(); +int des_new_random_key(); +void des_init_random_number_generator(); +void des_set_random_generator_seed(); +void des_set_sequence_number(); +void des_generate_random_block(); +int des_pcbc_encrypt(); +unsigned long des_quad_cksum(); +int des_random_key(); +krb5_error_code des_read_password(); +int des_string_to_key(); +int des_is_weak_key(); #endif /* DES_DEFS */ diff --git a/src/lib/des425/enc_dec.c b/src/lib/des425/enc_dec.c index cf6bfc8a0..f0225cbf2 100644 --- a/src/lib/des425/enc_dec.c +++ b/src/lib/des425/enc_dec.c @@ -57,7 +57,7 @@ * cleartext. */ -int INTERFACE +int des_cbc_encrypt(in,out,length,key,iv,encrypt) krb5_octet *in; /* >= length bytes of input text */ krb5_octet *out; /* >= length bytes of output text */ diff --git a/src/lib/des425/key_parity.c b/src/lib/des425/key_parity.c index 910c099d3..4bb593425 100644 --- a/src/lib/des425/key_parity.c +++ b/src/lib/des425/key_parity.c @@ -39,7 +39,7 @@ * 8,16,...64 in des order, implies 0, 8, 16, ... * vax order. */ -void INTERFACE +void des_fixup_key_parity(key) register mit_des_cblock key; { @@ -51,7 +51,7 @@ des_fixup_key_parity(key) * See des_fix_key_parity for the definition of * correct des parity. */ -int INTERFACE +int des_check_key_parity(key) register mit_des_cblock key; { diff --git a/src/lib/des425/key_sched.c b/src/lib/des425/key_sched.c index 96c7d4984..d96ef6fe0 100644 --- a/src/lib/des425/key_sched.c +++ b/src/lib/des425/key_sched.c @@ -48,7 +48,7 @@ #include #include "des.h" -int INTERFACE +int des_key_sched(k,schedule) register mit_des_cblock k; /* r11 */ mit_des_key_schedule schedule; diff --git a/src/lib/des425/new_rnd_key.c b/src/lib/des425/new_rnd_key.c index 5e4d5aa3b..99c92db46 100644 --- a/src/lib/des425/new_rnd_key.c +++ b/src/lib/des425/new_rnd_key.c @@ -42,7 +42,7 @@ static mit_des_random_key_seed random_sequence_state; * to be a weak des key. Des_generate_random_block is used to * provide the random bits. */ -int INTERFACE +int des_new_random_key(key) mit_des_cblock key; { @@ -63,7 +63,7 @@ des_new_random_key(key) * * Note: this routine calls des_set_random_generator_seed. */ -void INTERFACE +void des_init_random_number_generator(key) mit_des_cblock key; { @@ -87,7 +87,7 @@ des_init_random_number_generator(key) * Requires: key is a valid des key. I.e., has correct parity and is not a * weak des key. */ -void INTERFACE +void des_set_random_generator_seed(key) mit_des_cblock key; { @@ -103,7 +103,7 @@ des_set_random_generator_seed(key) * * Note that des_set_random_generator_seed resets the sequence number to 0. */ -void INTERFACE +void des_set_sequence_number(new_sequence_number) mit_des_cblock new_sequence_number; { @@ -118,7 +118,7 @@ des_set_sequence_number(new_sequence_number) * Requires: des_set_random_generator_seed must have been called at least once * before this routine is called. */ -void INTERFACE +void des_generate_random_block(block) mit_des_cblock block; { diff --git a/src/lib/des425/pcbc_encrypt.c b/src/lib/des425/pcbc_encrypt.c index 39744b6c9..c934926bf 100644 --- a/src/lib/des425/pcbc_encrypt.c +++ b/src/lib/des425/pcbc_encrypt.c @@ -71,7 +71,7 @@ typedef struct des_ks_struct bit_64; /* * des_pcbc_encrypt - {en,de}crypt a stream in PCBC mode */ -int INTERFACE +int des_pcbc_encrypt(in, out, length, schedule, ivec, encrypt) des_cblock *in; des_cblock *out; diff --git a/src/lib/des425/quad_cksum.c b/src/lib/des425/quad_cksum.c index 4654a1037..0e803ad75 100644 --- a/src/lib/des425/quad_cksum.c +++ b/src/lib/des425/quad_cksum.c @@ -106,7 +106,7 @@ extern int des_debug; /*** Routines ***************************************************** */ -unsigned long INTERFACE +unsigned long des_quad_cksum(in,out,length,out_count,c_seed) mit_des_cblock *c_seed; /* secret seed, 8 bytes */ unsigned char *in; /* input block */ diff --git a/src/lib/des425/random_key.c b/src/lib/des425/random_key.c index 945e20f40..9994302a9 100644 --- a/src/lib/des425/random_key.c +++ b/src/lib/des425/random_key.c @@ -27,7 +27,7 @@ #include "des.h" /* random_key */ -int INTERFACE +int des_random_key(key) mit_des_cblock *key; { diff --git a/src/lib/des425/read_passwd.c b/src/lib/des425/read_passwd.c index 61207c69a..2043b4f62 100644 --- a/src/lib/des425/read_passwd.c +++ b/src/lib/des425/read_passwd.c @@ -32,7 +32,7 @@ static krb5_context krb4_global_context = 0; /*** Routines ****************************************************** */ -krb5_error_code INTERFACE +krb5_error_code des_read_password/*_v4_compat_crock*/(k,prompt,verify) mit_des_cblock *k; char *prompt; diff --git a/src/lib/des425/str_to_key.c b/src/lib/des425/str_to_key.c index 2222897e5..cfd9914d2 100644 --- a/src/lib/des425/str_to_key.c +++ b/src/lib/des425/str_to_key.c @@ -48,7 +48,7 @@ extern int mit_des_debug; /* * convert an arbitrary length string to a DES key */ -int INTERFACE +int des_string_to_key(str,key) char *str; register mit_des_cblock *key; @@ -62,7 +62,7 @@ des_string_to_key(str,key) register char *p_char; static char k_char[64]; static mit_des_key_schedule key_sked; - extern void INTERFACE des_cbc_cksum(); + extern void des_cbc_cksum(); in_str = str; forward = 1; diff --git a/src/lib/des425/unix_time.c b/src/lib/des425/unix_time.c index 786d13575..ed1110007 100644 --- a/src/lib/des425/unix_time.c +++ b/src/lib/des425/unix_time.c @@ -15,7 +15,7 @@ #ifndef _MSDOS #include -krb5_ui_4 INTERFACE +krb5_ui_4 unix_time_gmt_unixsec (usecptr) krb5_ui_4 *usecptr; { @@ -45,7 +45,7 @@ unix_time_gmt_unixsec (usecptr) */ static long win_time_get_epoch(void); -krb5_ui_4 INTERFACE +krb5_ui_4 unix_time_gmt_unixsec (usecptr) krb5_ui_4 *usecptr; { diff --git a/src/lib/des425/weak_key.c b/src/lib/des425/weak_key.c index cab80d400..49f31bd14 100644 --- a/src/lib/des425/weak_key.c +++ b/src/lib/des425/weak_key.c @@ -37,7 +37,7 @@ * * Requires: key has correct odd parity. */ -int INTERFACE +int des_is_weak_key(key) mit_des_cblock key; { diff --git a/src/lib/gssapi.def b/src/lib/gssapi.def new file mode 100644 index 000000000..3ee304d6e --- /dev/null +++ b/src/lib/gssapi.def @@ -0,0 +1,35 @@ +;---------------------------------------------------- +; GSSAPI.DEF - GSSAPI.DLL module definition file +;---------------------------------------------------- + +LIBRARY GSSAPI +DESCRIPTION 'Base Generic Security Service API' +EXETYPE WINDOWS +CODE PRELOAD MOVEABLE DISCARDABLE +DATA PRELOAD MOVEABLE SINGLE +HEAPSIZE 8192 + +EXPORTS + WEP @1001 RESIDENTNAME + LIBMAIN @1002 + GSS_ACQUIRE_CRED @1 + GSS_RELEASE_CRED @2 + GSS_INIT_SEC_CONTEXT @3 + GSS_ACCEPT_SEC_CONTEXT @4 + GSS_PROCESS_CONTEXT_TOKEN @5 + GSS_DELETE_SEC_CONTEXT @6 + GSS_CONTEXT_TIME @7 + GSS_SIGN @8 + GSS_VERIFY @9 + GSS_SEAL @10 + GSS_UNSEAL @11 + GSS_DISPLAY_STATUS @12 + GSS_INDICATE_MECHS @13 + GSS_COMPARE_NAME @14 + GSS_DISPLAY_NAME @15 + GSS_IMPORT_NAME @16 + GSS_RELEASE_NAME @17 + GSS_RELEASE_BUFFER @18 + GSS_RELEASE_OID_SET @19 + GSS_INQUIRE_CRED @20 + diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index 5e3c5a3f3..e28a50767 100644 --- a/src/lib/gssapi/generic/ChangeLog +++ b/src/lib/gssapi/generic/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 13 16:27:56 1995 Keith Vetter (keithv@fusion.com) + + * gssapi_e.c: __STDC__ conditional also checks the _WINDOWS define. + * *.[ch]: removed unneeded INTERFACE from non-api functions. + * *.h added FAR to pointers visible at to the world. + Tue Mar 28 18:28:03 1995 John Gilmore (gnu at toad.com) * Makefile.in (unixmac): Add to build header files. diff --git a/src/lib/gssapi/generic/disp_com_err_status.c b/src/lib/gssapi/generic/disp_com_err_status.c index 369c962f5..79b5fbbe2 100644 --- a/src/lib/gssapi/generic/disp_com_err_status.c +++ b/src/lib/gssapi/generic/disp_com_err_status.c @@ -40,7 +40,7 @@ static const char * const no_error = "No error"; if status_type == GSS_C_MECH_CODE, return the output from error_message() */ -OM_uint32 INTERFACE +OM_uint32 g_display_com_err_status(minor_status, status_value, status_string) OM_uint32 *minor_status; OM_uint32 status_value; diff --git a/src/lib/gssapi/generic/disp_major_status.c b/src/lib/gssapi/generic/disp_major_status.c index 7dadd3e10..c6f82789d 100644 --- a/src/lib/gssapi/generic/disp_major_status.c +++ b/src/lib/gssapi/generic/disp_major_status.c @@ -202,7 +202,7 @@ static OM_uint32 display_bit(minor_status, code, status_string) message_context > 2 : print supplementary info bit (message_context-2) */ -OM_uint32 INTERFACE g_display_major_status(minor_status, status_value, +OM_uint32 g_display_major_status(minor_status, status_value, message_context, status_string) OM_uint32 *minor_status; OM_uint32 status_value; diff --git a/src/lib/gssapi/generic/gssapi.h b/src/lib/gssapi/generic/gssapi.h index b8bf1fa1a..61d01de0d 100644 --- a/src/lib/gssapi/generic/gssapi.h +++ b/src/lib/gssapi/generic/gssapi.h @@ -37,9 +37,9 @@ * First, define the platform-dependent types. */ typedef krb5_ui_4 OM_uint32; -typedef void * gss_name_t; -typedef void * gss_cred_id_t; -typedef void * gss_ctx_id_t; +typedef void FAR * gss_name_t; +typedef void FAR * gss_cred_id_t; +typedef void FAR * gss_ctx_id_t; /* * Note that a platform supporting the xom.h X/Open header file @@ -49,20 +49,20 @@ typedef void * gss_ctx_id_t; typedef struct gss_OID_desc_struct { OM_uint32 length; - void *elements; -} gss_OID_desc, *gss_OID; + void FAR *elements; +} gss_OID_desc, FAR *gss_OID; -typedef const gss_OID_desc * const const_gss_OID; +typedef const gss_OID_desc FAR * const const_gss_OID; typedef struct gss_OID_set_desc_struct { int count; gss_OID elements; -} gss_OID_set_desc, *gss_OID_set; +} gss_OID_set_desc, FAR *gss_OID_set; typedef struct gss_buffer_desc_struct { size_t length; - void *value; -} gss_buffer_desc, *gss_buffer_t; + void FAR *value; +} gss_buffer_desc, FAR *gss_buffer_t; typedef struct gss_channel_bindings_struct { OM_uint32 initiator_addrtype; @@ -70,7 +70,7 @@ typedef struct gss_channel_bindings_struct { OM_uint32 acceptor_addrtype; gss_buffer_desc acceptor_address; gss_buffer_desc application_data; -} *gss_channel_bindings_t; +} FAR *gss_channel_bindings_t; /* @@ -233,174 +233,174 @@ typedef struct gss_channel_bindings_struct { */ OM_uint32 INTERFACE gss_acquire_cred -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_name_t, /* desired_name */ - OM_uint32, /* time_req */ - gss_OID_set, /* desired_mechs */ - int, /* cred_usage */ - gss_cred_id_t*, /* output_cred_handle */ - gss_OID_set*, /* actual_mechs */ - OM_uint32* /* time_rec */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_name_t, /* desired_name */ + OM_uint32, /* time_req */ + gss_OID_set, /* desired_mechs */ + int, /* cred_usage */ + gss_cred_id_t FAR *,/* output_cred_handle */ + gss_OID_set FAR *, /* actual_mechs */ + OM_uint32 FAR * /* time_rec */ )); OM_uint32 INTERFACE gss_release_cred -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_cred_id_t* /* cred_handle */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_cred_id_t FAR * /* cred_handle */ )); OM_uint32 INTERFACE gss_init_sec_context -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_cred_id_t, /* claimant_cred_handle */ - gss_ctx_id_t*, /* context_handle */ - gss_name_t, /* target_name */ - const_gss_OID, /* mech_type */ - int, /* req_flags */ - OM_uint32, /* time_req */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_cred_id_t, /* claimant_cred_handle */ + gss_ctx_id_t FAR *, /* context_handle */ + gss_name_t, /* target_name */ + const_gss_OID, /* mech_type */ + int, /* req_flags */ + OM_uint32, /* time_req */ gss_channel_bindings_t, - /* input_chan_bindings */ - gss_buffer_t, /* input_token */ - gss_OID*, /* actual_mech_type */ - gss_buffer_t, /* output_token */ - int*, /* ret_flags */ - OM_uint32* /* time_rec */ + /* input_chan_bindings */ + gss_buffer_t, /* input_token */ + gss_OID FAR *, /* actual_mech_type */ + gss_buffer_t, /* output_token */ + int FAR *, /* ret_flags */ + OM_uint32 FAR * /* time_rec */ )); OM_uint32 INTERFACE gss_accept_sec_context -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t*, /* context_handle */ - gss_cred_id_t, /* verifier_cred_handle */ - gss_buffer_t, /* input_token_buffer */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t FAR *, /* context_handle */ + gss_cred_id_t, /* verifier_cred_handle */ + gss_buffer_t, /* input_token_buffer */ gss_channel_bindings_t, - /* input_chan_bindings */ - gss_name_t*, /* src_name */ - gss_OID*, /* mech_type */ - gss_buffer_t, /* output_token */ - int*, /* ret_flags */ - OM_uint32*, /* time_rec */ - gss_cred_id_t* /* delegated_cred_handle */ + /* input_chan_bindings */ + gss_name_t FAR *, /* src_name */ + gss_OID FAR *, /* mech_type */ + gss_buffer_t, /* output_token */ + int FAR *, /* ret_flags */ + OM_uint32 FAR *, /* time_rec */ + gss_cred_id_t FAR * /* delegated_cred_handle */ )); OM_uint32 INTERFACE gss_process_context_token -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t, /* context_handle */ - gss_buffer_t /* token_buffer */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t, /* context_handle */ + gss_buffer_t /* token_buffer */ )); OM_uint32 INTERFACE gss_delete_sec_context -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t*, /* context_handle */ - gss_buffer_t /* output_token */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t FAR *, /* context_handle */ + gss_buffer_t /* output_token */ )); OM_uint32 INTERFACE gss_context_time -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t, /* context_handle */ - OM_uint32* /* time_rec */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t, /* context_handle */ + OM_uint32 FAR * /* time_rec */ )); OM_uint32 INTERFACE gss_sign -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t, /* context_handle */ - int, /* qop_req */ - gss_buffer_t, /* message_buffer */ - gss_buffer_t /* message_token */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t, /* context_handle */ + int, /* qop_req */ + gss_buffer_t, /* message_buffer */ + gss_buffer_t /* message_token */ )); -OM_uint32 INTERFACE INTERFACE gss_verify -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t, /* context_handle */ - gss_buffer_t, /* message_buffer */ - gss_buffer_t, /* token_buffer */ - int* /* qop_state */ +OM_uint32 INTERFACE gss_verify +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t, /* context_handle */ + gss_buffer_t, /* message_buffer */ + gss_buffer_t, /* token_buffer */ + int FAR * /* qop_state */ )); OM_uint32 INTERFACE gss_seal -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t, /* context_handle */ - int, /* conf_req_flag */ - int, /* qop_req */ - gss_buffer_t, /* input_message_buffer */ - int*, /* conf_state */ - gss_buffer_t /* output_message_buffer */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t, /* context_handle */ + int, /* conf_req_flag */ + int, /* qop_req */ + gss_buffer_t, /* input_message_buffer */ + int FAR *, /* conf_state */ + gss_buffer_t /* output_message_buffer */ )); OM_uint32 INTERFACE gss_unseal -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t, /* context_handle */ - gss_buffer_t, /* input_message_buffer */ - gss_buffer_t, /* output_message_buffer */ - int*, /* conf_state */ - int* /* qop_state */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t, /* context_handle */ + gss_buffer_t, /* input_message_buffer */ + gss_buffer_t, /* output_message_buffer */ + int FAR *, /* conf_state */ + int FAR * /* qop_state */ )); OM_uint32 INTERFACE gss_display_status -PROTOTYPE( (OM_uint32*, /* minor_status */ - OM_uint32, /* status_value */ - int, /* status_type */ - const_gss_OID, /* mech_type */ - int*, /* message_context */ - gss_buffer_t /* status_string */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + OM_uint32, /* status_value */ + int, /* status_type */ + const_gss_OID, /* mech_type */ + int FAR *, /* message_context */ + gss_buffer_t /* status_string */ )); OM_uint32 INTERFACE gss_indicate_mechs -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_OID_set* /* mech_set */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_OID_set FAR * /* mech_set */ )); OM_uint32 INTERFACE gss_compare_name -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_name_t, /* name1 */ - gss_name_t, /* name2 */ - int* /* name_equal */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_name_t, /* name1 */ + gss_name_t, /* name2 */ + int FAR * /* name_equal */ )); OM_uint32 INTERFACE gss_display_name -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_name_t, /* input_name */ - gss_buffer_t, /* output_name_buffer */ - gss_OID* /* output_name_type */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_name_t, /* input_name */ + gss_buffer_t, /* output_name_buffer */ + gss_OID FAR * /* output_name_type */ )); OM_uint32 INTERFACE gss_import_name -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_buffer_t, /* input_name_buffer */ - const_gss_OID, /* input_name_type */ - gss_name_t* /* output_name */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_buffer_t, /* input_name_buffer */ + const_gss_OID, /* input_name_type */ + gss_name_t FAR * /* output_name */ )); OM_uint32 INTERFACE gss_release_name -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_name_t* /* input_name */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_name_t FAR * /* input_name */ )); OM_uint32 INTERFACE gss_release_buffer -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_buffer_t /* buffer */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_buffer_t /* buffer */ )); OM_uint32 INTERFACE gss_release_oid_set -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_OID_set* /* set */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_OID_set FAR * /* set */ )); OM_uint32 INTERFACE gss_inquire_cred -PROTOTYPE( (OM_uint32 *, /* minor_status */ - gss_cred_id_t, /* cred_handle */ - gss_name_t *, /* name */ - OM_uint32 *, /* lifetime */ - int *, /* cred_usage */ - gss_OID_set * /* mechanisms */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_cred_id_t, /* cred_handle */ + gss_name_t FAR *, /* name */ + OM_uint32 FAR *, /* lifetime */ + int FAR *, /* cred_usage */ + gss_OID_set FAR * /* mechanisms */ )); OM_uint32 INTERFACE gss_inquire_context -PROTOTYPE( (OM_uint32*, /* minor_status */ - gss_ctx_id_t, /* context_handle */ - gss_name_t*, /* initiator_name */ - gss_name_t*, /* acceptor_name */ - OM_uint32*, /* lifetime_rec */ - gss_OID*, /* mech_type */ - int*, /* ret_flags */ - int* /* locally_initiated */ +PROTOTYPE( (OM_uint32 FAR *, /* minor_status */ + gss_ctx_id_t, /* context_handle */ + gss_name_t FAR *, /* initiator_name */ + gss_name_t FAR *, /* acceptor_name */ + OM_uint32 FAR *, /* lifetime_rec */ + gss_OID FAR *, /* mech_type */ + int FAR *, /* ret_flags */ + int FAR * /* locally_initiated */ )); diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h index d8d86bb6a..49a876bf9 100644 --- a/src/lib/gssapi/generic/gssapiP_generic.h +++ b/src/lib/gssapi/generic/gssapiP_generic.h @@ -76,51 +76,51 @@ /** helper functions **/ -int INTERFACE g_save_name PROTOTYPE((void **vdb, gss_name_t *name)); -int INTERFACE g_save_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred)); -int INTERFACE g_save_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx)); +int g_save_name PROTOTYPE((void **vdb, gss_name_t *name)); +int g_save_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred)); +int g_save_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx)); -int INTERFACE g_validate_name PROTOTYPE((void **vdb, gss_name_t *name)); -int INTERFACE g_validate_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred)); -int INTERFACE g_validate_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx)); +int g_validate_name PROTOTYPE((void **vdb, gss_name_t *name)); +int g_validate_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred)); +int g_validate_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx)); -int INTERFACE g_delete_name PROTOTYPE((void **vdb, gss_name_t *name)); -int INTERFACE g_delete_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred)); -int INTERFACE g_delete_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx)); +int g_delete_name PROTOTYPE((void **vdb, gss_name_t *name)); +int g_delete_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred)); +int g_delete_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx)); -int INTERFACE g_make_string_buffer PROTOTYPE((const char *str, gss_buffer_t buffer)); +int g_make_string_buffer PROTOTYPE((const char *str, gss_buffer_t buffer)); -int INTERFACE g_copy_OID_set PROTOTYPE((const gss_OID_set_desc * const in, gss_OID_set *out)); +int g_copy_OID_set PROTOTYPE((const gss_OID_set_desc * const in, gss_OID_set *out)); -int INTERFACE g_token_size PROTOTYPE((const_gss_OID mech, unsigned int body_size)); +int g_token_size PROTOTYPE((const_gss_OID mech, unsigned int body_size)); -void INTERFACE g_make_token_header PROTOTYPE((const_gss_OID mech, int body_size, +void g_make_token_header PROTOTYPE((const_gss_OID mech, int body_size, unsigned char **buf, int tok_type)); -int INTERFACE g_verify_token_header PROTOTYPE((const_gss_OID mech, int *body_size, +int g_verify_token_header PROTOTYPE((const_gss_OID mech, int *body_size, unsigned char **buf, int tok_type, int toksize)); -OM_uint32 INTERFACE g_display_major_status PROTOTYPE((OM_uint32 *minor_status, +OM_uint32 g_display_major_status PROTOTYPE((OM_uint32 *minor_status, OM_uint32 status_value, int *message_context, gss_buffer_t status_string)); -OM_uint32 INTERFACE INTERFACE g_display_com_err_status PROTOTYPE((OM_uint32 *minor_status, +OM_uint32 g_display_com_err_status PROTOTYPE((OM_uint32 *minor_status, OM_uint32 status_value, gss_buffer_t status_string)); -char * INTERFACE g_canonicalize_host PROTOTYPE((char *hostname)); +char * g_canonicalize_host PROTOTYPE((char *hostname)); -char * INTERFACE g_strdup PROTOTYPE((char *str)); +char * g_strdup PROTOTYPE((char *str)); /** declarations of internal name mechanism functions **/ -OM_uint32 INTERFACE generic_gss_release_buffer +OM_uint32 generic_gss_release_buffer PROTOTYPE( (OM_uint32*, /* minor_status */ gss_buffer_t /* buffer */ )); -OM_uint32 INTERFACE generic_gss_release_oid_set +OM_uint32 generic_gss_release_oid_set PROTOTYPE( (OM_uint32*, /* minor_status */ gss_OID_set* /* set */ )); diff --git a/src/lib/gssapi/generic/gssapi_generic.h b/src/lib/gssapi/generic/gssapi_generic.h index f8f89e3c4..9073840de 100644 --- a/src/lib/gssapi/generic/gssapi_generic.h +++ b/src/lib/gssapi/generic/gssapi_generic.h @@ -25,9 +25,9 @@ #include -extern const gss_OID_desc * const gss_nt_user_name; -extern const gss_OID_desc * const gss_nt_machine_uid_name; -extern const gss_OID_desc * const gss_nt_string_uid_name; -extern const gss_OID_desc * const gss_nt_service_name; +extern const gss_OID_desc FAR * const gss_nt_user_name; +extern const gss_OID_desc FAR * const gss_nt_machine_uid_name; +extern const gss_OID_desc FAR * const gss_nt_string_uid_name; +extern const gss_OID_desc FAR * const gss_nt_service_name; #endif /* _GSSAPI_GENERIC_H_ */ diff --git a/src/lib/gssapi/generic/rel_buffer.c b/src/lib/gssapi/generic/rel_buffer.c index 2345fc4b0..b764a5b5f 100644 --- a/src/lib/gssapi/generic/rel_buffer.c +++ b/src/lib/gssapi/generic/rel_buffer.c @@ -22,7 +22,7 @@ #include "gssapiP_generic.h" -OM_uint32 INTERFACE generic_gss_release_buffer(minor_status, buffer) +OM_uint32 generic_gss_release_buffer(minor_status, buffer) OM_uint32 *minor_status; gss_buffer_t buffer; { diff --git a/src/lib/gssapi/generic/rel_oid_set.c b/src/lib/gssapi/generic/rel_oid_set.c index 073664a19..2edfe9a39 100644 --- a/src/lib/gssapi/generic/rel_oid_set.c +++ b/src/lib/gssapi/generic/rel_oid_set.c @@ -22,7 +22,7 @@ #include "gssapiP_generic.h" -OM_uint32 INTERFACE generic_gss_release_oid_set(minor_status, set) +OM_uint32 generic_gss_release_oid_set(minor_status, set) OM_uint32 *minor_status; gss_OID_set *set; { diff --git a/src/lib/gssapi/generic/util_buffer.c b/src/lib/gssapi/generic/util_buffer.c index 5fd06721c..cf144495f 100644 --- a/src/lib/gssapi/generic/util_buffer.c +++ b/src/lib/gssapi/generic/util_buffer.c @@ -27,7 +27,7 @@ make sure that buffer is consistent (release'able) when this function exits, no matter what the exit value */ -int INTERFACE g_make_string_buffer(str, buffer) +int g_make_string_buffer(str, buffer) const char *str; gss_buffer_t buffer; { diff --git a/src/lib/gssapi/generic/util_canonhost.c b/src/lib/gssapi/generic/util_canonhost.c index 409435f02..712d0ee07 100644 --- a/src/lib/gssapi/generic/util_canonhost.c +++ b/src/lib/gssapi/generic/util_canonhost.c @@ -28,7 +28,7 @@ #include #include -char * INTERFACE +char * g_canonicalize_host(hostname) char *hostname; { diff --git a/src/lib/gssapi/generic/util_dup.c b/src/lib/gssapi/generic/util_dup.c index d6ce11824..6b19092db 100644 --- a/src/lib/gssapi/generic/util_dup.c +++ b/src/lib/gssapi/generic/util_dup.c @@ -23,7 +23,7 @@ #include "gssapiP_generic.h" #include -char * INTERFACE g_strdup(str) +char * g_strdup(str) char *str; { char *ret; diff --git a/src/lib/gssapi/generic/util_oid.c b/src/lib/gssapi/generic/util_oid.c index 8f3d434eb..c415aad76 100644 --- a/src/lib/gssapi/generic/util_oid.c +++ b/src/lib/gssapi/generic/util_oid.c @@ -22,7 +22,7 @@ #include "gssapiP_generic.h" -int INTERFACE +int g_copy_OID_set(in, out) const gss_OID_set_desc * const in; gss_OID_set *out; diff --git a/src/lib/gssapi/generic/util_token.c b/src/lib/gssapi/generic/util_token.c index c5067fde9..c37819894 100644 --- a/src/lib/gssapi/generic/util_token.c +++ b/src/lib/gssapi/generic/util_token.c @@ -111,7 +111,7 @@ static int der_read_length(buf, bufsize) /* returns the length of a token, given the mech oid and the body size */ -int INTERFACE g_token_size(mech, body_size) +int g_token_size(mech, body_size) const_gss_OID mech; unsigned int body_size; { @@ -123,7 +123,7 @@ int INTERFACE g_token_size(mech, body_size) /* fills in a buffer with the token header. The buffer is assumed to be the right size. buf is advanced past the token header */ -void INTERFACE g_make_token_header(mech, body_size, buf, tok_type) +void g_make_token_header(mech, body_size, buf, tok_type) const_gss_OID mech; int body_size; unsigned char **buf; @@ -142,7 +142,7 @@ void INTERFACE g_make_token_header(mech, body_size, buf, tok_type) leaving buf advanced past the token header, and setting body_size to the number of remaining bytes */ -int INTERFACE g_verify_token_header(mech, body_size, buf, tok_type, toksize) +int g_verify_token_header(mech, body_size, buf, tok_type, toksize) const_gss_OID mech; int *body_size; unsigned char **buf; diff --git a/src/lib/gssapi/generic/util_validate.c b/src/lib/gssapi/generic/util_validate.c index e60ed427b..72631341b 100644 --- a/src/lib/gssapi/generic/util_validate.c +++ b/src/lib/gssapi/generic/util_validate.c @@ -105,45 +105,45 @@ static int g_delete(DB **vdb, int type, void *ptr) /* save */ -int INTERFACE g_save_name(void **vdb, gss_name_t *name) +int g_save_name(void **vdb, gss_name_t *name) { return(g_save((DB **) vdb, V_NAME, (void *) name)); } -int INTERFACE g_save_cred_id(void **vdb, gss_cred_id_t *cred) +int g_save_cred_id(void **vdb, gss_cred_id_t *cred) { return(g_save((DB **) vdb, V_CRED_ID, (void *) cred)); } -int INTERFACE g_save_ctx_id(void **vdb, gss_ctx_id_t *ctx) +int g_save_ctx_id(void **vdb, gss_ctx_id_t *ctx) { return(g_save((DB **) vdb, V_CTX_ID, (void *) ctx)); } /* validate */ -int INTERFACE g_validate_name(void **vdb, gss_name_t *name) +int g_validate_name(void **vdb, gss_name_t *name) { return(g_validate((DB **) vdb, V_NAME, (void *) name)); } -int INTERFACE g_validate_cred_id(void **vdb, gss_cred_id_t *cred) +int g_validate_cred_id(void **vdb, gss_cred_id_t *cred) { return(g_validate((DB **) vdb, V_CRED_ID, (void *) cred)); } -int INTERFACE g_validate_ctx_id(void **vdb, gss_ctx_id_t *ctx) +int g_validate_ctx_id(void **vdb, gss_ctx_id_t *ctx) { return(g_validate((DB **) vdb, V_CTX_ID, (void *) ctx)); } /* delete */ -int INTERFACE g_delete_name(void **vdb, gss_name_t *name) +int g_delete_name(void **vdb, gss_name_t *name) { return(g_delete((DB **) vdb, V_NAME, (void *) name)); } -int INTERFACE g_delete_cred_id(void **vdb, gss_cred_id_t *cred) +int g_delete_cred_id(void **vdb, gss_cred_id_t *cred) { return(g_delete((DB **) vdb, V_CRED_ID, (void *) cred)); } -int INTERFACE g_delete_ctx_id(void **vdb, gss_ctx_id_t *ctx) +int g_delete_ctx_id(void **vdb, gss_ctx_id_t *ctx) { return(g_delete((DB **) vdb, V_CTX_ID, (void *) ctx)); } diff --git a/src/lib/gssapi/generic/utl_nohash_validate.c b/src/lib/gssapi/generic/utl_nohash_validate.c index 88ad5937c..eaa83d34d 100644 --- a/src/lib/gssapi/generic/utl_nohash_validate.c +++ b/src/lib/gssapi/generic/utl_nohash_validate.c @@ -33,19 +33,19 @@ /* save */ -int INTERFACE g_save_name(vdb, name) +int g_save_name(vdb, name) void **vdb; gss_name_t *name; { return 1; } -int INTERFACE g_save_cred_id(vdb, cred) +int g_save_cred_id(vdb, cred) void **vdb; gss_cred_id_t *cred; { return 1; } -int INTERFACE g_save_ctx_id(vdb, ctx) +int g_save_ctx_id(vdb, ctx) void **vdb; gss_ctx_id_t *ctx; { @@ -54,19 +54,19 @@ int INTERFACE g_save_ctx_id(vdb, ctx) /* validate */ -int INTERFACE g_validate_name(vdb, name) +int g_validate_name(vdb, name) void **vdb; gss_name_t *name; { return 1; } -int INTERFACE g_validate_cred_id(vdb, cred) +int g_validate_cred_id(vdb, cred) void **vdb; gss_cred_id_t *cred; { return 1; } -int INTERFACE g_validate_ctx_id(vdb, ctx) +int g_validate_ctx_id(vdb, ctx) void **vdb; gss_ctx_id_t *ctx; { @@ -75,19 +75,19 @@ int INTERFACE g_validate_ctx_id(vdb, ctx) /* delete */ -int INTERFACE g_delete_name(vdb, name) +int g_delete_name(vdb, name) void **vdb; gss_name_t *name; { return 1; } -int INTERFACE g_delete_cred_id(vdb, cred) +int g_delete_cred_id(vdb, cred) void **vdb; gss_cred_id_t *cred; { return 1; } -int INTERFACE g_delete_ctx_id(vdb, ctx) +int g_delete_ctx_id(vdb, ctx) void **vdb; gss_ctx_id_t *ctx; { diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index d34555da7..870f13f75 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + * *.h added FAR to pointers visible at to the world. + * gssapi_e.c: __STDC__ conditional also checks the _WINDOWS define. + Thu Mar 30 16:00:30 1995 Keith Vetter (keithv@fusion.com) * accept_sec_context.c: fixed wrong level of indirection on a diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c index 3f35197e5..78f183908 100644 --- a/src/lib/gssapi/krb5/accept_sec_context.c +++ b/src/lib/gssapi/krb5/accept_sec_context.c @@ -24,7 +24,7 @@ #include #include -OM_uint32 INTERFACE +OM_uint32 krb5_gss_accept_sec_context(context, minor_status, context_handle, verifier_cred_handle, input_token, input_chan_bindings, src_name, mech_type, diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c index 419643b90..10563d694 100644 --- a/src/lib/gssapi/krb5/acquire_cred.c +++ b/src/lib/gssapi/krb5/acquire_cred.c @@ -237,7 +237,7 @@ acquire_init_cred(context, minor_status, desired_name, output_princ, cred) } /*ARGSUSED*/ -OM_uint32 INTERFACE +OM_uint32 krb5_gss_acquire_cred(context, minor_status, desired_name, time_req, desired_mechs, cred_usage, output_cred_handle, actual_mechs, time_rec) diff --git a/src/lib/gssapi/krb5/compare_name.c b/src/lib/gssapi/krb5/compare_name.c index e73797a62..c18eace1b 100644 --- a/src/lib/gssapi/krb5/compare_name.c +++ b/src/lib/gssapi/krb5/compare_name.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_compare_name(context, minor_status, name1, name2, name_equal) krb5_context context; OM_uint32 *minor_status; diff --git a/src/lib/gssapi/krb5/context_time.c b/src/lib/gssapi/krb5/context_time.c index 05276c305..8b849ea5a 100644 --- a/src/lib/gssapi/krb5/context_time.c +++ b/src/lib/gssapi/krb5/context_time.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_context_time(context, minor_status, context_handle, time_rec) krb5_context context; OM_uint32 *minor_status; diff --git a/src/lib/gssapi/krb5/delete_sec_context.c b/src/lib/gssapi/krb5/delete_sec_context.c index e7ccdfa33..8127ea61e 100644 --- a/src/lib/gssapi/krb5/delete_sec_context.c +++ b/src/lib/gssapi/krb5/delete_sec_context.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_delete_sec_context(context, minor_status, context_handle, output_token) krb5_context context; OM_uint32 *minor_status; diff --git a/src/lib/gssapi/krb5/disp_name.c b/src/lib/gssapi/krb5/disp_name.c index f59d7aef8..3ce5ac25b 100644 --- a/src/lib/gssapi/krb5/disp_name.c +++ b/src/lib/gssapi/krb5/disp_name.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_display_name(context, minor_status, input_name, output_name_buffer, output_name_type) krb5_context context; diff --git a/src/lib/gssapi/krb5/disp_status.c b/src/lib/gssapi/krb5/disp_status.c index e1df99803..4e04d9b6b 100644 --- a/src/lib/gssapi/krb5/disp_status.c +++ b/src/lib/gssapi/krb5/disp_status.c @@ -31,7 +31,7 @@ static int init_et = 0; /**/ -OM_uint32 INTERFACE +OM_uint32 krb5_gss_display_status(context, minor_status, status_value, status_type, mech_type, message_context, status_string) krb5_context context; diff --git a/src/lib/gssapi/krb5/get_tkt_flags.c b/src/lib/gssapi/krb5/get_tkt_flags.c index 1708e564e..2e73cacfe 100644 --- a/src/lib/gssapi/krb5/get_tkt_flags.c +++ b/src/lib/gssapi/krb5/get_tkt_flags.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 gss_krb5_get_tkt_flags(minor_status, context_handle, ticket_flags) OM_uint32 *minor_status; gss_ctx_id_t context_handle; diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h index ee7ec9ab5..8d846f73b 100644 --- a/src/lib/gssapi/krb5/gssapiP_krb5.h +++ b/src/lib/gssapi/krb5/gssapiP_krb5.h @@ -115,38 +115,38 @@ extern krb5_context kg_context; /** helper functions **/ -OM_uint32 INTERFACE kg_get_defcred +OM_uint32 kg_get_defcred PROTOTYPE((OM_uint32 *minor_status, gss_cred_id_t *cred)); -OM_uint32 INTERFACE kg_release_defcred PROTOTYPE((OM_uint32 *minor_status)); +OM_uint32 kg_release_defcred PROTOTYPE((OM_uint32 *minor_status)); -krb5_error_code INTERFACE kg_checksum_channel_bindings +krb5_error_code kg_checksum_channel_bindings PROTOTYPE((gss_channel_bindings_t cb, krb5_checksum *cksum, int bigend)); -krb5_error_code INTERFACE kg_make_seq_num PROTOTYPE((krb5_gss_enc_desc *ed, +krb5_error_code kg_make_seq_num PROTOTYPE((krb5_gss_enc_desc *ed, int direction, krb5_int32 seqnum, unsigned char *cksum, unsigned char *buf)); -krb5_error_code INTERFACE kg_make_seed PROTOTYPE((krb5_keyblock *key, +krb5_error_code kg_make_seed PROTOTYPE((krb5_keyblock *key, unsigned char *seed)); -int INTERFACE kg_confounder_size PROTOTYPE((krb5_gss_enc_desc *ed)); +int kg_confounder_size PROTOTYPE((krb5_gss_enc_desc *ed)); -krb5_error_code INTERFACE kg_make_confounder PROTOTYPE((krb5_gss_enc_desc *ed, +krb5_error_code kg_make_confounder PROTOTYPE((krb5_gss_enc_desc *ed, unsigned char *buf)); -int INTERFACE kg_encrypt_size PROTOTYPE((krb5_gss_enc_desc *ed, int n)); +int kg_encrypt_size PROTOTYPE((krb5_gss_enc_desc *ed, int n)); -krb5_error_code INTERFACE kg_encrypt PROTOTYPE((krb5_gss_enc_desc *ed, +krb5_error_code kg_encrypt PROTOTYPE((krb5_gss_enc_desc *ed, krb5_pointer iv, krb5_pointer in, krb5_pointer out, int length)); -krb5_error_code INTERFACE kg_decrypt PROTOTYPE((krb5_gss_enc_desc *ed, +krb5_error_code kg_decrypt PROTOTYPE((krb5_gss_enc_desc *ed, krb5_pointer iv, krb5_pointer in, krb5_pointer out, int length)); -OM_uint32 INTERFACE kg_seal PROTOTYPE((OM_uint32 *minor_status, +OM_uint32 kg_seal PROTOTYPE((OM_uint32 *minor_status, gss_ctx_id_t context_handle, int conf_req_flag, int qop_req, @@ -155,7 +155,7 @@ OM_uint32 INTERFACE kg_seal PROTOTYPE((OM_uint32 *minor_status, gss_buffer_t output_message_buffer, int toktype)); -OM_uint32 INTERFACE kg_unseal PROTOTYPE((OM_uint32 *minor_status, +OM_uint32 kg_unseal PROTOTYPE((OM_uint32 *minor_status, gss_ctx_id_t context_handle, gss_buffer_t input_token_buffer, gss_buffer_t message_buffer, @@ -165,7 +165,7 @@ OM_uint32 INTERFACE kg_unseal PROTOTYPE((OM_uint32 *minor_status, /** declarations of internal name mechanism functions **/ -OM_uint32 INTERFACE krb5_gss_acquire_cred +OM_uint32 krb5_gss_acquire_cred PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_name_t, /* desired_name */ @@ -177,13 +177,13 @@ PROTOTYPE( (krb5_context, OM_uint32* /* time_rec */ )); -OM_uint32 INTERFACE krb5_gss_release_cred +OM_uint32 krb5_gss_release_cred PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_cred_id_t* /* cred_handle */ )); -OM_uint32 INTERFACE krb5_gss_init_sec_context +OM_uint32 krb5_gss_init_sec_context PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_cred_id_t, /* claimant_cred_handle */ @@ -201,7 +201,7 @@ PROTOTYPE( (krb5_context, OM_uint32* /* time_rec */ )); -OM_uint32 INTERFACE krb5_gss_accept_sec_context +OM_uint32 krb5_gss_accept_sec_context PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t*, /* context_handle */ @@ -217,28 +217,28 @@ PROTOTYPE( (krb5_context, gss_cred_id_t* /* delegated_cred_handle */ )); -OM_uint32 INTERFACE krb5_gss_process_context_token +OM_uint32 krb5_gss_process_context_token PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ gss_buffer_t /* token_buffer */ )); -OM_uint32 INTERFACE krb5_gss_delete_sec_context +OM_uint32 krb5_gss_delete_sec_context PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t*, /* context_handle */ gss_buffer_t /* output_token */ )); -OM_uint32 INTERFACE krb5_gss_context_time +OM_uint32 krb5_gss_context_time PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ OM_uint32* /* time_rec */ )); -OM_uint32 INTERFACE krb5_gss_sign +OM_uint32 krb5_gss_sign PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ @@ -247,7 +247,7 @@ PROTOTYPE( (krb5_context, gss_buffer_t /* message_token */ )); -OM_uint32 INTERFACE krb5_gss_verify +OM_uint32 krb5_gss_verify PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ @@ -256,7 +256,7 @@ PROTOTYPE( (krb5_context, int* /* qop_state */ )); -OM_uint32 INTERFACE krb5_gss_seal +OM_uint32 krb5_gss_seal PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ @@ -267,7 +267,7 @@ PROTOTYPE( (krb5_context, gss_buffer_t /* output_message_buffer */ )); -OM_uint32 INTERFACE krb5_gss_unseal +OM_uint32 krb5_gss_unseal PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ @@ -277,7 +277,7 @@ PROTOTYPE( (krb5_context, int* /* qop_state */ )); -OM_uint32 INTERFACE krb5_gss_display_status +OM_uint32 krb5_gss_display_status PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ OM_uint32, /* status_value */ @@ -287,13 +287,13 @@ PROTOTYPE( (krb5_context, gss_buffer_t /* status_string */ )); -OM_uint32 INTERFACE krb5_gss_indicate_mechs +OM_uint32 krb5_gss_indicate_mechs PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_OID_set* /* mech_set */ )); -OM_uint32 INTERFACE krb5_gss_compare_name +OM_uint32 krb5_gss_compare_name PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_name_t, /* name1 */ @@ -301,7 +301,7 @@ PROTOTYPE( (krb5_context, int* /* name_equal */ )); -OM_uint32 INTERFACE krb5_gss_display_name +OM_uint32 krb5_gss_display_name PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_name_t, /* input_name */ @@ -309,7 +309,7 @@ PROTOTYPE( (krb5_context, gss_OID* /* output_name_type */ )); -OM_uint32 INTERFACE krb5_gss_import_name +OM_uint32 krb5_gss_import_name PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_buffer_t, /* input_name_buffer */ @@ -317,13 +317,13 @@ PROTOTYPE( (krb5_context, gss_name_t* /* output_name */ )); -OM_uint32 INTERFACE krb5_gss_release_name +OM_uint32 krb5_gss_release_name PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_name_t* /* input_name */ )); -OM_uint32 INTERFACE krb5_gss_inquire_cred +OM_uint32 krb5_gss_inquire_cred PROTOTYPE( (krb5_context, OM_uint32 *, /* minor_status */ gss_cred_id_t, /* cred_handle */ @@ -333,7 +333,7 @@ PROTOTYPE( (krb5_context, gss_OID_set * /* mechanisms */ )); -OM_uint32 INTERFACE krb5_gss_inquire_context +OM_uint32 krb5_gss_inquire_context PROTOTYPE( (krb5_context, OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ @@ -345,6 +345,6 @@ PROTOTYPE( (krb5_context, int* /* locally_initiated */ )); -OM_uint32 INTERFACE kg_get_context(); +OM_uint32 kg_get_context(); #endif /* _GSSAPIP_KRB5_H_ */ diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c index 9b318587f..4b23217fa 100644 --- a/src/lib/gssapi/krb5/gssapi_krb5.c +++ b/src/lib/gssapi/krb5/gssapi_krb5.c @@ -73,7 +73,7 @@ static gss_cred_id_t defcred = GSS_C_NO_CREDENTIAL; /* XXX what happens when the default credentials expire or are invalidated? */ -OM_uint32 INTERFACE +OM_uint32 kg_get_defcred(minor_status, cred) OM_uint32 *minor_status; gss_cred_id_t *cred; @@ -99,7 +99,7 @@ kg_get_defcred(minor_status, cred) return(GSS_S_COMPLETE); } -OM_uint32 INTERFACE +OM_uint32 kg_release_defcred(minor_status) OM_uint32 *minor_status; { @@ -114,7 +114,7 @@ kg_release_defcred(minor_status) return(krb5_gss_release_cred(kg_context, minor_status, &defcred)); } -OM_uint32 INTERFACE +OM_uint32 kg_get_context() { if (kg_context) diff --git a/src/lib/gssapi/krb5/gssapi_krb5.h b/src/lib/gssapi/krb5/gssapi_krb5.h index 1f189773f..ef8477291 100644 --- a/src/lib/gssapi/krb5/gssapi_krb5.h +++ b/src/lib/gssapi/krb5/gssapi_krb5.h @@ -39,7 +39,7 @@ extern const gss_OID_desc * const gss_nt_krb5_principal; #define gss_krb5_nt_machine_uid_name gss_nt_machine_uid_name #define gss_krb5_nt_string_uid_name gss_nt_string_uid_name -OM_uint32 INTERFACE gss_krb5_get_tkt_flags +OM_uint32 gss_krb5_get_tkt_flags PROTOTYPE((OM_uint32 *minor_status, gss_ctx_id_t context_handle, krb5_flags *ticket_flags)); diff --git a/src/lib/gssapi/krb5/import_name.c b/src/lib/gssapi/krb5/import_name.c index 0510a0b8e..d5dcd20f9 100644 --- a/src/lib/gssapi/krb5/import_name.c +++ b/src/lib/gssapi/krb5/import_name.c @@ -38,7 +38,7 @@ * GSS_S_FAILURE if memory allocation fails */ -OM_uint32 INTERFACE +OM_uint32 krb5_gss_import_name(context, minor_status, input_name_buffer, input_name_type, output_name) krb5_context context; diff --git a/src/lib/gssapi/krb5/indicate_mechs.c b/src/lib/gssapi/krb5/indicate_mechs.c index 11d94131b..f10087345 100644 --- a/src/lib/gssapi/krb5/indicate_mechs.c +++ b/src/lib/gssapi/krb5/indicate_mechs.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_indicate_mechs(context, minor_status, mech_set) krb5_context context; OM_uint32 *minor_status; diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c index 924d0c94d..0e8bd86c4 100644 --- a/src/lib/gssapi/krb5/init_sec_context.c +++ b/src/lib/gssapi/krb5/init_sec_context.c @@ -147,7 +147,7 @@ make_ap_req(context, auth_context, cred, server, endtime, chan_bindings, return(0); } -OM_uint32 INTERFACE +OM_uint32 krb5_gss_init_sec_context(context, minor_status, claimant_cred_handle, context_handle, target_name, mech_type, req_flags, time_req, input_chan_bindings, @@ -175,7 +175,7 @@ krb5_gss_init_sec_context(context, minor_status, claimant_cred_handle, gss_buffer_desc token; int i; /* Remove this when server is fixed and this function goes away */ -krb5_error_code INTERFACE krb5_auth_con_setkey (); +krb5_error_code krb5_auth_con_setkey (); /* set up return values so they can be "freed" successfully */ diff --git a/src/lib/gssapi/krb5/inq_context.c b/src/lib/gssapi/krb5/inq_context.c index 927483396..371f3cbe7 100644 --- a/src/lib/gssapi/krb5/inq_context.c +++ b/src/lib/gssapi/krb5/inq_context.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_inquire_context(context, minor_status, context_handle, initiator_name, acceptor_name, lifetime_rec, mech_type, ret_flags, locally_initiated) diff --git a/src/lib/gssapi/krb5/inq_cred.c b/src/lib/gssapi/krb5/inq_cred.c index fb5346281..d040018ae 100644 --- a/src/lib/gssapi/krb5/inq_cred.c +++ b/src/lib/gssapi/krb5/inq_cred.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_inquire_cred(context, minor_status, cred_handle, name, lifetime_ret, cred_usage, mechanisms) krb5_context context; diff --git a/src/lib/gssapi/krb5/k5seal.c b/src/lib/gssapi/krb5/k5seal.c index 0958a8736..acb37196e 100644 --- a/src/lib/gssapi/krb5/k5seal.c +++ b/src/lib/gssapi/krb5/k5seal.c @@ -179,7 +179,7 @@ make_seal_token(context, enc_ed, seq_ed, seqnum, direction, text, token, /* if signonly is true, ignore conf_req, conf_state, and do not encode the ENC_TYPE, MSG_LENGTH, or MSG_TEXT fields */ -OM_uint32 INTERFACE +OM_uint32 kg_seal(minor_status, context_handle, conf_req_flag, qop_req, input_message_buffer, conf_state, output_message_buffer, toktype) OM_uint32 *minor_status; diff --git a/src/lib/gssapi/krb5/k5unseal.c b/src/lib/gssapi/krb5/k5unseal.c index 1e9e2580a..054b5eac7 100644 --- a/src/lib/gssapi/krb5/k5unseal.c +++ b/src/lib/gssapi/krb5/k5unseal.c @@ -28,7 +28,7 @@ conf_state is only valid if SEAL. */ -OM_uint32 INTERFACE +OM_uint32 kg_unseal(minor_status, context_handle, input_token_buffer, message_buffer, conf_state, qop_state, toktype) OM_uint32 *minor_status; diff --git a/src/lib/gssapi/krb5/process_context_token.c b/src/lib/gssapi/krb5/process_context_token.c index 1bea1a5f7..0de7e090f 100644 --- a/src/lib/gssapi/krb5/process_context_token.c +++ b/src/lib/gssapi/krb5/process_context_token.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_process_context_token(context, minor_status, context_handle, token_buffer) krb5_context context; diff --git a/src/lib/gssapi/krb5/rel_cred.c b/src/lib/gssapi/krb5/rel_cred.c index e976d0a22..cb5ac0bb4 100644 --- a/src/lib/gssapi/krb5/rel_cred.c +++ b/src/lib/gssapi/krb5/rel_cred.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_release_cred(context, minor_status, cred_handle) krb5_context context; OM_uint32 *minor_status; diff --git a/src/lib/gssapi/krb5/rel_name.c b/src/lib/gssapi/krb5/rel_name.c index 872746304..3e41bf43e 100644 --- a/src/lib/gssapi/krb5/rel_name.c +++ b/src/lib/gssapi/krb5/rel_name.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_release_name(context, minor_status, input_name) krb5_context context; OM_uint32 *minor_status; diff --git a/src/lib/gssapi/krb5/seal.c b/src/lib/gssapi/krb5/seal.c index 645b3d638..a0e06ebde 100644 --- a/src/lib/gssapi/krb5/seal.c +++ b/src/lib/gssapi/krb5/seal.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_seal(context, minor_status, context_handle, conf_req_flag, qop_req, input_message_buffer, conf_state, output_message_buffer) diff --git a/src/lib/gssapi/krb5/sign.c b/src/lib/gssapi/krb5/sign.c index 368d7f81d..bafc0837d 100644 --- a/src/lib/gssapi/krb5/sign.c +++ b/src/lib/gssapi/krb5/sign.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_sign(context, minor_status, context_handle, qop_req, message_buffer, message_token) diff --git a/src/lib/gssapi/krb5/unseal.c b/src/lib/gssapi/krb5/unseal.c index f7aa994b1..3449951af 100644 --- a/src/lib/gssapi/krb5/unseal.c +++ b/src/lib/gssapi/krb5/unseal.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_unseal(context, minor_status, context_handle, input_message_buffer, output_message_buffer, conf_state, qop_state) diff --git a/src/lib/gssapi/krb5/util_cksum.c b/src/lib/gssapi/krb5/util_cksum.c index d5c12aab2..99f8c3bef 100644 --- a/src/lib/gssapi/krb5/util_cksum.c +++ b/src/lib/gssapi/krb5/util_cksum.c @@ -23,7 +23,7 @@ #include "gssapiP_krb5.h" #include -krb5_error_code INTERFACE +krb5_error_code kg_checksum_channel_bindings(cb, cksum, bigend) gss_channel_bindings_t cb; krb5_checksum *cksum; diff --git a/src/lib/gssapi/krb5/util_crypt.c b/src/lib/gssapi/krb5/util_crypt.c index a53b7c2ce..89028270e 100644 --- a/src/lib/gssapi/krb5/util_crypt.c +++ b/src/lib/gssapi/krb5/util_crypt.c @@ -25,7 +25,7 @@ static unsigned char zeros[8] = {0,0,0,0,0,0,0,0}; -int INTERFACE +int kg_confounder_size(ed) krb5_gss_enc_desc *ed; { @@ -34,7 +34,7 @@ kg_confounder_size(ed) return(ed->eblock.crypto_entry->block_length); } -krb5_error_code INTERFACE +krb5_error_code kg_make_confounder(ed, buf) krb5_gss_enc_desc *ed; unsigned char *buf; @@ -42,7 +42,7 @@ kg_make_confounder(ed, buf) return(krb5_random_confounder( ed->eblock.crypto_entry->block_length, buf)); } -int INTERFACE +int kg_encrypt_size(ed, n) krb5_gss_enc_desc *ed; int n; @@ -50,7 +50,7 @@ kg_encrypt_size(ed, n) return(krb5_encrypt_size(n, ed->eblock.crypto_entry)); } -krb5_error_code INTERFACE +krb5_error_code kg_encrypt(ed, iv, in, out, length) krb5_gss_enc_desc *ed; krb5_pointer iv; @@ -78,7 +78,7 @@ kg_encrypt(ed, iv, in, out, length) /* length is the length of the cleartext. */ -krb5_error_code INTERFACE +krb5_error_code kg_decrypt(ed, iv, in, out, length) krb5_gss_enc_desc *ed; krb5_pointer iv; diff --git a/src/lib/gssapi/krb5/util_seed.c b/src/lib/gssapi/krb5/util_seed.c index 318a49b8c..8792b8bd9 100644 --- a/src/lib/gssapi/krb5/util_seed.c +++ b/src/lib/gssapi/krb5/util_seed.c @@ -25,7 +25,7 @@ static unsigned char zeros[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0}; -krb5_error_code INTERFACE +krb5_error_code kg_make_seed(key, seed) krb5_keyblock *key; unsigned char *seed; diff --git a/src/lib/gssapi/krb5/util_seqnum.c b/src/lib/gssapi/krb5/util_seqnum.c index 7a9d31b5a..67bcda6db 100644 --- a/src/lib/gssapi/krb5/util_seqnum.c +++ b/src/lib/gssapi/krb5/util_seqnum.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -krb5_error_code INTERFACE +krb5_error_code kg_make_seq_num(ed, direction, seqnum, cksum, buf) krb5_gss_enc_desc *ed; int direction; diff --git a/src/lib/gssapi/krb5/verify.c b/src/lib/gssapi/krb5/verify.c index df0316aa8..398b1d771 100644 --- a/src/lib/gssapi/krb5/verify.c +++ b/src/lib/gssapi/krb5/verify.c @@ -22,7 +22,7 @@ #include "gssapiP_krb5.h" -OM_uint32 INTERFACE +OM_uint32 krb5_gss_verify(context, minor_status, context_handle, message_buffer, token_buffer, qop_state) diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog index 8daaad5fc..4a0494be4 100644 --- a/src/lib/krb5/asn.1/ChangeLog +++ b/src/lib/krb5/asn.1/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + Wed Mar 22 09:39:55 1995 * asn1_k_decode.c (setup, next_tag, apptag, get_field_body, diff --git a/src/lib/krb5/asn.1/asn1_decode.c b/src/lib/krb5/asn.1/asn1_decode.c index c12e3a5cd..54a14df37 100644 --- a/src/lib/krb5/asn.1/asn1_decode.c +++ b/src/lib/krb5/asn.1/asn1_decode.c @@ -52,7 +52,7 @@ return 0 time_t gmt_mktime PROTOTYPE((struct tm *)); -asn1_error_code INTERFACE asn1_decode_integer(buf, val) +asn1_error_code asn1_decode_integer(buf, val) asn1buf * buf; long * val; { @@ -71,7 +71,7 @@ asn1_error_code INTERFACE asn1_decode_integer(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_unsigned_integer(buf, val) +asn1_error_code asn1_decode_unsigned_integer(buf, val) asn1buf * buf; unsigned long * val; { @@ -90,7 +90,7 @@ asn1_error_code INTERFACE asn1_decode_unsigned_integer(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_octetstring(buf, retlen, val) +asn1_error_code asn1_decode_octetstring(buf, retlen, val) asn1buf * buf; int * retlen; asn1_octet ** val; @@ -103,7 +103,7 @@ asn1_error_code INTERFACE asn1_decode_octetstring(buf, retlen, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_charstring(buf, retlen, val) +asn1_error_code asn1_decode_charstring(buf, retlen, val) asn1buf * buf; int * retlen; char ** val; @@ -117,7 +117,7 @@ asn1_error_code INTERFACE asn1_decode_charstring(buf, retlen, val) } -asn1_error_code INTERFACE asn1_decode_generalstring(buf, retlen, val) +asn1_error_code asn1_decode_generalstring(buf, retlen, val) asn1buf * buf; int * retlen; char ** val; @@ -131,7 +131,7 @@ asn1_error_code INTERFACE asn1_decode_generalstring(buf, retlen, val) } -asn1_error_code INTERFACE asn1_decode_null(buf) +asn1_error_code asn1_decode_null(buf) asn1buf * buf; { setup(); @@ -140,7 +140,7 @@ asn1_error_code INTERFACE asn1_decode_null(buf) cleanup(); } -asn1_error_code INTERFACE asn1_decode_printablestring(buf, retlen, val) +asn1_error_code asn1_decode_printablestring(buf, retlen, val) asn1buf * buf; int * retlen; char ** val; @@ -153,7 +153,7 @@ asn1_error_code INTERFACE asn1_decode_printablestring(buf, retlen, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_ia5string(buf, retlen, val) +asn1_error_code asn1_decode_ia5string(buf, retlen, val) asn1buf * buf; int * retlen; char ** val; @@ -166,7 +166,7 @@ asn1_error_code INTERFACE asn1_decode_ia5string(buf, retlen, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_generaltime(buf, val) +asn1_error_code asn1_decode_generaltime(buf, val) asn1buf * buf; time_t * val; { diff --git a/src/lib/krb5/asn.1/asn1_decode.h b/src/lib/krb5/asn.1/asn1_decode.h index 2d8f07495..39bc6badb 100644 --- a/src/lib/krb5/asn.1/asn1_decode.h +++ b/src/lib/krb5/asn.1/asn1_decode.h @@ -55,18 +55,18 @@ Returns ENOMEM if memory is exhausted. Returns asn1 errors. */ -asn1_error_code INTERFACE asn1_decode_integer +asn1_error_code asn1_decode_integer PROTOTYPE((asn1buf *buf, long *val)); -asn1_error_code INTERFACE asn1_decode_unsigned_integer +asn1_error_code asn1_decode_unsigned_integer PROTOTYPE((asn1buf *buf, unsigned long *val)); -asn1_error_code INTERFACE asn1_decode_null +asn1_error_code asn1_decode_null PROTOTYPE((asn1buf *buf)); -asn1_error_code INTERFACE asn1_decode_octetstring +asn1_error_code asn1_decode_octetstring PROTOTYPE((asn1buf *buf, int *retlen, asn1_octet **val)); -asn1_error_code INTERFACE asn1_decode_generalstring +asn1_error_code asn1_decode_generalstring PROTOTYPE((asn1buf *buf, int *retlen, char **val)); -asn1_error_code INTERFACE asn1_decode_charstring +asn1_error_code asn1_decode_charstring PROTOTYPE((asn1buf *buf, int *retlen, char **val)); /* Note: A charstring is a special hack to account for the fact that krb5 structures store some OCTET STRING values in krb5_octet @@ -74,12 +74,12 @@ asn1_error_code INTERFACE asn1_decode_charstring PROTOTYPE((which use char arrays). From the ASN.1 point of view, the two string types are the same, only the receptacles differ. */ -asn1_error_code INTERFACE asn1_decode_printablestring +asn1_error_code asn1_decode_printablestring PROTOTYPE((asn1buf *buf, int *retlen, char **val)); -asn1_error_code INTERFACE asn1_decode_ia5string +asn1_error_code asn1_decode_ia5string PROTOTYPE((asn1buf *buf, int *retlen, char **val)); -asn1_error_code INTERFACE asn1_decode_generaltime +asn1_error_code asn1_decode_generaltime PROTOTYPE((asn1buf *buf, time_t *val)); #endif diff --git a/src/lib/krb5/asn.1/asn1_encode.c b/src/lib/krb5/asn.1/asn1_encode.c index a91520b04..d26d95de8 100644 --- a/src/lib/krb5/asn.1/asn1_encode.c +++ b/src/lib/krb5/asn.1/asn1_encode.c @@ -26,7 +26,7 @@ #include "asn1_encode.h" #include "asn1_make.h" -asn1_error_code INTERFACE asn1_encode_integer(buf, val, retlen) +asn1_error_code asn1_encode_integer(buf, val, retlen) asn1buf * buf; const long val; int * retlen; @@ -63,7 +63,7 @@ asn1_error_code INTERFACE asn1_encode_integer(buf, val, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_unsigned_integer(buf, val, retlen) +asn1_error_code asn1_encode_unsigned_integer(buf, val, retlen) asn1buf * buf; const unsigned long val; int * retlen; @@ -96,7 +96,7 @@ asn1_error_code INTERFACE asn1_encode_unsigned_integer(buf, val, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_octetstring(buf, len, val, retlen) +asn1_error_code asn1_encode_octetstring(buf, len, val, retlen) asn1buf * buf; const int len; const asn1_octet * val; @@ -114,7 +114,7 @@ asn1_error_code INTERFACE asn1_encode_octetstring(buf, len, val, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_charstring(buf, len, val, retlen) +asn1_error_code asn1_encode_charstring(buf, len, val, retlen) asn1buf * buf; const int len; const char * val; @@ -132,7 +132,7 @@ asn1_error_code INTERFACE asn1_encode_charstring(buf, len, val, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_null(buf, retlen) +asn1_error_code asn1_encode_null(buf, retlen) asn1buf * buf; int * retlen; { @@ -147,7 +147,7 @@ asn1_error_code INTERFACE asn1_encode_null(buf, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_printablestring(buf, len, val, retlen) +asn1_error_code asn1_encode_printablestring(buf, len, val, retlen) asn1buf * buf; const int len; const char * val; @@ -165,7 +165,7 @@ asn1_error_code INTERFACE asn1_encode_printablestring(buf, len, val, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_ia5string(buf, len, val, retlen) +asn1_error_code asn1_encode_ia5string(buf, len, val, retlen) asn1buf * buf; const int len; const char * val; @@ -183,7 +183,7 @@ asn1_error_code INTERFACE asn1_encode_ia5string(buf, len, val, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_generaltime(buf, val, retlen) +asn1_error_code asn1_encode_generaltime(buf, val, retlen) asn1buf * buf; const time_t val; int * retlen; @@ -210,7 +210,7 @@ asn1_error_code INTERFACE asn1_encode_generaltime(buf, val, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_generalstring(buf, len, val, retlen) +asn1_error_code asn1_encode_generalstring(buf, len, val, retlen) asn1buf * buf; const int len; const char * val; diff --git a/src/lib/krb5/asn.1/asn1_encode.h b/src/lib/krb5/asn.1/asn1_encode.h index f5d803655..c8995b549 100644 --- a/src/lib/krb5/asn.1/asn1_encode.h +++ b/src/lib/krb5/asn.1/asn1_encode.h @@ -46,7 +46,7 @@ asn1_encode_generalstring */ -asn1_error_code INTERFACE asn1_encode_integer +asn1_error_code asn1_encode_integer PROTOTYPE((asn1buf *buf, const long val, int *retlen)); /* requires *buf is allocated modifies *buf, *retlen @@ -55,7 +55,7 @@ asn1_error_code INTERFACE asn1_encode_integer Returns ENOMEM to signal an unsuccesful attempt to expand the buffer. */ -asn1_error_code INTERFACE asn1_encode_unsigned_integer +asn1_error_code asn1_encode_unsigned_integer PROTOTYPE((asn1buf *buf, const unsigned long val, int *retlen)); /* requires *buf is allocated modifies *buf, *retlen @@ -64,7 +64,7 @@ asn1_error_code INTERFACE asn1_encode_unsigned_integer Returns ENOMEM to signal an unsuccesful attempt to expand the buffer. */ -asn1_error_code INTERFACE asn1_encode_octetstring +asn1_error_code asn1_encode_octetstring PROTOTYPE((asn1buf *buf, const int len, const asn1_octet *val, int *retlen)); @@ -75,7 +75,7 @@ asn1_error_code INTERFACE asn1_encode_octetstring Returns ENOMEM to signal an unsuccesful attempt to expand the buffer. */ -asn1_error_code INTERFACE asn1_encode_charstring +asn1_error_code asn1_encode_charstring PROTOTYPE((asn1buf *buf, const int len, const char *val, int *retlen)); @@ -86,7 +86,7 @@ asn1_error_code INTERFACE asn1_encode_charstring Returns ENOMEM to signal an unsuccesful attempt to expand the buffer. */ -asn1_error_code INTERFACE asn1_encode_null +asn1_error_code asn1_encode_null PROTOTYPE((asn1buf *buf, int *retlen)); /* requires *buf is allocated modifies *buf, *retlen @@ -95,7 +95,7 @@ asn1_error_code INTERFACE asn1_encode_null Returns ENOMEM to signal an unsuccesful attempt to expand the buffer. */ -asn1_error_code INTERFACE asn1_encode_printablestring +asn1_error_code asn1_encode_printablestring PROTOTYPE((asn1buf *buf, const int len, const char *val, int *retlen)); @@ -106,7 +106,7 @@ asn1_error_code INTERFACE asn1_encode_printablestring Returns ENOMEM to signal an unsuccesful attempt to expand the buffer. */ -asn1_error_code INTERFACE asn1_encode_ia5string +asn1_error_code asn1_encode_ia5string PROTOTYPE((asn1buf *buf, const int len, const char *val, int *retlen)); @@ -117,7 +117,7 @@ asn1_error_code INTERFACE asn1_encode_ia5string Returns ENOMEM to signal an unsuccesful attempt to expand the buffer. */ -asn1_error_code INTERFACE asn1_encode_generaltime +asn1_error_code asn1_encode_generaltime PROTOTYPE((asn1buf *buf, const time_t val, int *retlen)); /* requires *buf is allocated modifies *buf, *retlen @@ -127,7 +127,7 @@ asn1_error_code INTERFACE asn1_encode_generaltime to expand the buffer. Note: The encoding of GeneralizedTime is YYYYMMDDhhmmZ */ -asn1_error_code INTERFACE asn1_encode_generalstring +asn1_error_code asn1_encode_generalstring PROTOTYPE((asn1buf *buf, const int len, const char *val, int *retlen)); diff --git a/src/lib/krb5/asn.1/asn1_get.c b/src/lib/krb5/asn.1/asn1_get.c index 3a7e33d75..602a25e8c 100644 --- a/src/lib/krb5/asn.1/asn1_get.c +++ b/src/lib/krb5/asn.1/asn1_get.c @@ -23,7 +23,7 @@ #include "asn1_get.h" -asn1_error_code INTERFACE asn1_get_tag(buf, class, construction, tagnum, retlen) +asn1_error_code asn1_get_tag(buf, class, construction, tagnum, retlen) asn1buf * buf; asn1_class * class; asn1_construction * construction; @@ -44,7 +44,7 @@ asn1_error_code INTERFACE asn1_get_tag(buf, class, construction, tagnum, retlen) return 0; } -asn1_error_code INTERFACE asn1_get_sequence(buf, retlen) +asn1_error_code asn1_get_sequence(buf, retlen) asn1buf * buf; int * retlen; { @@ -64,7 +64,7 @@ asn1_error_code INTERFACE asn1_get_sequence(buf, retlen) /****************************************************************/ /* Private Procedures */ -asn1_error_code INTERFACE asn1_get_id(buf, class, construction, tagnum) +asn1_error_code asn1_get_id(buf, class, construction, tagnum) asn1buf * buf; asn1_class * class; asn1_construction * construction; @@ -100,7 +100,7 @@ asn1_error_code INTERFACE asn1_get_id(buf, class, construction, tagnum) return 0; } -asn1_error_code INTERFACE asn1_get_length(buf, retlen) +asn1_error_code asn1_get_length(buf, retlen) asn1buf * buf; int * retlen; { diff --git a/src/lib/krb5/asn.1/asn1_get.h b/src/lib/krb5/asn.1/asn1_get.h index ac7103d6e..67bc71952 100644 --- a/src/lib/krb5/asn.1/asn1_get.h +++ b/src/lib/krb5/asn.1/asn1_get.h @@ -30,7 +30,7 @@ #include "krbasn1.h" #include "asn1buf.h" -asn1_error_code INTERFACE asn1_get_tag +asn1_error_code asn1_get_tag PROTOTYPE((asn1buf *buf, asn1_class *class, asn1_construction *construction, @@ -45,7 +45,7 @@ asn1_error_code INTERFACE asn1_get_tag *tagnum is set to ASN1_TAGNUM_CEILING. Returns ASN1_OVERRUN if *buf is exhausted during the parse. */ -asn1_error_code INTERFACE asn1_get_sequence +asn1_error_code asn1_get_sequence PROTOTYPE((asn1buf *buf, int *retlen)); /* requires *buf is allocated effects Decodes a tag from *buf and returns ASN1_BAD_ID if it @@ -55,7 +55,7 @@ asn1_error_code INTERFACE asn1_get_sequence /****************************************************************/ /* Private Procedures */ -asn1_error_code INTERFACE asn1_get_id +asn1_error_code asn1_get_id PROTOTYPE((asn1buf *buf, asn1_class *class, asn1_construction *construction, @@ -67,7 +67,7 @@ asn1_error_code INTERFACE asn1_get_id are returned in *construction and *tagnum, respectively. Returns ASN1_OVERRUN if *buf is exhausted. */ -asn1_error_code INTERFACE asn1_get_length +asn1_error_code asn1_get_length PROTOTYPE((asn1buf *buf, int *retlen)); /* requires *buf is allocated effects Decodes the group of length octets at *buf's diff --git a/src/lib/krb5/asn.1/asn1_k_decode.c b/src/lib/krb5/asn.1/asn1_k_decode.c index 0d2566e2d..2d5703e64 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode.c +++ b/src/lib/krb5/asn.1/asn1_k_decode.c @@ -112,7 +112,7 @@ return 0 /* scalars */ -asn1_error_code INTERFACE asn1_decode_kerberos_time(buf, val) +asn1_error_code asn1_decode_kerberos_time(buf, val) asn1buf * buf; krb5_timestamp * val; { @@ -128,7 +128,7 @@ asn1_error_code INTERFACE asn1_decode_kerberos_time(buf, val) } #define integer_convert(fname,ktype)\ -asn1_error_code INTERFACE fname(buf, val)\ +asn1_error_code fname(buf, val)\ asn1buf * buf;\ ktype * val;\ {\ @@ -140,7 +140,7 @@ asn1_error_code INTERFACE fname(buf, val)\ return 0;\ } #define unsigned_integer_convert(fname,ktype)\ -asn1_error_code INTERFACE fname(buf, val)\ +asn1_error_code fname(buf, val)\ asn1buf * buf;\ ktype * val;\ {\ @@ -163,7 +163,7 @@ integer_convert(asn1_decode_authdatatype,krb5_authdatatype) unsigned_integer_convert(asn1_decode_ui_2,krb5_ui_2) unsigned_integer_convert(asn1_decode_ui_4,krb5_ui_4) -asn1_error_code INTERFACE asn1_decode_msgtype(buf, val) +asn1_error_code asn1_decode_msgtype(buf, val) asn1buf * buf; krb5_msgtype * val; { @@ -179,7 +179,7 @@ asn1_error_code INTERFACE asn1_decode_msgtype(buf, val) /* structures */ -asn1_error_code INTERFACE asn1_decode_realm(buf, val) +asn1_error_code asn1_decode_realm(buf, val) asn1buf * buf; krb5_principal * val; { @@ -188,7 +188,7 @@ asn1_error_code INTERFACE asn1_decode_realm(buf, val) &((*val)->realm.data)); } -asn1_error_code INTERFACE asn1_decode_principal_name(buf, val) +asn1_error_code asn1_decode_principal_name(buf, val) asn1buf * buf; krb5_principal * val; { @@ -219,7 +219,7 @@ asn1_error_code INTERFACE asn1_decode_principal_name(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_checksum(buf, val) +asn1_error_code asn1_decode_checksum(buf, val) asn1buf * buf; krb5_checksum * val; { @@ -233,7 +233,7 @@ asn1_error_code INTERFACE asn1_decode_checksum(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_encryption_key(buf, val) +asn1_error_code asn1_decode_encryption_key(buf, val) asn1buf * buf; krb5_keyblock * val; { @@ -248,7 +248,7 @@ asn1_error_code INTERFACE asn1_decode_encryption_key(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_encrypted_data(buf, val) +asn1_error_code asn1_decode_encrypted_data(buf, val) asn1buf * buf; krb5_enc_data * val; { @@ -263,7 +263,7 @@ asn1_error_code INTERFACE asn1_decode_encrypted_data(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_krb5_flags(buf, val) +asn1_error_code asn1_decode_krb5_flags(buf, val) asn1buf * buf; krb5_flags * val; { @@ -291,22 +291,22 @@ asn1_error_code INTERFACE asn1_decode_krb5_flags(buf, val) return 0; } -asn1_error_code INTERFACE asn1_decode_ticket_flags(buf, val) +asn1_error_code asn1_decode_ticket_flags(buf, val) asn1buf * buf; krb5_flags * val; { return asn1_decode_krb5_flags(buf,val); } -asn1_error_code INTERFACE asn1_decode_ap_options(buf, val) +asn1_error_code asn1_decode_ap_options(buf, val) asn1buf * buf; krb5_flags * val; { return asn1_decode_krb5_flags(buf,val); } -asn1_error_code INTERFACE asn1_decode_kdc_options(buf, val) +asn1_error_code asn1_decode_kdc_options(buf, val) asn1buf * buf; krb5_flags * val; { return asn1_decode_krb5_flags(buf,val); } -asn1_error_code INTERFACE asn1_decode_transited_encoding(buf, val) +asn1_error_code asn1_decode_transited_encoding(buf, val) asn1buf * buf; krb5_transited * val; { @@ -320,7 +320,7 @@ asn1_error_code INTERFACE asn1_decode_transited_encoding(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_enc_kdc_rep_part(buf, val) +asn1_error_code asn1_decode_enc_kdc_rep_part(buf, val) asn1buf * buf; krb5_enc_kdc_rep_part * val; { @@ -346,7 +346,7 @@ asn1_error_code INTERFACE asn1_decode_enc_kdc_rep_part(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_ticket(buf, val) +asn1_error_code asn1_decode_ticket(buf, val) asn1buf * buf; krb5_ticket * val; { @@ -370,7 +370,7 @@ asn1_error_code INTERFACE asn1_decode_ticket(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_kdc_req(buf, val) +asn1_error_code asn1_decode_kdc_req(buf, val) asn1buf * buf; krb5_kdc_req * val; { @@ -388,7 +388,7 @@ asn1_error_code INTERFACE asn1_decode_kdc_req(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_kdc_req_body(buf, val) +asn1_error_code asn1_decode_kdc_req_body(buf, val) asn1buf * buf; krb5_kdc_req * val; { @@ -425,7 +425,7 @@ asn1_error_code INTERFACE asn1_decode_kdc_req_body(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_krb_safe_body(buf, val) +asn1_error_code asn1_decode_krb_safe_body(buf, val) asn1buf * buf; krb5_safe * val; { @@ -447,7 +447,7 @@ asn1_error_code INTERFACE asn1_decode_krb_safe_body(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_host_address(buf, val) +asn1_error_code asn1_decode_host_address(buf, val) asn1buf * buf; krb5_address * val; { @@ -461,7 +461,7 @@ asn1_error_code INTERFACE asn1_decode_host_address(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_kdc_rep(buf, val) +asn1_error_code asn1_decode_kdc_rep(buf, val) asn1buf * buf; krb5_kdc_rep * val; { @@ -516,14 +516,14 @@ if(*(array) == NULL) return ENOMEM;\ cleanup() -asn1_error_code INTERFACE asn1_decode_authorization_data(buf, val) +asn1_error_code asn1_decode_authorization_data(buf, val) asn1buf * buf; krb5_authdata *** val; { decode_array_body(krb5_authdata,asn1_decode_authdata_elt); } -asn1_error_code INTERFACE asn1_decode_authdata_elt(buf, val) +asn1_error_code asn1_decode_authdata_elt(buf, val) asn1buf * buf; krb5_authdata * val; { @@ -537,28 +537,28 @@ asn1_error_code INTERFACE asn1_decode_authdata_elt(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_host_addresses(buf, val) +asn1_error_code asn1_decode_host_addresses(buf, val) asn1buf * buf; krb5_address *** val; { decode_array_body(krb5_address,asn1_decode_host_address); } -asn1_error_code INTERFACE asn1_decode_sequence_of_ticket(buf, val) +asn1_error_code asn1_decode_sequence_of_ticket(buf, val) asn1buf * buf; krb5_ticket *** val; { decode_array_body(krb5_ticket,asn1_decode_ticket); } -asn1_error_code INTERFACE asn1_decode_sequence_of_krb_cred_info(buf, val) +asn1_error_code asn1_decode_sequence_of_krb_cred_info(buf, val) asn1buf * buf; krb5_cred_info *** val; { decode_array_body(krb5_cred_info,asn1_decode_krb_cred_info); } -asn1_error_code INTERFACE asn1_decode_krb_cred_info(buf, val) +asn1_error_code asn1_decode_krb_cred_info(buf, val) asn1buf * buf; krb5_cred_info * val; { @@ -586,14 +586,14 @@ asn1_error_code INTERFACE asn1_decode_krb_cred_info(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_sequence_of_pa_data(buf, val) +asn1_error_code asn1_decode_sequence_of_pa_data(buf, val) asn1buf * buf; krb5_pa_data *** val; { decode_array_body(krb5_pa_data,asn1_decode_pa_data); } -asn1_error_code INTERFACE asn1_decode_pa_data(buf, val) +asn1_error_code asn1_decode_pa_data(buf, val) asn1buf * buf; krb5_pa_data * val; { @@ -607,14 +607,14 @@ asn1_error_code INTERFACE asn1_decode_pa_data(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_last_req(buf, val) +asn1_error_code asn1_decode_last_req(buf, val) asn1buf * buf; krb5_last_req_entry *** val; { decode_array_body(krb5_last_req_entry,asn1_decode_last_req_entry); } -asn1_error_code INTERFACE asn1_decode_last_req_entry(buf, val) +asn1_error_code asn1_decode_last_req_entry(buf, val) asn1buf * buf; krb5_last_req_entry * val; { @@ -628,7 +628,7 @@ asn1_error_code INTERFACE asn1_decode_last_req_entry(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_sequence_of_enctype(buf, num, val) +asn1_error_code asn1_decode_sequence_of_enctype(buf, num, val) asn1buf * buf; int * num; krb5_enctype ** val; @@ -651,7 +651,7 @@ asn1_error_code INTERFACE asn1_decode_sequence_of_enctype(buf, num, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_passwdsequence(buf, val) +asn1_error_code asn1_decode_passwdsequence(buf, val) asn1buf * buf; passwd_phrase_element * val; { @@ -668,7 +668,7 @@ asn1_error_code INTERFACE asn1_decode_passwdsequence(buf, val) cleanup(); } -asn1_error_code INTERFACE asn1_decode_sequence_of_passwdsequence(buf, val) +asn1_error_code asn1_decode_sequence_of_passwdsequence(buf, val) asn1buf * buf; passwd_phrase_element *** val; { diff --git a/src/lib/krb5/asn.1/asn1_k_decode.h b/src/lib/krb5/asn.1/asn1_k_decode.h index b2ccd20cc..f58f1845f 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode.h +++ b/src/lib/krb5/asn.1/asn1_k_decode.h @@ -64,98 +64,98 @@ the bounds of *buf */ /* scalars */ -asn1_error_code INTERFACE asn1_decode_int +asn1_error_code asn1_decode_int PROTOTYPE((asn1buf *buf, int *val)); -asn1_error_code INTERFACE asn1_decode_int32 +asn1_error_code asn1_decode_int32 PROTOTYPE((asn1buf *buf, krb5_int32 *val)); -asn1_error_code INTERFACE asn1_decode_kvno +asn1_error_code asn1_decode_kvno PROTOTYPE((asn1buf *buf, krb5_kvno *val)); -asn1_error_code INTERFACE asn1_decode_keytype +asn1_error_code asn1_decode_keytype PROTOTYPE((asn1buf *buf, krb5_keytype *val)); -asn1_error_code INTERFACE asn1_decode_msgtype +asn1_error_code asn1_decode_msgtype PROTOTYPE((asn1buf *buf, krb5_msgtype *val)); -asn1_error_code INTERFACE asn1_decode_cksumtype +asn1_error_code asn1_decode_cksumtype PROTOTYPE((asn1buf *buf, krb5_cksumtype *val)); -asn1_error_code INTERFACE asn1_decode_enctype +asn1_error_code asn1_decode_enctype PROTOTYPE((asn1buf *buf, krb5_enctype *val)); -asn1_error_code INTERFACE asn1_decode_octet +asn1_error_code asn1_decode_octet PROTOTYPE((asn1buf *buf, krb5_octet *val)); -asn1_error_code INTERFACE asn1_decode_addrtype +asn1_error_code asn1_decode_addrtype PROTOTYPE((asn1buf *buf, krb5_addrtype *val)); -asn1_error_code INTERFACE asn1_decode_authdatatype +asn1_error_code asn1_decode_authdatatype PROTOTYPE((asn1buf *buf, krb5_authdatatype *val)); -asn1_error_code INTERFACE asn1_decode_ui_2 +asn1_error_code asn1_decode_ui_2 PROTOTYPE((asn1buf *buf, krb5_ui_2 *val)); -asn1_error_code INTERFACE asn1_decode_ui_4 +asn1_error_code asn1_decode_ui_4 PROTOTYPE((asn1buf *buf, krb5_ui_4 *val)); -asn1_error_code INTERFACE asn1_decode_kerberos_time +asn1_error_code asn1_decode_kerberos_time PROTOTYPE((asn1buf *buf, krb5_timestamp *val)); /* structures */ -asn1_error_code INTERFACE asn1_decode_realm +asn1_error_code asn1_decode_realm PROTOTYPE((asn1buf *buf, krb5_principal *val)); -asn1_error_code INTERFACE asn1_decode_principal_name +asn1_error_code asn1_decode_principal_name PROTOTYPE((asn1buf *buf, krb5_principal *val)); -asn1_error_code INTERFACE asn1_decode_checksum +asn1_error_code asn1_decode_checksum PROTOTYPE((asn1buf *buf, krb5_checksum *val)); -asn1_error_code INTERFACE asn1_decode_encryption_key +asn1_error_code asn1_decode_encryption_key PROTOTYPE((asn1buf *buf, krb5_keyblock *val)); -asn1_error_code INTERFACE asn1_decode_encrypted_data +asn1_error_code asn1_decode_encrypted_data PROTOTYPE((asn1buf *buf, krb5_enc_data *val)); -asn1_error_code INTERFACE asn1_decode_ticket_flags +asn1_error_code asn1_decode_ticket_flags PROTOTYPE((asn1buf *buf, krb5_flags *val)); -asn1_error_code INTERFACE asn1_decode_transited_encoding +asn1_error_code asn1_decode_transited_encoding PROTOTYPE((asn1buf *buf, krb5_transited *val)); -asn1_error_code INTERFACE asn1_decode_enc_kdc_rep_part +asn1_error_code asn1_decode_enc_kdc_rep_part PROTOTYPE((asn1buf *buf, krb5_enc_kdc_rep_part *val)); -asn1_error_code INTERFACE asn1_decode_krb5_flags +asn1_error_code asn1_decode_krb5_flags PROTOTYPE((asn1buf *buf, krb5_flags *val)); -asn1_error_code INTERFACE asn1_decode_ap_options +asn1_error_code asn1_decode_ap_options PROTOTYPE((asn1buf *buf, krb5_flags *val)); -asn1_error_code INTERFACE asn1_decode_kdc_options +asn1_error_code asn1_decode_kdc_options PROTOTYPE((asn1buf *buf, krb5_flags *val)); -asn1_error_code INTERFACE asn1_decode_ticket +asn1_error_code asn1_decode_ticket PROTOTYPE((asn1buf *buf, krb5_ticket *val)); -asn1_error_code INTERFACE asn1_decode_kdc_req +asn1_error_code asn1_decode_kdc_req PROTOTYPE((asn1buf *buf, krb5_kdc_req *val)); -asn1_error_code INTERFACE asn1_decode_kdc_req_body +asn1_error_code asn1_decode_kdc_req_body PROTOTYPE((asn1buf *buf, krb5_kdc_req *val)); -asn1_error_code INTERFACE asn1_decode_krb_safe_body +asn1_error_code asn1_decode_krb_safe_body PROTOTYPE((asn1buf *buf, krb5_safe *val)); -asn1_error_code INTERFACE asn1_decode_host_address +asn1_error_code asn1_decode_host_address PROTOTYPE((asn1buf *buf, krb5_address *val)); -asn1_error_code INTERFACE asn1_decode_kdc_rep +asn1_error_code asn1_decode_kdc_rep PROTOTYPE((asn1buf *buf, krb5_kdc_rep *val)); -asn1_error_code INTERFACE asn1_decode_last_req_entry +asn1_error_code asn1_decode_last_req_entry PROTOTYPE((asn1buf *buf, krb5_last_req_entry *val)); -asn1_error_code INTERFACE asn1_decode_authdata_elt +asn1_error_code asn1_decode_authdata_elt PROTOTYPE((asn1buf *buf, krb5_authdata *val)); -asn1_error_code INTERFACE asn1_decode_krb_cred_info +asn1_error_code asn1_decode_krb_cred_info PROTOTYPE((asn1buf *buf, krb5_cred_info *val)); -asn1_error_code INTERFACE asn1_decode_pa_data +asn1_error_code asn1_decode_pa_data PROTOTYPE((asn1buf *buf, krb5_pa_data *val)); -asn1_error_code INTERFACE asn1_decode_passwdsequence +asn1_error_code asn1_decode_passwdsequence PROTOTYPE((asn1buf *buf, passwd_phrase_element *val)); /* arrays */ -asn1_error_code INTERFACE asn1_decode_authorization_data +asn1_error_code asn1_decode_authorization_data PROTOTYPE((asn1buf *buf, krb5_authdata ***val)); -asn1_error_code INTERFACE asn1_decode_host_addresses +asn1_error_code asn1_decode_host_addresses PROTOTYPE((asn1buf *buf, krb5_address ***val)); -asn1_error_code INTERFACE asn1_decode_sequence_of_ticket +asn1_error_code asn1_decode_sequence_of_ticket PROTOTYPE((asn1buf *buf, krb5_ticket ***val)); -asn1_error_code INTERFACE asn1_decode_sequence_of_krb_cred_info +asn1_error_code asn1_decode_sequence_of_krb_cred_info PROTOTYPE((asn1buf *buf, krb5_cred_info ***val)); -asn1_error_code INTERFACE asn1_decode_sequence_of_pa_data +asn1_error_code asn1_decode_sequence_of_pa_data PROTOTYPE((asn1buf *buf, krb5_pa_data ***val)); -asn1_error_code INTERFACE asn1_decode_last_req +asn1_error_code asn1_decode_last_req PROTOTYPE((asn1buf *buf, krb5_last_req_entry ***val)); -asn1_error_code INTERFACE asn1_decode_sequence_of_enctype +asn1_error_code asn1_decode_sequence_of_enctype PROTOTYPE((asn1buf *buf, int *num, krb5_enctype **val)); -asn1_error_code INTERFACE asn1_decode_sequence_of_passwdsequence +asn1_error_code asn1_decode_sequence_of_passwdsequence PROTOTYPE((asn1buf *buf, passwd_phrase_element ***val)); diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c index 77858f625..731083a99 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.c +++ b/src/lib/krb5/asn.1/asn1_k_encode.c @@ -120,7 +120,7 @@ *retlen = sum;\ return 0 -asn1_error_code INTERFACE asn1_encode_ui_4(buf, val, retlen) +asn1_error_code asn1_encode_ui_4(buf, val, retlen) asn1buf * buf; const krb5_ui_4 val; int *retlen; @@ -129,7 +129,7 @@ asn1_error_code INTERFACE asn1_encode_ui_4(buf, val, retlen) } -asn1_error_code INTERFACE asn1_encode_realm(buf, val, retlen) +asn1_error_code asn1_encode_realm(buf, val, retlen) asn1buf * buf; const krb5_principal val; int * retlen; @@ -139,7 +139,7 @@ asn1_error_code INTERFACE asn1_encode_realm(buf, val, retlen) retlen); } -asn1_error_code INTERFACE asn1_encode_principal_name(buf, val, retlen) +asn1_error_code asn1_encode_principal_name(buf, val, retlen) asn1buf * buf; const krb5_principal val; int * retlen; @@ -170,7 +170,7 @@ asn1_error_code INTERFACE asn1_encode_principal_name(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_kerberos_time(buf, val, retlen) +asn1_error_code asn1_encode_kerberos_time(buf, val, retlen) asn1buf * buf; const krb5_timestamp val; int * retlen; @@ -179,7 +179,7 @@ asn1_error_code INTERFACE asn1_encode_kerberos_time(buf, val, retlen) return asn1_encode_generaltime(buf,val,retlen); } -asn1_error_code INTERFACE asn1_encode_host_address(buf, val, retlen) +asn1_error_code asn1_encode_host_address(buf, val, retlen) asn1buf * buf; const krb5_address * val; int * retlen; @@ -195,7 +195,7 @@ asn1_error_code INTERFACE asn1_encode_host_address(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_host_addresses(buf, val, retlen) +asn1_error_code asn1_encode_host_addresses(buf, val, retlen) asn1buf * buf; const krb5_address ** val; int * retlen; @@ -216,7 +216,7 @@ asn1_error_code INTERFACE asn1_encode_host_addresses(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_encrypted_data(buf, val, retlen) +asn1_error_code asn1_encode_encrypted_data(buf, val, retlen) asn1buf * buf; const krb5_enc_data * val; int * retlen; @@ -235,7 +235,7 @@ asn1_error_code INTERFACE asn1_encode_encrypted_data(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_krb5_flags(buf, val, retlen) +asn1_error_code asn1_encode_krb5_flags(buf, val, retlen) asn1buf * buf; const krb5_flags val; int * retlen; @@ -262,7 +262,7 @@ asn1_error_code INTERFACE asn1_encode_krb5_flags(buf, val, retlen) return 0; } -asn1_error_code INTERFACE asn1_encode_ap_options(buf, val, retlen) +asn1_error_code asn1_encode_ap_options(buf, val, retlen) asn1buf * buf; const krb5_flags val; int * retlen; @@ -270,7 +270,7 @@ asn1_error_code INTERFACE asn1_encode_ap_options(buf, val, retlen) return asn1_encode_krb5_flags(buf,val,retlen); } -asn1_error_code INTERFACE asn1_encode_ticket_flags(buf, val, retlen) +asn1_error_code asn1_encode_ticket_flags(buf, val, retlen) asn1buf * buf; const krb5_flags val; int * retlen; @@ -278,7 +278,7 @@ asn1_error_code INTERFACE asn1_encode_ticket_flags(buf, val, retlen) return asn1_encode_krb5_flags(buf,val,retlen); } -asn1_error_code INTERFACE asn1_encode_kdc_options(buf, val, retlen) +asn1_error_code asn1_encode_kdc_options(buf, val, retlen) asn1buf * buf; const krb5_flags val; int * retlen; @@ -286,7 +286,7 @@ asn1_error_code INTERFACE asn1_encode_kdc_options(buf, val, retlen) return asn1_encode_krb5_flags(buf,val,retlen); } -asn1_error_code INTERFACE asn1_encode_authorization_data(buf, val, retlen) +asn1_error_code asn1_encode_authorization_data(buf, val, retlen) asn1buf * buf; const krb5_authdata ** val; int * retlen; @@ -307,7 +307,7 @@ asn1_error_code INTERFACE asn1_encode_authorization_data(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_krb5_authdata_elt(buf, val, retlen) +asn1_error_code asn1_encode_krb5_authdata_elt(buf, val, retlen) asn1buf * buf; const krb5_authdata * val; int * retlen; @@ -326,7 +326,7 @@ asn1_error_code INTERFACE asn1_encode_krb5_authdata_elt(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_kdc_rep(msg_type, buf, val, retlen) +asn1_error_code asn1_encode_kdc_rep(msg_type, buf, val, retlen) int msg_type; asn1buf * buf; const krb5_kdc_rep * val; @@ -351,7 +351,7 @@ asn1_error_code INTERFACE asn1_encode_kdc_rep(msg_type, buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_enc_kdc_rep_part(buf, val, retlen) +asn1_error_code asn1_encode_enc_kdc_rep_part(buf, val, retlen) asn1buf * buf; const krb5_enc_kdc_rep_part * val; int * retlen; @@ -406,7 +406,7 @@ asn1_error_code INTERFACE asn1_encode_enc_kdc_rep_part(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_kdc_req_body(buf, rep, retlen) +asn1_error_code asn1_encode_kdc_req_body(buf, rep, retlen) asn1buf * buf; const krb5_kdc_req * rep; int * retlen; @@ -475,7 +475,7 @@ asn1_error_code INTERFACE asn1_encode_kdc_req_body(buf, rep, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_encryption_key(buf, val, retlen) +asn1_error_code asn1_encode_encryption_key(buf, val, retlen) asn1buf * buf; const krb5_keyblock * val; int * retlen; @@ -491,7 +491,7 @@ asn1_error_code INTERFACE asn1_encode_encryption_key(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_checksum(buf, val, retlen) +asn1_error_code asn1_encode_checksum(buf, val, retlen) asn1buf * buf; const krb5_checksum * val; int * retlen; @@ -507,7 +507,7 @@ asn1_error_code INTERFACE asn1_encode_checksum(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_transited_encoding(buf, val, retlen) +asn1_error_code asn1_encode_transited_encoding(buf, val, retlen) asn1buf * buf; const krb5_transited * val; int * retlen; @@ -526,7 +526,7 @@ asn1_error_code INTERFACE asn1_encode_transited_encoding(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_last_req(buf, val, retlen) +asn1_error_code asn1_encode_last_req(buf, val, retlen) asn1buf * buf; const krb5_last_req_entry ** val; int * retlen; @@ -547,7 +547,7 @@ asn1_error_code INTERFACE asn1_encode_last_req(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_last_req_entry(buf, val, retlen) +asn1_error_code asn1_encode_last_req_entry(buf, val, retlen) asn1buf * buf; const krb5_last_req_entry * val; int * retlen; @@ -563,7 +563,7 @@ asn1_error_code INTERFACE asn1_encode_last_req_entry(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_sequence_of_pa_data(buf, val, retlen) +asn1_error_code asn1_encode_sequence_of_pa_data(buf, val, retlen) asn1buf * buf; const krb5_pa_data ** val; int * retlen; @@ -584,7 +584,7 @@ asn1_error_code INTERFACE asn1_encode_sequence_of_pa_data(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_pa_data(buf, val, retlen) +asn1_error_code asn1_encode_pa_data(buf, val, retlen) asn1buf * buf; const krb5_pa_data * val; int * retlen; @@ -601,7 +601,7 @@ asn1_error_code INTERFACE asn1_encode_pa_data(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_sequence_of_ticket(buf, val, retlen) +asn1_error_code asn1_encode_sequence_of_ticket(buf, val, retlen) asn1buf * buf; const krb5_ticket ** val; int * retlen; @@ -622,7 +622,7 @@ asn1_error_code INTERFACE asn1_encode_sequence_of_ticket(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_ticket(buf, val, retlen) +asn1_error_code asn1_encode_ticket(buf, val, retlen) asn1buf * buf; const krb5_ticket * val; int * retlen; @@ -641,7 +641,7 @@ asn1_error_code INTERFACE asn1_encode_ticket(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_sequence_of_enctype(buf, len, val, retlen) +asn1_error_code asn1_encode_sequence_of_enctype(buf, len, val, retlen) asn1buf * buf; const int len; const krb5_enctype * val; @@ -662,7 +662,7 @@ asn1_error_code INTERFACE asn1_encode_sequence_of_enctype(buf, len, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_kdc_req(msg_type, buf, val, retlen) +asn1_error_code asn1_encode_kdc_req(msg_type, buf, val, retlen) int msg_type; asn1buf * buf; const krb5_kdc_req * val; @@ -684,7 +684,7 @@ asn1_error_code INTERFACE asn1_encode_kdc_req(msg_type, buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_krb_safe_body(buf, val, retlen) +asn1_error_code asn1_encode_krb_safe_body(buf, val, retlen) asn1buf * buf; const krb5_safe * val; int * retlen; @@ -710,7 +710,7 @@ asn1_error_code INTERFACE asn1_encode_krb_safe_body(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_sequence_of_krb_cred_info(buf, val, retlen) +asn1_error_code asn1_encode_sequence_of_krb_cred_info(buf, val, retlen) asn1buf * buf; const krb5_cred_info ** val; int * retlen; @@ -731,7 +731,7 @@ asn1_error_code INTERFACE asn1_encode_sequence_of_krb_cred_info(buf, val, retlen asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_krb_cred_info(buf, val, retlen) +asn1_error_code asn1_encode_krb_cred_info(buf, val, retlen) asn1buf * buf; const krb5_cred_info * val; int * retlen; @@ -767,7 +767,7 @@ asn1_error_code INTERFACE asn1_encode_krb_cred_info(buf, val, retlen) asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_sequence_of_passwdsequence(buf, val, retlen) +asn1_error_code asn1_encode_sequence_of_passwdsequence(buf, val, retlen) asn1buf * buf; const passwd_phrase_element ** val; int * retlen; @@ -787,7 +787,7 @@ asn1_error_code INTERFACE asn1_encode_sequence_of_passwdsequence(buf, val, retle asn1_cleanup(); } -asn1_error_code INTERFACE asn1_encode_passwdsequence(buf, val, retlen) +asn1_error_code asn1_encode_passwdsequence(buf, val, retlen) asn1buf * buf; const passwd_phrase_element * val; int * retlen; diff --git a/src/lib/krb5/asn.1/asn1_k_encode.h b/src/lib/krb5/asn.1/asn1_k_encode.h index 93be05da3..a4adb5fc4 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.h +++ b/src/lib/krb5/asn.1/asn1_k_encode.h @@ -102,114 +102,114 @@ asn1_error_code asn1_encode_asn1_type(asn1buf *buf, Returns ENOMEM if memory runs out. */ -asn1_error_code INTERFACE asn1_encode_ui_4 PROTOTYPE((asn1buf *buf, +asn1_error_code asn1_encode_ui_4 PROTOTYPE((asn1buf *buf, const krb5_ui_4 val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_msgtype PROTOTYPE((asn1buf *buf, +asn1_error_code asn1_encode_msgtype PROTOTYPE((asn1buf *buf, const /*krb5_msgtype*/int val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_realm +asn1_error_code asn1_encode_realm PROTOTYPE((asn1buf *buf, const krb5_principal val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_principal_name +asn1_error_code asn1_encode_principal_name PROTOTYPE((asn1buf *buf, const krb5_principal val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_encrypted_data +asn1_error_code asn1_encode_encrypted_data PROTOTYPE((asn1buf *buf, const krb5_enc_data *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_krb5_flags +asn1_error_code asn1_encode_krb5_flags PROTOTYPE((asn1buf *buf, const krb5_flags val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_ap_options +asn1_error_code asn1_encode_ap_options PROTOTYPE((asn1buf *buf, const krb5_flags val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_ticket_flags +asn1_error_code asn1_encode_ticket_flags PROTOTYPE((asn1buf *buf, const krb5_flags val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_kdc_options +asn1_error_code asn1_encode_kdc_options PROTOTYPE((asn1buf *buf, const krb5_flags val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_authorization_data +asn1_error_code asn1_encode_authorization_data PROTOTYPE((asn1buf *buf, const krb5_authdata **val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_krb5_authdata_elt +asn1_error_code asn1_encode_krb5_authdata_elt PROTOTYPE((asn1buf *buf, const krb5_authdata *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_kdc_rep +asn1_error_code asn1_encode_kdc_rep PROTOTYPE((int msg_type, asn1buf *buf, const krb5_kdc_rep *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_enc_kdc_rep_part +asn1_error_code asn1_encode_enc_kdc_rep_part PROTOTYPE((asn1buf *buf, const krb5_enc_kdc_rep_part *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_ticket +asn1_error_code asn1_encode_ticket PROTOTYPE((asn1buf *buf, const krb5_ticket *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_encryption_key +asn1_error_code asn1_encode_encryption_key PROTOTYPE((asn1buf *buf, const krb5_keyblock *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_kerberos_time +asn1_error_code asn1_encode_kerberos_time PROTOTYPE((asn1buf *buf, const krb5_timestamp val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_checksum +asn1_error_code asn1_encode_checksum PROTOTYPE((asn1buf *buf, const krb5_checksum *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_host_address +asn1_error_code asn1_encode_host_address PROTOTYPE((asn1buf *buf, const krb5_address *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_host_addresses +asn1_error_code asn1_encode_host_addresses PROTOTYPE((asn1buf *buf, const krb5_address **val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_transited_encoding +asn1_error_code asn1_encode_transited_encoding PROTOTYPE((asn1buf *buf, const krb5_transited *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_last_req +asn1_error_code asn1_encode_last_req PROTOTYPE((asn1buf *buf, const krb5_last_req_entry **val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_sequence_of_pa_data +asn1_error_code asn1_encode_sequence_of_pa_data PROTOTYPE((asn1buf *buf, const krb5_pa_data **val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_sequence_of_ticket +asn1_error_code asn1_encode_sequence_of_ticket PROTOTYPE((asn1buf *buf, const krb5_ticket **val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_sequence_of_enctype +asn1_error_code asn1_encode_sequence_of_enctype PROTOTYPE((asn1buf *buf, const int len, const krb5_enctype *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_kdc_req +asn1_error_code asn1_encode_kdc_req PROTOTYPE((int msg_type, asn1buf *buf, const krb5_kdc_req *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_kdc_req_body +asn1_error_code asn1_encode_kdc_req_body PROTOTYPE((asn1buf *buf, const krb5_kdc_req *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_krb_safe_body +asn1_error_code asn1_encode_krb_safe_body PROTOTYPE((asn1buf *buf, const krb5_safe *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_sequence_of_krb_cred_info +asn1_error_code asn1_encode_sequence_of_krb_cred_info PROTOTYPE((asn1buf *buf, const krb5_cred_info **val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_krb_cred_info +asn1_error_code asn1_encode_krb_cred_info PROTOTYPE((asn1buf *buf, const krb5_cred_info *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_last_req_entry +asn1_error_code asn1_encode_last_req_entry PROTOTYPE((asn1buf *buf, const krb5_last_req_entry *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_pa_data +asn1_error_code asn1_encode_pa_data PROTOTYPE((asn1buf *buf, const krb5_pa_data *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_passwdsequence +asn1_error_code asn1_encode_passwdsequence PROTOTYPE((asn1buf *buf, const passwd_phrase_element *val, int *retlen)); -asn1_error_code INTERFACE asn1_encode_sequence_of_passwdsequence +asn1_error_code asn1_encode_sequence_of_passwdsequence PROTOTYPE((asn1buf *buf, const passwd_phrase_element **val, int *retlen)); #endif diff --git a/src/lib/krb5/asn.1/asn1_make.c b/src/lib/krb5/asn.1/asn1_make.c index 84d9f4e43..ab147f85d 100644 --- a/src/lib/krb5/asn.1/asn1_make.c +++ b/src/lib/krb5/asn.1/asn1_make.c @@ -23,7 +23,7 @@ #include "asn1_make.h" -asn1_error_code INTERFACE asn1_make_etag(buf, class, tagnum, in_len, retlen) +asn1_error_code asn1_make_etag(buf, class, tagnum, in_len, retlen) asn1buf * buf; const asn1_class class; const asn1_tagnum tagnum; @@ -33,7 +33,7 @@ asn1_error_code INTERFACE asn1_make_etag(buf, class, tagnum, in_len, retlen) return asn1_make_tag(buf,class,CONSTRUCTED,tagnum,in_len,retlen); } -asn1_error_code INTERFACE asn1_make_tag(buf, class, construction, tagnum, in_len, retlen) +asn1_error_code asn1_make_tag(buf, class, construction, tagnum, in_len, retlen) asn1buf * buf; const asn1_class class; const asn1_construction construction; @@ -57,7 +57,7 @@ asn1_error_code INTERFACE asn1_make_tag(buf, class, construction, tagnum, in_len return 0; } -asn1_error_code INTERFACE asn1_make_length(buf, in_len, retlen) +asn1_error_code asn1_make_length(buf, in_len, retlen) asn1buf * buf; const int in_len; int * retlen; @@ -86,7 +86,7 @@ asn1_error_code INTERFACE asn1_make_length(buf, in_len, retlen) return 0; } -asn1_error_code INTERFACE asn1_make_id(buf, class, construction, tagnum, retlen) +asn1_error_code asn1_make_id(buf, class, construction, tagnum, retlen) asn1buf * buf; const asn1_class class; const asn1_construction construction; @@ -124,7 +124,7 @@ asn1_error_code INTERFACE asn1_make_id(buf, class, construction, tagnum, retlen) return 0; } -asn1_error_code INTERFACE asn1_make_sequence(buf, seq_len, retlen) +asn1_error_code asn1_make_sequence(buf, seq_len, retlen) asn1buf * buf; const int seq_len; int * retlen; @@ -143,7 +143,7 @@ asn1_error_code INTERFACE asn1_make_sequence(buf, seq_len, retlen) return 0; } -asn1_error_code INTERFACE asn1_make_set(buf, set_len, retlen) +asn1_error_code asn1_make_set(buf, set_len, retlen) asn1buf * buf; const int set_len; int * retlen; @@ -162,7 +162,7 @@ asn1_error_code INTERFACE asn1_make_set(buf, set_len, retlen) return 0; } -asn1_error_code INTERFACE asn1_make_string(buf, length, string, retlen) +asn1_error_code asn1_make_string(buf, length, string, retlen) asn1buf * buf; const int length; const char * string; diff --git a/src/lib/krb5/asn.1/asn1_make.h b/src/lib/krb5/asn.1/asn1_make.h index 6fcf891a8..89ece9bcf 100644 --- a/src/lib/krb5/asn.1/asn1_make.h +++ b/src/lib/krb5/asn.1/asn1_make.h @@ -43,7 +43,7 @@ asn1_make_string */ -asn1_error_code INTERFACE asn1_make_etag +asn1_error_code asn1_make_etag PROTOTYPE((asn1buf *buf, const asn1_class class, const asn1_tagnum tagnum, @@ -57,7 +57,7 @@ asn1_error_code INTERFACE asn1_make_etag Returns the length of this encoding in *retlen. Returns ENOMEM if memory runs out. */ -asn1_error_code INTERFACE asn1_make_tag +asn1_error_code asn1_make_tag PROTOTYPE((asn1buf *buf, const asn1_class class, const asn1_construction construction, const asn1_tagnum tagnum, @@ -74,7 +74,7 @@ asn1_error_code INTERFACE asn1_make_tag Returns ASN1_OVERFLOW if tagnum exceeds the limits of the implementation. */ -asn1_error_code INTERFACE asn1_make_sequence +asn1_error_code asn1_make_sequence PROTOTYPE((asn1buf *buf, const int seq_len, int *len)); /* requires *buf is allocated, seq_len is the length of a series of sequence components which have just been inserted in *buf @@ -83,7 +83,7 @@ asn1_error_code INTERFACE asn1_make_sequence in *buf. Returns the length of this encoding in *retlen. Returns ENOMEM if memory runs out. */ -asn1_error_code INTERFACE asn1_make_set +asn1_error_code asn1_make_set PROTOTYPE((asn1buf *buf, const int set_len, int *retlen)); /* requires *buf is allocated, seq_len is the length of a series of sequence components which have just been inserted in *buf @@ -92,7 +92,7 @@ asn1_error_code INTERFACE asn1_make_set Returns the length of this encoding in *retlen. Returns ENOMEM if memory runs out. */ -asn1_error_code INTERFACE asn1_make_string +asn1_error_code asn1_make_string PROTOTYPE((asn1buf *buf, const int len, const char *string, int *retlen)); @@ -107,7 +107,7 @@ asn1_error_code INTERFACE asn1_make_string /* Private procedures */ /* "helper" procedure for asn1_make_tag */ -asn1_error_code INTERFACE asn1_make_length +asn1_error_code asn1_make_length PROTOTYPE((asn1buf *buf, const int in_len, int *retlen)); /* requires *buf is allocated, in_len is the length of an ASN.1 encoding which has just been inserted in *buf @@ -116,7 +116,7 @@ asn1_error_code INTERFACE asn1_make_length PROTOTYPE((s) for in_len into *buf */ /* "helper" procedure for asn1_make_tag */ -asn1_error_code INTERFACE asn1_make_id +asn1_error_code asn1_make_id PROTOTYPE((asn1buf *buf, const asn1_class class, const asn1_construction construction, diff --git a/src/lib/krb5/asn.1/asn1_misc.c b/src/lib/krb5/asn.1/asn1_misc.c index eb6516a31..a687d062a 100644 --- a/src/lib/krb5/asn.1/asn1_misc.c +++ b/src/lib/krb5/asn.1/asn1_misc.c @@ -23,7 +23,7 @@ #include "asn1_misc.h" -asn1_error_code INTERFACE asn1_krb5_realm_copy(target, source) +asn1_error_code asn1_krb5_realm_copy(target, source) krb5_principal target; krb5_principal source; { diff --git a/src/lib/krb5/asn.1/asn1_misc.h b/src/lib/krb5/asn.1/asn1_misc.h index d1364e343..9378b330e 100644 --- a/src/lib/krb5/asn.1/asn1_misc.h +++ b/src/lib/krb5/asn.1/asn1_misc.h @@ -27,7 +27,7 @@ #include "k5-int.h" #include "krbasn1.h" -asn1_error_code INTERFACE asn1_krb5_realm_copy +asn1_error_code asn1_krb5_realm_copy PROTOTYPE((krb5_principal target, krb5_principal source)); /* requires target, source, and source->realm are allocated effects Copies source->realm into target->realm. diff --git a/src/lib/krb5/asn.1/asn1buf.c b/src/lib/krb5/asn.1/asn1buf.c index e04b0928d..327a9dfd5 100644 --- a/src/lib/krb5/asn.1/asn1buf.c +++ b/src/lib/krb5/asn.1/asn1buf.c @@ -51,7 +51,7 @@ #include "asn1buf.h" #include -asn1_error_code INTERFACE asn1buf_create(buf) +asn1_error_code asn1buf_create(buf) asn1buf ** buf; { *buf = (asn1buf*)calloc(1,sizeof(asn1buf)); @@ -62,7 +62,7 @@ asn1_error_code INTERFACE asn1buf_create(buf) return 0; } -asn1_error_code INTERFACE asn1buf_wrap_data(buf, code) +asn1_error_code asn1buf_wrap_data(buf, code) asn1buf * buf; const krb5_data * code; { @@ -72,7 +72,7 @@ asn1_error_code INTERFACE asn1buf_wrap_data(buf, code) return 0; } -asn1_error_code INTERFACE asn1buf_imbed(subbuf, buf, length) +asn1_error_code asn1buf_imbed(subbuf, buf, length) asn1buf * subbuf; const asn1buf * buf; const int length; @@ -87,14 +87,14 @@ asn1_error_code INTERFACE asn1buf_imbed(subbuf, buf, length) return 0; } -void INTERFACE asn1buf_sync(buf, subbuf) +void asn1buf_sync(buf, subbuf) asn1buf * buf; asn1buf * subbuf; { buf->next = subbuf->next; } -asn1_error_code INTERFACE asn1buf_destroy(buf) +asn1_error_code asn1buf_destroy(buf) asn1buf ** buf; { if (*buf != NULL) { @@ -105,7 +105,7 @@ asn1_error_code INTERFACE asn1buf_destroy(buf) return 0; } -asn1_error_code INTERFACE asn1buf_insert_octet(buf, o) +asn1_error_code asn1buf_insert_octet(buf, o) asn1buf * buf; const int o; { @@ -118,7 +118,7 @@ asn1_error_code INTERFACE asn1buf_insert_octet(buf, o) return 0; } -asn1_error_code INTERFACE asn1buf_insert_octetstring(buf, len, s) +asn1_error_code asn1buf_insert_octetstring(buf, len, s) asn1buf * buf; const int len; const krb5_octet * s; @@ -133,7 +133,7 @@ asn1_error_code INTERFACE asn1buf_insert_octetstring(buf, len, s) return 0; } -asn1_error_code INTERFACE asn1buf_insert_charstring(buf, len, s) +asn1_error_code asn1buf_insert_charstring(buf, len, s) asn1buf * buf; const int len; const char * s; @@ -148,7 +148,7 @@ asn1_error_code INTERFACE asn1buf_insert_charstring(buf, len, s) return 0; } -asn1_error_code INTERFACE asn1buf_remove_octet(buf, o) +asn1_error_code asn1buf_remove_octet(buf, o) asn1buf * buf; asn1_octet * o; { @@ -157,7 +157,7 @@ asn1_error_code INTERFACE asn1buf_remove_octet(buf, o) return 0; } -asn1_error_code INTERFACE asn1buf_remove_octetstring(buf, len, s) +asn1_error_code asn1buf_remove_octetstring(buf, len, s) asn1buf * buf; const int len; asn1_octet ** s; @@ -178,7 +178,7 @@ asn1_error_code INTERFACE asn1buf_remove_octetstring(buf, len, s) return 0; } -asn1_error_code INTERFACE asn1buf_remove_charstring(buf, len, s) +asn1_error_code asn1buf_remove_charstring(buf, len, s) asn1buf * buf; const int len; char ** s; @@ -219,8 +219,7 @@ int asn1buf_remains(buf) else return remain; } - -asn1_error_code INTERFACE asn12krb5_buf(buf, code) +asn1_error_code asn12krb5_buf(buf, code) const asn1buf * buf; krb5_data ** code; { @@ -242,7 +241,7 @@ asn1_error_code INTERFACE asn12krb5_buf(buf, code) /* These parse and unparse procedures should be moved out. They're useful only for debugging and superfluous in the production version. */ -asn1_error_code INTERFACE asn1buf_unparse(buf, s) +asn1_error_code asn1buf_unparse(buf, s) const asn1buf * buf; char ** s; { @@ -268,7 +267,7 @@ asn1_error_code INTERFACE asn1buf_unparse(buf, s) return 0; } -asn1_error_code INTERFACE asn1buf_hex_unparse(buf, s) +asn1_error_code asn1buf_hex_unparse(buf, s) const asn1buf * buf; char ** s; { @@ -305,21 +304,21 @@ asn1_error_code INTERFACE asn1buf_hex_unparse(buf, s) /****************************************************************/ /* Private Procedures */ -int INTERFACE asn1buf_size(buf) +int asn1buf_size(buf) const asn1buf * buf; { if(buf == NULL || buf->base == NULL) return 0; return buf->bound - buf->base + 1; } -int INTERFACE asn1buf_free(buf) +int asn1buf_free(buf) const asn1buf * buf; { if(buf == NULL || buf->base == NULL) return 0; else return buf->bound - buf->next + 1; } -asn1_error_code INTERFACE asn1buf_ensure_space(buf, amount) +asn1_error_code asn1buf_ensure_space(buf, amount) asn1buf * buf; const int amount; { @@ -331,7 +330,7 @@ asn1_error_code INTERFACE asn1buf_ensure_space(buf, amount) return 0; } -asn1_error_code INTERFACE asn1buf_expand(buf, inc) +asn1_error_code asn1buf_expand(buf, inc) asn1buf * buf; const int inc; { @@ -356,7 +355,7 @@ asn1_error_code INTERFACE asn1buf_expand(buf, inc) return 0; } -int INTERFACE asn1buf_len(buf) +int asn1buf_len(buf) const asn1buf * buf; { return buf->next - buf->base; diff --git a/src/lib/krb5/asn.1/asn1buf.h b/src/lib/krb5/asn.1/asn1buf.h index 0d18f3b7c..f3f4a3f2e 100644 --- a/src/lib/krb5/asn.1/asn1buf.h +++ b/src/lib/krb5/asn.1/asn1buf.h @@ -46,12 +46,12 @@ typedef struct code_buffer_rep { (asn1buf_len) */ -asn1_error_code INTERFACE asn1buf_create +asn1_error_code asn1buf_create PROTOTYPE((asn1buf **buf)); /* effects Creates a new encoding buffer pointed to by *buf. Returns ENOMEM if the buffer can't be created. */ -asn1_error_code INTERFACE asn1buf_wrap_data +asn1_error_code asn1buf_wrap_data PROTOTYPE((asn1buf *buf, const krb5_data *code)); /* requires *buf has already been allocated effects Turns *buf into a "wrapper" for *code. i.e. *buf is set up @@ -59,7 +59,7 @@ asn1_error_code INTERFACE asn1buf_wrap_data is the top of *code. Returns ASN1_MISSING_FIELD if code is empty. */ -asn1_error_code INTERFACE asn1buf_imbed +asn1_error_code asn1buf_imbed PROTOTYPE((asn1buf *subbuf, const asn1buf *buf, const int length)); /* requires *subbuf and *buf are allocated effects *subbuf becomes a sub-buffer of *buf. *subbuf begins @@ -68,22 +68,22 @@ asn1_error_code INTERFACE asn1buf_imbed that case, ASN1_OVERRUN is returned) *subbuf's current position starts at the beginning of *subbuf. */ -void INTERFACE asn1buf_sync +void asn1buf_sync PROTOTYPE((asn1buf *buf, asn1buf *subbuf)); /* requires *subbuf is a sub-buffer of *buf, as created by asn1buf_imbed. effects Synchronizes *buf's current position to match that of *subbuf. */ -asn1_error_code INTERFACE asn1buf_destroy +asn1_error_code asn1buf_destroy PROTOTYPE((asn1buf **buf)); /* effects Deallocates **buf, sets *buf to NULL. */ -asn1_error_code INTERFACE asn1buf_insert_octet +asn1_error_code asn1buf_insert_octet PROTOTYPE((asn1buf *buf, const int o)); /* requires *buf is allocated effects Inserts o into the buffer *buf, expanding the buffer if necessary. Returns ENOMEM memory is exhausted. */ -asn1_error_code INTERFACE asn1buf_insert_octetstring +asn1_error_code asn1buf_insert_octetstring PROTOTYPE((asn1buf *buf, const int len, const asn1_octet *s)); /* requires *buf is allocated modifies *buf @@ -91,7 +91,7 @@ asn1_error_code INTERFACE asn1buf_insert_octetstring into the buffer *buf, expanding the buffer if necessary. Returns ENOMEM if memory is exhausted. */ -asn1_error_code INTERFACE asn1buf_insert_charstring +asn1_error_code asn1buf_insert_charstring PROTOTYPE((asn1buf *buf, const int len, const char *s)); /* requires *buf is allocated modifies *buf @@ -99,14 +99,14 @@ asn1_error_code INTERFACE asn1buf_insert_charstring into the buffer *buf, expanding the buffer if necessary. Returns ENOMEM if memory is exhuasted. */ -asn1_error_code INTERFACE asn1buf_remove_octet +asn1_error_code asn1buf_remove_octet PROTOTYPE((asn1buf *buf, asn1_octet *o)); /* requires *buf is allocated effects Returns *buf's current octet in *o and advances to the next octet. Returns ASN1_OVERRUN if *buf has already been exhuasted. */ -asn1_error_code INTERFACE asn1buf_remove_octetstring +asn1_error_code asn1buf_remove_octetstring PROTOTYPE((asn1buf *buf, const int len, asn1_octet **s)); /* requires *buf is allocated effects Removes the next len octets of *buf and returns them in **s. @@ -114,7 +114,7 @@ asn1_error_code INTERFACE asn1buf_remove_octetstring left in *buf. Returns ENOMEM if *s could not be allocated. */ -asn1_error_code INTERFACE asn1buf_remove_charstring +asn1_error_code asn1buf_remove_charstring PROTOTYPE((asn1buf *buf, const int len, char **s)); /* requires *buf is allocated @@ -123,26 +123,26 @@ asn1_error_code INTERFACE asn1buf_remove_charstring left in *buf. Returns ENOMEM if *s could not be allocated. */ -asn1_error_code INTERFACE asn1buf_unparse +asn1_error_code asn1buf_unparse PROTOTYPE((const asn1buf *buf, char **s)); /* modifies *s effects Returns a human-readable representation of *buf in *s, where each octet in *buf is represented by a character in *s. */ -asn1_error_code INTERFACE asn1buf_hex_unparse +asn1_error_code asn1buf_hex_unparse PROTOTYPE((const asn1buf *buf, char **s)); /* modifies *s effects Returns a human-readable representation of *buf in *s, where each octet in *buf is represented by a 2-digit hexadecimal number in *s. */ -asn1_error_code INTERFACE asn12krb5_buf +asn1_error_code asn12krb5_buf PROTOTYPE((const asn1buf *buf, krb5_data **code)); /* modifies *code effects Instantiates **code with the krb5_data representation of **buf. */ -int INTERFACE asn1buf_remains +int asn1buf_remains PROTOTYPE((asn1buf *buf)); /* requires *buf is a buffer containing an asn.1 structure or array modifies *buf @@ -150,18 +150,18 @@ int INTERFACE asn1buf_remains /**************** Private Procedures ****************/ -int INTERFACE asn1buf_size +int asn1buf_size PROTOTYPE((const asn1buf *buf)); /* requires *buf has been created and not destroyed effects Returns the total size PROTOTYPE((in octets) of buf's octet buffer. */ -int INTERFACE asn1buf_free +int asn1buf_free PROTOTYPE((const asn1buf *buf)); /* requires *buf is allocated effects Returns the number of unused, allocated octets in *buf. */ -asn1_error_code INTERFACE asn1buf_ensure_space +asn1_error_code asn1buf_ensure_space PROTOTYPE((asn1buf *buf, const int amount)); /* requires *buf is allocated modifies *buf @@ -169,14 +169,14 @@ asn1_error_code INTERFACE asn1buf_ensure_space expanded to have at least amount octets of free space. Returns ENOMEM memory is exhausted. */ -asn1_error_code INTERFACE asn1buf_expand +asn1_error_code asn1buf_expand PROTOTYPE((asn1buf *buf, const int inc)); /* requires *buf is allocated modifies *buf effects Expands *buf by allocating space for inc more octets. Returns ENOMEM if memory is exhausted. */ -int INTERFACE asn1buf_len +int asn1buf_len PROTOTYPE((const asn1buf *buf)); /* requires *buf is allocated effects Returns the length of the encoding in *buf. */ diff --git a/src/lib/krb5/asn.1/krb5_decode.c b/src/lib/krb5/asn.1/krb5_decode.c index 2c1cf4d1a..fd716f4b4 100644 --- a/src/lib/krb5/asn.1/krb5_decode.c +++ b/src/lib/krb5/asn.1/krb5_decode.c @@ -147,7 +147,7 @@ if(tagnum == (tagexpect)){\ #define cleanup()\ return 0 -krb5_error_code INTERFACE decode_krb5_authenticator(code, rep) +krb5_error_code decode_krb5_authenticator(code, rep) const krb5_data * code; krb5_authenticator ** rep; { @@ -176,7 +176,7 @@ krb5_error_code INTERFACE decode_krb5_authenticator(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_ticket(code, rep) +krb5_error_code decode_krb5_ticket(code, rep) const krb5_data * code; krb5_ticket ** rep; { @@ -198,7 +198,7 @@ krb5_error_code INTERFACE decode_krb5_ticket(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_encryption_key(code, rep) +krb5_error_code decode_krb5_encryption_key(code, rep) const krb5_data * code; krb5_keyblock ** rep; { @@ -215,7 +215,7 @@ krb5_error_code INTERFACE decode_krb5_encryption_key(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_enc_tkt_part(code, rep) +krb5_error_code decode_krb5_enc_tkt_part(code, rep) const krb5_data * code; krb5_enc_tkt_part ** rep; { @@ -242,7 +242,7 @@ krb5_error_code INTERFACE decode_krb5_enc_tkt_part(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_enc_kdc_rep_part(code, rep) +krb5_error_code decode_krb5_enc_kdc_rep_part(code, rep) const krb5_data * code; krb5_enc_kdc_rep_part ** rep; { @@ -262,7 +262,7 @@ krb5_error_code INTERFACE decode_krb5_enc_kdc_rep_part(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_as_rep(code, rep) +krb5_error_code decode_krb5_as_rep(code, rep) const krb5_data * code; krb5_kdc_rep ** rep; { @@ -280,7 +280,7 @@ krb5_error_code INTERFACE decode_krb5_as_rep(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_tgs_rep(code, rep) +krb5_error_code decode_krb5_tgs_rep(code, rep) const krb5_data * code; krb5_kdc_rep ** rep; { @@ -297,7 +297,7 @@ krb5_error_code INTERFACE decode_krb5_tgs_rep(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_ap_req(code, rep) +krb5_error_code decode_krb5_ap_req(code, rep) const krb5_data * code; krb5_ap_req ** rep; { @@ -324,7 +324,7 @@ krb5_error_code INTERFACE decode_krb5_ap_req(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_ap_rep(code, rep) +krb5_error_code decode_krb5_ap_rep(code, rep) const krb5_data * code; krb5_ap_rep ** rep; { @@ -348,7 +348,7 @@ krb5_error_code INTERFACE decode_krb5_ap_rep(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_ap_rep_enc_part(code, rep) +krb5_error_code decode_krb5_ap_rep_enc_part(code, rep) const krb5_data * code; krb5_ap_rep_enc_part ** rep; { @@ -367,7 +367,7 @@ krb5_error_code INTERFACE decode_krb5_ap_rep_enc_part(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_as_req(code, rep) +krb5_error_code decode_krb5_as_req(code, rep) const krb5_data * code; krb5_kdc_req ** rep; { @@ -384,7 +384,7 @@ krb5_error_code INTERFACE decode_krb5_as_req(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_tgs_req(code, rep) +krb5_error_code decode_krb5_tgs_req(code, rep) const krb5_data * code; krb5_kdc_req ** rep; { @@ -401,7 +401,7 @@ krb5_error_code INTERFACE decode_krb5_tgs_req(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_kdc_req_body(code, rep) +krb5_error_code decode_krb5_kdc_req_body(code, rep) const krb5_data * code; krb5_kdc_req ** rep; { @@ -414,7 +414,7 @@ krb5_error_code INTERFACE decode_krb5_kdc_req_body(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_safe(code, rep) +krb5_error_code decode_krb5_safe(code, rep) const krb5_data * code; krb5_safe ** rep; { @@ -440,7 +440,7 @@ krb5_error_code INTERFACE decode_krb5_safe(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_priv(code, rep) +krb5_error_code decode_krb5_priv(code, rep) const krb5_data * code; krb5_priv ** rep; { @@ -464,7 +464,7 @@ krb5_error_code INTERFACE decode_krb5_priv(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_enc_priv_part(code, rep) +krb5_error_code decode_krb5_enc_priv_part(code, rep) const krb5_data * code; krb5_priv_enc_part ** rep; { @@ -486,7 +486,7 @@ krb5_error_code INTERFACE decode_krb5_enc_priv_part(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_cred(code, rep) +krb5_error_code decode_krb5_cred(code, rep) const krb5_data * code; krb5_cred ** rep; { @@ -511,7 +511,7 @@ krb5_error_code INTERFACE decode_krb5_cred(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_enc_cred_part(code, rep) +krb5_error_code decode_krb5_enc_cred_part(code, rep) const krb5_data * code; krb5_cred_enc_part ** rep; { @@ -533,7 +533,7 @@ krb5_error_code INTERFACE decode_krb5_enc_cred_part(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_error(code, rep) +krb5_error_code decode_krb5_error(code, rep) const krb5_data * code; krb5_error ** rep; { @@ -569,7 +569,7 @@ krb5_error_code INTERFACE decode_krb5_error(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_authdata(code, rep) +krb5_error_code decode_krb5_authdata(code, rep) const krb5_data * code; krb5_authdata *** rep; { @@ -580,7 +580,7 @@ krb5_error_code INTERFACE decode_krb5_authdata(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_pwd_sequence(code, rep) +krb5_error_code decode_krb5_pwd_sequence(code, rep) const krb5_data * code; passwd_phrase_element ** rep; { @@ -591,7 +591,7 @@ krb5_error_code INTERFACE decode_krb5_pwd_sequence(code, rep) cleanup(); } -krb5_error_code INTERFACE decode_krb5_pwd_data(code, rep) +krb5_error_code decode_krb5_pwd_data(code, rep) const krb5_data * code; krb5_pwd_data ** rep; { diff --git a/src/lib/krb5/asn.1/krb5_encode.c b/src/lib/krb5/asn.1/krb5_encode.c index dc85fdf27..aa7ad61d1 100644 --- a/src/lib/krb5/asn.1/krb5_encode.c +++ b/src/lib/krb5/asn.1/krb5_encode.c @@ -141,7 +141,7 @@ \ return 0 -krb5_error_code INTERFACE encode_krb5_authenticator(rep, code) +krb5_error_code encode_krb5_authenticator(rep, code) const krb5_authenticator * rep; krb5_data ** code; { @@ -198,7 +198,7 @@ krb5_error_code INTERFACE encode_krb5_authenticator(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_ticket(rep, code) +krb5_error_code encode_krb5_ticket(rep, code) const krb5_ticket * rep; krb5_data ** code; { @@ -223,7 +223,7 @@ krb5_error_code INTERFACE encode_krb5_ticket(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_encryption_key(rep, code) +krb5_error_code encode_krb5_encryption_key(rep, code) const krb5_keyblock * rep; krb5_data ** code; { @@ -241,7 +241,7 @@ krb5_error_code INTERFACE encode_krb5_encryption_key(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_enc_tkt_part(rep, code) +krb5_error_code encode_krb5_enc_tkt_part(rep, code) const krb5_enc_tkt_part * rep; krb5_data ** code; { @@ -293,7 +293,7 @@ krb5_error_code INTERFACE encode_krb5_enc_tkt_part(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_enc_kdc_rep_part(rep, code) +krb5_error_code encode_krb5_enc_kdc_rep_part(rep, code) const krb5_enc_kdc_rep_part * rep; krb5_data ** code; { @@ -321,7 +321,7 @@ krb5_error_code INTERFACE encode_krb5_enc_kdc_rep_part(rep, code) } /* yes, the translation is identical to that used for KDC__REP */ -krb5_error_code INTERFACE encode_krb5_as_rep(rep, code) +krb5_error_code encode_krb5_as_rep(rep, code) const krb5_kdc_rep * rep; krb5_data ** code; { @@ -338,7 +338,7 @@ krb5_error_code INTERFACE encode_krb5_as_rep(rep, code) } /* yes, the translation is identical to that used for KDC__REP */ -krb5_error_code INTERFACE encode_krb5_tgs_rep( rep, code) +krb5_error_code encode_krb5_tgs_rep( rep, code) const krb5_kdc_rep * rep; krb5_data ** code; { @@ -354,7 +354,7 @@ krb5_error_code INTERFACE encode_krb5_tgs_rep( rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_ap_req(rep, code) +krb5_error_code encode_krb5_ap_req(rep, code) const krb5_ap_req * rep; krb5_data ** code; { @@ -382,7 +382,7 @@ krb5_error_code INTERFACE encode_krb5_ap_req(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_ap_rep(rep, code) +krb5_error_code encode_krb5_ap_rep(rep, code) const krb5_ap_rep * rep; krb5_data ** code; { @@ -405,7 +405,7 @@ krb5_error_code INTERFACE encode_krb5_ap_rep(rep, code) } -krb5_error_code INTERFACE encode_krb5_ap_rep_enc_part(rep, code) +krb5_error_code encode_krb5_ap_rep_enc_part(rep, code) const krb5_ap_rep_enc_part * rep; krb5_data ** code; { @@ -432,7 +432,7 @@ krb5_error_code INTERFACE encode_krb5_ap_rep_enc_part(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_as_req(rep, code) +krb5_error_code encode_krb5_as_req(rep, code) const krb5_kdc_req * rep; krb5_data ** code; { @@ -448,7 +448,7 @@ krb5_error_code INTERFACE encode_krb5_as_req(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_tgs_req(rep, code) +krb5_error_code encode_krb5_tgs_req(rep, code) const krb5_kdc_req * rep; krb5_data ** code; { @@ -464,7 +464,7 @@ krb5_error_code INTERFACE encode_krb5_tgs_req(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_kdc_req_body(rep, code) +krb5_error_code encode_krb5_kdc_req_body(rep, code) const krb5_kdc_req * rep; krb5_data ** code; { @@ -478,7 +478,7 @@ krb5_error_code INTERFACE encode_krb5_kdc_req_body(rep, code) } -krb5_error_code INTERFACE encode_krb5_safe(rep, code) +krb5_error_code encode_krb5_safe(rep, code) const krb5_safe * rep; krb5_data ** code; { @@ -503,7 +503,7 @@ krb5_error_code INTERFACE encode_krb5_safe(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_priv(rep, code) +krb5_error_code encode_krb5_priv(rep, code) const krb5_priv * rep; krb5_data ** code; { @@ -525,7 +525,7 @@ krb5_error_code INTERFACE encode_krb5_priv(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_enc_priv_part(rep, code) +krb5_error_code encode_krb5_enc_priv_part(rep, code) const krb5_priv_enc_part * rep; krb5_data ** code; { @@ -559,7 +559,7 @@ krb5_error_code INTERFACE encode_krb5_enc_priv_part(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_cred(rep, code) +krb5_error_code encode_krb5_cred(rep, code) const krb5_cred * rep; krb5_data ** code; { @@ -584,7 +584,7 @@ krb5_error_code INTERFACE encode_krb5_cred(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_enc_cred_part(rep, code) +krb5_error_code encode_krb5_enc_cred_part(rep, code) const krb5_cred_enc_part * rep; krb5_data ** code; { @@ -620,7 +620,7 @@ krb5_error_code INTERFACE encode_krb5_enc_cred_part(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_error(rep, code) +krb5_error_code encode_krb5_error(rep, code) const krb5_error * rep; krb5_data ** code; { @@ -677,7 +677,7 @@ krb5_error_code INTERFACE encode_krb5_error(rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_authdata(rep, code) +krb5_error_code encode_krb5_authdata(rep, code) const krb5_authdata ** rep; krb5_data ** code; { @@ -698,7 +698,7 @@ krb5_error_code INTERFACE encode_krb5_authdata(rep, code) } /* Sandia Additions */ -krb5_error_code INTERFACE encode_krb5_pwd_sequence( rep, code) +krb5_error_code encode_krb5_pwd_sequence( rep, code) const passwd_phrase_element * rep; krb5_data ** code; { @@ -709,7 +709,7 @@ krb5_error_code INTERFACE encode_krb5_pwd_sequence( rep, code) krb5_cleanup(); } -krb5_error_code INTERFACE encode_krb5_pwd_data(rep, code) +krb5_error_code encode_krb5_pwd_data(rep, code) const krb5_pwd_data * rep; krb5_data ** code; { diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index 6974ed5e0..8319cfe7a 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * ccbase.c: removed unneeded INTERFACE from non-api functions. + Wed Mar 22 11:47:49 1995 * Makefile.in (CFLAGS): Make -I options work when the build and diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c index c86212c32..05a18d0df 100644 --- a/src/lib/krb5/ccache/ccbase.c +++ b/src/lib/krb5/ccache/ccbase.c @@ -39,7 +39,7 @@ static struct krb5_cc_typelist *cc_typehead = 0; * If override is set, replace any existing ccache with that type tag */ -krb5_error_code INTERFACE +krb5_error_code krb5_cc_register(context, ops, override) krb5_context context; krb5_cc_ops *ops; @@ -73,7 +73,7 @@ krb5_cc_register(context, ops, override) * particular cache type. */ -krb5_error_code INTERFACE +krb5_error_code krb5_cc_resolve (context, name, cache) krb5_context context; char *name; diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog index 22fc4bf2b..8df729730 100644 --- a/src/lib/krb5/ccache/file/ChangeLog +++ b/src/lib/krb5/ccache/file/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + Wed Mar 22 11:24:07 1995 Keith Vetter (keithv@fusion.com) * fcc-proto.h: added prototype for cache changing hook, diff --git a/src/lib/krb5/ccache/file/fcc-proto.h b/src/lib/krb5/ccache/file/fcc-proto.h index 9d6687577..d8f9db024 100644 --- a/src/lib/krb5/ccache/file/fcc-proto.h +++ b/src/lib/krb5/ccache/file/fcc-proto.h @@ -33,7 +33,7 @@ krb5_error_code INTERFACE krb5_fcc_close PROTOTYPE((krb5_context, krb5_ccache id )); /* fcc_defnam.c */ -char * INTERFACE krb5_fcc_default_name +char * krb5_fcc_default_name PROTOTYPE((krb5_context)); /* fcc_destry.c */ @@ -68,27 +68,27 @@ krb5_error_code INTERFACE krb5_fcc_next_cred krb5_creds *creds )); /* fcc_read.c */ -krb5_error_code INTERFACE krb5_fcc_read_principal +krb5_error_code krb5_fcc_read_principal PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ )); -krb5_error_code INTERFACE krb5_fcc_read_keyblock +krb5_error_code krb5_fcc_read_keyblock PROTOTYPE((krb5_context, krb5_ccache id , krb5_keyblock *keyblock )); -krb5_error_code INTERFACE krb5_fcc_read_data +krb5_error_code krb5_fcc_read_data PROTOTYPE((krb5_context, krb5_ccache id , krb5_data *data )); -krb5_error_code INTERFACE krb5_fcc_read_int32 +krb5_error_code krb5_fcc_read_int32 PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 *i )); -krb5_error_code INTERFACE krb5_fcc_read_ui_2 +krb5_error_code krb5_fcc_read_ui_2 PROTOTYPE((krb5_context, krb5_ccache id , krb5_ui_2 *i )); -krb5_error_code INTERFACE krb5_fcc_read_octet +krb5_error_code krb5_fcc_read_octet PROTOTYPE((krb5_context, krb5_ccache id , krb5_octet *i )); -krb5_error_code INTERFACE krb5_fcc_read_times +krb5_error_code krb5_fcc_read_times PROTOTYPE((krb5_context, krb5_ccache id , krb5_ticket_times *t )); -krb5_error_code INTERFACE krb5_fcc_read_addrs +krb5_error_code krb5_fcc_read_addrs PROTOTYPE((krb5_context, krb5_ccache, krb5_address ***)); -krb5_error_code INTERFACE krb5_fcc_read_addr +krb5_error_code krb5_fcc_read_addr PROTOTYPE((krb5_context, krb5_ccache, krb5_address *)); -krb5_error_code INTERFACE krb5_fcc_read_authdata +krb5_error_code krb5_fcc_read_authdata PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata ***)); -krb5_error_code INTERFACE krb5_fcc_read_authdatum +krb5_error_code krb5_fcc_read_authdatum PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata *)); /* fcc_reslv.c */ @@ -112,7 +112,7 @@ krb5_error_code INTERFACE krb5_fcc_store PROTOTYPE((krb5_context, krb5_ccache id , krb5_creds *creds )); /* fcc_skip.c */ -krb5_error_code INTERFACE krb5_fcc_skip_principal +krb5_error_code krb5_fcc_skip_principal PROTOTYPE((krb5_context, krb5_ccache id )); /* fcc_sflags.c */ @@ -126,39 +126,39 @@ krb5_error_code krb5_change_cache /* fcc_write.c */ -krb5_error_code INTERFACE krb5_fcc_write +krb5_error_code krb5_fcc_write PROTOTYPE((krb5_context, krb5_ccache id , krb5_pointer buf , int len )); -krb5_error_code INTERFACE krb5_fcc_store_principal +krb5_error_code krb5_fcc_store_principal PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ )); -krb5_error_code INTERFACE krb5_fcc_store_keyblock +krb5_error_code krb5_fcc_store_keyblock PROTOTYPE((krb5_context, krb5_ccache id , krb5_keyblock *keyblock )); -krb5_error_code INTERFACE krb5_fcc_store_data +krb5_error_code krb5_fcc_store_data PROTOTYPE((krb5_context, krb5_ccache id , krb5_data *data )); -krb5_error_code INTERFACE krb5_fcc_store_int32 +krb5_error_code krb5_fcc_store_int32 PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i )); -krb5_error_code INTERFACE krb5_fcc_store_ui_2 +krb5_error_code krb5_fcc_store_ui_2 PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i )); -krb5_error_code INTERFACE krb5_fcc_store_octet +krb5_error_code krb5_fcc_store_octet PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i )); -krb5_error_code INTERFACE krb5_fcc_store_times +krb5_error_code krb5_fcc_store_times PROTOTYPE((krb5_context, krb5_ccache id , krb5_ticket_times *t )); -krb5_error_code INTERFACE krb5_fcc_store_addrs +krb5_error_code krb5_fcc_store_addrs PROTOTYPE((krb5_context, krb5_ccache , krb5_address ** )); -krb5_error_code INTERFACE krb5_fcc_store_addr +krb5_error_code krb5_fcc_store_addr PROTOTYPE((krb5_context, krb5_ccache , krb5_address * )); -krb5_error_code INTERFACE krb5_fcc_store_authdata +krb5_error_code krb5_fcc_store_authdata PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata **)); -krb5_error_code INTERFACE krb5_fcc_store_authdatum +krb5_error_code krb5_fcc_store_authdatum PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata *)); /* fcc_errs.c */ -krb5_error_code INTERFACE krb5_fcc_interpret +krb5_error_code krb5_fcc_interpret PROTOTYPE((krb5_context, int )); /* fcc_maybe.c */ -krb5_error_code INTERFACE krb5_fcc_close_file +krb5_error_code krb5_fcc_close_file PROTOTYPE((krb5_context, krb5_ccache)); -krb5_error_code INTERFACE krb5_fcc_open_file +krb5_error_code krb5_fcc_open_file PROTOTYPE((krb5_context, krb5_ccache, int)); #endif /* KRB5_FCC_PROTO__ */ diff --git a/src/lib/krb5/ccache/file/fcc_errs.c b/src/lib/krb5/ccache/file/fcc_errs.c index 43d8525dc..b93e16220 100644 --- a/src/lib/krb5/ccache/file/fcc_errs.c +++ b/src/lib/krb5/ccache/file/fcc_errs.c @@ -28,7 +28,7 @@ #include "fcc.h" -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_interpret(context, errnum) krb5_context context; int errnum; diff --git a/src/lib/krb5/ccache/file/fcc_maybe.c b/src/lib/krb5/ccache/file/fcc_maybe.c index 43579aafe..6378d6801 100644 --- a/src/lib/krb5/ccache/file/fcc_maybe.c +++ b/src/lib/krb5/ccache/file/fcc_maybe.c @@ -183,7 +183,7 @@ int lockunlock; #endif } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_close_file (context, id) krb5_context context; krb5_ccache id; @@ -204,7 +204,7 @@ krb5_fcc_close_file (context, id) return (ret == -1) ? krb5_fcc_interpret (context, errno) : 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_open_file (context, id, mode) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/file/fcc_read.c b/src/lib/krb5/ccache/file/fcc_read.c index ae8052c06..e963d9eb7 100644 --- a/src/lib/krb5/ccache/file/fcc_read.c +++ b/src/lib/krb5/ccache/file/fcc_read.c @@ -40,7 +40,7 @@ * KRB5_CC_END - there were not len bytes available * system errors (read) */ -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read(context, id, buf, len) krb5_context context; krb5_ccache id; @@ -75,7 +75,7 @@ krb5_fcc_read(context, id, buf, len) * KRB5_CC_NOMEM */ -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_principal(context, id, princ) krb5_context context; krb5_ccache id; @@ -146,7 +146,7 @@ krb5_fcc_read_principal(context, id, princ) return kret; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_addrs(context, id, addrs) krb5_context context; krb5_ccache id; @@ -189,7 +189,7 @@ krb5_fcc_read_addrs(context, id, addrs) return kret; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_keyblock(context, id, keyblock) krb5_context context; krb5_ccache id; @@ -238,7 +238,7 @@ krb5_fcc_read_keyblock(context, id, keyblock) return kret; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_data(context, id, data) krb5_context context; krb5_ccache id; @@ -276,7 +276,7 @@ krb5_fcc_read_data(context, id, data) return kret; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_addr(context, id, addr) krb5_context context; krb5_ccache id; @@ -316,7 +316,7 @@ krb5_fcc_read_addr(context, id, addr) return kret; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_int32(context, id, i) krb5_context context; krb5_ccache id; @@ -343,7 +343,7 @@ krb5_fcc_read_int32(context, id, i) } } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_ui_2(context, id, i) krb5_context context; krb5_ccache id; @@ -365,7 +365,7 @@ krb5_fcc_read_ui_2(context, id, i) } } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_octet(context, id, i) krb5_context context; krb5_ccache id; @@ -375,7 +375,7 @@ krb5_fcc_read_octet(context, id, i) } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_times(context, id, t) krb5_context context; krb5_ccache id; @@ -410,7 +410,7 @@ errout: return retval; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_authdata(context, id, a) krb5_context context; krb5_ccache id; @@ -456,7 +456,7 @@ krb5_fcc_read_authdata(context, id, a) return kret; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_read_authdatum(context, id, a) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/file/fcc_skip.c b/src/lib/krb5/ccache/file/fcc_skip.c index f4db9b3f8..15aa43bd2 100644 --- a/src/lib/krb5/ccache/file/fcc_skip.c +++ b/src/lib/krb5/ccache/file/fcc_skip.c @@ -28,7 +28,7 @@ #include "fcc.h" -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_skip_principal(context, id) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/file/fcc_write.c b/src/lib/krb5/ccache/file/fcc_write.c index e433bff7a..38067b5f5 100644 --- a/src/lib/krb5/ccache/file/fcc_write.c +++ b/src/lib/krb5/ccache/file/fcc_write.c @@ -41,7 +41,7 @@ * Errors: * system errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_write(context, id, buf, len) krb5_context context; krb5_ccache id; @@ -72,7 +72,7 @@ krb5_fcc_write(context, id, buf, len) * system errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_principal(context, id, princ) krb5_context context; krb5_ccache id; @@ -111,7 +111,7 @@ krb5_fcc_store_principal(context, id, princ) return KRB5_OK; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_addrs(context, id, addrs) krb5_context context; krb5_ccache id; @@ -138,7 +138,7 @@ krb5_fcc_store_addrs(context, id, addrs) return KRB5_OK; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_keyblock(context, id, keyblock) krb5_context context; krb5_ccache id; @@ -159,7 +159,7 @@ krb5_fcc_store_keyblock(context, id, keyblock) return krb5_fcc_write(context, id, (char *) keyblock->contents, keyblock->length); } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_addr(context, id, addr) krb5_context context; krb5_ccache id; @@ -175,7 +175,7 @@ krb5_fcc_store_addr(context, id, addr) } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_data(context, id, data) krb5_context context; krb5_ccache id; @@ -188,7 +188,7 @@ krb5_fcc_store_data(context, id, data) return krb5_fcc_write(context, id, data->data, data->length); } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_int32(context, id, i) krb5_context context; krb5_ccache id; @@ -213,7 +213,7 @@ krb5_fcc_store_int32(context, id, i) } } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_ui_2(context, id, i) krb5_context context; krb5_ccache id; @@ -236,7 +236,7 @@ krb5_fcc_store_ui_2(context, id, i) } } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_octet(context, id, i) krb5_context context; krb5_ccache id; @@ -248,7 +248,7 @@ krb5_fcc_store_octet(context, id, i) return krb5_fcc_write(context, id, (char *) &ibuf, 1); } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_times(context, id, t) krb5_context context; krb5_ccache id; @@ -273,7 +273,7 @@ krb5_fcc_store_times(context, id, t) } } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_authdata(context, id, a) krb5_context context; krb5_ccache id; @@ -297,7 +297,7 @@ krb5_fcc_store_authdata(context, id, a) return KRB5_OK; } -krb5_error_code INTERFACE +krb5_error_code krb5_fcc_store_authdatum (context, id, a) krb5_context context; krb5_ccache id; diff --git a/src/lib/krb5/ccache/stdio/ChangeLog b/src/lib/krb5/ccache/stdio/ChangeLog index 5fda9a66d..f6f311ffc 100644 --- a/src/lib/krb5/ccache/stdio/ChangeLog +++ b/src/lib/krb5/ccache/stdio/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 16:32:12 1995 Keith Vetter (keithv@fusion.com) + + * scc_genn.c: __STDC__ conditional also checks the _WINDOWS define. + Sat Mar 25 14:42:37 1995 Tom Yu (tlyu@dragons-lair) * scc_maybe.c (krb5_scc_open_file): fixed typo (extra & in diff --git a/src/lib/krb5/ccache/stdio/scc_gennew.c b/src/lib/krb5/ccache/stdio/scc_gennew.c index 0172f4d1e..7e4e8dba7 100644 --- a/src/lib/krb5/ccache/stdio/scc_gennew.c +++ b/src/lib/krb5/ccache/stdio/scc_gennew.c @@ -86,7 +86,7 @@ krb5_scc_generate_new (context, id) strcpy(((krb5_scc_data *) lid->data)->filename, scratch); /* Make sure the file name is useable */ -#if defined(__STDC__) +#if defined(__STDC__) || defined(_WINDOWS) f = fopen (((krb5_scc_data *) lid->data)->filename, "wb+"); #else f = fopen (((krb5_scc_data *) lid->data)->filename, "w+"); diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog index 8938b0daa..210218b33 100644 --- a/src/lib/krb5/error_tables/ChangeLog +++ b/src/lib/krb5/error_tables/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 16:36:10 1995 Keith Vetter (keithv@fusion.com) + + * Makefile.in: clean target was cleaning too much for the PC. + Wed Apr 5 16:29:25 1995 Keith Vetter (keithv@fusion.com) * krb5_err.et: added KRB5_REALM_CANT_RESOLVE for more precise diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in index cbcbed068..a007cbed5 100644 --- a/src/lib/krb5/error_tables/Makefile.in +++ b/src/lib/krb5/error_tables/Makefile.in @@ -70,9 +70,9 @@ kv5m_err.$(OBJEXT): kv5m_err.c clean:: clean-$(WHAT) -clean-unix:: +clean-unix:: clean-hdrs $(RM) $(HDRS) $(ETSRCS) -clean-mac: +clean-mac:: clean-hdrs $(RM) $(HDRS) $(ETSRCS) clean-windows:: @@ -84,7 +84,7 @@ includes:: $(HDRS) (set -x; rm -f $(EHDRDIR)/$$x; cp $$x $(EHDRDIR)/$$x) \ fi; done -clean:: +clean-hdrs:: for x in $(HDRS); do \ rm -f $(EHDRDIR)/$$x; \ done diff --git a/src/lib/krb5/free/ChangeLog b/src/lib/krb5/free/ChangeLog index ecc7923f9..6f444bb60 100644 --- a/src/lib/krb5/free/ChangeLog +++ b/src/lib/krb5/free/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + Fri Mar 17 19:45:01 1995 John Gilmore (gnu at toad.com) * Makefile.in (LDFLAGS): Elim duplicate. diff --git a/src/lib/krb5/free/f_addr.c b/src/lib/krb5/free/f_addr.c index 6da52acfe..d8f58b767 100644 --- a/src/lib/krb5/free/f_addr.c +++ b/src/lib/krb5/free/f_addr.c @@ -25,7 +25,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_address(context, val) krb5_context context; krb5_address *val; diff --git a/src/lib/krb5/free/f_ap_rep.c b/src/lib/krb5/free/f_ap_rep.c index 5d608b64e..0301af162 100644 --- a/src/lib/krb5/free/f_ap_rep.c +++ b/src/lib/krb5/free/f_ap_rep.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_ap_rep(context, val) krb5_context context; register krb5_ap_rep *val; diff --git a/src/lib/krb5/free/f_ap_req.c b/src/lib/krb5/free/f_ap_req.c index 199049442..1b9a93a7e 100644 --- a/src/lib/krb5/free/f_ap_req.c +++ b/src/lib/krb5/free/f_ap_req.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_ap_req(context, val) krb5_context context; register krb5_ap_req *val; diff --git a/src/lib/krb5/free/f_auth_cnt.c b/src/lib/krb5/free/f_auth_cnt.c index be51d88a2..d061f26f9 100644 --- a/src/lib/krb5/free/f_auth_cnt.c +++ b/src/lib/krb5/free/f_auth_cnt.c @@ -27,7 +27,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_authenticator_contents(context, val) krb5_context context; krb5_authenticator *val; diff --git a/src/lib/krb5/free/f_authdata.c b/src/lib/krb5/free/f_authdata.c index ccaf918a8..fba8dd319 100644 --- a/src/lib/krb5/free/f_authdata.c +++ b/src/lib/krb5/free/f_authdata.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_authdata(context, val) krb5_context context; krb5_authdata **val; diff --git a/src/lib/krb5/free/f_authent.c b/src/lib/krb5/free/f_authent.c index 60ef9017f..f4d1c0659 100644 --- a/src/lib/krb5/free/f_authent.c +++ b/src/lib/krb5/free/f_authent.c @@ -27,7 +27,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_authenticator(context, val) krb5_context context; krb5_authenticator *val; diff --git a/src/lib/krb5/free/f_chksum.c b/src/lib/krb5/free/f_chksum.c index 9149ce22e..beab7450b 100644 --- a/src/lib/krb5/free/f_chksum.c +++ b/src/lib/krb5/free/f_chksum.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_checksum(context, val) krb5_context context; register krb5_checksum *val; diff --git a/src/lib/krb5/free/f_cred.c b/src/lib/krb5/free/f_cred.c index df6436c5b..7cc2a9a97 100644 --- a/src/lib/krb5/free/f_cred.c +++ b/src/lib/krb5/free/f_cred.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_cred(context, val) krb5_context context; register krb5_cred *val; diff --git a/src/lib/krb5/free/f_cred_enc.c b/src/lib/krb5/free/f_cred_enc.c index 60e0b1ee2..d14b3d861 100644 --- a/src/lib/krb5/free/f_cred_enc.c +++ b/src/lib/krb5/free/f_cred_enc.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_cred_enc_part(context, val) krb5_context context; register krb5_cred_enc_part *val; diff --git a/src/lib/krb5/free/f_enc_kdc.c b/src/lib/krb5/free/f_enc_kdc.c index 20fa9a86e..102237674 100644 --- a/src/lib/krb5/free/f_enc_kdc.c +++ b/src/lib/krb5/free/f_enc_kdc.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_enc_kdc_rep_part(context, val) krb5_context context; register krb5_enc_kdc_rep_part *val; diff --git a/src/lib/krb5/free/f_enc_tkt.c b/src/lib/krb5/free/f_enc_tkt.c index d2cddf0d3..3c2aa3ae4 100644 --- a/src/lib/krb5/free/f_enc_tkt.c +++ b/src/lib/krb5/free/f_enc_tkt.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_enc_tkt_part(context, val) krb5_context context; krb5_enc_tkt_part *val; diff --git a/src/lib/krb5/free/f_error.c b/src/lib/krb5/free/f_error.c index 29a0541d6..a24a6c409 100644 --- a/src/lib/krb5/free/f_error.c +++ b/src/lib/krb5/free/f_error.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_error(context, val) krb5_context context; register krb5_error *val; diff --git a/src/lib/krb5/free/f_kdc_rp.c b/src/lib/krb5/free/f_kdc_rp.c index 21fbb6c7b..aba2fff31 100644 --- a/src/lib/krb5/free/f_kdc_rp.c +++ b/src/lib/krb5/free/f_kdc_rp.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_kdc_rep(context, val) krb5_context context; krb5_kdc_rep *val; diff --git a/src/lib/krb5/free/f_kdc_rq.c b/src/lib/krb5/free/f_kdc_rq.c index d8f171609..0e0ca640e 100644 --- a/src/lib/krb5/free/f_kdc_rq.c +++ b/src/lib/krb5/free/f_kdc_rq.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_kdc_req(context, val) krb5_context context; krb5_kdc_req *val; diff --git a/src/lib/krb5/free/f_keyblock.c b/src/lib/krb5/free/f_keyblock.c index 6a513f182..605165719 100644 --- a/src/lib/krb5/free/f_keyblock.c +++ b/src/lib/krb5/free/f_keyblock.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_keyblock(context, val) krb5_context context; register krb5_keyblock *val; diff --git a/src/lib/krb5/free/f_last_req.c b/src/lib/krb5/free/f_last_req.c index 3e01f9608..278b6f4b7 100644 --- a/src/lib/krb5/free/f_last_req.c +++ b/src/lib/krb5/free/f_last_req.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_last_req(context, val) krb5_context context; krb5_last_req_entry **val; diff --git a/src/lib/krb5/free/f_padata.c b/src/lib/krb5/free/f_padata.c index cd2af5357..954001451 100644 --- a/src/lib/krb5/free/f_padata.c +++ b/src/lib/krb5/free/f_padata.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_pa_data(context, val) krb5_context context; krb5_pa_data **val; diff --git a/src/lib/krb5/free/f_priv.c b/src/lib/krb5/free/f_priv.c index 5a47f3ec3..06861421a 100644 --- a/src/lib/krb5/free/f_priv.c +++ b/src/lib/krb5/free/f_priv.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_priv(context, val) krb5_context context; register krb5_priv *val; diff --git a/src/lib/krb5/free/f_priv_enc.c b/src/lib/krb5/free/f_priv_enc.c index 95dcde539..8e25602bb 100644 --- a/src/lib/krb5/free/f_priv_enc.c +++ b/src/lib/krb5/free/f_priv_enc.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_priv_enc_part(context, val) krb5_context context; register krb5_priv_enc_part *val; diff --git a/src/lib/krb5/free/f_pwd_data.c b/src/lib/krb5/free/f_pwd_data.c index 54240d242..2a92336b3 100644 --- a/src/lib/krb5/free/f_pwd_data.c +++ b/src/lib/krb5/free/f_pwd_data.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_pwd_data(context, val) krb5_context context; krb5_pwd_data *val; diff --git a/src/lib/krb5/free/f_pwd_seq.c b/src/lib/krb5/free/f_pwd_seq.c index 70da746f9..436fb6830 100644 --- a/src/lib/krb5/free/f_pwd_seq.c +++ b/src/lib/krb5/free/f_pwd_seq.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_pwd_sequences(context, val) krb5_context context; passwd_phrase_element **val; diff --git a/src/lib/krb5/free/f_safe.c b/src/lib/krb5/free/f_safe.c index 9ca750e21..11a3159f4 100644 --- a/src/lib/krb5/free/f_safe.c +++ b/src/lib/krb5/free/f_safe.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_safe(context, val) krb5_context context; register krb5_safe *val; diff --git a/src/lib/krb5/free/f_tckt.c b/src/lib/krb5/free/f_tckt.c index 94f26b3b1..8344345eb 100644 --- a/src/lib/krb5/free/f_tckt.c +++ b/src/lib/krb5/free/f_tckt.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_ticket(context, val) krb5_context context; krb5_ticket *val; diff --git a/src/lib/krb5/free/f_tckts.c b/src/lib/krb5/free/f_tckts.c index 89a7d7cf2..1a1af1e18 100644 --- a/src/lib/krb5/free/f_tckts.c +++ b/src/lib/krb5/free/f_tckts.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_tickets(context, val) krb5_context context; krb5_ticket **val; diff --git a/src/lib/krb5/free/f_tgt_cred.c b/src/lib/krb5/free/f_tgt_cred.c index 0dbffd2c0..ddf726826 100644 --- a/src/lib/krb5/free/f_tgt_cred.c +++ b/src/lib/krb5/free/f_tgt_cred.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_tgt_creds(context, tgts) krb5_context context; krb5_creds **tgts; diff --git a/src/lib/krb5/free/f_tkt_auth.c b/src/lib/krb5/free/f_tkt_auth.c index 7aaf723c9..2ef99f482 100644 --- a/src/lib/krb5/free/f_tkt_auth.c +++ b/src/lib/krb5/free/f_tkt_auth.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_tkt_authent(context, val) krb5_context context; krb5_tkt_authent *val; diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog index d6b9d5f48..97ee383e0 100644 --- a/src/lib/krb5/keytab/ChangeLog +++ b/src/lib/krb5/keytab/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.c: removed unneeded INTERFACE from non-api functions. + Fri Mar 17 19:46:07 1995 John Gilmore (gnu at toad.com) * Makefile.in (LDFLAGS): Zap duplicate defn. diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog index e224a9a92..47da64df3 100644 --- a/src/lib/krb5/keytab/file/ChangeLog +++ b/src/lib/krb5/keytab/file/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + Fri Mar 17 19:46:49 1995 John Gilmore (gnu at toad.com) * Makefile.in (LDFLAGS): Zap duplicate. diff --git a/src/lib/krb5/keytab/file/ktf_add.c b/src/lib/krb5/keytab/file/ktf_add.c index a1cad2a3f..0de762918 100644 --- a/src/lib/krb5/keytab/file/ktf_add.c +++ b/src/lib/krb5/keytab/file/ktf_add.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_add(context, id, entry) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_close.c b/src/lib/krb5/keytab/file/ktf_close.c index a59a796cc..93ee92e68 100644 --- a/src/lib/krb5/keytab/file/ktf_close.c +++ b/src/lib/krb5/keytab/file/ktf_close.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_close(context, id) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_endget.c b/src/lib/krb5/keytab/file/ktf_endget.c index 714e4b7b7..25ef4de7e 100644 --- a/src/lib/krb5/keytab/file/ktf_endget.c +++ b/src/lib/krb5/keytab/file/ktf_endget.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_end_get(context, id, cursor) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_g_ent.c b/src/lib/krb5/keytab/file/ktf_g_ent.c index 591a887ab..a296720ce 100644 --- a/src/lib/krb5/keytab/file/ktf_g_ent.c +++ b/src/lib/krb5/keytab/file/ktf_g_ent.c @@ -29,7 +29,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_get_entry(context, id, principal, kvno, keytype, entry) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_g_name.c b/src/lib/krb5/keytab/file/ktf_g_name.c index 86f6159e9..a8f27c474 100644 --- a/src/lib/krb5/keytab/file/ktf_g_name.c +++ b/src/lib/krb5/keytab/file/ktf_g_name.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_get_name(context, id, name, len) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_next.c b/src/lib/krb5/keytab/file/ktf_next.c index eb3ecc35a..da23bb934 100644 --- a/src/lib/krb5/keytab/file/ktf_next.c +++ b/src/lib/krb5/keytab/file/ktf_next.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_get_next(context, id, entry, cursor) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_remove.c b/src/lib/krb5/keytab/file/ktf_remove.c index b3ddd75b1..93704300a 100644 --- a/src/lib/krb5/keytab/file/ktf_remove.c +++ b/src/lib/krb5/keytab/file/ktf_remove.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_remove(context, id, entry) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_resolv.c b/src/lib/krb5/keytab/file/ktf_resolv.c index bd304d943..e9e3827a6 100644 --- a/src/lib/krb5/keytab/file/ktf_resolv.c +++ b/src/lib/krb5/keytab/file/ktf_resolv.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_resolve(context, name, id) krb5_context context; const char *name; diff --git a/src/lib/krb5/keytab/file/ktf_ssget.c b/src/lib/krb5/keytab/file/ktf_ssget.c index b00a3f8c3..67e3bb649 100644 --- a/src/lib/krb5/keytab/file/ktf_ssget.c +++ b/src/lib/krb5/keytab/file/ktf_ssget.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_start_seq_get(context, id, cursorp) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_util.c b/src/lib/krb5/keytab/file/ktf_util.c index 84f3f0c20..fa79ef0a0 100644 --- a/src/lib/krb5/keytab/file/ktf_util.c +++ b/src/lib/krb5/keytab/file/ktf_util.c @@ -160,7 +160,7 @@ int mode; return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_openr(context, id) krb5_context context; krb5_keytab id; @@ -168,7 +168,7 @@ krb5_keytab id; return krb5_ktfileint_open(context, id, KRB5_LOCKMODE_SHARED); } -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_openw(context, id) krb5_context context; krb5_keytab id; @@ -176,7 +176,7 @@ krb5_keytab id; return krb5_ktfileint_open(context, id, KRB5_LOCKMODE_EXCLUSIVE); } -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_close(context, id) krb5_context context; krb5_keytab id; @@ -191,7 +191,7 @@ krb5_keytab id; return kerror; } -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_delete_entry(context, id, delete_point) krb5_context context; krb5_keytab id; @@ -244,7 +244,7 @@ krb5_int32 delete_point; return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_internal_read_entry(context, id, ret_entry, delete_point) krb5_context context; krb5_keytab id; @@ -452,7 +452,7 @@ fail: return error; } -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_read_entry(context, id, entryp) krb5_context context; krb5_keytab id; @@ -463,7 +463,7 @@ krb5_keytab_entry *entryp; return krb5_ktfileint_internal_read_entry(context, id, entryp, &delete_point); } -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_write_entry(context, id, entry) krb5_context context; krb5_keytab id; @@ -609,7 +609,7 @@ krb5_keytab_entry *entry; * Determine the size needed for a file entry for the given * keytab entry. */ -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_size_entry(context, entry, size_needed) krb5_context context; krb5_keytab_entry *entry; @@ -651,7 +651,7 @@ krb5_int32 *size_needed; * to commit the write, but that this field must indicate the size of the * block in the file rather than the size of the actual entry) */ -krb5_error_code INTERFACE +krb5_error_code krb5_ktfileint_find_slot(context, id, size_needed, commit_point) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/file/ktf_wreslv.c b/src/lib/krb5/keytab/file/ktf_wreslv.c index 7845a6b58..684f8d558 100644 --- a/src/lib/krb5/keytab/file/ktf_wreslv.c +++ b/src/lib/krb5/keytab/file/ktf_wreslv.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include "ktfile.h" -krb5_error_code INTERFACE +krb5_error_code krb5_ktfile_wresolve(context, name, id) krb5_context context; const char *name; diff --git a/src/lib/krb5/keytab/file/ktfile.h b/src/lib/krb5/keytab/file/ktfile.h index 4bb7e1dc5..c1c55dc88 100644 --- a/src/lib/krb5/keytab/file/ktfile.h +++ b/src/lib/krb5/keytab/file/ktfile.h @@ -61,27 +61,27 @@ typedef struct _krb5_ktfile_data { extern struct _krb5_kt_ops krb5_ktf_ops; extern struct _krb5_kt_ops krb5_ktf_writable_ops; -krb5_error_code INTERFACE krb5_ktfile_resolve +krb5_error_code krb5_ktfile_resolve PROTOTYPE((krb5_context, const char *, krb5_keytab *)); -krb5_error_code INTERFACE krb5_ktfile_wresolve +krb5_error_code krb5_ktfile_wresolve PROTOTYPE((krb5_context, const char *, krb5_keytab *)); -krb5_error_code INTERFACE krb5_ktfile_get_name +krb5_error_code krb5_ktfile_get_name PROTOTYPE((krb5_context, krb5_keytab, char *, int)); -krb5_error_code INTERFACE krb5_ktfile_close +krb5_error_code krb5_ktfile_close PROTOTYPE((krb5_context, krb5_keytab)); -krb5_error_code INTERFACE krb5_ktfile_get_entry +krb5_error_code krb5_ktfile_get_entry PROTOTYPE((krb5_context, krb5_keytab, krb5_principal, @@ -89,72 +89,72 @@ krb5_error_code INTERFACE krb5_ktfile_get_entry krb5_keytype, krb5_keytab_entry *)); -krb5_error_code INTERFACE krb5_ktfile_start_seq_get +krb5_error_code krb5_ktfile_start_seq_get PROTOTYPE((krb5_context, krb5_keytab, krb5_kt_cursor *)); -krb5_error_code INTERFACE krb5_ktfile_get_next +krb5_error_code krb5_ktfile_get_next PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry *, krb5_kt_cursor *)); -krb5_error_code INTERFACE krb5_ktfile_end_get +krb5_error_code krb5_ktfile_end_get PROTOTYPE((krb5_context, krb5_keytab, krb5_kt_cursor *)); /* routines to be included on extended version (write routines) */ -krb5_error_code INTERFACE krb5_ktfile_add +krb5_error_code krb5_ktfile_add PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry *)); -krb5_error_code INTERFACE krb5_ktfile_remove +krb5_error_code krb5_ktfile_remove PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry *)); -krb5_error_code INTERFACE krb5_ktfileint_openr +krb5_error_code krb5_ktfileint_openr PROTOTYPE((krb5_context, krb5_keytab)); -krb5_error_code INTERFACE krb5_ktfileint_openw +krb5_error_code krb5_ktfileint_openw PROTOTYPE((krb5_context, krb5_keytab)); -krb5_error_code INTERFACE krb5_ktfileint_close +krb5_error_code krb5_ktfileint_close PROTOTYPE((krb5_context, krb5_keytab)); -krb5_error_code INTERFACE krb5_ktfileint_read_entry +krb5_error_code krb5_ktfileint_read_entry PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry *)); -krb5_error_code INTERFACE krb5_ktfileint_write_entry +krb5_error_code krb5_ktfileint_write_entry PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry *)); -krb5_error_code INTERFACE krb5_ktfileint_delete_entry +krb5_error_code krb5_ktfileint_delete_entry PROTOTYPE((krb5_context, krb5_keytab, krb5_int32)); -krb5_error_code INTERFACE krb5_ktfileint_internal_read_entry +krb5_error_code krb5_ktfileint_internal_read_entry PROTOTYPE((krb5_context, krb5_keytab, krb5_keytab_entry *, krb5_int32 *)); -krb5_error_code INTERFACE krb5_ktfileint_size_entry +krb5_error_code krb5_ktfileint_size_entry PROTOTYPE((krb5_context, krb5_keytab_entry *, krb5_int32 *)); -krb5_error_code INTERFACE krb5_ktfileint_find_slot +krb5_error_code krb5_ktfileint_find_slot PROTOTYPE((krb5_context, krb5_keytab, krb5_int32 *, diff --git a/src/lib/krb5/keytab/ktadd.c b/src/lib/krb5/keytab/ktadd.c index 7656c7e95..56d31028c 100644 --- a/src/lib/krb5/keytab/ktadd.c +++ b/src/lib/krb5/keytab/ktadd.c @@ -26,7 +26,7 @@ #include "k5-int.h" -krb5_error_code INTERFACE +krb5_error_code krb5_kt_add_entry (context, id, entry) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c index 97ea1a03e..4f9869d17 100644 --- a/src/lib/krb5/keytab/ktbase.c +++ b/src/lib/krb5/keytab/ktbase.c @@ -39,7 +39,7 @@ static struct krb5_kt_typelist *kt_typehead = &krb5_kt_typelist_dfl; * don't replace if it already exists; return an error instead. */ -krb5_error_code INTERFACE +krb5_error_code krb5_kt_register(context, ops) krb5_context context; krb5_kt_ops *ops; @@ -68,7 +68,7 @@ krb5_kt_register(context, ops) * particular keytab type. */ -krb5_error_code INTERFACE +krb5_error_code krb5_kt_resolve (context, name, ktid) krb5_context context; const char *name; diff --git a/src/lib/krb5/keytab/ktdefault.c b/src/lib/krb5/keytab/ktdefault.c index 195d0ca03..868153553 100644 --- a/src/lib/krb5/keytab/ktdefault.c +++ b/src/lib/krb5/keytab/ktdefault.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include -krb5_error_code INTERFACE +krb5_error_code krb5_kt_default(context, id) krb5_context context; krb5_keytab *id; diff --git a/src/lib/krb5/keytab/ktfr_entry.c b/src/lib/krb5/keytab/ktfr_entry.c index e573d4031..5aaa77512 100644 --- a/src/lib/krb5/keytab/ktfr_entry.c +++ b/src/lib/krb5/keytab/ktfr_entry.c @@ -26,7 +26,7 @@ #include "k5-int.h" -krb5_error_code INTERFACE +krb5_error_code krb5_kt_free_entry (context, entry) krb5_context context; krb5_keytab_entry *entry; diff --git a/src/lib/krb5/keytab/ktremove.c b/src/lib/krb5/keytab/ktremove.c index 928d6aa85..377c4a0a7 100644 --- a/src/lib/krb5/keytab/ktremove.c +++ b/src/lib/krb5/keytab/ktremove.c @@ -26,7 +26,7 @@ #include "k5-int.h" -krb5_error_code INTERFACE +krb5_error_code krb5_kt_remove_entry (context, id, entry) krb5_context context; krb5_keytab id; diff --git a/src/lib/krb5/keytab/read_servi.c b/src/lib/krb5/keytab/read_servi.c index 90315dda1..bd9331ece 100644 --- a/src/lib/krb5/keytab/read_servi.c +++ b/src/lib/krb5/keytab/read_servi.c @@ -40,7 +40,7 @@ * returns: Either KSUCCESS or error code. * errors: error code if not found or keyprocarg is invalid. */ -krb5_error_code INTERFACE +krb5_error_code krb5_kt_read_service_key(context, keyprocarg, principal, vno, keytype, key) krb5_context context; krb5_pointer keyprocarg; diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index c591d110e..7dd6e6a5a 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + Fri Mar 31 16:45:47 1995 Keith Vetter (keithv@fusion.com) * krb5_get_in_tkt: changed error return value for when clocks diff --git a/src/lib/krb5/krb/addr_comp.c b/src/lib/krb5/krb/addr_comp.c index f63ea0205..661f6960e 100644 --- a/src/lib/krb5/krb/addr_comp.c +++ b/src/lib/krb5/krb/addr_comp.c @@ -29,7 +29,7 @@ /* * If the two addresses are the same, return TRUE, else return FALSE */ -krb5_boolean INTERFACE +krb5_boolean krb5_address_compare(context, addr1, addr2) krb5_context context; const krb5_address *addr1; diff --git a/src/lib/krb5/krb/addr_order.c b/src/lib/krb5/krb/addr_order.c index c872c52c6..757f7bf52 100644 --- a/src/lib/krb5/krb/addr_order.c +++ b/src/lib/krb5/krb/addr_order.c @@ -34,7 +34,7 @@ * Return an ordering on two addresses: 0 if the same, * < 0 if first is less than 2nd, > 0 if first is greater than 2nd. */ -int INTERFACE +int krb5_address_order(context, addr1, addr2) krb5_context context; register const krb5_address *addr1; diff --git a/src/lib/krb5/krb/addr_srch.c b/src/lib/krb5/krb/addr_srch.c index 2e112ea8c..d30b68cd1 100644 --- a/src/lib/krb5/krb/addr_srch.c +++ b/src/lib/krb5/krb/addr_srch.c @@ -30,7 +30,7 @@ * if addr is listed in addrlist, or addrlist is null, return TRUE. * if not listed, return FALSE */ -krb5_boolean INTERFACE +krb5_boolean krb5_address_search(context, addr, addrlist) krb5_context context; const krb5_address *addr; diff --git a/src/lib/krb5/krb/auth_con.c b/src/lib/krb5/krb/auth_con.c index ebf72a790..134e07ba5 100644 --- a/src/lib/krb5/krb/auth_con.c +++ b/src/lib/krb5/krb/auth_con.c @@ -2,7 +2,7 @@ #include "k5-int.h" #include "auth_con.h" -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_init(context, auth_context) krb5_context context; krb5_auth_context ** auth_context; @@ -21,7 +21,7 @@ krb5_auth_con_init(context, auth_context) return ENOMEM; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_free(context, auth_context) krb5_context context; krb5_auth_context * auth_context; @@ -38,7 +38,7 @@ krb5_auth_con_free(context, auth_context) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_setaddrs(context, auth_context, local_addr, remote_addr) krb5_context context; krb5_auth_context * auth_context; @@ -51,7 +51,7 @@ krb5_auth_con_setaddrs(context, auth_context, local_addr, remote_addr) } /* XXX this call is a hack. Fixed when I do the servers. */ -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_setkey(context, auth_context, keyblock) krb5_context context; krb5_auth_context * auth_context; @@ -69,7 +69,7 @@ krb5_auth_con_setkey(context, auth_context, keyblock) * Once decrypted this key is no longer necessary and is then overwritten * with the session key sent by the client. */ -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_setuseruserkey(context, auth_context, keyblock) krb5_context context; krb5_auth_context * auth_context; @@ -80,7 +80,7 @@ krb5_auth_con_setuseruserkey(context, auth_context, keyblock) return(krb5_copy_keyblock(context, keyblock, &(auth_context->keyblock))); } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_getkey(context, auth_context, keyblock) krb5_context context; krb5_auth_context * auth_context; @@ -92,7 +92,7 @@ krb5_auth_con_getkey(context, auth_context, keyblock) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_getlocalsubkey(context, auth_context, keyblock) krb5_context context; krb5_auth_context * auth_context; @@ -104,7 +104,7 @@ krb5_auth_con_getlocalsubkey(context, auth_context, keyblock) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_getremotesubkey(context, auth_context, keyblock) krb5_context context; krb5_auth_context * auth_context; @@ -116,7 +116,7 @@ krb5_auth_con_getremotesubkey(context, auth_context, keyblock) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_setcksumtype(context, auth_context, cksumtype) krb5_context context; krb5_auth_context * auth_context; @@ -126,7 +126,7 @@ krb5_auth_con_setcksumtype(context, auth_context, cksumtype) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_getlocalseqnumber(context, auth_context, seqnumber) krb5_context context; krb5_auth_context * auth_context; @@ -136,7 +136,7 @@ krb5_auth_con_getlocalseqnumber(context, auth_context, seqnumber) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_getauthenticator(context, auth_context, authenticator) krb5_context context; krb5_auth_context * auth_context; @@ -146,7 +146,7 @@ krb5_auth_con_getauthenticator(context, auth_context, authenticator) authenticator)); } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_getremoteseqnumber(context, auth_context, seqnumber) krb5_context context; krb5_auth_context * auth_context; @@ -156,7 +156,7 @@ krb5_auth_con_getremoteseqnumber(context, auth_context, seqnumber) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_initivector(context, auth_context) krb5_context context; krb5_auth_context * auth_context; @@ -174,7 +174,7 @@ krb5_auth_con_initivector(context, auth_context) return EINVAL; /* XXX need an error for no keyblock */ } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_setivector(context, auth_context, ivector) krb5_context context; krb5_auth_context * auth_context; @@ -184,7 +184,7 @@ krb5_auth_con_setivector(context, auth_context, ivector) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_getivector(context, auth_context, ivector) krb5_context context; krb5_auth_context * auth_context; @@ -194,7 +194,7 @@ krb5_auth_con_getivector(context, auth_context, ivector) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_setflags(context, auth_context, flags) krb5_context context; krb5_auth_context * auth_context; @@ -204,7 +204,7 @@ krb5_auth_con_setflags(context, auth_context, flags) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_auth_con_setrcache(context, auth_context, rcache) krb5_context context; krb5_auth_context * auth_context; diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c index 289a0bf3a..d2dc46949 100644 --- a/src/lib/krb5/krb/bld_princ.c +++ b/src/lib/krb5/krb/bld_princ.c @@ -33,7 +33,7 @@ #include #endif -krb5_error_code INTERFACE_C +krb5_error_code krb5_build_principal_va(context, princ, rlen, realm, ap) krb5_context context; krb5_principal princ; @@ -96,7 +96,7 @@ krb5_build_principal_va(context, princ, rlen, realm, ap) return 0; } -krb5_error_code INTERFACE_C +krb5_error_code #ifdef HAVE_STDARG_H krb5_build_principal(krb5_context context, krb5_principal * princ, int rlen, const char * realm, ...) diff --git a/src/lib/krb5/krb/chk_trans.c b/src/lib/krb5/krb/chk_trans.c index 215991560..75794e815 100644 --- a/src/lib/krb5/krb/chk_trans.c +++ b/src/lib/krb5/krb/chk_trans.c @@ -25,7 +25,7 @@ #define MAX_REALM_LN 500 -krb5_error_code INTERFACE +krb5_error_code krb5_check_transited_list(context, trans, realm1, realm2) krb5_context context; krb5_data *trans; diff --git a/src/lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c index e1b90c927..e76bf9b88 100644 --- a/src/lib/krb5/krb/conv_princ.c +++ b/src/lib/krb5/krb/conv_princ.c @@ -99,7 +99,7 @@ static char *strnchr(s, c, n) /* XXX This calls for a new error code */ #define KRB5_INVALID_PRINCIPAL KRB5_LNAME_BADFORMAT -krb5_error_code INTERFACE +krb5_error_code krb5_524_conv_principal(context, princ, name, inst, realm) krb5_context context; const krb5_principal princ; @@ -167,7 +167,7 @@ krb5_524_conv_principal(context, princ, name, inst, realm) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_425_conv_principal(context, name, instance, realm, princ) krb5_context context; const char *name; diff --git a/src/lib/krb5/krb/copy_addrs.c b/src/lib/krb5/krb/copy_addrs.c index 29c97cecd..fa3773103 100644 --- a/src/lib/krb5/krb/copy_addrs.c +++ b/src/lib/krb5/krb/copy_addrs.c @@ -49,7 +49,7 @@ krb5_address **outad; /* * Copy an address array, with fresh allocation. */ -krb5_error_code INTERFACE +krb5_error_code krb5_copy_addresses(context, inaddr, outaddr) krb5_context context; krb5_address * const * inaddr; @@ -87,7 +87,7 @@ krb5_copy_addresses(context, inaddr, outaddr) * Note that this function may change the value of *outaddr even if it * returns failure, but it will not change the contents of the list. */ -krb5_error_code INTERFACE +krb5_error_code krb5_append_addresses(context, inaddr, outaddr) krb5_context context; krb5_address * const * inaddr; diff --git a/src/lib/krb5/krb/copy_athctr.c b/src/lib/krb5/krb/copy_athctr.c index 826db0e6f..5523f3134 100644 --- a/src/lib/krb5/krb/copy_athctr.c +++ b/src/lib/krb5/krb/copy_athctr.c @@ -26,7 +26,7 @@ #include "k5-int.h" -krb5_error_code INTERFACE +krb5_error_code krb5_copy_authenticator(context, authfrom, authto) krb5_context context; const krb5_authenticator *authfrom; diff --git a/src/lib/krb5/krb/copy_auth.c b/src/lib/krb5/krb/copy_auth.c index 993d08417..23c91dc28 100644 --- a/src/lib/krb5/krb/copy_auth.c +++ b/src/lib/krb5/krb/copy_auth.c @@ -49,7 +49,7 @@ krb5_authdata **outad; /* * Copy an authdata array, with fresh allocation. */ -krb5_error_code INTERFACE +krb5_error_code krb5_copy_authdata(context, inauthdat, outauthdat) krb5_context context; krb5_authdata * const * inauthdat; diff --git a/src/lib/krb5/krb/copy_cksum.c b/src/lib/krb5/krb/copy_cksum.c index c7ebb8cb7..4d8d3efc6 100644 --- a/src/lib/krb5/krb/copy_cksum.c +++ b/src/lib/krb5/krb/copy_cksum.c @@ -26,7 +26,7 @@ #include "k5-int.h" -krb5_error_code INTERFACE +krb5_error_code krb5_copy_checksum(context, ckfrom, ckto) krb5_context context; const krb5_checksum *ckfrom; diff --git a/src/lib/krb5/krb/copy_creds.c b/src/lib/krb5/krb/copy_creds.c index 264ca5143..1b58af914 100644 --- a/src/lib/krb5/krb/copy_creds.c +++ b/src/lib/krb5/krb/copy_creds.c @@ -30,7 +30,7 @@ * Copy credentials, allocating fresh storage where needed. */ -krb5_error_code INTERFACE +krb5_error_code krb5_copy_creds(context, incred, outcred) krb5_context context; const krb5_creds *incred; diff --git a/src/lib/krb5/krb/copy_data.c b/src/lib/krb5/krb/copy_data.c index fedf2dca7..e9dd229a0 100644 --- a/src/lib/krb5/krb/copy_data.c +++ b/src/lib/krb5/krb/copy_data.c @@ -29,7 +29,7 @@ /* * Copy a data structure, with fresh allocation. */ -krb5_error_code INTERFACE +krb5_error_code krb5_copy_data(context, indata, outdata) krb5_context context; const krb5_data *indata; diff --git a/src/lib/krb5/krb/copy_key.c b/src/lib/krb5/krb/copy_key.c index 6e367d4de..065b66ef8 100644 --- a/src/lib/krb5/krb/copy_key.c +++ b/src/lib/krb5/krb/copy_key.c @@ -29,7 +29,7 @@ /* * Copy a keyblock, including alloc'ed storage. */ -krb5_error_code INTERFACE +krb5_error_code krb5_copy_keyblock(context, from, to) krb5_context context; const krb5_keyblock *from; diff --git a/src/lib/krb5/krb/copy_princ.c b/src/lib/krb5/krb/copy_princ.c index 4e7fb9998..d8e47de2f 100644 --- a/src/lib/krb5/krb/copy_princ.c +++ b/src/lib/krb5/krb/copy_princ.c @@ -29,7 +29,7 @@ /* * Copy a principal structure, with fresh allocation. */ -krb5_error_code INTERFACE +krb5_error_code krb5_copy_principal(context, inprinc, outprinc) krb5_context context; krb5_const_principal inprinc; diff --git a/src/lib/krb5/krb/copy_tick.c b/src/lib/krb5/krb/copy_tick.c index b1e05e83d..3d9b99a99 100644 --- a/src/lib/krb5/krb/copy_tick.c +++ b/src/lib/krb5/krb/copy_tick.c @@ -91,7 +91,7 @@ krb5_copy_enc_tkt_part(context, partfrom, partto) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_copy_ticket(context, from, pto) krb5_context context; const krb5_ticket *from; diff --git a/src/lib/krb5/krb/cp_key_cnt.c b/src/lib/krb5/krb/cp_key_cnt.c index b4afc2ea1..fd32cae15 100644 --- a/src/lib/krb5/krb/cp_key_cnt.c +++ b/src/lib/krb5/krb/cp_key_cnt.c @@ -29,7 +29,7 @@ /* * Copy a keyblock, including alloc'ed storage. */ -krb5_error_code INTERFACE +krb5_error_code krb5_copy_keyblock_contents(context, from, to) krb5_context context; const krb5_keyblock *from; diff --git a/src/lib/krb5/krb/decode_kdc.c b/src/lib/krb5/krb/decode_kdc.c index 007b2ab15..642de5b08 100644 --- a/src/lib/krb5/krb/decode_kdc.c +++ b/src/lib/krb5/krb/decode_kdc.c @@ -39,7 +39,7 @@ returns errors from encryption routines, system errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_decode_kdc_rep(context, enc_rep, key, etype, dec_rep) krb5_context context; krb5_data * enc_rep; diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c index 330712466..3777ffa6b 100644 --- a/src/lib/krb5/krb/decrypt_tk.c +++ b/src/lib/krb5/krb/decrypt_tk.c @@ -35,7 +35,7 @@ */ -krb5_error_code INTERFACE +krb5_error_code krb5_decrypt_tkt_part(context, srv_key, ticket) krb5_context context; const krb5_keyblock *srv_key; diff --git a/src/lib/krb5/krb/encode_kdc.c b/src/lib/krb5/krb/encode_kdc.c index 5b72dc4f1..a4d0edb32 100644 --- a/src/lib/krb5/krb/encode_kdc.c +++ b/src/lib/krb5/krb/encode_kdc.c @@ -40,7 +40,7 @@ */ /* due to argument promotion rules, we need to use the DECLARG/OLDDECLARG stuff... */ -krb5_error_code INTERFACE +krb5_error_code krb5_encode_kdc_rep(context, type, encpart, eblock, client_key, dec_rep, enc_rep) krb5_context context; const krb5_msgtype type; diff --git a/src/lib/krb5/krb/encrypt_tk.c b/src/lib/krb5/krb/encrypt_tk.c index 65cbd744d..101b6b7dc 100644 --- a/src/lib/krb5/krb/encrypt_tk.c +++ b/src/lib/krb5/krb/encrypt_tk.c @@ -38,7 +38,7 @@ enc_part->ciphertext.data allocated & filled in with encrypted stuff */ -krb5_error_code INTERFACE +krb5_error_code krb5_encrypt_tkt_part(context, eblock, srv_key, dec_ticket) krb5_context context; krb5_encrypt_block *eblock; diff --git a/src/lib/krb5/krb/faddr_ordr.c b/src/lib/krb5/krb/faddr_ordr.c index 1afb65af5..629499366 100644 --- a/src/lib/krb5/krb/faddr_ordr.c +++ b/src/lib/krb5/krb/faddr_ordr.c @@ -34,7 +34,7 @@ * Return an ordering on the two full addresses: 0 if the same, * < 0 if first is less than 2nd, > 0 if first is greater than 2nd. */ -int INTERFACE +int krb5_fulladdr_order(context, addr1, addr2) krb5_context context; register const krb5_fulladdr *addr1; diff --git a/src/lib/krb5/krb/free_rtree.c b/src/lib/krb5/krb/free_rtree.c index b3b70e480..58492710e 100644 --- a/src/lib/krb5/krb/free_rtree.c +++ b/src/lib/krb5/krb/free_rtree.c @@ -26,7 +26,7 @@ #include "k5-int.h" -void INTERFACE +void krb5_free_realm_tree(context, realms) krb5_context context; krb5_principal *realms; diff --git a/src/lib/krb5/krb/gc_2tgt.c b/src/lib/krb5/krb/gc_2tgt.c index 5689f1eaf..9f9106fc0 100644 --- a/src/lib/krb5/krb/gc_2tgt.c +++ b/src/lib/krb5/krb/gc_2tgt.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "int-proto.h" -krb5_error_code INTERFACE +krb5_error_code krb5_get_cred_via_2tgt (context, tgt, kdcoptions, sumtype, in_cred, out_cred) krb5_context context; krb5_creds *tgt; diff --git a/src/lib/krb5/krb/gc_frm_kdc.c b/src/lib/krb5/krb/gc_frm_kdc.c index daf14caf4..30e278d38 100644 --- a/src/lib/krb5/krb/gc_frm_kdc.c +++ b/src/lib/krb5/krb/gc_frm_kdc.c @@ -63,7 +63,7 @@ extern krb5_cksumtype krb5_kdc_req_sumtype; #define TGT_ETYPE \ krb5_keytype_array[tgt.keyblock.keytype]->system->proto_enctype; -krb5_error_code INTERFACE +krb5_error_code krb5_get_cred_from_kdc(context, ccache, in_cred, out_cred, tgts) krb5_context context; krb5_ccache ccache; diff --git a/src/lib/krb5/krb/gc_via_tgt.c b/src/lib/krb5/krb/gc_via_tgt.c index de9dae52b..c0d31c25d 100644 --- a/src/lib/krb5/krb/gc_via_tgt.c +++ b/src/lib/krb5/krb/gc_via_tgt.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "int-proto.h" -krb5_error_code INTERFACE +krb5_error_code krb5_get_cred_via_tgt (context, tgt, kdcoptions, sumtype, in_cred, out_cred) krb5_context context; krb5_creds * tgt; diff --git a/src/lib/krb5/krb/gen_seqnum.c b/src/lib/krb5/krb/gen_seqnum.c index 4befc40af..ec6e032c6 100644 --- a/src/lib/krb5/krb/gen_seqnum.c +++ b/src/lib/krb5/krb/gen_seqnum.c @@ -32,7 +32,7 @@ #define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif -krb5_error_code INTERFACE +krb5_error_code krb5_generate_seq_number(context, key, seqno) krb5_context context; const krb5_keyblock *key; diff --git a/src/lib/krb5/krb/gen_subkey.c b/src/lib/krb5/krb/gen_subkey.c index a326f2f43..bd8ae4bb4 100644 --- a/src/lib/krb5/krb/gen_subkey.c +++ b/src/lib/krb5/krb/gen_subkey.c @@ -26,7 +26,7 @@ #include "k5-int.h" -krb5_error_code INTERFACE +krb5_error_code krb5_generate_subkey(context, key, subkey) krb5_context context; const krb5_keyblock *key; diff --git a/src/lib/krb5/krb/get_fcreds.c b/src/lib/krb5/krb/get_fcreds.c index e0a263049..7c080222c 100644 --- a/src/lib/krb5/krb/get_fcreds.c +++ b/src/lib/krb5/krb/get_fcreds.c @@ -39,7 +39,7 @@ #define flags2options(flags) (flags & KDC_TKT_COMMON_MASK) /* Get a TGT for use at the remote host */ -krb5_error_code INTERFACE +krb5_error_code krb5_get_for_creds(context, sumtype, rhost, client, enc_key, forwardable, outbuf) krb5_context context; diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index 42dcdb4b8..ed3408748 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -60,17 +60,17 @@ extern krb5_deltat krb5_clockskew; /* some typedef's for the function args to make things look a bit cleaner */ -typedef krb5_error_code (INTERFACE *git_key_proc) PROTOTYPE((krb5_context, +typedef krb5_error_code (*git_key_proc) PROTOTYPE((krb5_context, const krb5_keytype, krb5_data *, krb5_const_pointer, krb5_keyblock **)); -typedef krb5_error_code (INTERFACE *git_decrypt_proc) PROTOTYPE((krb5_context, +typedef krb5_error_code (*git_decrypt_proc) PROTOTYPE((krb5_context, const krb5_keyblock *, krb5_const_pointer, krb5_kdc_rep * )); -krb5_error_code INTERFACE +krb5_error_code krb5_get_in_tkt(context, options, addrs, etypes, ptypes, key_proc, keyseed, decrypt_proc, decryptarg, creds, ccache, ret_as_reply) krb5_context context; diff --git a/src/lib/krb5/krb/in_tkt_ktb.c b/src/lib/krb5/krb/in_tkt_ktb.c index 7b0858e44..29701cc23 100644 --- a/src/lib/krb5/krb/in_tkt_ktb.c +++ b/src/lib/krb5/krb/in_tkt_ktb.c @@ -37,14 +37,14 @@ struct keytab_keyproc_arg { * "keyseed" is actually a krb5_keytab, or NULL if we should fetch * from system area. */ -krb5_error_code INTERFACE keytab_keyproc +krb5_error_code keytab_keyproc PROTOTYPE((krb5_context, const krb5_keytype, krb5_data *, krb5_const_pointer, krb5_keyblock **)); -krb5_error_code INTERFACE +krb5_error_code keytab_keyproc(context, type, salt, keyseed, key) krb5_context context; const krb5_keytype type; @@ -107,7 +107,7 @@ keytab_keyproc(context, type, salt, keyseed, key) returns system errors, encryption errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_get_in_tkt_with_keytab(context, options, addrs, etypes, pre_auth_types, keytab, ccache, creds, ret_as_reply) krb5_context context; diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c index c28806362..2c899bf65 100644 --- a/src/lib/krb5/krb/in_tkt_pwd.c +++ b/src/lib/krb5/krb/in_tkt_pwd.c @@ -31,14 +31,14 @@ extern char *krb5_default_pwd_prompt1; /* * key-producing procedure for use by krb5_get_in_tkt_with_password. */ -krb5_error_code INTERFACE pwd_keyproc +krb5_error_code pwd_keyproc PROTOTYPE((krb5_context, const krb5_keytype, krb5_data *, krb5_const_pointer, krb5_keyblock **)); -krb5_error_code INTERFACE +krb5_error_code pwd_keyproc(context, type, salt, keyseed, key) krb5_context context; const krb5_keytype type; diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c index b8378e1d0..ab5d24ce7 100644 --- a/src/lib/krb5/krb/in_tkt_sky.c +++ b/src/lib/krb5/krb/in_tkt_sky.c @@ -37,14 +37,14 @@ struct skey_keyproc_arg { * "keyseed" is actually a krb5_keyblock *, or NULL if we should fetch * from system area. */ -krb5_error_code INTERFACE skey_keyproc +krb5_error_code skey_keyproc PROTOTYPE((krb5_context, const krb5_keytype, krb5_data *, krb5_const_pointer, krb5_keyblock **)); -krb5_error_code INTERFACE +krb5_error_code skey_keyproc(context, type, salt, keyseed, key) krb5_context context; const krb5_keytype type; @@ -94,7 +94,7 @@ skey_keyproc(context, type, salt, keyseed, key) returns system errors, encryption errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_get_in_tkt_with_skey(context, options, addrs, etypes, pre_auth_types, key, ccache, creds, ret_as_reply) krb5_context context; diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index d137c29b4..9daa66b85 100644 --- a/src/lib/krb5/krb/init_ctx.c +++ b/src/lib/krb5/krb/init_ctx.c @@ -55,7 +55,7 @@ cleanup: return retval; } -void INTERFACE +void krb5_free_context(ctx) krb5_context ctx; { @@ -71,7 +71,7 @@ krb5_free_context(ctx) /* * Set the desired default etypes, making sure they are valid. */ -krb5_error_code INTERFACE +krb5_error_code krb5_set_default_in_tkt_etypes(context, etypes) krb5_context context; const krb5_enctype *etypes; @@ -110,7 +110,7 @@ krb5_set_default_in_tkt_etypes(context, etypes) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_get_default_in_tkt_etypes(context, etypes) krb5_context context; krb5_enctype **etypes; diff --git a/src/lib/krb5/krb/int-proto.h b/src/lib/krb5/krb/int-proto.h index e8dafaf00..0a08e39cd 100644 --- a/src/lib/krb5/krb/int-proto.h +++ b/src/lib/krb5/krb/int-proto.h @@ -28,19 +28,19 @@ #ifndef KRB5_INT_FUNC_PROTO__ #define KRB5_INT_FUNC_PROTO__ -krb5_error_code INTERFACE krb5_tgtname +krb5_error_code krb5_tgtname PROTOTYPE((krb5_context context, const krb5_data *, const krb5_data *, krb5_principal *)); -krb5_error_code INTERFACE krb5_get_cred_via_tgt +krb5_error_code krb5_get_cred_via_tgt PROTOTYPE((krb5_context context, krb5_creds *, const krb5_flags, const krb5_cksumtype, krb5_creds *, krb5_creds **)); -krb5_error_code INTERFACE krb5_get_cred_via_2tgt +krb5_error_code krb5_get_cred_via_2tgt PROTOTYPE((krb5_context context, krb5_creds *, const krb5_flags, diff --git a/src/lib/krb5/krb/kdc_rep_dc.c b/src/lib/krb5/krb/kdc_rep_dc.c index c2cdf1228..881a5873d 100644 --- a/src/lib/krb5/krb/kdc_rep_dc.c +++ b/src/lib/krb5/krb/kdc_rep_dc.c @@ -33,7 +33,7 @@ */ /*ARGSUSED*/ -krb5_error_code INTERFACE +krb5_error_code krb5_kdc_rep_decrypt_proc(context, key, decryptarg, dec_rep) krb5_context context; const krb5_keyblock * key; diff --git a/src/lib/krb5/krb/mk_cred.c b/src/lib/krb5/krb/mk_cred.c index b43268056..12df2c88a 100644 --- a/src/lib/krb5/krb/mk_cred.c +++ b/src/lib/krb5/krb/mk_cred.c @@ -31,7 +31,7 @@ #include "k5-int.h" /* Create asn.1 encoded KRB-CRED message from the kdc reply. */ -krb5_error_code INTERFACE +krb5_error_code krb5_mk_cred(context, dec_rep, etype, key, sender_addr, recv_addr, outbuf) krb5_context context; krb5_kdc_rep *dec_rep; diff --git a/src/lib/krb5/krb/mk_error.c b/src/lib/krb5/krb/mk_error.c index 4f05e75dd..1e772e56a 100644 --- a/src/lib/krb5/krb/mk_error.c +++ b/src/lib/krb5/krb/mk_error.c @@ -34,7 +34,7 @@ returns system errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_mk_error(context, dec_err, enc_err) krb5_context context; const krb5_error *dec_err; diff --git a/src/lib/krb5/krb/mk_priv.c b/src/lib/krb5/krb/mk_priv.c index 37cf62f91..6a804915b 100644 --- a/src/lib/krb5/krb/mk_priv.c +++ b/src/lib/krb5/krb/mk_priv.c @@ -133,7 +133,7 @@ clean_scratch: } -krb5_error_code INTERFACE +krb5_error_code krb5_mk_priv(context, auth_context, userdata, outbuf, outdata) krb5_context context; krb5_auth_context * auth_context; diff --git a/src/lib/krb5/krb/mk_rep.c b/src/lib/krb5/krb/mk_rep.c index b25e67c9a..9d5e81e2e 100644 --- a/src/lib/krb5/krb/mk_rep.c +++ b/src/lib/krb5/krb/mk_rep.c @@ -36,7 +36,7 @@ returns system errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_mk_rep(context, auth_context, outbuf) krb5_context context; krb5_auth_context * auth_context; diff --git a/src/lib/krb5/krb/mk_req.c b/src/lib/krb5/krb/mk_req.c index 3d86741fc..a9884a48b 100644 --- a/src/lib/krb5/krb/mk_req.c +++ b/src/lib/krb5/krb/mk_req.c @@ -48,7 +48,7 @@ extern krb5_flags krb5_kdc_default_options; -krb5_error_code INTERFACE +krb5_error_code krb5_mk_req(context, auth_context, ap_req_options, service, hostname, in_data, ccache, outbuf) krb5_context context; diff --git a/src/lib/krb5/krb/mk_safe.c b/src/lib/krb5/krb/mk_safe.c index 528973d1c..36670edff 100644 --- a/src/lib/krb5/krb/mk_safe.c +++ b/src/lib/krb5/krb/mk_safe.c @@ -117,7 +117,7 @@ cleanup_scratch: return retval; } -krb5_error_code INTERFACE +krb5_error_code krb5_mk_safe(context, auth_context, userdata, outbuf, outdata) krb5_context context; krb5_auth_context * auth_context; diff --git a/src/lib/krb5/krb/pr_to_salt.c b/src/lib/krb5/krb/pr_to_salt.c index 2c614d946..b8e9a1b92 100644 --- a/src/lib/krb5/krb/pr_to_salt.c +++ b/src/lib/krb5/krb/pr_to_salt.c @@ -29,7 +29,7 @@ /* * Convert a krb5_principal into the default salt for that principal. */ -krb5_error_code INTERFACE +krb5_error_code krb5_principal2salt_internal(context, pr, ret, use_realm) krb5_context context; register krb5_const_principal pr; @@ -71,7 +71,7 @@ krb5_principal2salt_internal(context, pr, ret, use_realm) return 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_principal2salt(context, pr, ret) krb5_context context; register krb5_const_principal pr; @@ -80,7 +80,7 @@ krb5_principal2salt(context, pr, ret) return krb5_principal2salt_internal(context, pr, ret, 1); } -krb5_error_code INTERFACE +krb5_error_code krb5_principal2salt_norealm(context, pr, ret) krb5_context context; register krb5_const_principal pr; diff --git a/src/lib/krb5/krb/preauth.c b/src/lib/krb5/krb/preauth.c index 8beade6ef..00c17a9a2 100644 --- a/src/lib/krb5/krb/preauth.c +++ b/src/lib/krb5/krb/preauth.c @@ -76,7 +76,7 @@ static krb5_error_code find_preauthenticator * * Note: This is a first crack at what any preauthentication will need... */ -krb5_error_code INTERFACE +krb5_error_code krb5_obtain_padata(context, type, client, src_addr, encrypt_key, ret_data) krb5_context context; int type; /*IN: Preauth type */ @@ -182,7 +182,7 @@ error_out: * Note: This is a first crack at what any preauthentication will need... */ -krb5_error_code INTERFACE +krb5_error_code krb5_verify_padata(context, data,client,src_addr, decrypt_key, req_id, flags) krb5_context context; krb5_pa_data *data; /*IN: padata */ @@ -307,7 +307,7 @@ find_preauthenticator(type, preauth) */ int seeded = 0 ; /* Used by srand below */ -krb5_error_code INTERFACE +krb5_error_code get_unixtime_padata(context, client, src_addr, pa_data) krb5_context context; krb5_principal client; @@ -344,7 +344,7 @@ get_unixtime_padata(context, client, src_addr, pa_data) return(0); } -krb5_error_code INTERFACE +krb5_error_code verify_unixtime_padata(context, client, src_addr, data) krb5_context context; krb5_principal client; @@ -379,7 +379,7 @@ verify_unixtime_padata(context, client, src_addr, data) #include "sdcli.h" #include "sdconf.c" -krb5_error_code INTERFACE +krb5_error_code verify_securid_padata(client, src_addr, data) krb5_principal client; krb5_address **src_addr; @@ -427,7 +427,7 @@ verify_securid_padata(client, src_addr, data) } } #else -krb5_error_code INTERFACE +krb5_error_code verify_securid_padata(context, client, src_addr, data) krb5_context context; krb5_principal client; @@ -451,7 +451,7 @@ static char *krb5_SecureId_prompt = "\nEnter Your SecurId Access Code Prepended */ static char *krb5_SecureId_prompt = "\nEnter Your SecurId Access Code Prepended with Your PIN\n (or a \'#\'if Your PIN is entered on the card keypad): "; -krb5_error_code INTERFACE +krb5_error_code get_securid_padata(context, client,src_addr,pa_data) krb5_context context; krb5_principal client; diff --git a/src/lib/krb5/krb/princ_comp.c b/src/lib/krb5/krb/princ_comp.c index 0ada4a26b..35c5847c6 100644 --- a/src/lib/krb5/krb/princ_comp.c +++ b/src/lib/krb5/krb/princ_comp.c @@ -27,7 +27,7 @@ #include "k5-int.h" -krb5_boolean INTERFACE +krb5_boolean krb5_realm_compare(context, princ1, princ2) krb5_context context; krb5_const_principal princ1; @@ -43,7 +43,7 @@ krb5_realm_compare(context, princ1, princ2) return TRUE; } -krb5_boolean INTERFACE +krb5_boolean krb5_principal_compare(context, princ1, princ2) krb5_context context; krb5_const_principal princ1; diff --git a/src/lib/krb5/krb/rd_cred.c b/src/lib/krb5/krb/rd_cred.c index d8212e555..dfe774b51 100644 --- a/src/lib/krb5/krb/rd_cred.c +++ b/src/lib/krb5/krb/rd_cred.c @@ -33,7 +33,7 @@ extern krb5_deltat krb5_clockskew; #define in_clock_skew(date) (labs((date)-currenttime) < krb5_clockskew) /* Decode the KRB-CRED message, and return creds */ -krb5_error_code INTERFACE +krb5_error_code krb5_rd_cred(context, inbuf, key, creds, sender_addr, recv_addr) krb5_context context; const krb5_data *inbuf; diff --git a/src/lib/krb5/krb/rd_error.c b/src/lib/krb5/krb/rd_error.c index 0b2d147f4..bf0753927 100644 --- a/src/lib/krb5/krb/rd_error.c +++ b/src/lib/krb5/krb/rd_error.c @@ -36,7 +36,7 @@ * returns system errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_rd_error(context, enc_errbuf, dec_error) krb5_context context; const krb5_data *enc_errbuf; diff --git a/src/lib/krb5/krb/rd_priv.c b/src/lib/krb5/krb/rd_priv.c index 3aa6bd265..3c5a416ba 100644 --- a/src/lib/krb5/krb/rd_priv.c +++ b/src/lib/krb5/krb/rd_priv.c @@ -172,7 +172,7 @@ cleanup_privmsg:; return retval; } -krb5_error_code INTERFACE +krb5_error_code krb5_rd_priv(context, auth_context, inbuf, outbuf, outdata) krb5_context context; krb5_auth_context * auth_context; diff --git a/src/lib/krb5/krb/rd_req.c b/src/lib/krb5/krb/rd_req.c index cd498a1a4..a2dfb3c57 100644 --- a/src/lib/krb5/krb/rd_req.c +++ b/src/lib/krb5/krb/rd_req.c @@ -42,7 +42,7 @@ * returns system errors, encryption errors, replay errors */ -krb5_error_code INTERFACE +krb5_error_code krb5_rd_req(context, auth_context, inbuf, server, keytab, ap_req_options, ticket) krb5_context context; diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c index 85552960a..0cee98c2a 100644 --- a/src/lib/krb5/krb/rd_req_dec.c +++ b/src/lib/krb5/krb/rd_req_dec.c @@ -90,7 +90,7 @@ krb5_rd_req_decrypt_tkt_part(context, req, keytab) return retval; } -krb5_error_code INTERFACE +krb5_error_code krb5_rd_req_decoded(context, auth_context, req, server, keytab, ap_req_options, ticket) krb5_context context; diff --git a/src/lib/krb5/krb/rd_safe.c b/src/lib/krb5/krb/rd_safe.c index aa5dd3538..b7798c16d 100644 --- a/src/lib/krb5/krb/rd_safe.c +++ b/src/lib/krb5/krb/rd_safe.c @@ -161,7 +161,7 @@ cleanup: return retval; } -krb5_error_code INTERFACE +krb5_error_code krb5_rd_safe(context, auth_context, inbuf, outbuf, outdata) krb5_context context; krb5_auth_context * auth_context; diff --git a/src/lib/krb5/krb/recvauth.c b/src/lib/krb5/krb/recvauth.c index 02c9e42cf..b8e384a5d 100644 --- a/src/lib/krb5/krb/recvauth.c +++ b/src/lib/krb5/krb/recvauth.c @@ -36,7 +36,7 @@ extern krb5_flags krb5_kdc_default_options; static char *sendauth_version = "KRB5_SENDAUTH_V1.0"; -krb5_error_code INTERFACE +krb5_error_code krb5_recvauth(context, auth_context, /* IN */ fd, appl_version, server, rc_type, flags, keytab, diff --git a/src/lib/krb5/krb/send_tgs.c b/src/lib/krb5/krb/send_tgs.c index f093c488e..e1bd76971 100644 --- a/src/lib/krb5/krb/send_tgs.c +++ b/src/lib/krb5/krb/send_tgs.c @@ -163,7 +163,7 @@ cleanup_scratch: return retval; } -krb5_error_code INTERFACE +krb5_error_code krb5_send_tgs(context, kdcoptions, timestruct, etypes, sumtype, sname, addrs, authorization_data, padata, second_ticket, in_cred, rep) krb5_context context; diff --git a/src/lib/krb5/krb/sendauth.c b/src/lib/krb5/krb/sendauth.c index e71a74970..1e890e8d6 100644 --- a/src/lib/krb5/krb/sendauth.c +++ b/src/lib/krb5/krb/sendauth.c @@ -39,7 +39,7 @@ extern krb5_flags krb5_kdc_default_options; static char *sendauth_version = "KRB5_SENDAUTH_V1.0"; -krb5_error_code INTERFACE +krb5_error_code krb5_sendauth(context, auth_context, /* IN */ fd, appl_version, client, server, ap_req_options, in_data, diff --git a/src/lib/krb5/krb/srv_rcache.c b/src/lib/krb5/krb/srv_rcache.c index 56758706a..a2534318d 100644 --- a/src/lib/krb5/krb/srv_rcache.c +++ b/src/lib/krb5/krb/srv_rcache.c @@ -28,7 +28,7 @@ #include #include -krb5_error_code INTERFACE +krb5_error_code krb5_get_server_rcache(context, piece, rcptr) krb5_context context; const krb5_data *piece; diff --git a/src/lib/krb5/krb/tgtname.c b/src/lib/krb5/krb/tgtname.c index 98e17b4e0..5db4d986d 100644 --- a/src/lib/krb5/krb/tgtname.c +++ b/src/lib/krb5/krb/tgtname.c @@ -28,7 +28,7 @@ /* This is an internal-only function, used by krb5_get_cred_from_kdc() */ -krb5_error_code INTERFACE +krb5_error_code krb5_tgtname(context, server, client, tgtprinc) krb5_context context; const krb5_data *server, *client; diff --git a/src/lib/krb5/krb/unparse.c b/src/lib/krb5/krb/unparse.c index 64823c550..d047a8bb6 100644 --- a/src/lib/krb5/krb/unparse.c +++ b/src/lib/krb5/krb/unparse.c @@ -54,7 +54,7 @@ #define REALM_SEP '@' #define COMPONENT_SEP '/' -krb5_error_code INTERFACE +krb5_error_code krb5_unparse_name_ext(context, principal, name, size) krb5_context context; krb5_const_principal principal; diff --git a/src/lib/krb5/krb/walk_rtree.c b/src/lib/krb5/krb/walk_rtree.c index e08373804..3e3945b00 100644 --- a/src/lib/krb5/krb/walk_rtree.c +++ b/src/lib/krb5/krb/walk_rtree.c @@ -34,7 +34,7 @@ #define max(x,y) ((x) > (y) ? (x) : (y)) #endif -krb5_error_code INTERFACE +krb5_error_code krb5_walk_realm_tree(context, client, server, tree, realm_branch_char) krb5_context context; const krb5_data *client, *server; diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index 75cb1dcb2..f647257c0 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,8 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + * read_pwd.c: __STDC__ conditional also checks the _WINDOWS define. + Fri Apr 7 15:32:04 1995 Keith Vetter (keithv@fusion.com) * ccdefname.c: diff --git a/src/lib/krb5/os/an_to_ln.c b/src/lib/krb5/os/an_to_ln.c index 01e3d415c..cb11cfdd1 100644 --- a/src/lib/krb5/os/an_to_ln.c +++ b/src/lib/krb5/os/an_to_ln.c @@ -173,7 +173,7 @@ username_an_to_ln(context, aname, lnsize, lname) #ifdef _MSDOS -krb5_error_code INTERFACE +krb5_error_code krb5_aname_to_localname(context, aname, lnsize, lname) krb5_context context; krb5_const_principal aname; diff --git a/src/lib/krb5/os/ccdefname.c b/src/lib/krb5/os/ccdefname.c index dd20f171b..fa794ca6a 100644 --- a/src/lib/krb5/os/ccdefname.c +++ b/src/lib/krb5/os/ccdefname.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include -char * INTERFACE +char * krb5_cc_default_name(context) krb5_context context; { diff --git a/src/lib/krb5/os/free_hstrl.c b/src/lib/krb5/os/free_hstrl.c index 8314d44f6..f112041e4 100644 --- a/src/lib/krb5/os/free_hstrl.c +++ b/src/lib/krb5/os/free_hstrl.c @@ -31,7 +31,7 @@ Frees the storage taken by a realm list returned by krb5_get_local_realm. */ -krb5_error_code INTERFACE +krb5_error_code krb5_free_host_realm(context, realmlist) krb5_context context; char * const *realmlist; diff --git a/src/lib/krb5/os/free_krbhs.c b/src/lib/krb5/os/free_krbhs.c index 8b50a74c7..066acfcbf 100644 --- a/src/lib/krb5/os/free_krbhs.c +++ b/src/lib/krb5/os/free_krbhs.c @@ -30,7 +30,7 @@ Frees the storage taken by a host list returned by krb5_get_krbhst. */ -krb5_error_code INTERFACE +krb5_error_code krb5_free_krbhst(context, hostlist) krb5_context context; char * const *hostlist; diff --git a/src/lib/krb5/os/full_ipadr.c b/src/lib/krb5/os/full_ipadr.c index 775106431..41e6f1c1b 100644 --- a/src/lib/krb5/os/full_ipadr.c +++ b/src/lib/krb5/os/full_ipadr.c @@ -31,7 +31,7 @@ #include "os-proto.h" -krb5_error_code INTERFACE +krb5_error_code krb5_make_full_ipaddr(context, adr, port, outaddr) krb5_context context; krb5_int32 adr; diff --git a/src/lib/krb5/os/gen_port.c b/src/lib/krb5/os/gen_port.c index 3789759aa..a5eb91bca 100644 --- a/src/lib/krb5/os/gen_port.c +++ b/src/lib/krb5/os/gen_port.c @@ -27,7 +27,7 @@ #include "k5-int.h" #include "os-proto.h" -krb5_error_code INTERFACE +krb5_error_code krb5_gen_portaddr(context, addr, ptr, outaddr) krb5_context context; const krb5_address *addr; diff --git a/src/lib/krb5/os/gen_rname.c b/src/lib/krb5/os/gen_rname.c index d4b933de1..50c17242c 100644 --- a/src/lib/krb5/os/gen_rname.c +++ b/src/lib/krb5/os/gen_rname.c @@ -29,7 +29,7 @@ #include "k5-int.h" #include "os-proto.h" -krb5_error_code INTERFACE +krb5_error_code krb5_gen_replay_name(context, address, uniq, string) krb5_context context; const krb5_address *address; diff --git a/src/lib/krb5/os/get_krbhst.c b/src/lib/krb5/os/get_krbhst.c index d41b80a37..093af1163 100644 --- a/src/lib/krb5/os/get_krbhst.c +++ b/src/lib/krb5/os/get_krbhst.c @@ -57,7 +57,7 @@ extern char *krb5_config_file; /* extern so can be set at load/runtime */ -krb5_error_code INTERFACE +krb5_error_code krb5_get_krbhst(context, realm, hostlist) krb5_context context; const krb5_data *realm; diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c index 89156ee4b..950e2d04b 100644 --- a/src/lib/krb5/os/hst_realm.c +++ b/src/lib/krb5/os/hst_realm.c @@ -131,7 +131,7 @@ read_2str (FILE *fp, char *b1, int l1, char *b2, int l2) { #endif /* _WINDOWS */ -krb5_error_code INTERFACE +krb5_error_code krb5_get_host_realm(context, host, realmsp) krb5_context context; const char *host; diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c index 3f9599aad..4c92c6775 100644 --- a/src/lib/krb5/os/init_os_ctx.c +++ b/src/lib/krb5/os/init_os_ctx.c @@ -25,7 +25,7 @@ #include "k5-int.h" -krb5_error_code INTERFACE +krb5_error_code krb5_os_init_context(ctx) krb5_context ctx; { @@ -45,7 +45,7 @@ krb5_os_init_context(ctx) return 0; } -void INTERFACE +void krb5_os_free_context(ctx) krb5_context ctx; { diff --git a/src/lib/krb5/os/krbfileio.c b/src/lib/krb5/os/krbfileio.c index 43d12478b..5cc953801 100644 --- a/src/lib/krb5/os/krbfileio.c +++ b/src/lib/krb5/os/krbfileio.c @@ -51,7 +51,7 @@ static char *VersionID = "@(#)krbfileio.c 2 - 08/22/91"; # define OPEN_MODE_NOT_TRUSTWORTHY #endif -krb5_error_code INTERFACE +krb5_error_code krb5_create_secure_file(context, pathname) krb5_context context; const char * pathname; @@ -90,7 +90,7 @@ krb5_create_secure_file(context, pathname) } } -krb5_error_code INTERFACE +krb5_error_code krb5_sync_disk_file(context, fp) krb5_context context; FILE *fp; diff --git a/src/lib/krb5/os/ktdefname.c b/src/lib/krb5/os/ktdefname.c index 3e9e13d5f..d6321eb46 100644 --- a/src/lib/krb5/os/ktdefname.c +++ b/src/lib/krb5/os/ktdefname.c @@ -28,7 +28,7 @@ extern char *krb5_defkeyname; -krb5_error_code INTERFACE +krb5_error_code krb5_kt_default_name(context, name, namesize) krb5_context context; char *name; diff --git a/src/lib/krb5/os/kuserok.c b/src/lib/krb5/os/kuserok.c index 5a25e53a0..29573df15 100644 --- a/src/lib/krb5/os/kuserok.c +++ b/src/lib/krb5/os/kuserok.c @@ -143,7 +143,7 @@ krb5_kuserok(context, principal, luser) * If the given Kerberos name "server" translates to the same name as "luser" * (using * krb5_aname_to_lname()), returns TRUE. */ -krb5_boolean INTERFACE +krb5_boolean krb5_kuserok(context, principal, luser) krb5_context context; krb5_principal principal; diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c index 61abc2cef..cc498705c 100644 --- a/src/lib/krb5/os/locate_kdc.c +++ b/src/lib/krb5/os/locate_kdc.c @@ -37,7 +37,7 @@ extern char *krb5_kdc_sec_udp_portname; * returns count of number of addresses found */ -krb5_error_code INTERFACE +krb5_error_code krb5_locate_kdc(context, realm, addr_pp, naddrs) krb5_context context; const krb5_data *realm; diff --git a/src/lib/krb5/os/lock_file.c b/src/lib/krb5/os/lock_file.c index a449da250..dfdd729ed 100644 --- a/src/lib/krb5/os/lock_file.c +++ b/src/lib/krb5/os/lock_file.c @@ -108,7 +108,7 @@ krb5_lock_file(context, filep, pathname, mode) } #else /* MSDOS or Macintosh */ -krb5_error_code INTERFACE +krb5_error_code krb5_lock_file(context, filep, pathname, mode) krb5_context context; FILE *filep; diff --git a/src/lib/krb5/os/net_read.c b/src/lib/krb5/os/net_read.c index 9b28896d9..8cd5d15ef 100644 --- a/src/lib/krb5/os/net_read.c +++ b/src/lib/krb5/os/net_read.c @@ -35,7 +35,7 @@ * XXX must not use non-blocking I/O */ -int INTERFACE +int krb5_net_read(context, fd, buf, len) krb5_context context; int fd; diff --git a/src/lib/krb5/os/net_write.c b/src/lib/krb5/os/net_write.c index 4885a8172..f623d99df 100644 --- a/src/lib/krb5/os/net_write.c +++ b/src/lib/krb5/os/net_write.c @@ -34,7 +34,7 @@ * XXX must not use non-blocking I/O */ -int INTERFACE +int krb5_net_write(context, fd, buf, len) krb5_context context; int fd; diff --git a/src/lib/krb5/os/os-proto.h b/src/lib/krb5/os/os-proto.h index e5f982673..f23bb6646 100644 --- a/src/lib/krb5/os/os-proto.h +++ b/src/lib/krb5/os/os-proto.h @@ -28,7 +28,7 @@ #define KRB5_LIBOS_INT_PROTO__ #ifdef SOCK_DGRAM /* XXX hack... */ -krb5_error_code INTERFACE krb5_locate_kdc +krb5_error_code krb5_locate_kdc PROTOTYPE((krb5_context, const krb5_data *, struct sockaddr **, @@ -36,20 +36,20 @@ krb5_error_code INTERFACE krb5_locate_kdc #endif #ifdef KRB5_USE_INET -krb5_error_code INTERFACE krb5_unpack_full_ipaddr +krb5_error_code krb5_unpack_full_ipaddr PROTOTYPE((krb5_context, const krb5_address *, krb5_int32 *, krb5_int16 *)); #ifdef NARROW_PROTOTYPES -krb5_error_code INTERFACE krb5_make_full_ipaddr +krb5_error_code krb5_make_full_ipaddr PROTOTYPE((krb5_context, krb5_int32, krb5_int16, krb5_address **)); #else -krb5_error_code INTERFACE krb5_make_full_ipaddr +krb5_error_code krb5_make_full_ipaddr PROTOTYPE((krb5_context, krb5_int32, int, /* unsigned short promotes to signed diff --git a/src/lib/krb5/os/port2ip.c b/src/lib/krb5/os/port2ip.c index 7491727a5..531e61a47 100644 --- a/src/lib/krb5/os/port2ip.c +++ b/src/lib/krb5/os/port2ip.c @@ -30,7 +30,7 @@ #ifdef KRB5_USE_INET #include "os-proto.h" -krb5_error_code INTERFACE +krb5_error_code krb5_unpack_full_ipaddr(context, inaddr, adr, port) krb5_context context; const krb5_address *inaddr; diff --git a/src/lib/krb5/os/read_msg.c b/src/lib/krb5/os/read_msg.c index bd9cb6ea6..a5dc7964c 100644 --- a/src/lib/krb5/os/read_msg.c +++ b/src/lib/krb5/os/read_msg.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include -krb5_error_code INTERFACE +krb5_error_code krb5_read_message(context, fdp, inbuf) krb5_context context; krb5_pointer fdp; diff --git a/src/lib/krb5/os/read_pwd.c b/src/lib/krb5/os/read_pwd.c index 0c05359d3..0944e47fe 100644 --- a/src/lib/krb5/os/read_pwd.c +++ b/src/lib/krb5/os/read_pwd.c @@ -81,7 +81,7 @@ krb5_read_password(context, prompt, prompt2, return_pwd, size_return) int *size_return; { /* adapted from Kerberos v4 des/read_password.c */ -#if defined(__STDC__) || defined(mips) +#if defined(__STDC__) || defined(mips) || defined(_WINDOWS) /* readin_string is used after a longjmp, so must be volatile */ volatile #endif @@ -254,7 +254,7 @@ krb5_read_password(context, prompt, prompt2, return_pwd, size_return) /* Don't expect to be called, just define it for sanity and the linker. */ -krb5_error_code INTERFACE +krb5_error_code krb5_read_password(context, prompt, prompt2, return_pwd, size_return) krb5_context context; char *prompt; diff --git a/src/lib/krb5/os/realm_dom.c b/src/lib/krb5/os/realm_dom.c index 5b4c071a9..fcb0b5594 100644 --- a/src/lib/krb5/os/realm_dom.c +++ b/src/lib/krb5/os/realm_dom.c @@ -101,7 +101,7 @@ read_2str (FILE *fp, char *b1, int l1, char *b2, int l2) { #endif /* _WINDOWS */ -krb5_error_code INTERFACE +krb5_error_code krb5_get_realm_domain(context, realm, domain) krb5_context context; const char *realm; diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c index f4fffee9b..c64320c41 100644 --- a/src/lib/krb5/os/sendto_kdc.c +++ b/src/lib/krb5/os/sendto_kdc.c @@ -56,7 +56,7 @@ extern int krb5_max_skdc_timeout; extern int krb5_skdc_timeout_shift; extern int krb5_skdc_timeout_1; -krb5_error_code INTERFACE +krb5_error_code krb5_sendto_kdc (context, message, realm, reply) krb5_context context; const krb5_data * message; diff --git a/src/lib/krb5/os/unlck_file.c b/src/lib/krb5/os/unlck_file.c index 3e0b3b32b..900073e09 100644 --- a/src/lib/krb5/os/unlck_file.c +++ b/src/lib/krb5/os/unlck_file.c @@ -27,7 +27,7 @@ #include #include "k5-int.h" -krb5_error_code INTERFACE +krb5_error_code krb5_unlock_file(context, filep, pathname) krb5_context context; FILE *filep; diff --git a/src/lib/krb5/os/write_msg.c b/src/lib/krb5/os/write_msg.c index 85845c1da..ec1ff01c4 100644 --- a/src/lib/krb5/os/write_msg.c +++ b/src/lib/krb5/os/write_msg.c @@ -28,7 +28,7 @@ #include "k5-int.h" #include -krb5_error_code INTERFACE +krb5_error_code krb5_write_message(context, fdp, outbuf) krb5_context context; krb5_pointer fdp; diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog index c310a5e4a..7734a5d02 100644 --- a/src/lib/krb5/posix/ChangeLog +++ b/src/lib/krb5/posix/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 16:44:55 1995 Keith Vetter (keithv@fusion.com) + + * syslog.c: __STDC__ conditional also checks the _WINDOWS define. + Tue Mar 28 18:46:55 1995 John Gilmore (gnu at toad.com) * configure.in (AC_REPLACE_FUNCS): Add getuid to the list. diff --git a/src/lib/krb5/posix/syslog.c b/src/lib/krb5/posix/syslog.c index 4e5510f1f..c605e88bc 100644 --- a/src/lib/krb5/posix/syslog.c +++ b/src/lib/krb5/posix/syslog.c @@ -33,8 +33,9 @@ * Modified to use UNIX domain IPC by Ralph Campbell */ -#ifndef _MSDOS -#ifdef __STDC__ +#ifndef _WINDOWS + +#if defined(__STDC__) || defined(_WINDOWS) #include #else #define const @@ -62,7 +63,7 @@ static int LogFacility = LOG_USER; /* default facility code */ void -#ifdef __STDC__ +#if defined(__STDC__) || defined(_WINDOWS) syslog(int pri, const char *fmt, ...) #else syslog(pri, fmt, va_alist) @@ -73,7 +74,7 @@ syslog(pri, fmt, va_alist) { va_list pvar; void vsyslog(); -#ifdef __STDC__ +#if defined(__STDC__) || defined(_WINDOWS) va_start(pvar, fmt); #else va_start(pvar); diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog index 01150216d..b55c33e99 100644 --- a/src/lib/krb5/rcache/ChangeLog +++ b/src/lib/krb5/rcache/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) + + * *.[ch]: removed unneeded INTERFACE from non-api functions. + Fri Mar 31 16:44:34 1995 Theodore Y. Ts'o (tytso@dcl) * rc_dfl.c (krb5_rc_dfl_expunage): Close the old, temporary reply diff --git a/src/lib/krb5/rcache/rc_base.c b/src/lib/krb5/rcache/rc_base.c index f7f9e44de..1e53094c7 100644 --- a/src/lib/krb5/rcache/rc_base.c +++ b/src/lib/krb5/rcache/rc_base.c @@ -30,7 +30,7 @@ static struct krb5_rc_typelist *typehead = &krb5_rc_typelist_dfl; semaphore ex_typelist = 1; #endif -krb5_error_code INTERFACE krb5_rc_register_type(context, ops) +krb5_error_code krb5_rc_register_type(context, ops) krb5_context context; krb5_rc_ops *ops; { @@ -59,7 +59,7 @@ krb5_error_code INTERFACE krb5_rc_register_type(context, ops) return 0; } -krb5_error_code INTERFACE krb5_rc_resolve_type(context, id, type) +krb5_error_code krb5_rc_resolve_type(context, id, type) krb5_context context; krb5_rcache *id; char *type; @@ -80,14 +80,14 @@ krb5_error_code INTERFACE krb5_rc_resolve_type(context, id, type) return 0; } -char * INTERFACE krb5_rc_get_type(context, id) +char * krb5_rc_get_type(context, id) krb5_context context; krb5_rcache id; { return id->ops->type; } -char * INTERFACE krb5_rc_default_type(context) +char * krb5_rc_default_type(context) krb5_context context; { char *s; @@ -97,7 +97,7 @@ char * INTERFACE krb5_rc_default_type(context) return "dfl"; } -char * INTERFACE krb5_rc_default_name(context) +char * krb5_rc_default_name(context) krb5_context context; { char *s; @@ -107,7 +107,7 @@ char * INTERFACE krb5_rc_default_name(context) return (char *) 0; } -krb5_error_code INTERFACE +krb5_error_code krb5_rc_default(context, id) krb5_context context; krb5_rcache *id; @@ -129,7 +129,7 @@ krb5_rc_default(context, id) } -krb5_error_code INTERFACE krb5_rc_resolve_full(context, id, string_name) +krb5_error_code krb5_rc_resolve_full(context, id, string_name) krb5_context context; krb5_rcache *id; char *string_name; diff --git a/src/lib/krb5/rcache/rc_conv.c b/src/lib/krb5/rcache/rc_conv.c index 2ba4fca9c..92cf77f8d 100644 --- a/src/lib/krb5/rcache/rc_conv.c +++ b/src/lib/krb5/rcache/rc_conv.c @@ -21,7 +21,7 @@ Local stuff: given auth, take important information and make rep; return -1 if failed */ -krb5_error_code INTERFACE +krb5_error_code krb5_auth_to_rep(context, auth, rep) krb5_context context; krb5_tkt_authent *auth; diff --git a/src/lib/krb5/rcache/rc_dfl.c b/src/lib/krb5/rcache/rc_dfl.c index aecbb37e9..120eaa515 100644 --- a/src/lib/krb5/rcache/rc_dfl.c +++ b/src/lib/krb5/rcache/rc_dfl.c @@ -165,14 +165,14 @@ static int store(context, id, rep) return CMP_HOHUM; } -char * INTERFACE krb5_rc_dfl_get_name(context, id) +char * krb5_rc_dfl_get_name(context, id) krb5_context context; krb5_rcache id; { return ((struct dfl_data *) (id->data))->name; } -krb5_error_code INTERFACE krb5_rc_dfl_get_span(context, id, lifespan) +krb5_error_code krb5_rc_dfl_get_span(context, id, lifespan) krb5_context context; krb5_rcache id; krb5_deltat *lifespan; @@ -181,7 +181,7 @@ krb5_error_code INTERFACE krb5_rc_dfl_get_span(context, id, lifespan) return 0; } -krb5_error_code INTERFACE krb5_rc_dfl_init(context, id, lifespan) +krb5_error_code krb5_rc_dfl_init(context, id, lifespan) krb5_context context; krb5_rcache id; krb5_deltat lifespan; @@ -200,7 +200,7 @@ krb5_deltat lifespan; return 0; } -krb5_error_code INTERFACE krb5_rc_dfl_close_no_free(context, id) +krb5_error_code krb5_rc_dfl_close_no_free(context, id) krb5_context context; krb5_rcache id; { @@ -225,7 +225,7 @@ krb5_error_code INTERFACE krb5_rc_dfl_close_no_free(context, id) return 0; } -krb5_error_code INTERFACE krb5_rc_dfl_close(context, id) +krb5_error_code krb5_rc_dfl_close(context, id) krb5_context context; krb5_rcache id; { @@ -234,7 +234,7 @@ krb5_error_code INTERFACE krb5_rc_dfl_close(context, id) return 0; } -krb5_error_code INTERFACE krb5_rc_dfl_destroy(context, id) +krb5_error_code krb5_rc_dfl_destroy(context, id) krb5_context context; krb5_rcache id; { @@ -245,7 +245,7 @@ krb5_rcache id; return krb5_rc_dfl_close(context, id); } -krb5_error_code INTERFACE krb5_rc_dfl_resolve(context, id, name) +krb5_error_code krb5_rc_dfl_resolve(context, id, name) krb5_context context; krb5_rcache id; char *name; @@ -292,7 +292,7 @@ cleanup: return retval; } -void INTERFACE krb5_rc_free_entry (context, rep) +void krb5_rc_free_entry (context, rep) krb5_context context; krb5_donot_replay **rep; { @@ -377,7 +377,7 @@ errout: -krb5_error_code INTERFACE krb5_rc_dfl_recover(context, id) +krb5_error_code krb5_rc_dfl_recover(context, id) krb5_context context; krb5_rcache id; { @@ -486,7 +486,7 @@ krb5_rc_io_store (context, t, rep) return ret; } -krb5_error_code INTERFACE krb5_rc_dfl_store(context, id, rep) +krb5_error_code krb5_rc_dfl_store(context, id, rep) krb5_context context; krb5_rcache id; krb5_donot_replay *rep; @@ -522,7 +522,7 @@ krb5_donot_replay *rep; return 0; } -krb5_error_code INTERFACE krb5_rc_dfl_expunge(context, id) +krb5_error_code krb5_rc_dfl_expunge(context, id) krb5_context context; krb5_rcache id; { diff --git a/src/lib/krb5/rcache/rc_dfl.h b/src/lib/krb5/rcache/rc_dfl.h index 0245ed06b..6529b6d41 100644 --- a/src/lib/krb5/rcache/rc_dfl.h +++ b/src/lib/krb5/rcache/rc_dfl.h @@ -15,41 +15,41 @@ extern krb5_rc_ops krb5_rc_dfl_ops; /* initialized to the following */ -krb5_error_code INTERFACE krb5_rc_dfl_init +krb5_error_code krb5_rc_dfl_init PROTOTYPE((krb5_context, krb5_rcache, krb5_deltat)); -krb5_error_code INTERFACE krb5_rc_dfl_recover +krb5_error_code krb5_rc_dfl_recover PROTOTYPE((krb5_context, krb5_rcache)); -krb5_error_code INTERFACE krb5_rc_dfl_destroy +krb5_error_code krb5_rc_dfl_destroy PROTOTYPE((krb5_context, krb5_rcache)); -krb5_error_code INTERFACE krb5_rc_dfl_close +krb5_error_code krb5_rc_dfl_close PROTOTYPE((krb5_context, krb5_rcache)); -krb5_error_code INTERFACE krb5_rc_dfl_store +krb5_error_code krb5_rc_dfl_store PROTOTYPE((krb5_context, krb5_rcache, krb5_donot_replay *)); -krb5_error_code INTERFACE krb5_rc_dfl_expunge +krb5_error_code krb5_rc_dfl_expunge PROTOTYPE((krb5_context, krb5_rcache)); -krb5_error_code INTERFACE krb5_rc_dfl_get_span +krb5_error_code krb5_rc_dfl_get_span PROTOTYPE((krb5_context, krb5_rcache, krb5_deltat *)); -char * INTERFACE krb5_rc_dfl_get_name +char * krb5_rc_dfl_get_name PROTOTYPE((krb5_context, krb5_rcache)); -krb5_error_code INTERFACE krb5_rc_dfl_resolve +krb5_error_code krb5_rc_dfl_resolve PROTOTYPE((krb5_context, krb5_rcache, char *)); -krb5_error_code INTERFACE krb5_rc_dfl_close_no_free +krb5_error_code krb5_rc_dfl_close_no_free PROTOTYPE((krb5_context, krb5_rcache)); -void INTERFACE krb5_rc_free_entry +void krb5_rc_free_entry PROTOTYPE((krb5_context, krb5_donot_replay **)); #endif diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c index 8d61d5724..3bbd6004c 100644 --- a/src/lib/krb5/rcache/rc_io.c +++ b/src/lib/krb5/rcache/rc_io.c @@ -65,7 +65,7 @@ static void getdir() } } -krb5_error_code INTERFACE krb5_rc_io_creat (context, d, fn) +krb5_error_code krb5_rc_io_creat (context, d, fn) krb5_context context; krb5_rc_iostuff *d; char **fn; @@ -149,7 +149,7 @@ krb5_error_code INTERFACE krb5_rc_io_creat (context, d, fn) return 0; } -krb5_error_code INTERFACE krb5_rc_io_open (context, d, fn) +krb5_error_code krb5_rc_io_open (context, d, fn) krb5_context context; krb5_rc_iostuff *d; char *fn; @@ -227,7 +227,7 @@ krb5_error_code INTERFACE krb5_rc_io_open (context, d, fn) return 0; } -krb5_error_code INTERFACE krb5_rc_io_move (context, new, old) +krb5_error_code krb5_rc_io_move (context, new, old) krb5_context context; krb5_rc_iostuff *new; krb5_rc_iostuff *old; @@ -243,7 +243,7 @@ krb5_error_code INTERFACE krb5_rc_io_move (context, new, old) return 0; } -krb5_error_code INTERFACE krb5_rc_io_write (context, d, buf, num) +krb5_error_code krb5_rc_io_write (context, d, buf, num) krb5_context context; krb5_rc_iostuff *d; krb5_pointer buf; @@ -264,7 +264,7 @@ krb5_error_code INTERFACE krb5_rc_io_write (context, d, buf, num) return 0; } -krb5_error_code INTERFACE krb5_rc_io_sync (context, d) +krb5_error_code krb5_rc_io_sync (context, d) krb5_context context; krb5_rc_iostuff *d; { @@ -281,7 +281,7 @@ krb5_error_code INTERFACE krb5_rc_io_sync (context, d) return 0; } -krb5_error_code INTERFACE krb5_rc_io_read (context, d, buf, num) +krb5_error_code krb5_rc_io_read (context, d, buf, num) krb5_context context; krb5_rc_iostuff *d; krb5_pointer buf; @@ -300,7 +300,7 @@ krb5_error_code INTERFACE krb5_rc_io_read (context, d, buf, num) return 0; } -krb5_error_code INTERFACE krb5_rc_io_close (context, d) +krb5_error_code krb5_rc_io_close (context, d) krb5_context context; krb5_rc_iostuff *d; { @@ -311,7 +311,7 @@ krb5_error_code INTERFACE krb5_rc_io_close (context, d) return 0; } -krb5_error_code INTERFACE krb5_rc_io_destroy (context, d) +krb5_error_code krb5_rc_io_destroy (context, d) krb5_context context; krb5_rc_iostuff *d; { @@ -328,7 +328,7 @@ krb5_error_code INTERFACE krb5_rc_io_destroy (context, d) return 0; } -krb5_error_code INTERFACE krb5_rc_io_mark (context, d) +krb5_error_code krb5_rc_io_mark (context, d) krb5_context context; krb5_rc_iostuff *d; { @@ -336,7 +336,7 @@ krb5_error_code INTERFACE krb5_rc_io_mark (context, d) return 0; } -krb5_error_code INTERFACE krb5_rc_io_unmark (context, d) +krb5_error_code krb5_rc_io_unmark (context, d) krb5_context context; krb5_rc_iostuff *d; { @@ -344,7 +344,7 @@ krb5_error_code INTERFACE krb5_rc_io_unmark (context, d) return 0; } -long INTERFACE +long krb5_rc_io_size (context, d) krb5_context context; krb5_rc_iostuff *d; diff --git a/src/lib/krb5/rcache/rc_io.h b/src/lib/krb5/rcache/rc_io.h index 74df1a0ae..aa909614c 100644 --- a/src/lib/krb5/rcache/rc_io.h +++ b/src/lib/krb5/rcache/rc_io.h @@ -27,44 +27,44 @@ krb5_rc_iostuff; /* first argument is always iostuff for result file */ -krb5_error_code INTERFACE krb5_rc_io_creat +krb5_error_code krb5_rc_io_creat PROTOTYPE((krb5_context, krb5_rc_iostuff *, char **)); -krb5_error_code INTERFACE krb5_rc_io_open +krb5_error_code krb5_rc_io_open PROTOTYPE((krb5_context, krb5_rc_iostuff *, char *)); -krb5_error_code INTERFACE krb5_rc_io_move +krb5_error_code krb5_rc_io_move PROTOTYPE((krb5_context, krb5_rc_iostuff *, krb5_rc_iostuff *)); -krb5_error_code INTERFACE krb5_rc_io_write +krb5_error_code krb5_rc_io_write PROTOTYPE((krb5_context, krb5_rc_iostuff *, krb5_pointer, int)); -krb5_error_code INTERFACE krb5_rc_io_read +krb5_error_code krb5_rc_io_read PROTOTYPE((krb5_context, krb5_rc_iostuff *, krb5_pointer, int)); -krb5_error_code INTERFACE krb5_rc_io_close +krb5_error_code krb5_rc_io_close PROTOTYPE((krb5_context, krb5_rc_iostuff *)); -krb5_error_code INTERFACE krb5_rc_io_destroy +krb5_error_code krb5_rc_io_destroy PROTOTYPE((krb5_context, krb5_rc_iostuff *)); -krb5_error_code INTERFACE krb5_rc_io_mark +krb5_error_code krb5_rc_io_mark PROTOTYPE((krb5_context, krb5_rc_iostuff *)); -krb5_error_code INTERFACE krb5_rc_io_unmark +krb5_error_code krb5_rc_io_unmark PROTOTYPE((krb5_context, krb5_rc_iostuff *)); -krb5_error_code INTERFACE krb5_rc_io_sync +krb5_error_code krb5_rc_io_sync PROTOTYPE((krb5_context, krb5_rc_iostuff *)); -long INTERFACE krb5_rc_io_size +long krb5_rc_io_size PROTOTYPE((krb5_context, krb5_rc_iostuff *)); #endif diff --git a/src/lib/libkrb5.def b/src/lib/libkrb5.def index 7f668c618..79ac64df6 100644 --- a/src/lib/libkrb5.def +++ b/src/lib/libkrb5.def @@ -1,17 +1,38 @@ -;----------------------------- -; LIBKRB5.DEF - module definition file -;----------------------------- +;---------------------------------------------------- +; LIBKRB5.DEF - LIBKRB5.DLL module definition file +;---------------------------------------------------- -LIBRARY LIBKRB5 -DESCRIPTION 'DLL for Kerberos 5' -EXETYPE WINDOWS -CODE PRELOAD MOVEABLE DISCARDABLE -DATA PRELOAD MOVEABLE SINGLE -HEAPSIZE 8192 +LIBRARY LIBKRB5 +DESCRIPTION 'DLL for Kerberos 5' +EXETYPE WINDOWS +CODE PRELOAD MOVEABLE DISCARDABLE +DATA PRELOAD MOVEABLE SINGLE +HEAPSIZE 8192 EXPORTS - WEP @1 RESIDENTNAME - LIBMAIN @2 + WEP @1001 RESIDENTNAME + LIBMAIN @1002 + GSS_ACQUIRE_CRED @1 + GSS_RELEASE_CRED @2 + GSS_INIT_SEC_CONTEXT @3 + GSS_ACCEPT_SEC_CONTEXT @4 + GSS_PROCESS_CONTEXT_TOKEN @5 + GSS_DELETE_SEC_CONTEXT @6 + GSS_CONTEXT_TIME @7 + GSS_SIGN @8 + GSS_VERIFY @9 + GSS_SEAL @10 + GSS_UNSEAL @11 + GSS_DISPLAY_STATUS @12 + GSS_INDICATE_MECHS @13 + GSS_COMPARE_NAME @14 + GSS_DISPLAY_NAME @15 + GSS_IMPORT_NAME @16 + GSS_RELEASE_NAME @17 + GSS_RELEASE_BUFFER @18 + GSS_RELEASE_OID_SET @19 + GSS_INQUIRE_CRED @20 +; Kerberos 5 _krb5_build_principal_ext KRB5_CC_DEFAULT KRB5_FREE_ADDRESSES @@ -36,26 +57,3 @@ EXPORTS ;Com_err routines _com_err ERROR_MESSAGE -;GSSAPI - GSS_ACCEPT_SEC_CONTEXT - GSS_ACQUIRE_CRED - GSS_COMPARE_NAME - GSS_CONTEXT_TIME - GSS_DELETE_SEC_CONTEXT - GSS_DISPLAY_NAME - GSS_DISPLAY_STATUS - GSS_IMPORT_NAME - GSS_INDICATE_MECHS - GSS_INIT_SEC_CONTEXT - GSS_INQUIRE_CONTEXT - GSS_INQUIRE_CRED - GSS_PROCESS_CONTEXT_TOKEN - GSS_RELEASE_BUFFER - GSS_RELEASE_CRED - GSS_RELEASE_NAME - GSS_RELEASE_OID_SET - GSS_SEAL - GSS_SIGN - GSS_UNSEAL - GSS_VERIFY - diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog index ea43dcd24..666514f92 100644 --- a/src/util/et/ChangeLog +++ b/src/util/et/ChangeLog @@ -1,3 +1,8 @@ +Thu Apr 13 16:02:24 1995 Keith Vetter (keithv@fusion.com) + + * com_err.c, compile_et.c, error_ta.h, et_c.awk, internal.h: + __STDC__ conditionals also checks for the _WINDOWS define. + Wed Apr 5 16:25:35 1995 Keith Vetter (keithv@fusion.com) * com_err.h: added FAR to pointers in prototypes. diff --git a/src/util/et/com_err.c b/src/util/et/com_err.c index 43b315264..7a39966b7 100644 --- a/src/util/et/com_err.c +++ b/src/util/et/com_err.c @@ -35,14 +35,14 @@ * should fix up com_err.h so that it's safe to #include here * directly. */ -#ifdef __STDC__ +#if defined(__STDC__) || defined(_WINDOWS) extern char const * INTERFACE error_message (long); #else extern char * INTERFACE error_message (); #endif static void -#ifdef __STDC__ +#if defined(__STDC__) || defined(_WINDOWS) default_com_err_proc (const char *whoami, long code, const char *fmt, va_list args) #else default_com_err_proc (whoami, code, fmt, args) @@ -77,7 +77,7 @@ static void #endif } -#ifdef __STDC__ +#if defined(__STDC__) || defined(_WINDOWS) typedef void (*errf) (const char *, long, const char *, va_list); #else typedef void (*errf) (); diff --git a/src/util/et/compile_et.c b/src/util/et/compile_et.c index a6bf02c6a..921aad240 100644 --- a/src/util/et/compile_et.c +++ b/src/util/et/compile_et.c @@ -76,7 +76,7 @@ static const char * const c_src_prolog[] = { }; static const char * const krc_src_prolog[] = { - "#ifdef __STDC__\n", + "#if defined(__STDC__) || defined(_WINDOWS)\n", "#define NOARGS void\n", "#else\n", "#define NOARGS\n", diff --git a/src/util/et/error_table.h b/src/util/et/error_table.h index f1d493fda..53e73d5fc 100644 --- a/src/util/et/error_table.h +++ b/src/util/et/error_table.h @@ -39,7 +39,7 @@ extern struct et_list * _et_list; #define ERRCODE_RANGE 8 /* # of bits to shift table number */ #define BITS_PER_CHAR 6 /* # bits to shift per character in name */ -#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) +#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS) extern const char *error_table_name (long); #else extern const char *error_table_name (); diff --git a/src/util/et/et_c.awk b/src/util/et/et_c.awk index 4f53fc3eb..376a8d653 100644 --- a/src/util/et/et_c.awk +++ b/src/util/et/et_c.awk @@ -109,7 +109,7 @@ c2n["_"]=63 print " * This file is automatically generated; please do not edit it." > outfile print " */" > outfile - print "#ifdef __STDC__" > outfile + print "#if defined(__STDC__) || defined(_WINDOWS)" > outfile print "#define NOARGS void" > outfile print "#else" > outfile print "#define NOARGS" > outfile diff --git a/src/util/et/internal.h b/src/util/et/internal.h index a101f262f..9cf55c8d4 100644 --- a/src/util/et/internal.h +++ b/src/util/et/internal.h @@ -10,6 +10,6 @@ extern char const * const sys_errlist[]; extern const int sys_nerr; #endif -#if defined(__STDC__) && !defined(HDR_HAS_PERROR) +#if defined(__STDC__) && !defined(HDR_HAS_PERROR) && !defined(_WINDOWS) void perror (const char *); #endif diff --git a/src/windows/cns/changelo b/src/windows/cns/changelo index c1acf8386..6d7921292 100644 --- a/src/windows/cns/changelo +++ b/src/windows/cns/changelo @@ -1,3 +1,8 @@ +Thu Apr 13 16:19:01 1995 Keith Vetter (keithv@fusion.com) + + * cns.c: Added better error message for incorrect password. + * tktlist.c: flag string gets displayed within parentheses. + Fri Apr 7 15:03:10 1995 Keith Vetter (keithv@fusion.com) * cns.c, cns.h, cns.rc: added option dialog widget allowing user diff --git a/src/windows/cns/cns.c b/src/windows/cns/cns.c index 50cf1cdd2..6d4c6cdad 100644 --- a/src/windows/cns/cns.c +++ b/src/windows/cns/cns.c @@ -1940,7 +1940,6 @@ kwin_command ( krb5_principal principal; krb5_creds creds; krb5_principal server; - krb5_timestamp now; krb5_int32 sec, usec; #endif @@ -2063,12 +2062,6 @@ kwin_command ( code = krb5_us_timeofday(k5_context, &sec, &usec); if (code) break; - code = krb5_timeofday(k5_context, &now); - if (code) break; - if (labs(now-sec) > 60*60) { // Off by more than an hour - MessageBox (NULL, "DEBUG: timeofday != us_timeofday", NULL, 0); - now = sec; - } creds.times.starttime = 0; creds.times.endtime = sec + 60L * lifetime; creds.times.renew_till = 0; @@ -2099,7 +2092,11 @@ kwin_command ( #ifdef KRB5 if (code) { - com_err (NULL, code, "while logging in"); + if (code == KRB5KRB_AP_ERR_BAD_INTEGRITY) + MessageBox (hwnd, "Password incorrect", NULL, + MB_OK | MB_ICONEXCLAMATION); + else + com_err (NULL, code, "while logging in"); return TRUE; } #endif diff --git a/src/windows/cns/tktlist.c b/src/windows/cns/tktlist.c index 8f258c640..1478ea18f 100644 --- a/src/windows/cns/tktlist.c +++ b/src/windows/cns/tktlist.c @@ -445,6 +445,7 @@ flags_string(krb5_creds *cred) { int i = 0; buf[i++] = ' '; + buf[i++] = '('; if (cred->ticket_flags & TKT_FLG_FORWARDABLE) buf[i++] = 'F'; if (cred->ticket_flags & TKT_FLG_FORWARDED) @@ -468,7 +469,10 @@ flags_string(krb5_creds *cred) { if (cred->ticket_flags & TKT_FLG_PRE_AUTH) buf[i++] = 'A'; + buf[i++] = ')'; buf[i] = '\0'; + if (i <= 3) + buf[0] = '\0'; return(buf); }