[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS gss/lib/krb5
|
From: |
gss-commit |
|
Subject: |
CVS gss/lib/krb5 |
|
Date: |
Thu, 14 Oct 2004 23:18:14 +0200 |
Update of /home/cvs/gss/lib/krb5
In directory dopio:/tmp/cvs-serv4197/lib/krb5
Modified Files:
checksum.c checksum.h context.c msg.c name.c
Log Message:
Indent.
--- /home/cvs/gss/lib/krb5/checksum.c 2004/04/21 20:24:45 1.5
+++ /home/cvs/gss/lib/krb5/checksum.c 2004/10/14 21:18:14 1.6
@@ -29,8 +29,7 @@
OM_uint32
_gss_krb5_checksum_pack (const gss_cred_id_t initiator_cred_handle,
const gss_channel_bindings_t input_chan_bindings,
- OM_uint32 req_flags,
- char **data, size_t *datalen)
+ OM_uint32 req_flags, char **data, size_t * datalen)
{
char *p;
@@ -100,7 +99,7 @@
* in little-endian form.
*/
- req_flags &= /* GSS_C_DELEG_FLAG | */
+ req_flags &= /* GSS_C_DELEG_FLAG | */
GSS_C_MUTUAL_FLAG |
GSS_C_REPLAY_FLAG | GSS_C_SEQUENCE_FLAG |
GSS_C_CONF_FLAG | GSS_C_INTEG_FLAG;
@@ -127,8 +126,8 @@
if (req_flags & GSS_C_DELEG_FLAG)
{
/* XXX We don't support credential delegation yet. We should
- not fail here, as GSS_C_DELEG_FLAG is masked out above, and
- in context.c. */
+ not fail here, as GSS_C_DELEG_FLAG is masked out above, and
+ in context.c. */
}
return GSS_S_COMPLETE;
--- /home/cvs/gss/lib/krb5/checksum.h 2004/04/21 20:24:37 1.2
+++ /home/cvs/gss/lib/krb5/checksum.h 2004/10/14 21:18:14 1.3
@@ -22,5 +22,4 @@
OM_uint32
_gss_krb5_checksum_pack (const gss_cred_id_t initiator_cred_handle,
const gss_channel_bindings_t input_chan_bindings,
- OM_uint32 req_flags,
- char **data, size_t *datalen);
+ OM_uint32 req_flags, char **data, size_t * datalen);
--- /home/cvs/gss/lib/krb5/context.c 2004/10/14 21:03:14 1.57
+++ /home/cvs/gss/lib/krb5/context.c 2004/10/14 21:18:14 1.58
@@ -127,8 +127,7 @@
const gss_buffer_t input_token,
gss_OID * actual_mech_type,
gss_buffer_t output_token,
- OM_uint32 * ret_flags,
- OM_uint32 * time_rec)
+ OM_uint32 * ret_flags, OM_uint32 * time_rec)
{
gss_ctx_id_t ctx = *context_handle;
_gss_krb5_ctx_t k5 = ctx->krb5;
@@ -159,8 +158,8 @@
if (rc != SHISHI_OK)
{
/* A strict 1964 implementation would return
- GSS_S_DEFECTIVE_TOKEN here. gssapi-cfx permit absent
- sequence number, though. */
+ GSS_S_DEFECTIVE_TOKEN here. gssapi-cfx permit absent
+ sequence number, though. */
k5->acceptseqnr = 0;
}
@@ -195,11 +194,11 @@
if (initiator_cred_handle)
{
/* We only support the default initiator. See k5internal.h for
- adding a Shishi_tkt to the credential structure. I'm not sure
- what the use would be -- user-to-user authentication perhaps?
- Later: if you have tickets for address@hidden and address@hidden, it
may be
- useful to call gss_acquire_cred first to chose which one to
- initiate the context with. Not many applications need this. */
+ adding a Shishi_tkt to the credential structure. I'm not sure
+ what the use would be -- user-to-user authentication perhaps?
+ Later: if you have tickets for address@hidden and address@hidden, it
may be
+ useful to call gss_acquire_cred first to chose which one to
+ initiate the context with. Not many applications need this. */
return GSS_S_NO_CRED;
}
@@ -228,12 +227,12 @@
if (GSS_ERROR (maj_stat))
return maj_stat;
- k5->flags = req_flags & (/* GSS_C_DELEG_FLAG | */
- GSS_C_MUTUAL_FLAG |
- GSS_C_REPLAY_FLAG | GSS_C_SEQUENCE_FLAG |
- GSS_C_CONF_FLAG | GSS_C_INTEG_FLAG);
+ k5->flags = req_flags & ( /* GSS_C_DELEG_FLAG | */
+ GSS_C_MUTUAL_FLAG |
+ GSS_C_REPLAY_FLAG | GSS_C_SEQUENCE_FLAG |
+ GSS_C_CONF_FLAG | GSS_C_INTEG_FLAG);
/* PROT_READY is not mentioned in 1964/gssapi-cfx but we support
- it anyway. */
+ it anyway. */
k5->flags |= GSS_C_PROT_READY_FLAG;
if (ret_flags)
@@ -383,7 +382,8 @@
}
rc = shishi_encapreppart_seqnumber_get (cxk5->sh,
- shishi_ap_encapreppart (cxk5->ap),
+ shishi_ap_encapreppart (cxk5->
+ ap),
&cxk5->acceptseqnr);
if (rc != SHISHI_OK)
{
--- /home/cvs/gss/lib/krb5/msg.c 2004/04/21 20:00:10 1.11
+++ /home/cvs/gss/lib/krb5/msg.c 2004/10/14 21:18:14 1.12
@@ -260,7 +260,8 @@
size_t tmplen;
int rc;
- rc = gss_decapsulate_token (input_message_buffer, GSS_KRB5, &data, &datalen);
+ rc = gss_decapsulate_token (input_message_buffer, GSS_KRB5,
+ &data, &datalen);
if (!rc)
return GSS_S_BAD_MIC;
@@ -360,8 +361,7 @@
rc = shishi_checksum (k5->sh,
k5->key,
0, SHISHI_RSA_MD5_DES_GSS,
- data + 16, datalen - 16,
- &tmp, &tmplen);
+ data + 16, datalen - 16, &tmp, &tmplen);
if (rc != SHISHI_OK || tmplen != 8)
return GSS_S_FAILURE;
@@ -375,8 +375,7 @@
output_message_buffer->length = datalen - 8 - 8 - 8 - 8 - padlen;
output_message_buffer->value =
xmalloc (output_message_buffer->length);
- memcpy (output_message_buffer->value, pt,
- datalen - 4 * 8 - padlen);
+ memcpy (output_message_buffer->value, pt, datalen - 4 * 8 - padlen);
}
break;
--- /home/cvs/gss/lib/krb5/name.c 2004/04/19 21:19:53 1.10
+++ /home/cvs/gss/lib/krb5/name.c 2004/10/14 21:18:14 1.11
@@ -76,7 +76,8 @@
size_t hostlen = strlen (hostname);
size_t oldlen = (*output_name)->length;
size_t newlen = oldlen + 1 + hostlen;
- (*output_name)->value = xrealloc ((*output_name)->value, newlen + 1);
+ (*output_name)->value =
+ xrealloc ((*output_name)->value, newlen + 1);
(*output_name)->value[oldlen] = '/';
memcpy ((*output_name)->value + 1 + oldlen, hostname, hostlen);
(*output_name)->length = newlen;