oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

use DES_set_key_unchecked()

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23112 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-04-27 18:51:26 +00:00
parent 7a34fd05b1
commit 81d68d4ee2
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/gssapi/ChangeLog
View File

@@ -1,3 +1,7 @@
2008-04-27 Love H<>rnquist <20>strand <lha@it.su.se>
* krb5: use DES_set_key_unchecked()
2008-04-17 Love H<>rnquist <20>strand <lha@it.su.se> 2008-04-17 Love H<>rnquist <20>strand <lha@it.su.se>
* add __declspec() for windows. * add __declspec() for windows.

4
lib/gssapi/krb5/get_mic.c
View File

@@ -88,7 +88,7 @@ mic_des
memset (&zero, 0, sizeof(zero)); memset (&zero, 0, sizeof(zero));
memcpy (&deskey, key->keyvalue.data, sizeof(deskey)); memcpy (&deskey, key->keyvalue.data, sizeof(deskey));
DES_set_key (&deskey, &schedule); DES_set_key_unchecked (&deskey, &schedule);
DES_cbc_cksum ((void *)hash, (void *)hash, sizeof(hash), DES_cbc_cksum ((void *)hash, (void *)hash, sizeof(hash),
&schedule, &zero); &schedule, &zero);
memcpy (p - 8, hash, 8); /* SGN_CKSUM */ memcpy (p - 8, hash, 8); /* SGN_CKSUM */
@@ -108,7 +108,7 @@ mic_des
(ctx->more_flags & LOCAL) ? 0 : 0xFF, (ctx->more_flags & LOCAL) ? 0 : 0xFF,
4); 4);
DES_set_key (&deskey, &schedule); DES_set_key_unchecked (&deskey, &schedule);
DES_cbc_encrypt ((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);

6
lib/gssapi/krb5/unwrap.c
View File

@@ -93,7 +93,7 @@ unwrap_des
for (i = 0; i < sizeof(deskey); ++i) for (i = 0; i < sizeof(deskey); ++i)
deskey[i] ^= 0xf0; deskey[i] ^= 0xf0;
DES_set_key (&deskey, &schedule); DES_set_key_unchecked (&deskey, &schedule);
memset (&zero, 0, sizeof(zero)); memset (&zero, 0, sizeof(zero));
DES_cbc_encrypt ((void *)p, DES_cbc_encrypt ((void *)p,
(void *)p, (void *)p,
@@ -119,7 +119,7 @@ unwrap_des
memset (&zero, 0, sizeof(zero)); memset (&zero, 0, sizeof(zero));
memcpy (&deskey, key->keyvalue.data, sizeof(deskey)); memcpy (&deskey, key->keyvalue.data, sizeof(deskey));
DES_set_key (&deskey, &schedule); DES_set_key_unchecked (&deskey, &schedule);
DES_cbc_cksum ((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)
@@ -130,7 +130,7 @@ unwrap_des
HEIMDAL_MUTEX_lock(&context_handle->ctx_id_mutex); HEIMDAL_MUTEX_lock(&context_handle->ctx_id_mutex);
p -= 16; p -= 16;
DES_set_key (&deskey, &schedule); DES_set_key_unchecked (&deskey, &schedule);
DES_cbc_encrypt ((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);

4
lib/gssapi/krb5/verify_mic.c
View File

@@ -83,7 +83,7 @@ verify_mic_des
memset (&zero, 0, sizeof(zero)); memset (&zero, 0, sizeof(zero));
memcpy (&deskey, key->keyvalue.data, sizeof(deskey)); memcpy (&deskey, key->keyvalue.data, sizeof(deskey));
DES_set_key (&deskey, &schedule); DES_set_key_unchecked (&deskey, &schedule);
DES_cbc_cksum ((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) {
@@ -97,7 +97,7 @@ verify_mic_des
HEIMDAL_MUTEX_lock(&context_handle->ctx_id_mutex); HEIMDAL_MUTEX_lock(&context_handle->ctx_id_mutex);
p -= 16; p -= 16;
DES_set_key (&deskey, &schedule); DES_set_key_unchecked (&deskey, &schedule);
DES_cbc_encrypt ((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);

6
lib/gssapi/krb5/wrap.c
View File

@@ -259,7 +259,7 @@ wrap_des
memset (&zero, 0, sizeof(zero)); memset (&zero, 0, sizeof(zero));
memcpy (&deskey, key->keyvalue.data, sizeof(deskey)); memcpy (&deskey, key->keyvalue.data, sizeof(deskey));
DES_set_key (&deskey, &schedule); DES_set_key_unchecked (&deskey, &schedule);
DES_cbc_cksum ((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);
@@ -279,7 +279,7 @@ wrap_des
(ctx->more_flags & LOCAL) ? 0 : 0xFF, (ctx->more_flags & LOCAL) ? 0 : 0xFF,
4); 4);
DES_set_key (&deskey, &schedule); DES_set_key_unchecked (&deskey, &schedule);
DES_cbc_encrypt ((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);
@@ -296,7 +296,7 @@ wrap_des
for (i = 0; i < sizeof(deskey); ++i) for (i = 0; i < sizeof(deskey); ++i)
deskey[i] ^= 0xf0; deskey[i] ^= 0xf0;
DES_set_key (&deskey, &schedule); DES_set_key_unchecked (&deskey, &schedule);
memset (&zero, 0, sizeof(zero)); memset (&zero, 0, sizeof(zero));
DES_cbc_encrypt ((void *)p, DES_cbc_encrypt ((void *)p,
(void *)p, (void *)p,