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

Win32 fixes.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2001-11-06 13:40:27 +00:00
parent 7f558334ad
commit b83eddc578
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/speed.c
View File

@ -218,12 +218,6 @@ static void print_result(int alg,int run_no,int count,double time_used);
#ifdef HAVE_FORK #ifdef HAVE_FORK
static int do_multi(int multi); static int do_multi(int multi);
#endif #endif
#ifdef SIGALRM
#if defined(__STDC__) || defined(sgi) || defined(_AIX)
#define SIGRETTYPE void
#else
#define SIGRETTYPE int
#endif
#define ALGOR_NUM 16 #define ALGOR_NUM 16
#define SIZE_NUM 5 #define SIZE_NUM 5
@ -238,6 +232,13 @@ static int lengths[SIZE_NUM]={8,64,256,1024,8*1024};
static double rsa_results[RSA_NUM][2]; static double rsa_results[RSA_NUM][2];
static double dsa_results[DSA_NUM][2]; static double dsa_results[DSA_NUM][2];
#ifdef SIGALRM
#if defined(__STDC__) || defined(sgi) || defined(_AIX)
#define SIGRETTYPE void
#else
#define SIGRETTYPE int
#endif
static SIGRETTYPE sig_done(int sig); static SIGRETTYPE sig_done(int sig);
static SIGRETTYPE sig_done(int sig) static SIGRETTYPE sig_done(int sig)
{ {
@ -893,9 +894,9 @@ int MAIN(int argc, char **argv)
do { do {
long i; long i;
count*=2; count*=2;
Time_F(START,usertime); Time_F(START);
for (i=count; i; i--) for (i=count; i; i--)
des_ecb_encrypt(buf_as_des_cblock,buf_as_des_cblock, DES_ecb_encrypt(buf_as_des_cblock,buf_as_des_cblock,
&sch,DES_ENCRYPT); &sch,DES_ENCRYPT);
d=Time_F(STOP); d=Time_F(STOP);
} while (d <3); } while (d <3);
@ -1441,7 +1442,9 @@ int MAIN(int argc, char **argv)
} }
if (rnd_fake) RAND_cleanup(); if (rnd_fake) RAND_cleanup();
#endif #endif
#ifdef HAVE_FORK
show_res: show_res:
#endif
if(!mr) if(!mr)
{ {
fprintf(stdout,"%s\n",SSLeay_version(SSLEAY_VERSION)); fprintf(stdout,"%s\n",SSLeay_version(SSLEAY_VERSION));

2
crypto/evp/evp_test.c
View File

@ -229,7 +229,7 @@ static int test_cipher(const char *cipher,const unsigned char *key,int kn,
static int test_digest(const char *digest, static int test_digest(const char *digest,
const unsigned char *plaintext,int pn, const unsigned char *plaintext,int pn,
const unsigned char *ciphertext, int cn) const unsigned char *ciphertext, unsigned int cn)
{ {
const EVP_MD *d; const EVP_MD *d;
EVP_MD_CTX ctx; EVP_MD_CTX ctx;