For a long time, I've wanted to be able to easily run one or a few

[oweals/openssl.git] / crypto / des / des.c

diff --git a/crypto/des/des.c b/crypto/des/des.c
index 91d7153b34667f9bd35945d2d26fe891f1e46c0b..215d7413c0766bd13ecbe7a02d02fe7a7cd0b5df 100644 (file)
--- a/crypto/des/des.c
+++ b/crypto/des/des.c
@@ -58,6 +58,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #ifndef MSDOS
 #ifndef VMS
 #include <openssl/opensslconf.h>
@@ -69,7 +70,7 @@
 #include <math.h>
 #endif /* __DECC */
 #endif /* VMS */
-#else
+#else /* MSDOS */
 #include <io.h>
 #endif
 
@@ -88,10 +89,6 @@
 #include <openssl/des.h>
 #include <openssl/rand.h>
 
-#if defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS)
-#include <string.h>
-#endif
-
 void usage(void);
 void doencryption(void);
 int uufwrite(unsigned char *data, int size, unsigned int num, FILE *fp);
@@ -377,8 +374,8 @@ void doencryption(void)
 
        if (buf == NULL)
                {
-               if (    (( buf=Malloc(BUFSIZE+8)) == NULL) ||
-                       ((obuf=Malloc(BUFSIZE+8)) == NULL))
+               if (    (( buf=OPENSSL_malloc(BUFSIZE+8)) == NULL) ||
+                       ((obuf=OPENSSL_malloc(BUFSIZE+8)) == NULL))
                        {
                        fputs("Not enough memory\n",stderr);
                        Exit=10;