diff options
| author | levitte <levitte> | 2001-03-30 07:26:02 +0000 |
|---|---|---|
| committer | levitte <levitte> | 2001-03-30 07:26:02 +0000 |
| commit | 09baae2c390f4d16f57c94d31cefe25161b199fe (patch) | |
| tree | 4ac167d1ca026da79707924b4acc31cbdee9515b | |
| parent | 8d7c837d1d21290bae08db0da3c30c65ef5ea7cb (diff) | |
| download | openssl-09baae2c390f4d16f57c94d31cefe25161b199fe.tar.gz | |
Additionally, rename des_encrypt to des_encrypt1 in files that are
seldom used or read, but may still be...
| -rw-r--r-- | crypto/des/asm/readme | 2 | ||||
| -rw-r--r-- | crypto/des/des_opts.c | 4 | ||||
| -rw-r--r-- | crypto/des/dess.cpp | 20 |
3 files changed, 13 insertions, 13 deletions
diff --git a/crypto/des/asm/readme b/crypto/des/asm/readme index f8529d930..1beafe253 100644 --- 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 bc2a5e839..138ee1c6b 100644 --- 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 7fb598731..5549bab90 100644 --- a/crypto/des/dess.cpp +++ b/crypto/des/dess.cpp @@ -32,7 +32,7 @@ void GetTSC(unsigned long& tsc) #include <stdio.h> #include <stdlib.h> -#include "des.h" +#include <openssl/des.h> void main(int argc,char *argv[]) { @@ -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", |