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

indent

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17206 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-24 10:16:36 +00:00
parent 31558d8dac
commit 61b5a1a5df
1 changed files with 115 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

230
lib/krb5/recvauth.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997-2002 Kungliga Tekniska H<>gskolan * Copyright (c) 1997-2006 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -73,33 +73,54 @@ krb5_recvauth_match_version(krb5_context context,
krb5_keytab keytab, krb5_keytab keytab,
krb5_ticket **ticket) krb5_ticket **ticket)
{ {
krb5_error_code ret; krb5_error_code ret;
const char *version = KRB5_SENDAUTH_VERSION; const char *version = KRB5_SENDAUTH_VERSION;
char her_version[sizeof(KRB5_SENDAUTH_VERSION)]; char her_version[sizeof(KRB5_SENDAUTH_VERSION)];
char *her_appl_version; char *her_appl_version;
u_int32_t len; u_int32_t len;
u_char repl; u_char repl;
krb5_data data; krb5_data data;
krb5_flags ap_options; krb5_flags ap_options;
ssize_t n; ssize_t n;
/* /*
* If there are no addresses in auth_context, get them from `fd'. * If there are no addresses in auth_context, get them from `fd'.
*/ */
if (*auth_context == NULL) { if (*auth_context == NULL) {
ret = krb5_auth_con_init (context, auth_context); ret = krb5_auth_con_init (context, auth_context);
if (ret) if (ret)
return ret; return ret;
} }
ret = krb5_auth_con_setaddrs_from_fd (context, ret = krb5_auth_con_setaddrs_from_fd (context,
*auth_context, *auth_context,
p_fd); p_fd);
if (ret) if (ret)
return ret; return ret;
if(!(flags & KRB5_RECVAUTH_IGNORE_VERSION)) {
n = krb5_net_read (context, p_fd, &len, 4);
if (n < 0) {
ret = errno;
krb5_set_error_string (context, "read: %s", strerror(errno));
return ret;
}
if (n == 0) {
krb5_clear_error_string (context);
return KRB5_SENDAUTH_BADAUTHVERS;
}
len = ntohl(len);
if (len != sizeof(her_version)
|| krb5_net_read (context, p_fd, her_version, len) != len
|| strncmp (version, her_version, len)) {
repl = 1;
krb5_net_write (context, p_fd, &repl, 1);
krb5_clear_error_string (context);
return KRB5_SENDAUTH_BADAUTHVERS;
}
}
if(!(flags & KRB5_RECVAUTH_IGNORE_VERSION)) {
n = krb5_net_read (context, p_fd, &len, 4); n = krb5_net_read (context, p_fd, &len, 4);
if (n < 0) { if (n < 0) {
ret = errno; ret = errno;
@@ -108,104 +129,83 @@ krb5_recvauth_match_version(krb5_context context,
} }
if (n == 0) { if (n == 0) {
krb5_clear_error_string (context); krb5_clear_error_string (context);
return KRB5_SENDAUTH_BADAUTHVERS; return KRB5_SENDAUTH_BADAPPLVERS;
} }
len = ntohl(len); len = ntohl(len);
if (len != sizeof(her_version) her_appl_version = malloc (len);
|| krb5_net_read (context, p_fd, her_version, len) != len if (her_appl_version == NULL) {
|| strncmp (version, her_version, len)) { repl = 2;
repl = 1; krb5_net_write (context, p_fd, &repl, 1);
krb5_net_write (context, p_fd, &repl, 1); krb5_set_error_string (context, "malloc: out of memory");
krb5_clear_error_string (context); return ENOMEM;
return KRB5_SENDAUTH_BADAUTHVERS; }
if (krb5_net_read (context, p_fd, her_appl_version, len) != len
|| !(*match_appl_version)(match_data, her_appl_version)) {
repl = 2;
krb5_net_write (context, p_fd, &repl, 1);
krb5_set_error_string (context, "wrong sendauth version (%s)",
her_appl_version);
free (her_appl_version);
return KRB5_SENDAUTH_BADAPPLVERS;
} }
}
n = krb5_net_read (context, p_fd, &len, 4);
if (n < 0) {
ret = errno;
krb5_set_error_string (context, "read: %s", strerror(errno));
return ret;
}
if (n == 0) {
krb5_clear_error_string (context);
return KRB5_SENDAUTH_BADAPPLVERS;
}
len = ntohl(len);
her_appl_version = malloc (len);
if (her_appl_version == NULL) {
repl = 2;
krb5_net_write (context, p_fd, &repl, 1);
krb5_set_error_string (context, "malloc: out of memory");
return ENOMEM;
}
if (krb5_net_read (context, p_fd, her_appl_version, len) != len
|| !(*match_appl_version)(match_data, her_appl_version)) {
repl = 2;
krb5_net_write (context, p_fd, &repl, 1);
krb5_set_error_string (context, "wrong sendauth version (%s)",
her_appl_version);
free (her_appl_version); free (her_appl_version);
return KRB5_SENDAUTH_BADAPPLVERS;
}
free (her_appl_version);
repl = 0; repl = 0;
if (krb5_net_write (context, p_fd, &repl, 1) != 1) { if (krb5_net_write (context, p_fd, &repl, 1) != 1) {
ret = errno; ret = errno;
krb5_set_error_string (context, "write: %s", strerror(errno)); krb5_set_error_string (context, "write: %s", strerror(errno));
return ret; return ret;
} }
krb5_data_zero (&data); krb5_data_zero (&data);
ret = krb5_read_message (context, p_fd, &data); ret = krb5_read_message (context, p_fd, &data);
if (ret)
return ret;
ret = krb5_rd_req (context,
auth_context,
&data,
server,
keytab,
&ap_options,
ticket);
krb5_data_free (&data);
if (ret) {
krb5_data error_data;
krb5_error_code ret2;
ret2 = krb5_mk_error (context,
ret,
NULL,
NULL,
NULL,
server,
NULL,
NULL,
&error_data);
if (ret2 == 0) {
krb5_write_message (context, p_fd, &error_data);
krb5_data_free (&error_data);
}
return ret;
}
len = 0;
if (krb5_net_write (context, p_fd, &len, 4) != 4) {
ret = errno;
krb5_set_error_string (context, "write: %s", strerror(errno));
return ret;
}
if (ap_options & AP_OPTS_MUTUAL_REQUIRED) {
ret = krb5_mk_rep (context, *auth_context, &data);
if (ret)
return ret;
ret = krb5_write_message (context, p_fd, &data);
if (ret) if (ret)
return ret; return ret;
ret = krb5_rd_req (context,
auth_context,
&data,
server,
keytab,
&ap_options,
ticket);
krb5_data_free (&data); krb5_data_free (&data);
} if (ret) {
return 0; krb5_data error_data;
krb5_error_code ret2;
ret2 = krb5_mk_error (context,
ret,
NULL,
NULL,
NULL,
server,
NULL,
NULL,
&error_data);
if (ret2 == 0) {
krb5_write_message (context, p_fd, &error_data);
krb5_data_free (&error_data);
}
return ret;
}
len = 0;
if (krb5_net_write (context, p_fd, &len, 4) != 4) {
ret = errno;
krb5_set_error_string (context, "write: %s", strerror(errno));
return ret;
}
if (ap_options & AP_OPTS_MUTUAL_REQUIRED) {
ret = krb5_mk_rep (context, *auth_context, &data);
if (ret)
return ret;
ret = krb5_write_message (context, p_fd, &data);
if (ret)
return ret;
krb5_data_free (&data);
}
return 0;
} }