diff options
| author | Matt Caswell <matt@openssl.org> | 2016-03-18 15:56:06 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-03-18 17:07:11 +0000 |
| commit | 96bea0002b44f1f490a798d6122d6b15d1fe6b09 (patch) | |
| tree | 8483f3d6eca4c15f020ec3fc3384c418d29f529f /apps | |
| parent | 40a8e9c2effc655413e8283fb31e7cffeeb6154a (diff) | |
Fix no-des
Numerous fixes for no-des.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/pkcs12.c | 4 | ||||
| -rw-r--r-- | apps/speed.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 1fd1fad001..6657c4fcee 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -57,7 +57,9 @@ */ #include <openssl/opensslconf.h> -#if !defined(OPENSSL_NO_DES) +#if defined(OPENSSL_NO_DES) +NON_EMPTY_TRANSLATION_UNIT +#else # include <stdio.h> # include <stdlib.h> diff --git a/apps/speed.c b/apps/speed.c index 230ed62e04..260b55fccc 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -1386,7 +1386,9 @@ int speed_main(int argc, char **argv) memset(results, 0, sizeof(results)); memset(c, 0, sizeof(c)); +#ifndef OPENSSL_NO_DES memset(DES_iv, 0, sizeof(DES_iv)); +#endif memset(iv, 0, sizeof(iv)); for (i = 0; i < ALGOR_NUM; i++) |