[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS shishi/lib
|
From: |
shishi-commit |
|
Subject: |
CVS shishi/lib |
|
Date: |
Fri, 10 Sep 2004 12:00:00 +0200 |
Update of /home/cvs/shishi/lib
In directory dopio:/tmp/cvs-serv20354/lib
Modified Files:
ap.c aprep.c apreq.c asn1.c authenticator.c cfg.c crypto-aes.c
diskio.c encapreppart.c enckdcreppart.c encticketpart.c
gztime.c kdc.c kdcrep.c kdcreq.c key.c krberror.c netio.c
principal.c priv.c safe.c starttls.c ticket.c tkt.c utils.c
Log Message:
Indent.
--- /home/cvs/shishi/lib/ap.c 2004/09/10 09:04:16 1.67
+++ /home/cvs/shishi/lib/ap.c 2004/09/10 10:00:00 1.68
@@ -291,8 +291,7 @@
shishi_ap_set_tktoptionsraw (Shishi_ap * ap,
Shishi_tkt * tkt,
int options,
- int32_t cksumtype,
- const char *data, size_t len)
+ int32_t cksumtype, const char *data, size_t len)
{
int rc;
@@ -445,8 +444,7 @@
shishi_ap_tktoptionsraw (Shishi * handle,
Shishi_ap ** ap,
Shishi_tkt * tkt, int options,
- int32_t cksumtype,
- const char *data, size_t len)
+ int32_t cksumtype, const char *data, size_t len)
{
int rc;
--- /home/cvs/shishi/lib/aprep.c 2004/09/10 09:58:30 1.39
+++ /home/cvs/shishi/lib/aprep.c 2004/09/10 10:00:00 1.40
@@ -398,7 +398,7 @@
return SHISHI_APREP_BAD_KEYTYPE;
res = shishi_asn1_read (handle, aprep, "enc-part.cipher",
- &cipher, &cipherlen);
+ &cipher, &cipherlen);
if (res != SHISHI_OK)
return res;
--- /home/cvs/shishi/lib/apreq.c 2004/09/10 09:58:30 1.47
+++ /home/cvs/shishi/lib/apreq.c 2004/09/10 10:00:00 1.48
@@ -520,7 +520,7 @@
* Return value: Returns SHISHI_OK iff successful.
**/
int
-shishi_apreq_options (Shishi * handle, Shishi_asn1 apreq, uint32_t *flags)
+shishi_apreq_options (Shishi * handle, Shishi_asn1 apreq, uint32_t * flags)
{
return shishi_asn1_read_bitstring (handle, apreq, "ap-options", flags);
}
@@ -574,7 +574,8 @@
* Return value: Returns SHISHI_OK iff successful.
**/
int
-shishi_apreq_options_set (Shishi * handle, Shishi_asn1 apreq, uint32_t options)
+shishi_apreq_options_set (Shishi * handle, Shishi_asn1 apreq,
+ uint32_t options)
{
int res;
@@ -628,8 +629,7 @@
**/
int
shishi_apreq_options_remove (Shishi * handle,
- Shishi_asn1 apreq,
- uint32_t option)
+ Shishi_asn1 apreq, uint32_t option)
{
uint32_t options;
int res;
@@ -708,7 +708,7 @@
goto error;
res = shishi_asn1_read (handle, apreq, "ticket.sname.name-type",
- &buf, &buflen);
+ &buf, &buflen);
if (res != SHISHI_OK)
goto error;
@@ -744,7 +744,7 @@
}
res = shishi_asn1_read (handle, apreq, "ticket.enc-part.etype",
- &buf, &buflen);
+ &buf, &buflen);
if (res != SHISHI_OK)
goto error;
@@ -754,7 +754,7 @@
goto error;
res = shishi_asn1_read (handle, apreq, "ticket.enc-part.kvno",
- &buf, &buflen);
+ &buf, &buflen);
if (res != SHISHI_OK && res != SHISHI_ASN1_NO_ELEMENT)
goto error;
@@ -769,7 +769,7 @@
goto error;
res = shishi_asn1_read (handle, apreq, "ticket.enc-part.cipher",
- &buf, &buflen);
+ &buf, &buflen);
if (res != SHISHI_OK)
goto error;
@@ -807,7 +807,7 @@
return SHISHI_APREQ_BAD_KEYTYPE;
res = shishi_asn1_read (handle, apreq, "authenticator.cipher",
- &cipher, &cipherlen);
+ &cipher, &cipherlen);
if (res != SHISHI_OK)
return res;
--- /home/cvs/shishi/lib/asn1.c 2004/09/10 09:58:30 1.68
+++ /home/cvs/shishi/lib/asn1.c 2004/09/10 10:00:00 1.69
@@ -149,8 +149,8 @@
**/
int
shishi_asn1_read (Shishi * handle,
- Shishi_asn1 node, const char *field,
- char **data, size_t * datalen)
+ Shishi_asn1 node, const char *field,
+ char **data, size_t * datalen)
{
int rc;
int len = 0;
@@ -242,7 +242,9 @@
if (buflen < 4)
{
memset (buf, 0, sizeof (buf));
- rc = shishi_asn1_read_inline (handle, node, field, &buf[4 - buflen],
&buflen);
+ rc =
+ shishi_asn1_read_inline (handle, node, field, &buf[4 - buflen],
+ &buflen);
if (rc != SHISHI_OK)
return rc;
}
--- /home/cvs/shishi/lib/authenticator.c 2004/09/10 09:58:30 1.67
+++ /home/cvs/shishi/lib/authenticator.c 2004/09/10 10:00:00 1.68
@@ -81,7 +81,7 @@
* it and the successive sequence numbers do not repeat other
* sequences.
*/
- shishi_randomize (handle, 0, &seqnr, sizeof(seqnr));
+ shishi_randomize (handle, 0, &seqnr, sizeof (seqnr));
/* XXX remove once libtasn1 _asn1_convert_integer is fixed. */
seqnr &= 0x7FFFFFFF;
@@ -389,8 +389,7 @@
**/
int
shishi_authenticator_ctime (Shishi * handle,
- Shishi_asn1 authenticator,
- char **t)
+ Shishi_asn1 authenticator, char **t)
{
return shishi_time (handle, authenticator, "ctime", t);
}
@@ -407,8 +406,7 @@
**/
int
shishi_authenticator_ctime_set (Shishi * handle,
- Shishi_asn1 authenticator,
- const char *t)
+ Shishi_asn1 authenticator, const char *t)
{
int res;
@@ -432,8 +430,7 @@
**/
int
shishi_authenticator_cusec_get (Shishi * handle,
- Shishi_asn1 authenticator,
- uint32_t *cusec)
+ Shishi_asn1 authenticator, uint32_t * cusec)
{
int res;
@@ -456,8 +453,7 @@
**/
int
shishi_authenticator_cusec_set (Shishi * handle,
- Shishi_asn1 authenticator,
- uint32_t cusec)
+ Shishi_asn1 authenticator, uint32_t cusec)
{
int res;
@@ -603,7 +599,7 @@
return res;
res = shishi_asn1_read (handle, authenticator, "cksum.checksum",
- cksum, cksumlen);
+ cksum, cksumlen);
if (res != SHISHI_OK)
return res;
@@ -806,7 +802,7 @@
int
shishi_authenticator_authorizationdata (Shishi * handle,
Shishi_asn1 authenticator,
- int32_t *adtype,
+ int32_t * adtype,
char **addata, size_t * addatalen,
size_t nth)
{
@@ -886,7 +882,7 @@
return res;
res = shishi_asn1_read (handle, authenticator, "subkey.keyvalue",
- &subkeyvalue, &subkeylen);
+ &subkeyvalue, &subkeylen);
if (res != SHISHI_OK)
return res;
--- /home/cvs/shishi/lib/cfg.c 2004/08/01 22:32:52 1.57
+++ /home/cvs/shishi/lib/cfg.c 2004/09/10 10:00:00 1.58
@@ -533,7 +533,8 @@
shishi_cfg_default_userfile (Shishi * handle)
{
if (!handle->usercfgfile)
- handle->usercfgfile = shishi_cfg_userdirectory_file (handle, USERCFG_FILE);
+ handle->usercfgfile =
+ shishi_cfg_userdirectory_file (handle, USERCFG_FILE);
return handle->usercfgfile;
}
--- /home/cvs/shishi/lib/crypto-aes.c 2004/04/18 10:32:34 1.30
+++ /home/cvs/shishi/lib/crypto-aes.c 2004/09/10 10:00:00 1.31
@@ -166,8 +166,7 @@
static int
aes128_random_to_key (Shishi * handle,
- const char *rnd,
- size_t rndlen, Shishi_key * outkey)
+ const char *rnd, size_t rndlen, Shishi_key * outkey)
{
if (rndlen < shishi_key_length (outkey))
return SHISHI_CRYPTO_ERROR;
@@ -179,8 +178,7 @@
static int
aes256_random_to_key (Shishi * handle,
- const char *rnd,
- size_t rndlen, Shishi_key * outkey)
+ const char *rnd, size_t rndlen, Shishi_key * outkey)
{
if (rndlen < shishi_key_length (outkey))
return SHISHI_CRYPTO_ERROR;
--- /home/cvs/shishi/lib/diskio.c 2004/09/10 09:04:16 1.41
+++ /home/cvs/shishi/lib/diskio.c 2004/09/10 10:00:00 1.42
@@ -37,8 +37,7 @@
_shishi_print_armored_data (Shishi * handle,
FILE * fh,
Shishi_asn1 asn1,
- const char *asn1type,
- char *headers)
+ const char *asn1type, char *headers)
{
char *der;
size_t derlen;
--- /home/cvs/shishi/lib/encapreppart.c 2004/09/10 09:58:30 1.38
+++ /home/cvs/shishi/lib/encapreppart.c 2004/09/10 10:00:00 1.39
@@ -70,7 +70,7 @@
* it and the successive sequence numbers do not repeat other
* sequences.
*/
- shishi_randomize (handle, 0, &seqnr, sizeof(seqnr));
+ shishi_randomize (handle, 0, &seqnr, sizeof (seqnr));
/*
* Implementation note: as noted before, some implementations omit
@@ -270,8 +270,7 @@
**/
int
shishi_encapreppart_get_key (Shishi * handle,
- Shishi_asn1 encapreppart,
- Shishi_key ** key)
+ Shishi_asn1 encapreppart, Shishi_key ** key)
{
int res;
char *buf;
@@ -284,7 +283,7 @@
return res;
res = shishi_asn1_read (handle, encapreppart, "subkey.keyvalue",
- &buf, &buflen);
+ &buf, &buflen);
if (res != SHISHI_OK)
return res;
@@ -311,8 +310,7 @@
**/
int
shishi_encapreppart_ctime (Shishi * handle,
- Shishi_asn1 encapreppart,
- char **t)
+ Shishi_asn1 encapreppart, char **t)
{
return shishi_time (handle, encapreppart, "ctime", t);
}
@@ -329,8 +327,7 @@
**/
int
shishi_encapreppart_ctime_set (Shishi * handle,
- Shishi_asn1 encapreppart,
- const char *t)
+ Shishi_asn1 encapreppart, const char *t)
{
int res;
@@ -354,8 +351,7 @@
**/
int
shishi_encapreppart_cusec_get (Shishi * handle,
- Shishi_asn1 encapreppart,
- uint32_t *cusec)
+ Shishi_asn1 encapreppart, uint32_t * cusec)
{
int res;
@@ -378,8 +374,7 @@
**/
int
shishi_encapreppart_cusec_set (Shishi * handle,
- Shishi_asn1 encapreppart,
- uint32_t cusec)
+ Shishi_asn1 encapreppart, uint32_t cusec)
{
int res;
--- /home/cvs/shishi/lib/enckdcreppart.c 2004/09/10 09:58:30 1.33
+++ /home/cvs/shishi/lib/enckdcreppart.c 2004/09/10 10:00:00 1.34
@@ -95,7 +95,7 @@
return res;
res = shishi_asn1_read (handle, enckdcreppart, "key.keyvalue",
- &buf, &buflen);
+ &buf, &buflen);
if (res != SHISHI_OK)
return res;
@@ -398,8 +398,7 @@
if (res != SHISHI_OK)
return SHISHI_ASN1_ERROR;
- res =
- shishi_asn1_read (handle, encticketpart, "renew-till", &buf, &buflen);
+ res = shishi_asn1_read (handle, encticketpart, "renew-till", &buf, &buflen);
if (res != SHISHI_OK && res != SHISHI_ASN1_NO_ELEMENT)
return SHISHI_ASN1_ERROR;
--- /home/cvs/shishi/lib/encticketpart.c 2004/09/10 09:58:30 1.31
+++ /home/cvs/shishi/lib/encticketpart.c 2004/09/10 10:00:00 1.32
@@ -115,7 +115,7 @@
return res;
res = shishi_asn1_read (handle, encticketpart, "key.keyvalue",
- &buf, &buflen);
+ &buf, &buflen);
if (res != SHISHI_OK)
return res;
@@ -188,7 +188,7 @@
char **crealm, size_t * crealmlen)
{
return shishi_asn1_read (handle, encticketpart, "crealm",
- crealm, crealmlen);
+ crealm, crealmlen);
}
/**
@@ -347,7 +347,7 @@
char *authtime, size_t * authtimelen)
{
return shishi_asn1_read_inline (handle, encticketpart, "authtime",
- authtime, authtimelen);
+ authtime, authtimelen);
}
time_t
--- /home/cvs/shishi/lib/gztime.c 2004/09/10 09:58:30 1.15
+++ /home/cvs/shishi/lib/gztime.c 2004/09/10 10:00:00 1.16
@@ -107,8 +107,7 @@
* Return value: Returns SHISHI_OK iff successful.
**/
int
-shishi_time (Shishi * handle, Shishi_asn1 node,
- const char *field, char **t)
+shishi_time (Shishi * handle, Shishi_asn1 node, const char *field, char **t)
{
size_t len;
int res;
--- /home/cvs/shishi/lib/kdc.c 2004/09/10 09:58:30 1.61
+++ /home/cvs/shishi/lib/kdc.c 2004/09/10 10:00:00 1.62
@@ -127,7 +127,7 @@
}
res = shishi_asn1_read (handle, kdcreq, "req-body.realm",
- &realm, &realmlen);
+ &realm, &realmlen);
if (res != SHISHI_OK)
{
shishi_error_printf (handle, "Could not get realm: %s\n",
@@ -242,7 +242,7 @@
int res;
res = shishi_asn1_read (handle, asreq, "req-body.realm",
- &reqrealm, &reqrealmlen);
+ &reqrealm, &reqrealmlen);
if (res != SHISHI_OK)
{
shishi_error_printf (handle, "Could not read request realm: %s\n",
@@ -298,7 +298,7 @@
int res;
res = shishi_asn1_read (handle, encticketpart,
- "cname.name-type", &buf, &buflen);
+ "cname.name-type", &buf, &buflen);
if (res != SHISHI_OK)
return res;
@@ -378,15 +378,13 @@
for (i = 1; i <= j; i++)
{
asprintf (&format, "req-body.cname.name-string.?%d", i);
- res = shishi_asn1_read (handle, asreq, format,
- &reqcname, &reqcnamelen);
+ res = shishi_asn1_read (handle, asreq, format, &reqcname, &reqcnamelen);
free (format);
if (res != SHISHI_OK)
return res;
asprintf (&format, "cname.name-string.?%d", i);
- res = shishi_asn1_read (handle, asrep, format,
- &repcname, &repcnamelen);
+ res = shishi_asn1_read (handle, asrep, format, &repcname, &repcnamelen);
free (format);
if (res != SHISHI_OK)
return res;
@@ -514,7 +512,7 @@
int res;
res = shishi_asn1_read (handle, kdcreq, "req-body.nonce",
- &reqnonce, &reqnoncelen);
+ &reqnonce, &reqnoncelen);
if (res != SHISHI_OK)
{
shishi_error_printf (handle, "Could not read request nonce: %s\n",
@@ -523,7 +521,7 @@
}
res = shishi_asn1_read (handle, enckdcreppart, "nonce",
- &repnonce, &repnoncelen);
+ &repnonce, &repnoncelen);
if (res != SHISHI_OK)
{
free (reqnonce);
--- /home/cvs/shishi/lib/kdcrep.c 2004/09/10 09:58:30 1.44
+++ /home/cvs/shishi/lib/kdcrep.c 2004/09/10 10:00:00 1.45
@@ -411,7 +411,7 @@
goto error;
res = shishi_asn1_read (handle, kdcrep, "ticket.sname.name-type",
- &buf, &buflen);
+ &buf, &buflen);
if (res != SHISHI_OK)
goto error;
@@ -447,7 +447,7 @@
}
res = shishi_asn1_read (handle, kdcrep, "ticket.enc-part.etype",
- &buf, &buflen);
+ &buf, &buflen);
if (res != SHISHI_OK)
goto error;
@@ -457,7 +457,7 @@
goto error;
res = shishi_asn1_read (handle, kdcrep, "ticket.enc-part.kvno",
- &buf, &buflen);
+ &buf, &buflen);
if (res != SHISHI_OK && res != SHISHI_ASN1_NO_ELEMENT)
goto error;
@@ -472,7 +472,7 @@
goto error;
res = shishi_asn1_read (handle, kdcrep, "ticket.enc-part.cipher",
- &buf, &buflen);
+ &buf, &buflen);
if (res != SHISHI_OK)
goto error;
@@ -721,7 +721,7 @@
return SHISHI_KDCREP_BAD_KEYTYPE;
res = shishi_asn1_read (handle, kdcrep, "enc-part.cipher",
- &cipher, &cipherlen);
+ &cipher, &cipherlen);
if (res != SHISHI_OK)
return res;
--- /home/cvs/shishi/lib/kdcreq.c 2004/09/10 09:58:30 1.68
+++ /home/cvs/shishi/lib/kdcreq.c 2004/09/10 10:00:00 1.69
@@ -109,7 +109,7 @@
goto error;
shishi_randomize (handle, 0, &nonce, sizeof (nonce));
- nonce &= 0x7FFFFFFF; /* XXX fix _libtasn1_convert_integer. */
+ nonce &= 0x7FFFFFFF; /* XXX fix _libtasn1_convert_integer. */
res = shishi_kdcreq_nonce_set (handle, node, nonce);
if (res != SHISHI_OK)
goto error;
@@ -353,9 +353,7 @@
* Return value: Returns %SHISHI_OK iff successful.
**/
int
-shishi_kdcreq_nonce_set (Shishi * handle,
- Shishi_asn1 kdcreq,
- uint32_t nonce)
+shishi_kdcreq_nonce_set (Shishi * handle, Shishi_asn1 kdcreq, uint32_t nonce)
{
int res;
@@ -456,7 +454,7 @@
char **realm, size_t * realmlen)
{
return shishi_asn1_read_optional (handle, kdcreq, "req-body.realm",
- realm, realmlen);
+ realm, realmlen);
}
int
@@ -464,7 +462,7 @@
char **realm, size_t * realmlen)
{
return shishi_asn1_read_optional (handle, kdcreq, "req-body.realm",
- realm, realmlen);
+ realm, realmlen);
}
/**
@@ -612,8 +610,7 @@
shishi_kdcreq_till (Shishi * handle, Shishi_asn1 kdcreq,
char **till, size_t * tilllen)
{
- return shishi_asn1_read (handle, kdcreq, "req-body.till",
- till, tilllen);
+ return shishi_asn1_read (handle, kdcreq, "req-body.till", till, tilllen);
}
/**
@@ -631,14 +628,14 @@
{
char *till;
size_t tilllen;
- time_t t = (time_t) -1;
+ time_t t = (time_t) - 1;
int res;
res = shishi_kdcreq_till (handle, kdcreq, &till, &tilllen);
if (res != SHISHI_OK)
return t;
- if (tilllen == SHISHI_GENERALIZEDTIME_LENGTH + 1) /* XXX why +1 ? */
+ if (tilllen == SHISHI_GENERALIZEDTIME_LENGTH + 1) /* XXX why +1 ? */
t = shishi_generalize_ctime (handle, till);
free (till);
--- /home/cvs/shishi/lib/key.c 2004/07/11 17:21:55 1.25
+++ /home/cvs/shishi/lib/key.c 2004/09/10 10:00:00 1.26
@@ -388,8 +388,7 @@
int
shishi_key_from_random (Shishi * handle,
int32_t type,
- const char *rnd, size_t rndlen,
- Shishi_key ** outkey)
+ const char *rnd, size_t rndlen, Shishi_key ** outkey)
{
int rc;
--- /home/cvs/shishi/lib/krberror.c 2004/09/10 09:58:30 1.35
+++ /home/cvs/shishi/lib/krberror.c 2004/09/10 10:00:00 1.36
@@ -736,8 +736,7 @@
**/
int
shishi_krberror_ctime_set (Shishi * handle,
- Shishi_asn1 krberror,
- const char *t)
+ Shishi_asn1 krberror, const char *t)
{
int res;
@@ -784,7 +783,8 @@
* Return value: Returns SHISHI_OK iff successful.
**/
int
-shishi_krberror_cusec (Shishi * handle, Shishi_asn1 krberror, uint32_t *cusec)
+shishi_krberror_cusec (Shishi * handle, Shishi_asn1 krberror,
+ uint32_t * cusec)
{
int res;
@@ -807,8 +807,7 @@
**/
int
shishi_krberror_cusec_set (Shishi * handle,
- Shishi_asn1 krberror,
- uint32_t cusec)
+ Shishi_asn1 krberror, uint32_t cusec)
{
int res;
@@ -892,8 +891,7 @@
**/
int
shishi_krberror_susec (Shishi * handle,
- Shishi_asn1 krberror,
- uint32_t *susec)
+ Shishi_asn1 krberror, uint32_t * susec)
{
int res;
@@ -916,8 +914,7 @@
**/
int
shishi_krberror_susec_set (Shishi * handle,
- Shishi_asn1 krberror,
- uint32_t susec)
+ Shishi_asn1 krberror, uint32_t susec)
{
int res;
@@ -1152,8 +1149,7 @@
if (res == SHISHI_OK && len > 0)
{
buf[len] = '\0';
- fprintf (fh, "Additional error message from server:\n%s\n",
- buf);
+ fprintf (fh, "Additional error message from server:\n%s\n", buf);
}
}
--- /home/cvs/shishi/lib/netio.c 2004/04/18 10:59:17 1.36
+++ /home/cvs/shishi/lib/netio.c 2004/09/10 10:00:00 1.37
@@ -37,7 +37,7 @@
shishi_sendrecv_udp (Shishi * handle,
struct sockaddr *addr,
const char *indata, int inlen,
- char **outdata, size_t *outlen, size_t timeout)
+ char **outdata, size_t * outlen, size_t timeout)
{
struct sockaddr lsa;
struct sockaddr_in *lsa_inp = (struct sockaddr_in *) &lsa;
@@ -116,7 +116,7 @@
shishi_sendrecv_tcp (Shishi * handle,
struct sockaddr *addr,
const char *indata, int inlen,
- char **outdata, size_t *outlen, size_t timeout)
+ char **outdata, size_t * outlen, size_t timeout)
{
char tmpbuf[BUFSIZ]; /* XXX can we do without it?
MSG_PEEK|MSG_TRUNC doesn't work for udp.. */
--- /home/cvs/shishi/lib/principal.c 2004/09/10 09:58:30 1.31
+++ /home/cvs/shishi/lib/principal.c 2004/09/10 10:00:00 1.32
@@ -293,7 +293,9 @@
{
len = *outlen - totlen;
asprintf (&format, "%s.name-string.?%d", namefield, i);
- res = shishi_asn1_read_inline (handle, namenode, format, &out[totlen],
&len);
+ res =
+ shishi_asn1_read_inline (handle, namenode, format, &out[totlen],
+ &len);
free (format);
if (res != SHISHI_OK)
return res;
@@ -365,7 +367,7 @@
len = *outlen - totlen;
res = shishi_asn1_read_inline (handle, realmnode, realmfield,
- &out[totlen], &len);
+ &out[totlen], &len);
if (res == SHISHI_ASN1_NO_ELEMENT)
totlen--;
else if (res != SHISHI_OK)
--- /home/cvs/shishi/lib/priv.c 2004/09/10 09:58:30 1.7
+++ /home/cvs/shishi/lib/priv.c 2004/09/10 10:00:00 1.8
@@ -547,7 +547,7 @@
int res;
res = shishi_asn1_read (handle, encprivpart, "user-data",
- userdata, userdatalen);
+ userdata, userdatalen);
if (res != SHISHI_OK)
return res;
@@ -659,7 +659,7 @@
return SHISHI_PRIV_BAD_KEYTYPE;
res = shishi_asn1_read (priv->handle, priv->priv, "enc-part.cipher",
- &cipher, &cipherlen);
+ &cipher, &cipherlen);
if (res != SHISHI_OK)
return res;
--- /home/cvs/shishi/lib/safe.c 2004/09/10 09:58:30 1.29
+++ /home/cvs/shishi/lib/safe.c 2004/09/10 10:00:00 1.30
@@ -468,7 +468,7 @@
int res;
res = shishi_asn1_read (handle, safe, "safe-body.user-data",
- userdata, userdatalen);
+ userdata, userdatalen);
if (res != SHISHI_OK)
return res;
--- /home/cvs/shishi/lib/starttls.c 2004/08/01 17:35:11 1.11
+++ /home/cvs/shishi/lib/starttls.c 2004/09/10 10:00:00 1.12
@@ -79,8 +79,7 @@
int sockfd,
gnutls_session session,
const char *indata, size_t inlen,
- char **outdata, size_t *outlen,
- size_t timeout)
+ char **outdata, size_t * outlen, size_t timeout)
{
int ret;
ssize_t bytes_sent, bytes_read;
@@ -110,7 +109,7 @@
return SHISHI_RECVFROM_ERROR;
}
- if (gnutls_session_is_resumed( session) != 0)
+ if (gnutls_session_is_resumed (session) != 0)
shishi_error_printf (handle, "TLS handshake completed (resumed)");
else
shishi_error_printf (handle, "TLS handshake completed (not resumed)");
@@ -180,7 +179,7 @@
_shishi_sendrecv_tls (Shishi * handle,
struct sockaddr *addr,
const char *indata, size_t inlen,
- char **outdata, size_t *outlen,
+ char **outdata, size_t * outlen,
size_t timeout, Shishi_tkts_hint * hint)
{
const int kx_prio[] = { GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS,
--- /home/cvs/shishi/lib/ticket.c 2004/09/10 09:58:30 1.55
+++ /home/cvs/shishi/lib/ticket.c 2004/09/10 10:00:00 1.56
@@ -44,14 +44,14 @@
return NULL;
rc = shishi_asn1_write (handle, node, "tkt-vno",
- SHISHI_TICKET_DEFAULT_TKTVNO,
- SHISHI_TICKET_DEFAULT_TKTVNO_LEN);
+ SHISHI_TICKET_DEFAULT_TKTVNO,
+ SHISHI_TICKET_DEFAULT_TKTVNO_LEN);
if (rc != SHISHI_OK)
goto error;
return node;
- error:
+error:
shishi_asn1_done (handle, node);
return NULL;
}
@@ -279,7 +279,7 @@
return SHISHI_TICKET_BAD_KEYTYPE;
res = shishi_asn1_read (handle, ticket, "enc-part.cipher",
- &cipher, &cipherlen);
+ &cipher, &cipherlen);
if (res != SHISHI_OK)
return res;
--- /home/cvs/shishi/lib/tkt.c 2004/09/10 09:58:30 1.43
+++ /home/cvs/shishi/lib/tkt.c 2004/09/10 10:00:00 1.44
@@ -536,7 +536,7 @@
* Return value: Returns SHISHI_OK iff successful.
**/
int
-shishi_tkt_flags (Shishi_tkt * tkt, uint32_t *flags)
+shishi_tkt_flags (Shishi_tkt * tkt, uint32_t * flags)
{
return shishi_asn1_read_bitstring (tkt->handle, tkt->enckdcreppart,
"flags", flags);
@@ -1033,8 +1033,7 @@
int
shishi_tkt_lastreq (Shishi_tkt * tkt,
- char **lrtime, size_t * lrtimelen,
- int32_t lrtype)
+ char **lrtime, size_t * lrtimelen, int32_t lrtype)
{
char *format;
int32_t tmplrtype;
@@ -1059,7 +1058,7 @@
{
asprintf (&format, "last-req.?%d.lr-value", i);
res = shishi_asn1_read (tkt->handle, tkt->enckdcreppart,
- format, lrtime, lrtimelen);
+ format, lrtime, lrtimelen);
free (format);
if (res != SHISHI_OK)
return res;
@@ -1088,7 +1087,7 @@
{
char *lrtime;
size_t lrtimelen;
- time_t t = (time_t) -1;
+ time_t t = (time_t) - 1;
int res;
res = shishi_tkt_lastreq (tkt, &lrtime, &lrtimelen, lrtype);
@@ -1107,7 +1106,7 @@
shishi_tkt_authtime (Shishi_tkt * tkt, char **authtime, size_t * authtimelen)
{
return shishi_asn1_read (tkt->handle, tkt->enckdcreppart, "authtime",
- authtime, authtimelen);
+ authtime, authtimelen);
}
/**
@@ -1125,14 +1124,14 @@
{
char *authtime;
size_t authtimelen;
- time_t t = (time_t) -1;
+ time_t t = (time_t) - 1;
int res;
res = shishi_tkt_authtime (tkt, &authtime, &authtimelen);
if (res != SHISHI_OK)
return t;
- if (authtimelen == SHISHI_GENERALIZEDTIME_LENGTH + 1) /* XXX why +1 ? */
+ if (authtimelen == SHISHI_GENERALIZEDTIME_LENGTH + 1) /* XXX why +1 ?
*/
t = shishi_generalize_ctime (tkt->handle, authtime);
free (authtime);
@@ -1142,11 +1141,10 @@
int
shishi_tkt_starttime (Shishi_tkt * tkt,
- char **starttime,
- size_t * starttimelen)
+ char **starttime, size_t * starttimelen)
{
return shishi_asn1_read_optional (tkt->handle, tkt->enckdcreppart,
- "starttime", starttime, starttimelen);
+ "starttime", starttime, starttimelen);
}
/**
@@ -1164,14 +1162,14 @@
{
char *starttime;
size_t starttimelen;
- time_t t = (time_t) -1;
+ time_t t = (time_t) - 1;
int res;
res = shishi_tkt_starttime (tkt, &starttime, &starttimelen);
if (res != SHISHI_OK || starttimelen == 0)
return t;
- if (starttimelen == SHISHI_GENERALIZEDTIME_LENGTH + 1) /* XXX why +1 ? */
+ if (starttimelen == SHISHI_GENERALIZEDTIME_LENGTH + 1) /* XXX why +1 ?
*/
t = shishi_generalize_ctime (tkt->handle, starttime);
free (starttime);
@@ -1183,7 +1181,7 @@
shishi_tkt_endtime (Shishi_tkt * tkt, char **endtime, size_t * endtimelen)
{
return shishi_asn1_read (tkt->handle, tkt->enckdcreppart, "endtime",
- endtime, endtimelen);
+ endtime, endtimelen);
}
/**
@@ -1200,14 +1198,14 @@
{
char *endtime;
size_t endtimelen;
- time_t t = (time_t) -1;
+ time_t t = (time_t) - 1;
int res;
res = shishi_tkt_endtime (tkt, &endtime, &endtimelen);
if (res != SHISHI_OK)
return t;
- if (endtimelen == SHISHI_GENERALIZEDTIME_LENGTH + 1) /* XXX why +1 ? */
+ if (endtimelen == SHISHI_GENERALIZEDTIME_LENGTH + 1) /* XXX why +1 ? */
t = shishi_generalize_ctime (tkt->handle, endtime);
free (endtime);
@@ -1217,11 +1215,10 @@
int
shishi_tkt_renew_till (Shishi_tkt * tkt,
- char **renewtill,
- size_t * renewtilllen)
+ char **renewtill, size_t * renewtilllen)
{
return shishi_asn1_read_optional (tkt->handle, tkt->enckdcreppart,
- "renew-till", renewtill, renewtilllen);
+ "renew-till", renewtill, renewtilllen);
}
/**
@@ -1238,14 +1235,14 @@
{
char *renewtill;
size_t renewtilllen;
- time_t t = (time_t) -1;
+ time_t t = (time_t) - 1;
int res;
res = shishi_tkt_renew_till (tkt, &renewtill, &renewtilllen);
if (res != SHISHI_OK || renewtilllen == 0)
return t;
- if (renewtilllen == SHISHI_GENERALIZEDTIME_LENGTH + 1) /* XXX why +1 ? */
+ if (renewtilllen == SHISHI_GENERALIZEDTIME_LENGTH + 1) /* XXX why +1 ?
*/
t = shishi_generalize_ctime (tkt->handle, renewtill);
free (renewtill);
--- /home/cvs/shishi/lib/utils.c 2004/04/18 12:36:22 1.7
+++ /home/cvs/shishi/lib/utils.c 2004/09/10 10:00:00 1.8
@@ -135,7 +135,7 @@
}
time_t
-shishi_get_date (const char *p, const time_t *now)
+shishi_get_date (const char *p, const time_t * now)
{
struct timespec nowspec = { 0, 0 };
struct timespec thenspec;
@@ -147,7 +147,7 @@
if (!get_date (&thenspec, p, &nowspec))
{
- thenspec.tv_sec = (time_t) -1;
+ thenspec.tv_sec = (time_t) - 1;
thenspec.tv_nsec = 0;
}
- CVS shishi/lib, (continued)
- CVS shishi/lib, shishi-commit, 2004/09/02
- CVS shishi/lib, shishi-commit, 2004/09/02
- CVS shishi/lib, shishi-commit, 2004/09/06
- CVS shishi/lib, shishi-commit, 2004/09/08
- CVS shishi/lib, shishi-commit, 2004/09/08
- CVS shishi/lib, shishi-commit, 2004/09/10
- CVS shishi/lib, shishi-commit, 2004/09/10
- CVS shishi/lib, shishi-commit, 2004/09/10
- CVS shishi/lib, shishi-commit, 2004/09/10
- CVS shishi/lib, shishi-commit, 2004/09/10
- CVS shishi/lib,
shishi-commit <=
- CVS shishi/lib, shishi-commit, 2004/09/10
- CVS shishi/lib, shishi-commit, 2004/09/17
- CVS shishi/lib, shishi-commit, 2004/09/17
- CVS shishi/lib, shishi-commit, 2004/09/17
- CVS shishi/lib, shishi-commit, 2004/09/17
- CVS shishi/lib, shishi-commit, 2004/09/17
- CVS shishi/lib, shishi-commit, 2004/09/17
- CVS shishi/lib, shishi-commit, 2004/09/17
- CVS shishi/lib, shishi-commit, 2004/09/17
- CVS shishi/lib, shishi-commit, 2004/09/17