be compatible with libdes's des_cbc_* prototypes
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8856 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -82,7 +82,7 @@ OM_uint32 gss_get_mic
|
|||||||
memset (&zero, 0, sizeof(zero));
|
memset (&zero, 0, sizeof(zero));
|
||||||
gss_krb5_getsomekey(context_handle, &key);
|
gss_krb5_getsomekey(context_handle, &key);
|
||||||
des_set_key (&key, schedule);
|
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);
|
schedule, &zero);
|
||||||
memcpy (p - 8, hash, 8);
|
memcpy (p - 8, hash, 8);
|
||||||
|
|
||||||
@@ -101,7 +101,7 @@ OM_uint32 gss_get_mic
|
|||||||
4);
|
4);
|
||||||
|
|
||||||
des_set_key (&key, schedule);
|
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);
|
schedule, (des_cblock *)(p + 8), DES_ENCRYPT);
|
||||||
|
|
||||||
krb5_auth_setlocalseqnumber (gssapi_krb5_context,
|
krb5_auth_setlocalseqnumber (gssapi_krb5_context,
|
||||||
|
@@ -82,7 +82,7 @@ OM_uint32 gss_get_mic
|
|||||||
memset (&zero, 0, sizeof(zero));
|
memset (&zero, 0, sizeof(zero));
|
||||||
gss_krb5_getsomekey(context_handle, &key);
|
gss_krb5_getsomekey(context_handle, &key);
|
||||||
des_set_key (&key, schedule);
|
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);
|
schedule, &zero);
|
||||||
memcpy (p - 8, hash, 8);
|
memcpy (p - 8, hash, 8);
|
||||||
|
|
||||||
@@ -101,7 +101,7 @@ OM_uint32 gss_get_mic
|
|||||||
4);
|
4);
|
||||||
|
|
||||||
des_set_key (&key, schedule);
|
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);
|
schedule, (des_cblock *)(p + 8), DES_ENCRYPT);
|
||||||
|
|
||||||
krb5_auth_setlocalseqnumber (gssapi_krb5_context,
|
krb5_auth_setlocalseqnumber (gssapi_krb5_context,
|
||||||
|
@@ -114,7 +114,7 @@ OM_uint32 gss_unwrap
|
|||||||
key[i] ^= 0xf0;
|
key[i] ^= 0xf0;
|
||||||
des_set_key (&key, schedule);
|
des_set_key (&key, schedule);
|
||||||
memset (&zero, 0, sizeof(zero));
|
memset (&zero, 0, sizeof(zero));
|
||||||
des_cbc_encrypt ((const void *)p,
|
des_cbc_encrypt ((void *)p,
|
||||||
(void *)p,
|
(void *)p,
|
||||||
input_message_buffer->length - len,
|
input_message_buffer->length - len,
|
||||||
schedule,
|
schedule,
|
||||||
@@ -142,7 +142,7 @@ OM_uint32 gss_unwrap
|
|||||||
memset (&zero, 0, sizeof(zero));
|
memset (&zero, 0, sizeof(zero));
|
||||||
gss_krb5_getsomekey(context_handle, &key);
|
gss_krb5_getsomekey(context_handle, &key);
|
||||||
des_set_key (&key, schedule);
|
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);
|
schedule, &zero);
|
||||||
if (memcmp (p - 8, hash, 8) != 0)
|
if (memcmp (p - 8, hash, 8) != 0)
|
||||||
return GSS_S_BAD_MIC;
|
return GSS_S_BAD_MIC;
|
||||||
@@ -162,7 +162,7 @@ OM_uint32 gss_unwrap
|
|||||||
|
|
||||||
p -= 16;
|
p -= 16;
|
||||||
des_set_key (&key, schedule);
|
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);
|
schedule, (des_cblock *)hash, DES_DECRYPT);
|
||||||
|
|
||||||
memset (key, 0, sizeof(key));
|
memset (key, 0, sizeof(key));
|
||||||
|
@@ -83,7 +83,7 @@ OM_uint32 gss_verify_mic
|
|||||||
sizeof(key));
|
sizeof(key));
|
||||||
|
|
||||||
des_set_key (&key, schedule);
|
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);
|
schedule, &zero);
|
||||||
if (memcmp (p - 8, hash, 8) != 0) {
|
if (memcmp (p - 8, hash, 8) != 0) {
|
||||||
memset (key, 0, sizeof(key));
|
memset (key, 0, sizeof(key));
|
||||||
@@ -106,7 +106,7 @@ OM_uint32 gss_verify_mic
|
|||||||
|
|
||||||
p -= 16;
|
p -= 16;
|
||||||
des_set_key (&key, schedule);
|
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);
|
schedule, (des_cblock *)hash, DES_DECRYPT);
|
||||||
|
|
||||||
memset (key, 0, sizeof(key));
|
memset (key, 0, sizeof(key));
|
||||||
|
@@ -118,7 +118,7 @@ OM_uint32 gss_wrap
|
|||||||
memset (&zero, 0, sizeof(zero));
|
memset (&zero, 0, sizeof(zero));
|
||||||
gss_krb5_getsomekey(context_handle, &key);
|
gss_krb5_getsomekey(context_handle, &key);
|
||||||
des_set_key (&key, schedule);
|
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);
|
schedule, &zero);
|
||||||
memcpy (p - 8, hash, 8);
|
memcpy (p - 8, hash, 8);
|
||||||
|
|
||||||
@@ -137,7 +137,7 @@ OM_uint32 gss_wrap
|
|||||||
4);
|
4);
|
||||||
|
|
||||||
des_set_key (&key, schedule);
|
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);
|
schedule, (des_cblock *)(p + 8), DES_ENCRYPT);
|
||||||
|
|
||||||
krb5_auth_setlocalseqnumber (gssapi_krb5_context,
|
krb5_auth_setlocalseqnumber (gssapi_krb5_context,
|
||||||
@@ -153,7 +153,7 @@ OM_uint32 gss_wrap
|
|||||||
key[i] ^= 0xf0;
|
key[i] ^= 0xf0;
|
||||||
des_set_key (&key, schedule);
|
des_set_key (&key, schedule);
|
||||||
memset (&zero, 0, sizeof(zero));
|
memset (&zero, 0, sizeof(zero));
|
||||||
des_cbc_encrypt ((const void *)p,
|
des_cbc_encrypt ((void *)p,
|
||||||
(void *)p,
|
(void *)p,
|
||||||
8 + input_message_buffer->length + padlength,
|
8 + input_message_buffer->length + padlength,
|
||||||
schedule,
|
schedule,
|
||||||
|
@@ -114,7 +114,7 @@ OM_uint32 gss_unwrap
|
|||||||
key[i] ^= 0xf0;
|
key[i] ^= 0xf0;
|
||||||
des_set_key (&key, schedule);
|
des_set_key (&key, schedule);
|
||||||
memset (&zero, 0, sizeof(zero));
|
memset (&zero, 0, sizeof(zero));
|
||||||
des_cbc_encrypt ((const void *)p,
|
des_cbc_encrypt ((void *)p,
|
||||||
(void *)p,
|
(void *)p,
|
||||||
input_message_buffer->length - len,
|
input_message_buffer->length - len,
|
||||||
schedule,
|
schedule,
|
||||||
@@ -142,7 +142,7 @@ OM_uint32 gss_unwrap
|
|||||||
memset (&zero, 0, sizeof(zero));
|
memset (&zero, 0, sizeof(zero));
|
||||||
gss_krb5_getsomekey(context_handle, &key);
|
gss_krb5_getsomekey(context_handle, &key);
|
||||||
des_set_key (&key, schedule);
|
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);
|
schedule, &zero);
|
||||||
if (memcmp (p - 8, hash, 8) != 0)
|
if (memcmp (p - 8, hash, 8) != 0)
|
||||||
return GSS_S_BAD_MIC;
|
return GSS_S_BAD_MIC;
|
||||||
@@ -162,7 +162,7 @@ OM_uint32 gss_unwrap
|
|||||||
|
|
||||||
p -= 16;
|
p -= 16;
|
||||||
des_set_key (&key, schedule);
|
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);
|
schedule, (des_cblock *)hash, DES_DECRYPT);
|
||||||
|
|
||||||
memset (key, 0, sizeof(key));
|
memset (key, 0, sizeof(key));
|
||||||
|
@@ -83,7 +83,7 @@ OM_uint32 gss_verify_mic
|
|||||||
sizeof(key));
|
sizeof(key));
|
||||||
|
|
||||||
des_set_key (&key, schedule);
|
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);
|
schedule, &zero);
|
||||||
if (memcmp (p - 8, hash, 8) != 0) {
|
if (memcmp (p - 8, hash, 8) != 0) {
|
||||||
memset (key, 0, sizeof(key));
|
memset (key, 0, sizeof(key));
|
||||||
@@ -106,7 +106,7 @@ OM_uint32 gss_verify_mic
|
|||||||
|
|
||||||
p -= 16;
|
p -= 16;
|
||||||
des_set_key (&key, schedule);
|
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);
|
schedule, (des_cblock *)hash, DES_DECRYPT);
|
||||||
|
|
||||||
memset (key, 0, sizeof(key));
|
memset (key, 0, sizeof(key));
|
||||||
|
@@ -118,7 +118,7 @@ OM_uint32 gss_wrap
|
|||||||
memset (&zero, 0, sizeof(zero));
|
memset (&zero, 0, sizeof(zero));
|
||||||
gss_krb5_getsomekey(context_handle, &key);
|
gss_krb5_getsomekey(context_handle, &key);
|
||||||
des_set_key (&key, schedule);
|
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);
|
schedule, &zero);
|
||||||
memcpy (p - 8, hash, 8);
|
memcpy (p - 8, hash, 8);
|
||||||
|
|
||||||
@@ -137,7 +137,7 @@ OM_uint32 gss_wrap
|
|||||||
4);
|
4);
|
||||||
|
|
||||||
des_set_key (&key, schedule);
|
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);
|
schedule, (des_cblock *)(p + 8), DES_ENCRYPT);
|
||||||
|
|
||||||
krb5_auth_setlocalseqnumber (gssapi_krb5_context,
|
krb5_auth_setlocalseqnumber (gssapi_krb5_context,
|
||||||
@@ -153,7 +153,7 @@ OM_uint32 gss_wrap
|
|||||||
key[i] ^= 0xf0;
|
key[i] ^= 0xf0;
|
||||||
des_set_key (&key, schedule);
|
des_set_key (&key, schedule);
|
||||||
memset (&zero, 0, sizeof(zero));
|
memset (&zero, 0, sizeof(zero));
|
||||||
des_cbc_encrypt ((const void *)p,
|
des_cbc_encrypt ((void *)p,
|
||||||
(void *)p,
|
(void *)p,
|
||||||
8 + input_message_buffer->length + padlength,
|
8 + input_message_buffer->length + padlength,
|
||||||
schedule,
|
schedule,
|
||||||
|
Reference in New Issue
Block a user