From 1ee6d08980813cef20d431975b0c45aad4cac27d Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Tue, 25 Jan 2000 23:10:13 +0000 Subject: [PATCH] update to pseudo-standard APIs for md4,md5,sha. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7819 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/des/mdtest.c | 30 +++++++++++++++--------------- lib/gssapi/8003.c | 24 ++++++++++++------------ lib/gssapi/krb5/8003.c | 24 ++++++++++++------------ 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lib/des/mdtest.c b/lib/des/mdtest.c index 668ea1fca..e1f072198 100644 --- a/lib/des/mdtest.c +++ b/lib/des/mdtest.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan + * Copyright (c) 1995 - 2000 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -70,13 +70,13 @@ md4_tests (void) printf ("md4... "); for (t = tests; t->str; ++t) { - struct md4 md4; + MD4_CTX md4; unsigned char res[16]; int i; - md4_init (&md4); - md4_update (&md4, (unsigned char *)t->str, strlen(t->str)); - md4_finito (&md4, res); + MD4Init (&md4); + MD4Update (&md4, (unsigned char *)t->str, strlen(t->str)); + MD4Final (res, &md4); if (memcmp (res, t->hash, 16) != 0) { printf ("MD4(\"%s\") failed\n", t->str); printf("should be: "); @@ -113,12 +113,12 @@ md5_tests (void) printf ("md5... "); for (t = tests; t->str; ++t) { - struct md5 md5; + MD5_CTX md5; unsigned char res[16]; - md5_init (&md5); - md5_update (&md5, (unsigned char *)t->str, strlen(t->str)); - md5_finito (&md5, res); + MD5Init (&md5); + MD5Update (&md5, (unsigned char *)t->str, strlen(t->str)); + MD5Final (res, &md5); if (memcmp (res, t->hash, 16) != 0) { int i; @@ -139,7 +139,7 @@ md5_tests (void) static int -sha_tests (void) +sha1_tests (void) { struct test { char *str; @@ -157,12 +157,12 @@ sha_tests (void) printf ("sha... "); for (t = tests; t->str; ++t) { - struct sha sha; + SHA1_CTX sha; unsigned char res[20]; - sha_init (&sha); - sha_update (&sha, (unsigned char *)t->str, strlen(t->str)); - sha_finito (&sha, res); + SHA1Init (&sha); + SHA1Update (&sha, (unsigned char *)t->str, strlen(t->str)); + SHA1Final (res, &sha); if (memcmp (res, t->hash, 20) != 0) { int i; @@ -184,5 +184,5 @@ sha_tests (void) int main (void) { - return md4_tests() + md5_tests() + sha_tests(); + return md4_tests() + md5_tests() + sha1_tests(); } diff --git a/lib/gssapi/8003.c b/lib/gssapi/8003.c index bb9f7adf8..d6714ca56 100644 --- a/lib/gssapi/8003.c +++ b/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. * @@ -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/lib/gssapi/krb5/8003.c b/lib/gssapi/krb5/8003.c index bb9f7adf8..d6714ca56 100644 --- a/lib/gssapi/krb5/8003.c +++ b/lib/gssapi/krb5/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. * @@ -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; }