generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Kerberos warnings with VC++.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2002-03-12 19:38:16 +00:00
parent c03ceadfbd
commit e38e8b29f8
2 changed files with 14 additions and 5 deletions

17
ssl/kssl.c

@ -128,9 +128,19 @@
#define krb5_decrypt_tkt_part kssl_krb5_decrypt_tkt_part #define krb5_decrypt_tkt_part kssl_krb5_decrypt_tkt_part
#define krb5_timeofday kssl_krb5_timeofday #define krb5_timeofday kssl_krb5_timeofday
#define krb5_rc_default kssl_krb5_rc_default #define krb5_rc_default kssl_krb5_rc_default
#ifndef krb5_rc_initialize
#define krb5_rc_initialize kssl_krb5_rc_initialize #define krb5_rc_initialize kssl_krb5_rc_initialize
#endif
#ifndef krb5_rc_get_lifespan
#define krb5_rc_get_lifespan kssl_krb5_rc_get_lifespan #define krb5_rc_get_lifespan kssl_krb5_rc_get_lifespan
#endif
#ifndef krb5_rc_destroy
#define krb5_rc_destroy kssl_krb5_rc_destroy #define krb5_rc_destroy kssl_krb5_rc_destroy
#endif
#define valid_cksumtype kssl_valid_cksumtype #define valid_cksumtype kssl_valid_cksumtype
#define krb5_checksum_size kssl_krb5_checksum_size #define krb5_checksum_size kssl_krb5_checksum_size
#define krb5_kt_free_entry kssl_krb5_kt_free_entry #define krb5_kt_free_entry kssl_krb5_kt_free_entry
@ -933,7 +943,7 @@ kssl_err_set(KSSL_ERR *kssl_err, int reason, char *text)
void void
print_krb5_data(char *label, krb5_data *kdata) print_krb5_data(char *label, krb5_data *kdata)
{ {
unsigned int i; int i;
printf("%s[%d] ", label, kdata->length); printf("%s[%d] ", label, kdata->length);
for (i=0; i < kdata->length; i++) for (i=0; i < kdata->length; i++)
@ -978,7 +988,7 @@ print_krb5_authdata(char *label, krb5_authdata **adata)
void void
print_krb5_keyblock(char *label, krb5_keyblock *keyblk) print_krb5_keyblock(char *label, krb5_keyblock *keyblk)
{ {
unsigned int i; int i;
if (keyblk == NULL) if (keyblk == NULL)
{ {
@ -1010,8 +1020,7 @@ print_krb5_keyblock(char *label, krb5_keyblock *keyblk)
void void
print_krb5_princ(char *label, krb5_principal_data *princ) print_krb5_princ(char *label, krb5_principal_data *princ)
{ {
unsigned int ui, uj; int i, ui, uj;
int i;
printf("%s principal Realm: ", label); printf("%s principal Realm: ", label);
if (princ == NULL) return; if (princ == NULL) return;

2
ssl/s3_srvr.c

@ -1574,7 +1574,7 @@ static int ssl3_get_client_key_exchange(SSL *s)
enc_pms.data = (char *)p; enc_pms.data = (char *)p;
p+=enc_pms.length; p+=enc_pms.length;
if ((unsigned long)n != enc_ticket.length + authenticator.length + if (n != enc_ticket.length + authenticator.length +
enc_pms.length + 6) enc_pms.length + 6)
{ {
SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,