aboutsummaryrefslogtreecommitdiff
path: root/crypto/rand
diff options
context:
space:
mode:
authorUlf Möller <ulf@openssl.org>1999-04-27 04:18:53 +0000
committerUlf Möller <ulf@openssl.org>1999-04-27 04:18:53 +0000
commitd02f751ce1d13183a0c0e5528ec89f76587ed989 (patch)
tree3ee5bb5030a36e5d5358d8a067b89232b0c6c15f /crypto/rand
parent79df9d62721467927c81f1fa91568340e873ee9c (diff)
downloadopenssl-d02f751ce1d13183a0c0e5528ec89f76587ed989.zip
openssl-d02f751ce1d13183a0c0e5528ec89f76587ed989.tar.gz
openssl-d02f751ce1d13183a0c0e5528ec89f76587ed989.tar.bz2
Message digest stuff.
Diffstat (limited to 'crypto/rand')
-rw-r--r--crypto/rand/Makefile.ssl4
-rw-r--r--crypto/rand/md_rand.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/crypto/rand/Makefile.ssl b/crypto/rand/Makefile.ssl
index 17591e0..e78d585 100644
--- a/crypto/rand/Makefile.ssl
+++ b/crypto/rand/Makefile.ssl
@@ -77,7 +77,7 @@ clean:
# DO NOT DELETE THIS LINE -- make depend depends on it.
md_rand.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
-md_rand.o: ../../include/openssl/md5.h ../../include/openssl/opensslv.h
-md_rand.o: ../../include/openssl/rand.h ../../include/openssl/stack.h
+md_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
+md_rand.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
rand_lib.o: ../../include/openssl/rand.h
randfile.o: ../../include/openssl/e_os.h ../../include/openssl/rand.h
diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index ab7e41c..8ab8608 100644
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -64,16 +64,16 @@
#include <openssl/crypto.h>
#if !defined(USE_MD5_RAND) && !defined(USE_SHA1_RAND) && !defined(USE_MDC2_RAND) && !defined(USE_MD2_RAND)
-#ifndef NO_MD5
-#define USE_MD5_RAND
-#elif !defined(NO_SHA1)
+#if !defined(NO_SHA) && !defined(NO_SHA1)
#define USE_SHA1_RAND
-#elif !defined(NO_MDC2)
+#elif !defined(NO_MD5)
+#define USE_MD5_RAND
+#elif !defined(NO_MDC2) && !defined(NO_DES)
#define USE_MDC2_RAND
#elif !defined(NO_MD2)
#define USE_MD2_RAND
#else
-We need a message digest of some type
+#error No message digest algorithm available
#endif
#endif