commit 96bea0002b44f1f490a798d6122d6b15d1fe6b09
author Matt Caswell <matt@openssl.org> Fri Mar 18 15:56:06 2016 +0000
committer Matt Caswell <matt@openssl.org> Fri Mar 18 17:07:11 2016 +0000
tree 8483f3d6eca4c15f020ec3fc3384c418d29f529f
parent 40a8e9c2effc655413e8283fb31e7cffeeb6154a

Fix no-des

Numerous fixes for no-des.

Reviewed-by: Rich Salz <rsalz@openssl.org>

apps/pkcs12.c

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 1fd1fad..6657c4f 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>

apps/speed.c

diff --git a/apps/speed.c b/apps/speed.c
index 230ed62..260b55f 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -1386,7 +1386,9 @@
     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++)