diff options
author | nectar <nectar@FreeBSD.org> | 2003-02-19 23:24:16 +0000 |
---|---|---|
committer | nectar <nectar@FreeBSD.org> | 2003-02-19 23:24:16 +0000 |
commit | 0fee824237555009e1c183a434436a50f306ecd7 (patch) | |
tree | 2948ffd23bfeeecbdc69292dd5e77ea732e29795 /crypto/openssl/apps | |
parent | 21bb0e5fa958b55498782bb6040051bad9010e66 (diff) | |
download | FreeBSD-src-0fee824237555009e1c183a434436a50f306ecd7.zip FreeBSD-src-0fee824237555009e1c183a434436a50f306ecd7.tar.gz |
Resolve conflicts after import of OpenSSL 0.9.7a.
Diffstat (limited to 'crypto/openssl/apps')
-rw-r--r-- | crypto/openssl/apps/speed.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/crypto/openssl/apps/speed.c b/crypto/openssl/apps/speed.c index 7f42b52..ec55b41 100644 --- a/crypto/openssl/apps/speed.c +++ b/crypto/openssl/apps/speed.c @@ -58,6 +58,8 @@ /* most of this code has been pilfered from my libdes speed.c program */ +#ifndef OPENSSL_NO_SPEED + #undef SECONDS #define SECONDS 3 #define RSA_SECONDS 10 @@ -370,7 +372,9 @@ int MAIN(int, char **); int MAIN(int argc, char **argv) { +#ifndef OPENSSL_NO_ENGINE ENGINE *e = NULL; +#endif unsigned char *buf=NULL,*buf2=NULL; int mret=1; long count=0,save_count=0; @@ -590,6 +594,7 @@ int MAIN(int argc, char **argv) j--; /* Otherwise, -elapsed gets confused with an algorithm. */ } +#ifndef OPENSSL_NO_ENGINE else if ((argc > 0) && (strcmp(*argv,"-engine") == 0)) { argc--; @@ -606,6 +611,7 @@ int MAIN(int argc, char **argv) means all of them should be run) */ j--; } +#endif #ifdef HAVE_FORK else if ((argc > 0) && (strcmp(*argv,"-multi") == 0)) { @@ -865,7 +871,9 @@ int MAIN(int argc, char **argv) #if defined(TIMES) || defined(USE_TOD) BIO_printf(bio_err,"-elapsed measure time in real time instead of CPU user time.\n"); #endif +#ifndef OPENSSL_NO_ENGINE BIO_printf(bio_err,"-engine e use engine e, possibly a hardware device.\n"); +#endif BIO_printf(bio_err,"-evp e use EVP e.\n"); BIO_printf(bio_err,"-decrypt time decryption instead of encryption (only EVP).\n"); BIO_printf(bio_err,"-mr produce machine readable output.\n"); @@ -1393,6 +1401,7 @@ int MAIN(int argc, char **argv) else EVP_EncryptFinal_ex(&ctx,buf,&outl); d=Time_F(STOP); + EVP_CIPHER_CTX_cleanup(&ctx); } if (evp_md) { @@ -1939,3 +1948,4 @@ static int do_multi(int multi) return 1; } #endif +#endif |