generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge in DES changed from 0.9.7-stable.

Browse Source
This commit is contained in:
Richard Levitte 2002-03-22 02:42:57 +00:00
parent 7e58aa7d71
commit 125cc35b59
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/passwd.c
View File

@ -16,7 +16,7 @@
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/rand.h> #include <openssl/rand.h>
#ifndef OPENSSL_NO_DES #ifndef OPENSSL_NO_DES
# include <openssl/des_old.h> # include <openssl/des.h>
#endif #endif
#ifndef NO_MD5CRYPT_1 #ifndef NO_MD5CRYPT_1
# include <openssl/evp.h> # include <openssl/evp.h>
@ -482,7 +482,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
/* now compute password hash */ /* now compute password hash */
#ifndef OPENSSL_NO_DES #ifndef OPENSSL_NO_DES
if (usecrypt) if (usecrypt)
hash = des_crypt(passwd, *salt_p); hash = DES_crypt(passwd, *salt_p);
#endif #endif
#ifndef NO_MD5CRYPT_1 #ifndef NO_MD5CRYPT_1
if (use1 || useapr1) if (use1 || useapr1)

12
apps/speed.c
View File

@ -131,7 +131,7 @@
#endif #endif
#ifndef OPENSSL_NO_DES #ifndef OPENSSL_NO_DES
#include <openssl/des_old.h> #include <openssl/des.h>
#endif #endif
#ifndef OPENSSL_NO_AES #ifndef OPENSSL_NO_AES
#include <openssl/aes.h> #include <openssl/aes.h>
@ -439,9 +439,9 @@ int MAIN(int argc, char **argv)
unsigned char iv[MAX_BLOCK_SIZE/8]; unsigned char iv[MAX_BLOCK_SIZE/8];
#ifndef OPENSSL_NO_DES #ifndef OPENSSL_NO_DES
DES_cblock *buf_as_des_cblock = NULL; DES_cblock *buf_as_des_cblock = NULL;
static des_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}; static DES_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0};
static des_cblock key2={0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12}; static DES_cblock key2={0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12};
static des_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34}; static DES_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34};
DES_key_schedule sch; DES_key_schedule sch;
DES_key_schedule sch2; DES_key_schedule sch2;
DES_key_schedule sch3; DES_key_schedule sch3;
@ -532,7 +532,7 @@ int MAIN(int argc, char **argv)
goto end; goto end;
} }
#ifndef OPENSSL_NO_DES #ifndef OPENSSL_NO_DES
buf_as_des_cblock = (des_cblock *)buf; buf_as_des_cblock = (DES_cblock *)buf;
#endif #endif
if ((buf2=(unsigned char *)OPENSSL_malloc((int)BUFSIZE)) == NULL) if ((buf2=(unsigned char *)OPENSSL_malloc((int)BUFSIZE)) == NULL)
{ {
@ -1603,7 +1603,7 @@ show_res:
printf("%s ",RC4_options()); printf("%s ",RC4_options());
#endif #endif
#ifndef OPENSSL_NO_DES #ifndef OPENSSL_NO_DES
printf("%s ",des_options()); printf("%s ",DES_options());
#endif #endif
#ifndef OPENSSL_NO_AES #ifndef OPENSSL_NO_AES
printf("%s ",AES_options()); printf("%s ",AES_options());

4
apps/version.c
View File

@ -122,7 +122,7 @@
# include <openssl/rc4.h> # include <openssl/rc4.h>
#endif #endif
#ifndef OPENSSL_NO_DES #ifndef OPENSSL_NO_DES
# include <openssl/des_old.h> # include <openssl/des.h>
#endif #endif
#ifndef OPENSSL_NO_IDEA #ifndef OPENSSL_NO_IDEA
# include <openssl/idea.h> # include <openssl/idea.h>
@ -186,7 +186,7 @@ int MAIN(int argc, char **argv)
printf("%s ",RC4_options()); printf("%s ",RC4_options());
#endif #endif
#ifndef OPENSSL_NO_DES #ifndef OPENSSL_NO_DES
printf("%s ",des_options()); printf("%s ",DES_options());
#endif #endif
#ifndef OPENSSL_NO_IDEA #ifndef OPENSSL_NO_IDEA
printf("%s ",idea_options()); printf("%s ",idea_options());