Fixed crypto_system table entries; added raw DES cryptosystem

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3316 dc483132-0cff-0310-8789-dd5450dbe970

3 files changed, 80 insertions, 9 deletions

diff --git a/src/lib/crypto/des/cs_entry.c b/src/lib/crypto/des/cs_entry.c
index 5f96f176a..b2dc6e1f8 100644
--- a/src/lib/crypto/des/cs_entry.c
+++ b/src/lib/crypto/des/cs_entry.c
@@ -36,7 +36,23 @@ static char rcsid_cs_entry_c[] =
 
 #include "des_int.h"
 
-krb5_cryptosystem_entry mit_des_cryptosystem_entry = {
+static krb5_cryptosystem_entry mit_raw_des_cryptosystem_entry = {
+    mit_raw_des_encrypt_func,
+    mit_raw_des_decrypt_func,
+    mit_des_process_key,
+    mit_des_finish_key,
+    mit_des_string_to_key,
+    mit_des_init_random_key,
+    mit_des_finish_random_key,
+    mit_des_random_key,
+    sizeof(mit_des_cblock),
+    0,
+    sizeof(mit_des_cblock),
+    ETYPE_DES_CBC_CRC,
+    KEYTYPE_DES
+    };
+
+static krb5_cryptosystem_entry mit_des_cryptosystem_entry = {
     mit_des_encrypt_func,
     mit_des_decrypt_func, 
     mit_des_process_key,
@@ -52,10 +68,16 @@ krb5_cryptosystem_entry mit_des_cryptosystem_entry = {
     KEYTYPE_DES
     };
 
+krb5_cs_table_entry krb5_raw_des_cst_entry = {
+    &mit_raw_des_cryptosystem_entry,
+    0
+    };
+
 krb5_cs_table_entry krb5_des_cst_entry = {
     &mit_des_cryptosystem_entry,
     0
     };
+
 extern krb5_error_code mit_des_cbc_checksum PROTOTYPE ((krb5_pointer ,
 							size_t ,
 							krb5_pointer ,
@@ -63,7 +85,7 @@ extern krb5_error_code mit_des_cbc_checksum PROTOTYPE ((krb5_pointer ,
 							krb5_checksum * ));
 
 
-krb5_checksum_entry mit_des_cbc_cksumtable_entry = {
+krb5_checksum_entry krb5_des_cbc_cksumtable_entry = {
     mit_des_cbc_checksum,
     sizeof(mit_des_cblock),
     1,					/* is collision proof */
diff --git a/src/lib/crypto/des/des_int.h b/src/lib/crypto/des/des_int.h
index 02beed14e..5ad058633 100644
--- a/src/lib/crypto/des/des_int.h
+++ b/src/lib/crypto/des/des_int.h
@@ -122,12 +122,6 @@ extern int mit_des_ecb_encrypt
     PROTOTYPE((unsigned long *, unsigned long *, mit_des_key_schedule , int ));
 
 /* enc_dec.c */
-extern krb5_error_code mit_des_encrypt_func
-    PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
-	       krb5_encrypt_block *, krb5_pointer ));
-extern krb5_error_code mit_des_decrypt_func
-    PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
-	       krb5_encrypt_block *, krb5_pointer ));
 extern krb5_error_code mit_des_cbc_encrypt
     PROTOTYPE((krb5_octet *, krb5_octet *, long, mit_des_key_schedule,
 	       krb5_octet *, int));
@@ -152,6 +146,20 @@ extern int mit_des_check_key_parity PROTOTYPE((mit_des_cblock ));
 extern int mit_des_key_sched
     PROTOTYPE((mit_des_cblock , mit_des_key_schedule ));
 
+/* krb_glue.c */
+extern krb5_error_code mit_raw_des_encrypt_func
+    PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
+               krb5_encrypt_block *, krb5_pointer ));
+extern krb5_error_code mit_des_encrypt_func
+    PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
+               krb5_encrypt_block *, krb5_pointer ));
+extern krb5_error_code mit_raw_des_decrypt_func
+    PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
+               krb5_encrypt_block *, krb5_pointer ));
+extern krb5_error_code mit_des_decrypt_func
+    PROTOTYPE(( krb5_const_pointer, krb5_pointer, const size_t,
+               krb5_encrypt_block *, krb5_pointer ));
+
 /* new_rnd_key.c */
 extern int mit_des_new_random_key
     PROTOTYPE((mit_des_cblock , mit_des_random_key_seed *));
diff --git a/src/lib/crypto/des/krb_glue.c b/src/lib/crypto/des/krb_glue.c
index 670d302b9..542bab63f 100644
--- a/src/lib/crypto/des/krb_glue.c
+++ b/src/lib/crypto/des/krb_glue.c
@@ -140,6 +140,33 @@ OLDDECLARG(krb5_pointer, ivec)
 			     MIT_DES_DECRYPT));
 }    
 
+krb5_error_code mit_raw_des_encrypt_func(DECLARG(krb5_const_pointer, in),
+                                         DECLARG(krb5_pointer, out),
+                                         DECLARG(const size_t, size),
+                                         DECLARG(krb5_encrypt_block *, key),
+                                         DECLARG(krb5_pointer, ivec))
+OLDDECLARG(krb5_const_pointer, in)
+OLDDECLARG(krb5_pointer, out)
+OLDDECLARG(const size_t, size)
+OLDDECLARG(krb5_encrypt_block *, key)
+OLDDECLARG(krb5_pointer, ivec)
+{
+   int sumsize;
+
+   /* round up to des block size */
+
+   sumsize =  krb5_roundup(size, sizeof(mit_des_cblock));
+
+   /* assemble crypto input into the output area, then encrypt in place. */
+
+   memset((char *)out, 0, sumsize);
+   memcpy((char *)out, (char *)in, size);
+
+    /* We depend here on the ability of this DES implementation to
+       encrypt plaintext to ciphertext in-place. */
+    return (mit_des_encrypt_f(out, out, sumsize, key, ivec));
+}
+
 krb5_error_code mit_des_encrypt_func(DECLARG(krb5_const_pointer, in),
 				     DECLARG(krb5_pointer, out),
 				     DECLARG(const size_t, size),
@@ -202,6 +229,20 @@ OLDDECLARG(krb5_pointer, ivec)
     return (mit_des_encrypt_f(out, out, sumsize, key, ivec));
 }
 
+krb5_error_code mit_raw_des_decrypt_func(DECLARG(krb5_const_pointer, in),
+                                         DECLARG(krb5_pointer, out),
+                                         DECLARG(const size_t, size),
+                                         DECLARG(krb5_encrypt_block *, key),
+                                         DECLARG(krb5_pointer, ivec))
+OLDDECLARG(krb5_const_pointer, in)
+OLDDECLARG(krb5_pointer, out)
+OLDDECLARG(const size_t, size)
+OLDDECLARG(krb5_encrypt_block *, key)
+OLDDECLARG(krb5_pointer, ivec)
+{
+   return(mit_des_decrypt_f(in, out, size, key, ivec));
+}
+
 krb5_error_code mit_des_decrypt_func(DECLARG(krb5_const_pointer, in),
 				     DECLARG(krb5_pointer, out),
 				     DECLARG(const size_t, size),
@@ -238,7 +279,7 @@ OLDDECLARG(krb5_pointer, ivec)
 
     if (memcmp((char *)contents_get, (char *)contents_prd, CRC32_CKSUM_LENGTH) )
         return KRB5KRB_AP_ERR_BAD_INTEGRITY;
-    memcpy((char *)out, (char *)out +
+    memmove((char *)out, (char *)out +
 	   sizeof(mit_des_cblock) + CRC32_CKSUM_LENGTH,
 	   size - sizeof(mit_des_cblock) - CRC32_CKSUM_LENGTH);
     return 0;