Deleted Added
sdiff udiff text old ( 206046 ) new ( 215697 )
full compact
speed.c (206046) speed.c (215697)
1/* apps/speed.c -*- mode:C; c-file-style: "eay" -*- */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *

--- 486 unchanged lines hidden (view full) ---

495 }
496#endif /* OPENSSL_NO_ECDH */
497
498
499int MAIN(int, char **);
500
501int MAIN(int argc, char **argv)
502 {
1/* apps/speed.c -*- mode:C; c-file-style: "eay" -*- */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *

--- 486 unchanged lines hidden (view full) ---

495 }
496#endif /* OPENSSL_NO_ECDH */
497
498
499int MAIN(int, char **);
500
501int MAIN(int argc, char **argv)
502 {
503#ifndef OPENSSL_NO_ENGINE
504 ENGINE *e = NULL;
505#endif
506 unsigned char *buf=NULL,*buf2=NULL;
507 int mret=1;
508 long count=0,save_count=0;
509 int i,j,k;
510#if !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_DSA)
511 long rsa_count;
512#endif
513#ifndef OPENSSL_NO_RSA

--- 74 unchanged lines hidden (view full) ---

588#ifndef OPENSSL_NO_AES
589#define MAX_BLOCK_SIZE 128
590#else
591#define MAX_BLOCK_SIZE 64
592#endif
593 unsigned char DES_iv[8];
594 unsigned char iv[2*MAX_BLOCK_SIZE/8];
595#ifndef OPENSSL_NO_DES
503 unsigned char *buf=NULL,*buf2=NULL;
504 int mret=1;
505 long count=0,save_count=0;
506 int i,j,k;
507#if !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_DSA)
508 long rsa_count;
509#endif
510#ifndef OPENSSL_NO_RSA

--- 74 unchanged lines hidden (view full) ---

585#ifndef OPENSSL_NO_AES
586#define MAX_BLOCK_SIZE 128
587#else
588#define MAX_BLOCK_SIZE 64
589#endif
590 unsigned char DES_iv[8];
591 unsigned char iv[2*MAX_BLOCK_SIZE/8];
592#ifndef OPENSSL_NO_DES
596 DES_cblock *buf_as_des_cblock = NULL;
597 static DES_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0};
598 static DES_cblock key2={0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12};
599 static DES_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34};
600 DES_key_schedule sch;
601 DES_key_schedule sch2;
602 DES_key_schedule sch3;
603#endif
604#ifndef OPENSSL_NO_AES

--- 196 unchanged lines hidden (view full) ---

801 rsa_key[i]=NULL;
802#endif
803
804 if ((buf=(unsigned char *)OPENSSL_malloc((int)BUFSIZE)) == NULL)
805 {
806 BIO_printf(bio_err,"out of memory\n");
807 goto end;
808 }
593 static DES_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0};
594 static DES_cblock key2={0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12};
595 static DES_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34};
596 DES_key_schedule sch;
597 DES_key_schedule sch2;
598 DES_key_schedule sch3;
599#endif
600#ifndef OPENSSL_NO_AES

--- 196 unchanged lines hidden (view full) ---

797 rsa_key[i]=NULL;
798#endif
799
800 if ((buf=(unsigned char *)OPENSSL_malloc((int)BUFSIZE)) == NULL)
801 {
802 BIO_printf(bio_err,"out of memory\n");
803 goto end;
804 }
809#ifndef OPENSSL_NO_DES
810 buf_as_des_cblock = (DES_cblock *)buf;
811#endif
812 if ((buf2=(unsigned char *)OPENSSL_malloc((int)BUFSIZE)) == NULL)
813 {
814 BIO_printf(bio_err,"out of memory\n");
815 goto end;
816 }
817
818 memset(c,0,sizeof(c));
819 memset(DES_iv,0,sizeof(DES_iv));

--- 58 unchanged lines hidden (view full) ---

878 {
879 argc--;
880 argv++;
881 if(argc == 0)
882 {
883 BIO_printf(bio_err,"no engine given\n");
884 goto end;
885 }
805 if ((buf2=(unsigned char *)OPENSSL_malloc((int)BUFSIZE)) == NULL)
806 {
807 BIO_printf(bio_err,"out of memory\n");
808 goto end;
809 }
810
811 memset(c,0,sizeof(c));
812 memset(DES_iv,0,sizeof(DES_iv));

--- 58 unchanged lines hidden (view full) ---

871 {
872 argc--;
873 argv++;
874 if(argc == 0)
875 {
876 BIO_printf(bio_err,"no engine given\n");
877 goto end;
878 }
886 e = setup_engine(bio_err, *argv, 0);
879 setup_engine(bio_err, *argv, 0);
887 /* j will be increased again further down. We just
888 don't want speed to confuse an engine with an
889 algorithm, especially when none is given (which
890 means all of them should be run) */
891 j--;
892 }
893#endif
894#ifndef NO_FORK

--- 488 unchanged lines hidden (view full) ---

1383#ifndef OPENSSL_NO_DES
1384 BIO_printf(bio_err,"First we calculate the approximate speed ...\n");
1385 count=10;
1386 do {
1387 long it;
1388 count*=2;
1389 Time_F(START);
1390 for (it=count; it; it--)
880 /* j will be increased again further down. We just
881 don't want speed to confuse an engine with an
882 algorithm, especially when none is given (which
883 means all of them should be run) */
884 j--;
885 }
886#endif
887#ifndef NO_FORK

--- 488 unchanged lines hidden (view full) ---

1376#ifndef OPENSSL_NO_DES
1377 BIO_printf(bio_err,"First we calculate the approximate speed ...\n");
1378 count=10;
1379 do {
1380 long it;
1381 count*=2;
1382 Time_F(START);
1383 for (it=count; it; it--)
1391 DES_ecb_encrypt(buf_as_des_cblock,buf_as_des_cblock,
1384 DES_ecb_encrypt((DES_cblock *)buf,
1385 (DES_cblock *)buf,
1392 &sch,DES_ENCRYPT);
1393 d=Time_F(STOP);
1394 } while (d <3);
1395 save_count=count;
1396 c[D_MD2][0]=count/10;
1397 c[D_MDC2][0]=count/10;
1398 c[D_MD4][0]=count;
1399 c[D_MD5][0]=count;

--- 1545 unchanged lines hidden --- 		1386 &sch,DES_ENCRYPT);
1387 d=Time_F(STOP);
1388 } while (d <3);
1389 save_count=count;
1390 c[D_MD2][0]=count/10;
1391 c[D_MDC2][0]=count/10;
1392 c[D_MD4][0]=count;
1393 c[D_MD5][0]=count;

--- 1545 unchanged lines hidden ---