diff options
Diffstat (limited to 'crypto/heimdal/lib/gssapi')
-rw-r--r-- | crypto/heimdal/lib/gssapi/8003.c | 26 | ||||
-rw-r--r-- | crypto/heimdal/lib/gssapi/ChangeLog | 19 | ||||
-rw-r--r-- | crypto/heimdal/lib/gssapi/Makefile.am | 4 | ||||
-rw-r--r-- | crypto/heimdal/lib/gssapi/Makefile.in | 4 | ||||
-rw-r--r-- | crypto/heimdal/lib/gssapi/context_time.c | 6 | ||||
-rw-r--r-- | crypto/heimdal/lib/gssapi/delete_sec_context.c | 12 | ||||
-rw-r--r-- | crypto/heimdal/lib/gssapi/get_mic.c | 22 | ||||
-rw-r--r-- | crypto/heimdal/lib/gssapi/unwrap.c | 24 | ||||
-rw-r--r-- | crypto/heimdal/lib/gssapi/verify_mic.c | 22 | ||||
-rw-r--r-- | crypto/heimdal/lib/gssapi/wrap.c | 24 |
10 files changed, 91 insertions, 72 deletions
diff --git a/crypto/heimdal/lib/gssapi/8003.c b/crypto/heimdal/lib/gssapi/8003.c index 61fe215..f37fe04 100644 --- a/crypto/heimdal/lib/gssapi/8003.c +++ b/crypto/heimdal/lib/gssapi/8003.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -33,7 +33,7 @@ #include "gssapi_locl.h" -RCSID("$Id: 8003.c,v 1.5 1999/12/02 17:05:03 joda Exp $"); +RCSID("$Id: 8003.c,v 1.6 2000/01/25 23:10:13 assar Exp $"); static krb5_error_code encode_om_uint32(OM_uint32 n, u_char *p) @@ -57,32 +57,32 @@ hash_input_chan_bindings (const gss_channel_bindings_t b, u_char *p) { u_char num[4]; - struct md5 md5; + MD5_CTX md5; - md5_init(&md5); + MD5Init(&md5); encode_om_uint32 (b->initiator_addrtype, num); - md5_update (&md5, num, sizeof(num)); + MD5Update (&md5, num, sizeof(num)); encode_om_uint32 (b->initiator_address.length, num); - md5_update (&md5, num, sizeof(num)); + MD5Update (&md5, num, sizeof(num)); if (b->initiator_address.length) - md5_update (&md5, + MD5Update (&md5, b->initiator_address.value, b->initiator_address.length); encode_om_uint32 (b->acceptor_addrtype, num); - md5_update (&md5, num, sizeof(num)); + MD5Update (&md5, num, sizeof(num)); encode_om_uint32 (b->acceptor_address.length, num); - md5_update (&md5, num, sizeof(num)); + MD5Update (&md5, num, sizeof(num)); if (b->acceptor_address.length) - md5_update (&md5, + MD5Update (&md5, b->acceptor_address.value, b->acceptor_address.length); encode_om_uint32 (b->application_data.length, num); - md5_update (&md5, num, sizeof(num)); + MD5Update (&md5, num, sizeof(num)); if (b->application_data.length) - md5_update (&md5, + MD5Update (&md5, b->application_data.value, b->application_data.length); - md5_finito (&md5, p); + MD5Final (p, &md5); return 0; } diff --git a/crypto/heimdal/lib/gssapi/ChangeLog b/crypto/heimdal/lib/gssapi/ChangeLog index 2524003..d8f80f4 100644 --- a/crypto/heimdal/lib/gssapi/ChangeLog +++ b/crypto/heimdal/lib/gssapi/ChangeLog @@ -1,3 +1,22 @@ +2000-02-07 Assar Westerlund <assar@sics.se> + + * Makefile.am: set version to 0:5:0 + +2000-01-26 Assar Westerlund <assar@sics.se> + + * delete_sec_context.c (gss_delete_sec_context): handle a NULL + output_token + + * wrap.c: update to pseudo-standard APIs for md4,md5,sha. some + changes to libdes calls to make them more portable. + * verify_mic.c: update to pseudo-standard APIs for md4,md5,sha. + some changes to libdes calls to make them more portable. + * unwrap.c: update to pseudo-standard APIs for md4,md5,sha. some + changes to libdes calls to make them more portable. + * get_mic.c: update to pseudo-standard APIs for md4,md5,sha. some + changes to libdes calls to make them more portable. + * 8003.c: update to pseudo-standard APIs for md4,md5,sha. + 2000-01-06 Assar Westerlund <assar@sics.se> * Makefile.am: set version to 0:4:0 diff --git a/crypto/heimdal/lib/gssapi/Makefile.am b/crypto/heimdal/lib/gssapi/Makefile.am index ff4ef63..72bdf45 100644 --- a/crypto/heimdal/lib/gssapi/Makefile.am +++ b/crypto/heimdal/lib/gssapi/Makefile.am @@ -1,11 +1,11 @@ -# $Id: Makefile.am,v 1.17 2000/01/06 21:47:40 assar Exp $ +# $Id: Makefile.am,v 1.19 2000/02/07 04:00:51 assar Exp $ include $(top_srcdir)/Makefile.am.common INCLUDES += -I$(srcdir)/../krb5 lib_LTLIBRARIES = libgssapi.la -libgssapi_la_LDFLAGS = -version-info 0:4:0 +libgssapi_la_LDFLAGS = -version-info 0:5:0 include_HEADERS = gssapi.h diff --git a/crypto/heimdal/lib/gssapi/Makefile.in b/crypto/heimdal/lib/gssapi/Makefile.in index 4e658c1..2ecd970 100644 --- a/crypto/heimdal/lib/gssapi/Makefile.in +++ b/crypto/heimdal/lib/gssapi/Makefile.in @@ -10,7 +10,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# $Id: Makefile.am,v 1.17 2000/01/06 21:47:40 assar Exp $ +# $Id: Makefile.am,v 1.19 2000/02/07 04:00:51 assar Exp $ # $Id: Makefile.am.common,v 1.3 1999/04/01 14:58:43 joda Exp $ @@ -174,7 +174,7 @@ NROFF_MAN = groff -mandoc -Tascii CHECK_LOCAL = $(PROGRAMS) lib_LTLIBRARIES = libgssapi.la -libgssapi_la_LDFLAGS = -version-info 0:4:0 +libgssapi_la_LDFLAGS = -version-info 0:5:0 include_HEADERS = gssapi.h diff --git a/crypto/heimdal/lib/gssapi/context_time.c b/crypto/heimdal/lib/gssapi/context_time.c index 2a04ce8..1882eb3 100644 --- a/crypto/heimdal/lib/gssapi/context_time.c +++ b/crypto/heimdal/lib/gssapi/context_time.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -33,7 +33,7 @@ #include "gssapi_locl.h" -RCSID("$Id: context_time.c,v 1.2 1999/12/02 17:05:03 joda Exp $"); +RCSID("$Id: context_time.c,v 1.3 2000/02/06 08:14:16 assar Exp $"); OM_uint32 gss_context_time (OM_uint32 * minor_status, @@ -44,7 +44,7 @@ OM_uint32 gss_context_time OM_uint32 lifetime; OM_uint32 ret; krb5_error_code kret; - int32_t timeret; + krb5_timestamp timeret; gssapi_krb5_init(); diff --git a/crypto/heimdal/lib/gssapi/delete_sec_context.c b/crypto/heimdal/lib/gssapi/delete_sec_context.c index 514206c..faa77e4 100644 --- a/crypto/heimdal/lib/gssapi/delete_sec_context.c +++ b/crypto/heimdal/lib/gssapi/delete_sec_context.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 1999 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -33,7 +33,7 @@ #include "gssapi_locl.h" -RCSID("$Id: delete_sec_context.c,v 1.5 1999/12/26 18:31:06 assar Exp $"); +RCSID("$Id: delete_sec_context.c,v 1.6 2000/01/26 00:45:46 assar Exp $"); OM_uint32 gss_delete_sec_context (OM_uint32 * minor_status, @@ -43,8 +43,10 @@ OM_uint32 gss_delete_sec_context { gssapi_krb5_init (); - output_token->length = 0; - output_token->value = NULL; + if (output_token) { + output_token->length = 0; + output_token->value = NULL; + } krb5_auth_con_free (gssapi_krb5_context, (*context_handle)->auth_context); @@ -58,7 +60,5 @@ OM_uint32 gss_delete_sec_context krb5_free_ticket (gssapi_krb5_context, (*context_handle)->ticket); free (*context_handle); - if (output_token) - output_token->length = 0; return GSS_S_COMPLETE; } diff --git a/crypto/heimdal/lib/gssapi/get_mic.c b/crypto/heimdal/lib/gssapi/get_mic.c index 2b779c7..8dd1b6f 100644 --- a/crypto/heimdal/lib/gssapi/get_mic.c +++ b/crypto/heimdal/lib/gssapi/get_mic.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -33,7 +33,7 @@ #include "gssapi_locl.h" -RCSID("$Id: get_mic.c,v 1.9 1999/12/02 17:05:03 joda Exp $"); +RCSID("$Id: get_mic.c,v 1.11 2000/01/25 23:19:22 assar Exp $"); OM_uint32 gss_get_mic (OM_uint32 * minor_status, @@ -44,7 +44,7 @@ OM_uint32 gss_get_mic ) { u_char *p; - struct md5 md5; + MD5_CTX md5; u_char hash[16]; des_key_schedule schedule; des_cblock key; @@ -73,17 +73,17 @@ OM_uint32 gss_get_mic p += 16; /* checksum */ - md5_init (&md5); - md5_update (&md5, p - 24, 8); - md5_update (&md5, message_buffer->value, - message_buffer->length); - md5_finito (&md5, hash); + MD5Init (&md5); + MD5Update (&md5, p - 24, 8); + MD5Update (&md5, message_buffer->value, + message_buffer->length); + MD5Final (hash, &md5); memset (&zero, 0, sizeof(zero)); gss_krb5_getsomekey(context_handle, &key); des_set_key (&key, schedule); - des_cbc_cksum ((des_cblock *)hash, - (des_cblock *)hash, sizeof(hash), schedule, &zero); + des_cbc_cksum ((const void *)hash, (void *)hash, sizeof(hash), + schedule, &zero); memcpy (p - 8, hash, 8); /* sequence number */ @@ -101,7 +101,7 @@ OM_uint32 gss_get_mic 4); des_set_key (&key, schedule); - des_cbc_encrypt ((des_cblock *)p, (des_cblock *)p, 8, + des_cbc_encrypt ((const void *)p, (void *)p, 8, schedule, (des_cblock *)(p + 8), DES_ENCRYPT); krb5_auth_setlocalseqnumber (gssapi_krb5_context, diff --git a/crypto/heimdal/lib/gssapi/unwrap.c b/crypto/heimdal/lib/gssapi/unwrap.c index 45b1df1..210bab1 100644 --- a/crypto/heimdal/lib/gssapi/unwrap.c +++ b/crypto/heimdal/lib/gssapi/unwrap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -33,7 +33,7 @@ #include "gssapi_locl.h" -RCSID("$Id: unwrap.c,v 1.10 1999/12/02 17:05:04 joda Exp $"); +RCSID("$Id: unwrap.c,v 1.11 2000/01/25 23:13:38 assar Exp $"); OM_uint32 gss_krb5_getsomekey(const gss_ctx_id_t context_handle, @@ -70,7 +70,7 @@ OM_uint32 gss_unwrap { u_char *p, *pad; size_t len; - struct md5 md5; + MD5_CTX md5; u_char hash[16], seq_data[8]; des_key_schedule schedule; des_cblock key; @@ -114,8 +114,8 @@ OM_uint32 gss_unwrap key[i] ^= 0xf0; des_set_key (&key, schedule); memset (&zero, 0, sizeof(zero)); - des_cbc_encrypt ((des_cblock *)p, - (des_cblock *)p, + des_cbc_encrypt ((const void *)p, + (void *)p, input_message_buffer->length - len, schedule, &zero, @@ -134,16 +134,16 @@ OM_uint32 gss_unwrap if (i != 0) return GSS_S_BAD_MIC; - md5_init (&md5); - md5_update (&md5, p - 24, 8); - md5_update (&md5, p, input_message_buffer->length - len); - md5_finito (&md5, hash); + MD5Init (&md5); + MD5Update (&md5, p - 24, 8); + MD5Update (&md5, p, input_message_buffer->length - len); + MD5Final (hash, &md5); memset (&zero, 0, sizeof(zero)); gss_krb5_getsomekey(context_handle, &key); des_set_key (&key, schedule); - des_cbc_cksum ((des_cblock *)hash, - (des_cblock *)hash, sizeof(hash), schedule, &zero); + des_cbc_cksum ((const void *)hash, (void *)hash, sizeof(hash), + schedule, &zero); if (memcmp (p - 8, hash, 8) != 0) return GSS_S_BAD_MIC; @@ -162,7 +162,7 @@ OM_uint32 gss_unwrap p -= 16; des_set_key (&key, schedule); - des_cbc_encrypt ((des_cblock *)p, (des_cblock *)p, 8, + des_cbc_encrypt ((const void *)p, (void *)p, 8, schedule, (des_cblock *)hash, DES_DECRYPT); memset (key, 0, sizeof(key)); diff --git a/crypto/heimdal/lib/gssapi/verify_mic.c b/crypto/heimdal/lib/gssapi/verify_mic.c index d4342a6..1cc4c52 100644 --- a/crypto/heimdal/lib/gssapi/verify_mic.c +++ b/crypto/heimdal/lib/gssapi/verify_mic.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -33,7 +33,7 @@ #include "gssapi_locl.h" -RCSID("$Id: verify_mic.c,v 1.8 1999/12/02 17:05:04 joda Exp $"); +RCSID("$Id: verify_mic.c,v 1.9 2000/01/25 23:14:47 assar Exp $"); OM_uint32 gss_verify_mic (OM_uint32 * minor_status, @@ -44,7 +44,7 @@ OM_uint32 gss_verify_mic ) { u_char *p; - struct md5 md5; + MD5_CTX md5; u_char hash[16], seq_data[8]; des_key_schedule schedule; des_cblock key; @@ -68,11 +68,11 @@ OM_uint32 gss_verify_mic p += 16; /* verify checksum */ - md5_init (&md5); - md5_update (&md5, p - 24, 8); - md5_update (&md5, message_buffer->value, - message_buffer->length); - md5_finito (&md5, hash); + MD5Init (&md5); + MD5Update (&md5, p - 24, 8); + MD5Update (&md5, message_buffer->value, + message_buffer->length); + MD5Final (hash, &md5); memset (&zero, 0, sizeof(zero)); #if 0 @@ -83,8 +83,8 @@ OM_uint32 gss_verify_mic sizeof(key)); des_set_key (&key, schedule); - des_cbc_cksum ((des_cblock *)hash, - (des_cblock *)hash, sizeof(hash), schedule, &zero); + des_cbc_cksum ((const void *)hash, (void *)hash, sizeof(hash), + schedule, &zero); if (memcmp (p - 8, hash, 8) != 0) { memset (key, 0, sizeof(key)); memset (schedule, 0, sizeof(schedule)); @@ -106,7 +106,7 @@ OM_uint32 gss_verify_mic p -= 16; des_set_key (&key, schedule); - des_cbc_encrypt ((des_cblock *)p, (des_cblock *)p, 8, + des_cbc_encrypt ((const void *)p, (void *)p, 8, schedule, (des_cblock *)hash, DES_DECRYPT); memset (key, 0, sizeof(key)); diff --git a/crypto/heimdal/lib/gssapi/wrap.c b/crypto/heimdal/lib/gssapi/wrap.c index 98ee689..c71f2b1 100644 --- a/crypto/heimdal/lib/gssapi/wrap.c +++ b/crypto/heimdal/lib/gssapi/wrap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -33,7 +33,7 @@ #include "gssapi_locl.h" -RCSID("$Id: wrap.c,v 1.10 1999/12/02 17:05:04 joda Exp $"); +RCSID("$Id: wrap.c,v 1.11 2000/01/25 23:15:44 assar Exp $"); OM_uint32 gss_wrap_size_limit ( OM_uint32 * minor_status, @@ -63,7 +63,7 @@ OM_uint32 gss_wrap ) { u_char *p; - struct md5 md5; + MD5_CTX md5; u_char hash[16]; des_key_schedule schedule; des_cblock key; @@ -110,16 +110,16 @@ OM_uint32 gss_wrap memset (p + 8 + input_message_buffer->length, padlength, padlength); /* checksum */ - md5_init (&md5); - md5_update (&md5, p - 24, 8); - md5_update (&md5, p, input_message_buffer->length + padlength + 8); - md5_finito (&md5, hash); + MD5Init (&md5); + MD5Update (&md5, p - 24, 8); + MD5Update (&md5, p, input_message_buffer->length + padlength + 8); + MD5Final (hash, &md5); memset (&zero, 0, sizeof(zero)); gss_krb5_getsomekey(context_handle, &key); des_set_key (&key, schedule); - des_cbc_cksum ((des_cblock *)hash, - (des_cblock *)hash, sizeof(hash), schedule, &zero); + des_cbc_cksum ((const void *)hash, (void *)hash, sizeof(hash), + schedule, &zero); memcpy (p - 8, hash, 8); /* sequence number */ @@ -137,7 +137,7 @@ OM_uint32 gss_wrap 4); des_set_key (&key, schedule); - des_cbc_encrypt ((des_cblock *)p, (des_cblock *)p, 8, + des_cbc_encrypt ((const void *)p, (void *)p, 8, schedule, (des_cblock *)(p + 8), DES_ENCRYPT); krb5_auth_setlocalseqnumber (gssapi_krb5_context, @@ -153,8 +153,8 @@ OM_uint32 gss_wrap key[i] ^= 0xf0; des_set_key (&key, schedule); memset (&zero, 0, sizeof(zero)); - des_cbc_encrypt ((des_cblock *)p, - (des_cblock *)p, + des_cbc_encrypt ((const void *)p, + (void *)p, 8 + input_message_buffer->length + padlength, schedule, &zero, |