diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-01-14 15:57:28 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-01-14 15:57:28 -0500 |
| commit | 4b618848f9beb8271f24883694e097caa70013c0 (patch) | |
| tree | 83a17961f721935b211a19bddf8ea02ab5760fb4 /apps/speed.c | |
| parent | b3d7294976c58e0e05d0ee44a0e7c9c3b8515e05 (diff) | |
Cleanup OPENSSL_NO_xxx, part 1master-pre-reformat
OPENSSL_NO_RIPEMD160, OPENSSL_NO_RIPEMD merged into OPENSSL_NO_RMD160
OPENSSL_NO_FP_API merged into OPENSSL_NO_STDIO
Two typo's on #endif comments fixed:
OPENSSL_NO_ECB fixed to OPENSSL_NO_OCB
OPENSSL_NO_HW_SureWare fixed to OPENSSL_NO_HW_SUREWARE
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps/speed.c')
| -rw-r--r-- | apps/speed.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/speed.c b/apps/speed.c index 3dcfb8d890..84fb4935f5 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -145,7 +145,7 @@ #ifndef OPENSSL_NO_SHA #include <openssl/sha.h> #endif -#ifndef OPENSSL_NO_RIPEMD +#ifndef OPENSSL_NO_RMD160 #include <openssl/ripemd.h> #endif #ifndef OPENSSL_NO_WHIRLPOOL @@ -392,7 +392,7 @@ int MAIN(int argc, char **argv) #ifndef OPENSSL_NO_WHIRLPOOL unsigned char whirlpool[WHIRLPOOL_DIGEST_LENGTH]; #endif -#ifndef OPENSSL_NO_RIPEMD +#ifndef OPENSSL_NO_RMD160 unsigned char rmd160[RIPEMD160_DIGEST_LENGTH]; #endif #ifndef OPENSSL_NO_RC4 @@ -849,7 +849,7 @@ int MAIN(int argc, char **argv) if (strcmp(*argv,"whirlpool") == 0) doit[D_WHIRLPOOL]=1; else #endif -#ifndef OPENSSL_NO_RIPEMD +#ifndef OPENSSL_NO_RMD160 if (strcmp(*argv,"ripemd") == 0) doit[D_RMD160]=1; else if (strcmp(*argv,"rmd160") == 0) doit[D_RMD160]=1; @@ -1073,12 +1073,12 @@ int MAIN(int argc, char **argv) #ifndef OPENSSL_NO_WHIRLPOOL BIO_printf(bio_err,"whirlpool"); #endif -#ifndef OPENSSL_NO_RIPEMD160 +#ifndef OPENSSL_NO_RMD160 BIO_printf(bio_err,"rmd160"); #endif #if !defined(OPENSSL_NO_MD2) || !defined(OPENSSL_NO_MDC2) || \ !defined(OPENSSL_NO_MD4) || !defined(OPENSSL_NO_MD5) || \ - !defined(OPENSSL_NO_SHA1) || !defined(OPENSSL_NO_RIPEMD160) || \ + !defined(OPENSSL_NO_SHA1) || !defined(OPENSSL_NO_RMD160) || \ !defined(OPENSSL_NO_WHIRLPOOL) BIO_printf(bio_err,"\n"); #endif @@ -1690,7 +1690,7 @@ int MAIN(int argc, char **argv) } #endif -#ifndef OPENSSL_NO_RIPEMD +#ifndef OPENSSL_NO_RMD160 if (doit[D_RMD160]) { for (j=0; j<SIZE_NUM; j++) |