Additionally, rename des_encrypt to des_encrypt1 in files that are

seldom used or read, but may still be...

diff --git a/crypto/des/asm/readme b/crypto/des/asm/readme
index f8529d9307eb0fd57effef4f5ea5958518aa811c..1beafe253b17fe52985f7c4de6f7b4577f1f1bfb 100644 (file)
--- a/crypto/des/asm/readme
+++ b/crypto/des/asm/readme
@@ -8,7 +8,7 @@ assembler for the inner DES routines in libdes :-).
 
 The file to implement in assembler is des_enc.c.  Replace the following
 4 functions
-des_encrypt(DES_LONG data[2],des_key_schedule ks, int encrypt);
+des_encrypt1(DES_LONG data[2],des_key_schedule ks, int encrypt);
 des_encrypt2(DES_LONG data[2],des_key_schedule ks, int encrypt);
 des_encrypt3(DES_LONG data[2],des_key_schedule ks1,ks2,ks3);
 des_decrypt3(DES_LONG data[2],des_key_schedule ks1,ks2,ks3);

diff --git a/crypto/des/des_opts.c b/crypto/des/des_opts.c
index bc2a5e839bb17de239fd6c843ed5ef0efd6082e1..138ee1c6b47bae98ace82960abeab9b99869ceba 100644 (file)
--- a/crypto/des/des_opts.c
+++ b/crypto/des/des_opts.c
@@ -118,7 +118,7 @@ extern void exit();
 #undef DES_RISC2
 #undef DES_PTR
 #undef D_ENCRYPT
-#define des_encrypt1  des_encrypt_u4_cisc_idx
+#define des_encrypt1 des_encrypt_u4_cisc_idx
 #define des_encrypt2 des_encrypt2_u4_cisc_idx
 #define des_encrypt3 des_encrypt3_u4_cisc_idx
 #define des_decrypt3 des_decrypt3_u4_cisc_idx
@@ -150,7 +150,7 @@ extern void exit();
 #undef des_encrypt2
 #undef des_encrypt3
 #undef des_decrypt3
-#define des_encrypt1  des_encrypt_u4_risc1_idx
+#define des_encrypt1 des_encrypt_u4_risc1_idx
 #define des_encrypt2 des_encrypt2_u4_risc1_idx
 #define des_encrypt3 des_encrypt3_u4_risc1_idx
 #define des_decrypt3 des_decrypt3_u4_risc1_idx

diff --git a/crypto/des/dess.cpp b/crypto/des/dess.cpp
index 753e67ad9be280a7670bf3a467bded532eae911e..5549bab90afb72158416fdfc5bf639e57bfcef44 100644 (file)
--- a/crypto/des/dess.cpp
+++ b/crypto/des/dess.cpp
@@ -45,19 +45,19 @@ void main(int argc,char *argv[])
                {
                for (i=0; i<1000; i++) /**/
                        {
-                       des_encrypt(&data[0],key,1);
+                       des_encrypt1(&data[0],key,1);
                        GetTSC(s1);
-                       des_encrypt(&data[0],key,1);
-                       des_encrypt(&data[0],key,1);
-                       des_encrypt(&data[0],key,1);
+                       des_encrypt1(&data[0],key,1);
+                       des_encrypt1(&data[0],key,1);
+                       des_encrypt1(&data[0],key,1);
                        GetTSC(e1);
                        GetTSC(s2);
-                       des_encrypt(&data[0],key,1);
-                       des_encrypt(&data[0],key,1);
-                       des_encrypt(&data[0],key,1);
-                       des_encrypt(&data[0],key,1);
+                       des_encrypt1(&data[0],key,1);
+                       des_encrypt1(&data[0],key,1);
+                       des_encrypt1(&data[0],key,1);
+                       des_encrypt1(&data[0],key,1);
                        GetTSC(e2);
-                       des_encrypt(&data[0],key,1);
+                       des_encrypt1(&data[0],key,1);
                        }
 
                printf("des %d %d (%d)\n",