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

int len -> size_t len

Browse Source 
fixed calls to `krb5_{en,de}crypt'


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2023 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-07-07 09:53:00 +00:00
parent 69790eb6db
commit b0c9ece231
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/krb5/get_in_tkt.c
View File

@@ -15,6 +15,7 @@ decrypt_tkt (krb5_context context,
ret = krb5_decrypt (context, ret = krb5_decrypt (context,
dec_rep->part1.enc_part.cipher.data, dec_rep->part1.enc_part.cipher.data,
dec_rep->part1.enc_part.cipher.length, dec_rep->part1.enc_part.cipher.length,
dec_rep->part1.enc_part.etype,
key, key,
&data); &data);
if (ret) if (ret)
@@ -52,7 +53,7 @@ extract_ticket(krb5_context context,
/* krb5_principal_free (rep.part1.cname);*/ /* krb5_principal_free (rep.part1.cname);*/
{ {
char buf[1024]; char buf[1024];
int len; size_t len;
encode_Ticket(buf + sizeof(buf) - 1, sizeof(buf), encode_Ticket(buf + sizeof(buf) - 1, sizeof(buf),
&rep->part1.ticket, &len); &rep->part1.ticket, &len);
creds->ticket.data = malloc(len); creds->ticket.data = malloc(len);
@@ -250,6 +251,7 @@ krb5_get_in_tkt(krb5_context context,
ret = krb5_encrypt (context, ret = krb5_encrypt (context,
buf + sizeof(buf) - len, buf + sizeof(buf) - len,
len, len,
encdata.etype,
key, key,
&encdata.cipher); &encdata.cipher);
if (ret) if (ret)

3
lib/krb5/mk_safe.c
View File

@@ -1,5 +1,4 @@
#include <krb5_locl.h> #include <krb5_locl.h>
#include "md4.h"
RCSID("$Id$"); RCSID("$Id$");
@@ -16,7 +15,7 @@ krb5_mk_safe(krb5_context context,
unsigned usec; unsigned usec;
krb5_addresses addr; krb5_addresses addr;
u_char buf[1024]; u_char buf[1024];
int len; size_t len;
r = krb5_create_checksum (context, r = krb5_create_checksum (context,
CKSUMTYPE_RSA_MD4, CKSUMTYPE_RSA_MD4,

6
lib/krb5/rd_rep.c
View File

@@ -10,10 +10,9 @@ krb5_rd_rep(krb5_context context,
{ {
krb5_error_code ret; krb5_error_code ret;
AP_REP ap_rep; AP_REP ap_rep;
int len; size_t len;
des_key_schedule schedule; des_key_schedule schedule;
char *buf; char *buf;
int i;
krb5_data data; krb5_data data;
ret = decode_AP_REP(inbuf->data, inbuf->length, &ap_rep, &len); ret = decode_AP_REP(inbuf->data, inbuf->length, &ap_rep, &len);
@@ -27,6 +26,7 @@ krb5_rd_rep(krb5_context context,
ret = krb5_decrypt (context, ret = krb5_decrypt (context,
ap_rep.enc_part.cipher.data, ap_rep.enc_part.cipher.data,
ap_rep.enc_part.cipher.length, ap_rep.enc_part.cipher.length,
ap_rep.enc_part.etype,
&auth_context->key, &auth_context->key,
&data); &data);
if (ret) if (ret)
@@ -38,7 +38,7 @@ krb5_rd_rep(krb5_context context,
ret = decode_EncAPRepPart(data.data, ret = decode_EncAPRepPart(data.data,
data.length, data.length,
*repl, *repl,
&i); &len);
if (ret) if (ret)
return ret; return ret;
if ((*repl)->ctime != auth_context->authenticator->ctime || if ((*repl)->ctime != auth_context->authenticator->ctime ||

16
lib/krb5/rd_req.c
View File

@@ -10,9 +10,13 @@ decrypt_tkt_enc_part (krb5_context context,
{ {
krb5_error_code ret; krb5_error_code ret;
krb5_data plain; krb5_data plain;
int len; size_t len;
ret = krb5_decrypt (context, enc_part->cipher.data, enc_part->cipher.length, key, &plain); ret = krb5_decrypt (context,
enc_part->cipher.data,
enc_part->cipher.length,
enc_part->etype,
key, &plain);
if (ret) if (ret)
return ret; return ret;
@@ -33,7 +37,11 @@ decrypt_authenticator (krb5_context context,
krb5_data plain; krb5_data plain;
size_t len; size_t len;
ret = krb5_decrypt (context, enc_part->cipher.data, enc_part->cipher.length, key, &plain); ret = krb5_decrypt (context,
enc_part->cipher.data,
enc_part->cipher.length,
enc_part->etype,
key, &plain);
if (ret) if (ret)
return ret; return ret;
@@ -55,7 +63,7 @@ krb5_rd_req_with_keyblock(krb5_context context,
{ {
krb5_error_code ret; krb5_error_code ret;
AP_REQ ap_req; AP_REQ ap_req;
int len; size_t len;
struct timeval now; struct timeval now;
if (*auth_context == NULL) { if (*auth_context == NULL) {