summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1995-09-23 01:35:53 +0000
committerTheodore Tso <tytso@mit.edu>1995-09-23 01:35:53 +0000
commita08b77afc7bb24043aba3e58bbc083f00d116fd8 (patch)
tree416f2bd27a349c93f5b05d692670335344afc91c /src/lib
parent9e7f2299b0df64a27d03e1ce304b74383daba2b2 (diff)
downloadkrb5-a08b77afc7bb24043aba3e58bbc083f00d116fd8.tar.gz
krb5-a08b77afc7bb24043aba3e58bbc083f00d116fd8.tar.xz
krb5-a08b77afc7bb24043aba3e58bbc083f00d116fd8.zip
get_in_t.c: removed unused variable.
rd_cred.c: removed INTERFACE keyword. ser_auth.c: passing int32 where a size_t is wanted. ser_ctx.c: 16/32 bit int size mismatch. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6826 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/krb5/krb/ChangeLog7
-rw-r--r--src/lib/krb5/krb/get_in_tkt.c2
-rw-r--r--src/lib/krb5/krb/rd_cred.c2
-rw-r--r--src/lib/krb5/krb/ser_auth.c6
-rw-r--r--src/lib/krb5/krb/ser_ctx.c2
5 files changed, 14 insertions, 5 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 1824c0c1e1..53d1640411 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,10 @@
+Wed Sep 13 10:58:20 1995 Keith Vetter (keithv@fusion.com)
+
+ * get_in_t.c: removed unused variable.
+ * rd_cred.c: removed INTERFACE keyword.
+ * ser_auth.c: passing int32 where a size_t is wanted.
+ * ser_ctx.c: 16/32 bit int size mismatch.
+
Sun Sep 17 23:41:19 1995 Ezra Peisach <epeisach@kangaroo.mit.edu>
* rd_safe.c: Fix typo error.
diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
index 3bd684dd71..5f0349f578 100644
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -86,7 +86,7 @@ krb5_get_in_tkt(context, options, addrs, ktypes, ptypes, key_proc, keyseed,
krb5_ccache ccache;
krb5_kdc_rep ** ret_as_reply;
{
- krb5_enctype enctype, ktype;
+ krb5_enctype enctype;
krb5_kdc_req request;
krb5_kdc_rep *as_reply = 0;
krb5_error *err_reply;
diff --git a/src/lib/krb5/krb/rd_cred.c b/src/lib/krb5/krb/rd_cred.c
index bb2398e193..539a75c96b 100644
--- a/src/lib/krb5/krb/rd_cred.c
+++ b/src/lib/krb5/krb/rd_cred.c
@@ -208,7 +208,7 @@ extern krb5_deltat krb5_clockskew;
* This functions takes as input an KRB_CRED message, validates it, and
* outputs the nonce and an array of the forwarded credentials.
*/
-krb5_error_code INTERFACE
+krb5_error_code
krb5_rd_cred(context, auth_context, pcreddata, pppcreds, outdata)
krb5_context context;
krb5_auth_context auth_context;
diff --git a/src/lib/krb5/krb/ser_auth.c b/src/lib/krb5/krb/ser_auth.c
index 828012ce36..791bbcf34a 100644
--- a/src/lib/krb5/krb/ser_auth.c
+++ b/src/lib/krb5/krb/ser_auth.c
@@ -239,6 +239,7 @@ krb5_authenticator_internalize(kcontext, argp, buffer, lenremain)
size_t remain;
int i;
krb5_int32 nadata;
+ size_t len;
bp = *buffer;
remain = *lenremain;
@@ -306,12 +307,13 @@ krb5_authenticator_internalize(kcontext, argp, buffer, lenremain)
/* Attempt to read in the authorization data count */
if (!(kret = krb5_ser_unpack_int32(&ibuf, &bp, &remain))) {
nadata = ibuf;
+ len = (size_t) (nadata + 1);
/* Get memory for the authorization data pointers */
if ((authenticator->authorization_data = (krb5_authdata **)
- malloc(sizeof(krb5_authdata *) * (nadata+1)))) {
+ malloc(sizeof(krb5_authdata *) * len))) {
memset(authenticator->authorization_data, 0,
- sizeof(krb5_authdata *) * (nadata+1));
+ sizeof(krb5_authdata *) * len);
for (i=0; !kret && (i<nadata); i++) {
kret = krb5_internalize_opaque(kcontext,
diff --git a/src/lib/krb5/krb/ser_ctx.c b/src/lib/krb5/krb/ser_ctx.c
index 695c43c968..69c0301e5e 100644
--- a/src/lib/krb5/krb/ser_ctx.c
+++ b/src/lib/krb5/krb/ser_ctx.c
@@ -283,7 +283,7 @@ krb5_context_internalize(kcontext, argp, buffer, lenremain)
/* Get the number of ktypes */
if (!(kret = krb5_ser_unpack_int32(&ibuf, &bp, &remain))) {
/* Reduce it to a count */
- context->ktype_count = ibuf;
+ context->ktype_count = (int) ibuf;
if ((context->ktypes = (krb5_enctype *)
malloc(sizeof(krb5_enctype) *
(context->ktype_count+1)))) {