From eba6c2d7862e3bf4b8d2daa07c60f3acae9982fc Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Thu, 27 Jul 2000 10:30:12 +0000 Subject: [PATCH] be compatible with libdes's des_cbc_* prototypes git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8856 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/gssapi/get_mic.c | 4 ++-- lib/gssapi/krb5/get_mic.c | 4 ++-- lib/gssapi/krb5/unwrap.c | 6 +++--- lib/gssapi/krb5/verify_mic.c | 4 ++-- lib/gssapi/krb5/wrap.c | 6 +++--- lib/gssapi/unwrap.c | 6 +++--- lib/gssapi/verify_mic.c | 4 ++-- lib/gssapi/wrap.c | 6 +++--- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/gssapi/get_mic.c b/lib/gssapi/get_mic.c index 13ee039c9..863e2e9bd 100644 --- a/lib/gssapi/get_mic.c +++ b/lib/gssapi/get_mic.c @@ -82,7 +82,7 @@ OM_uint32 gss_get_mic memset (&zero, 0, sizeof(zero)); gss_krb5_getsomekey(context_handle, &key); des_set_key (&key, schedule); - des_cbc_cksum ((const void *)hash, (void *)hash, sizeof(hash), + des_cbc_cksum ((void *)hash, (void *)hash, sizeof(hash), schedule, &zero); memcpy (p - 8, hash, 8); @@ -101,7 +101,7 @@ OM_uint32 gss_get_mic 4); des_set_key (&key, schedule); - des_cbc_encrypt ((const void *)p, (void *)p, 8, + des_cbc_encrypt ((void *)p, (void *)p, 8, schedule, (des_cblock *)(p + 8), DES_ENCRYPT); krb5_auth_setlocalseqnumber (gssapi_krb5_context, diff --git a/lib/gssapi/krb5/get_mic.c b/lib/gssapi/krb5/get_mic.c index 13ee039c9..863e2e9bd 100644 --- a/lib/gssapi/krb5/get_mic.c +++ b/lib/gssapi/krb5/get_mic.c @@ -82,7 +82,7 @@ OM_uint32 gss_get_mic memset (&zero, 0, sizeof(zero)); gss_krb5_getsomekey(context_handle, &key); des_set_key (&key, schedule); - des_cbc_cksum ((const void *)hash, (void *)hash, sizeof(hash), + des_cbc_cksum ((void *)hash, (void *)hash, sizeof(hash), schedule, &zero); memcpy (p - 8, hash, 8); @@ -101,7 +101,7 @@ OM_uint32 gss_get_mic 4); des_set_key (&key, schedule); - des_cbc_encrypt ((const void *)p, (void *)p, 8, + des_cbc_encrypt ((void *)p, (void *)p, 8, schedule, (des_cblock *)(p + 8), DES_ENCRYPT); krb5_auth_setlocalseqnumber (gssapi_krb5_context, diff --git a/lib/gssapi/krb5/unwrap.c b/lib/gssapi/krb5/unwrap.c index 65c52bce4..2bee77f0d 100644 --- a/lib/gssapi/krb5/unwrap.c +++ b/lib/gssapi/krb5/unwrap.c @@ -114,7 +114,7 @@ OM_uint32 gss_unwrap key[i] ^= 0xf0; des_set_key (&key, schedule); memset (&zero, 0, sizeof(zero)); - des_cbc_encrypt ((const void *)p, + des_cbc_encrypt ((void *)p, (void *)p, input_message_buffer->length - len, schedule, @@ -142,7 +142,7 @@ OM_uint32 gss_unwrap memset (&zero, 0, sizeof(zero)); gss_krb5_getsomekey(context_handle, &key); des_set_key (&key, schedule); - des_cbc_cksum ((const void *)hash, (void *)hash, sizeof(hash), + des_cbc_cksum ((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 ((const void *)p, (void *)p, 8, + des_cbc_encrypt ((void *)p, (void *)p, 8, schedule, (des_cblock *)hash, DES_DECRYPT); memset (key, 0, sizeof(key)); diff --git a/lib/gssapi/krb5/verify_mic.c b/lib/gssapi/krb5/verify_mic.c index 86f410c3e..2a7e15062 100644 --- a/lib/gssapi/krb5/verify_mic.c +++ b/lib/gssapi/krb5/verify_mic.c @@ -83,7 +83,7 @@ OM_uint32 gss_verify_mic sizeof(key)); des_set_key (&key, schedule); - des_cbc_cksum ((const void *)hash, (void *)hash, sizeof(hash), + des_cbc_cksum ((void *)hash, (void *)hash, sizeof(hash), schedule, &zero); if (memcmp (p - 8, hash, 8) != 0) { memset (key, 0, sizeof(key)); @@ -106,7 +106,7 @@ OM_uint32 gss_verify_mic p -= 16; des_set_key (&key, schedule); - des_cbc_encrypt ((const void *)p, (void *)p, 8, + des_cbc_encrypt ((void *)p, (void *)p, 8, schedule, (des_cblock *)hash, DES_DECRYPT); memset (key, 0, sizeof(key)); diff --git a/lib/gssapi/krb5/wrap.c b/lib/gssapi/krb5/wrap.c index 317498840..43f4d72e1 100644 --- a/lib/gssapi/krb5/wrap.c +++ b/lib/gssapi/krb5/wrap.c @@ -118,7 +118,7 @@ OM_uint32 gss_wrap memset (&zero, 0, sizeof(zero)); gss_krb5_getsomekey(context_handle, &key); des_set_key (&key, schedule); - des_cbc_cksum ((const void *)hash, (void *)hash, sizeof(hash), + des_cbc_cksum ((void *)hash, (void *)hash, sizeof(hash), schedule, &zero); memcpy (p - 8, hash, 8); @@ -137,7 +137,7 @@ OM_uint32 gss_wrap 4); des_set_key (&key, schedule); - des_cbc_encrypt ((const void *)p, (void *)p, 8, + des_cbc_encrypt ((void *)p, (void *)p, 8, schedule, (des_cblock *)(p + 8), DES_ENCRYPT); krb5_auth_setlocalseqnumber (gssapi_krb5_context, @@ -153,7 +153,7 @@ OM_uint32 gss_wrap key[i] ^= 0xf0; des_set_key (&key, schedule); memset (&zero, 0, sizeof(zero)); - des_cbc_encrypt ((const void *)p, + des_cbc_encrypt ((void *)p, (void *)p, 8 + input_message_buffer->length + padlength, schedule, diff --git a/lib/gssapi/unwrap.c b/lib/gssapi/unwrap.c index 65c52bce4..2bee77f0d 100644 --- a/lib/gssapi/unwrap.c +++ b/lib/gssapi/unwrap.c @@ -114,7 +114,7 @@ OM_uint32 gss_unwrap key[i] ^= 0xf0; des_set_key (&key, schedule); memset (&zero, 0, sizeof(zero)); - des_cbc_encrypt ((const void *)p, + des_cbc_encrypt ((void *)p, (void *)p, input_message_buffer->length - len, schedule, @@ -142,7 +142,7 @@ OM_uint32 gss_unwrap memset (&zero, 0, sizeof(zero)); gss_krb5_getsomekey(context_handle, &key); des_set_key (&key, schedule); - des_cbc_cksum ((const void *)hash, (void *)hash, sizeof(hash), + des_cbc_cksum ((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 ((const void *)p, (void *)p, 8, + des_cbc_encrypt ((void *)p, (void *)p, 8, schedule, (des_cblock *)hash, DES_DECRYPT); memset (key, 0, sizeof(key)); diff --git a/lib/gssapi/verify_mic.c b/lib/gssapi/verify_mic.c index 86f410c3e..2a7e15062 100644 --- a/lib/gssapi/verify_mic.c +++ b/lib/gssapi/verify_mic.c @@ -83,7 +83,7 @@ OM_uint32 gss_verify_mic sizeof(key)); des_set_key (&key, schedule); - des_cbc_cksum ((const void *)hash, (void *)hash, sizeof(hash), + des_cbc_cksum ((void *)hash, (void *)hash, sizeof(hash), schedule, &zero); if (memcmp (p - 8, hash, 8) != 0) { memset (key, 0, sizeof(key)); @@ -106,7 +106,7 @@ OM_uint32 gss_verify_mic p -= 16; des_set_key (&key, schedule); - des_cbc_encrypt ((const void *)p, (void *)p, 8, + des_cbc_encrypt ((void *)p, (void *)p, 8, schedule, (des_cblock *)hash, DES_DECRYPT); memset (key, 0, sizeof(key)); diff --git a/lib/gssapi/wrap.c b/lib/gssapi/wrap.c index 317498840..43f4d72e1 100644 --- a/lib/gssapi/wrap.c +++ b/lib/gssapi/wrap.c @@ -118,7 +118,7 @@ OM_uint32 gss_wrap memset (&zero, 0, sizeof(zero)); gss_krb5_getsomekey(context_handle, &key); des_set_key (&key, schedule); - des_cbc_cksum ((const void *)hash, (void *)hash, sizeof(hash), + des_cbc_cksum ((void *)hash, (void *)hash, sizeof(hash), schedule, &zero); memcpy (p - 8, hash, 8); @@ -137,7 +137,7 @@ OM_uint32 gss_wrap 4); des_set_key (&key, schedule); - des_cbc_encrypt ((const void *)p, (void *)p, 8, + des_cbc_encrypt ((void *)p, (void *)p, 8, schedule, (des_cblock *)(p + 8), DES_ENCRYPT); krb5_auth_setlocalseqnumber (gssapi_krb5_context, @@ -153,7 +153,7 @@ OM_uint32 gss_wrap key[i] ^= 0xf0; des_set_key (&key, schedule); memset (&zero, 0, sizeof(zero)); - des_cbc_encrypt ((const void *)p, + des_cbc_encrypt ((void *)p, (void *)p, 8 + input_message_buffer->length + padlength, schedule,