summaryrefslogtreecommitdiffstats
path: root/crypto/hmac
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2001-02-19 16:06:34 +0000
committerRichard Levitte <levitte@openssl.org>2001-02-19 16:06:34 +0000
commitcf1b7d96647d55e533f779e476e3d4371f40445a (patch)
treef7d6534cf77223190eaefe68d9e192d3d1246206 /crypto/hmac
parent649c5a2b096e89692b07dbbe19d2dbb12a9db075 (diff)
Make all configuration macros available for application by making
sure they are available in opensslconf.h, by giving them names starting with "OPENSSL_" to avoid conflicts with other packages and by making sure e_os2.h will cover all platform-specific cases together with opensslconf.h. I've checked fairly well that nothing breaks with this (apart from external software that will adapt if they have used something like NO_KRB5), but I can't guarantee it completely, so a review of this change would be a good thing.
Diffstat (limited to 'crypto/hmac')
-rw-r--r--crypto/hmac/Makefile.ssl5
-rw-r--r--crypto/hmac/hmac.h2
-rw-r--r--crypto/hmac/hmactest.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/crypto/hmac/Makefile.ssl b/crypto/hmac/Makefile.ssl
index 82a28f6167..7ff73525a1 100644
--- a/crypto/hmac/Makefile.ssl
+++ b/crypto/hmac/Makefile.ssl
@@ -11,7 +11,8 @@ INSTALL_PREFIX=
OPENSSLDIR= /usr/local/ssl
INSTALLTOP=/usr/local/ssl
MAKE= make -f Makefile.ssl
-MAKEDEPEND= $(TOP)/util/domd $(TOP)
+MAKEDEPPROG= makedepend
+MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
MAKEFILE= Makefile.ssl
AR= ar r
@@ -95,4 +96,4 @@ hmac.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
hmac.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
hmac.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
hmac.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-hmac.o: ../../include/openssl/symhacks.h
+hmac.o: ../../include/openssl/symhacks.h hmac.c
diff --git a/crypto/hmac/hmac.h b/crypto/hmac/hmac.h
index 328bad2608..7ed945da98 100644
--- a/crypto/hmac/hmac.h
+++ b/crypto/hmac/hmac.h
@@ -58,7 +58,7 @@
#ifndef HEADER_HMAC_H
#define HEADER_HMAC_H
-#ifdef NO_HMAC
+#ifdef OPENSSL_NO_HMAC
#error HMAC is disabled.
#endif
diff --git a/crypto/hmac/hmactest.c b/crypto/hmac/hmactest.c
index 4b56b8ee13..b8557b182e 100644
--- a/crypto/hmac/hmactest.c
+++ b/crypto/hmac/hmactest.c
@@ -60,7 +60,7 @@
#include <string.h>
#include <stdlib.h>
-#ifdef NO_HMAC
+#ifdef OPENSSL_NO_HMAC
int main(int argc, char *argv[])
{
printf("No HMAC support\n");