use DES_set_key_unchecked()
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23112 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
		| @@ -88,7 +88,7 @@ mic_des | ||||
|  | ||||
|   memset (&zero, 0, sizeof(zero)); | ||||
|   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), | ||||
| 		 &schedule, &zero); | ||||
|   memcpy (p - 8, hash, 8);	/* SGN_CKSUM */ | ||||
| @@ -108,7 +108,7 @@ mic_des | ||||
| 	  (ctx->more_flags & LOCAL) ? 0 : 0xFF, | ||||
| 	  4); | ||||
|  | ||||
|   DES_set_key (&deskey, &schedule); | ||||
|   DES_set_key_unchecked (&deskey, &schedule); | ||||
|   DES_cbc_encrypt ((void *)p, (void *)p, 8, | ||||
| 		   &schedule, (DES_cblock *)(p + 8), DES_ENCRYPT); | ||||
|  | ||||
|   | ||||
| @@ -93,7 +93,7 @@ unwrap_des | ||||
|  | ||||
|       for (i = 0; i < sizeof(deskey); ++i) | ||||
| 	  deskey[i] ^= 0xf0; | ||||
|       DES_set_key (&deskey, &schedule); | ||||
|       DES_set_key_unchecked (&deskey, &schedule); | ||||
|       memset (&zero, 0, sizeof(zero)); | ||||
|       DES_cbc_encrypt ((void *)p, | ||||
| 		       (void *)p, | ||||
| @@ -119,7 +119,7 @@ unwrap_des | ||||
|  | ||||
|   memset (&zero, 0, sizeof(zero)); | ||||
|   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), | ||||
| 		 &schedule, &zero); | ||||
|   if (memcmp (p - 8, hash, 8) != 0) | ||||
| @@ -130,7 +130,7 @@ unwrap_des | ||||
|   HEIMDAL_MUTEX_lock(&context_handle->ctx_id_mutex); | ||||
|  | ||||
|   p -= 16; | ||||
|   DES_set_key (&deskey, &schedule); | ||||
|   DES_set_key_unchecked (&deskey, &schedule); | ||||
|   DES_cbc_encrypt ((void *)p, (void *)p, 8, | ||||
| 		   &schedule, (DES_cblock *)hash, DES_DECRYPT); | ||||
|  | ||||
|   | ||||
| @@ -83,7 +83,7 @@ verify_mic_des | ||||
|   memset (&zero, 0, sizeof(zero)); | ||||
|   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), | ||||
| 		 &schedule, &zero); | ||||
|   if (memcmp (p - 8, hash, 8) != 0) { | ||||
| @@ -97,7 +97,7 @@ verify_mic_des | ||||
|   HEIMDAL_MUTEX_lock(&context_handle->ctx_id_mutex); | ||||
|  | ||||
|   p -= 16; | ||||
|   DES_set_key (&deskey, &schedule); | ||||
|   DES_set_key_unchecked (&deskey, &schedule); | ||||
|   DES_cbc_encrypt ((void *)p, (void *)p, 8, | ||||
| 		   &schedule, (DES_cblock *)hash, DES_DECRYPT); | ||||
|  | ||||
|   | ||||
| @@ -259,7 +259,7 @@ wrap_des | ||||
|  | ||||
|   memset (&zero, 0, sizeof(zero)); | ||||
|   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), | ||||
| 		 &schedule, &zero); | ||||
|   memcpy (p - 8, hash, 8); | ||||
| @@ -279,7 +279,7 @@ wrap_des | ||||
| 	  (ctx->more_flags & LOCAL) ? 0 : 0xFF, | ||||
| 	  4); | ||||
|  | ||||
|   DES_set_key (&deskey, &schedule); | ||||
|   DES_set_key_unchecked (&deskey, &schedule); | ||||
|   DES_cbc_encrypt ((void *)p, (void *)p, 8, | ||||
| 		   &schedule, (DES_cblock *)(p + 8), DES_ENCRYPT); | ||||
|  | ||||
| @@ -296,7 +296,7 @@ wrap_des | ||||
|  | ||||
|       for (i = 0; i < sizeof(deskey); ++i) | ||||
| 	  deskey[i] ^= 0xf0; | ||||
|       DES_set_key (&deskey, &schedule); | ||||
|       DES_set_key_unchecked (&deskey, &schedule); | ||||
|       memset (&zero, 0, sizeof(zero)); | ||||
|       DES_cbc_encrypt ((void *)p, | ||||
| 		       (void *)p, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Love Hörnquist Åstrand
					Love Hörnquist Åstrand