aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

Fix inclusion of header files after CONFIG_{MD5,SHA1} were removed

Browse Source 
Fixes: 206037eaa4
This commit is contained in:
Jonas Fonseca 2006-01-21 08:44:19 +01:00 committed by Jonas Fonseca
parent d5f6f198b1
commit 384a2d66e5
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/util/Makefile
View File

@ -1,6 +1,8 @@
top_builddir=../.. top_builddir=../..
include $(top_builddir)/Makefile.config include $(top_builddir)/Makefile.config
INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS)
# Reverse a CONFIG_* string # Reverse a CONFIG_* string
# Usage $(call not,$(CONFIG_FOO)) # Usage $(call not,$(CONFIG_FOO))
not = $(if $(findstring yes,$(1)),no,yes) not = $(if $(findstring yes,$(1)),no,yes)
@ -9,7 +11,6 @@ OBJS-$(call not,$(CONFIG_SMALL)) += fastfind.o
OBJS-$(CONFIG_CSS) += scanner.o OBJS-$(CONFIG_CSS) += scanner.o
OBJS-$(CONFIG_DEBUG) += memdebug.o OBJS-$(CONFIG_DEBUG) += memdebug.o
OBJS-$(CONFIG_DOM) += scanner.o OBJS-$(CONFIG_DOM) += scanner.o
OBJS-$(CONFIG_MD5) += md5.o
# Use own MD5 implementation if testing libc or there's no OpenSSL # Use own MD5 implementation if testing libc or there's no OpenSSL
# (either the real thing or GNUTLS compat wrappers). # (either the real thing or GNUTLS compat wrappers).

8
src/util/md5.h
View File

@ -3,12 +3,14 @@
/* Optionally MD5 support can depend on external implementation when linking /* Optionally MD5 support can depend on external implementation when linking
* against a SSL library that supports it. */ * against a SSL library that supports it. */
#ifndef CONFIG_MD5 #if defined(CONFIG_OWN_LIBC)
#if defined(CONFIG_OPENSSL) #define CONFIG_MD5 1
#elif defined(CONFIG_OPENSSL)
#include <openssl/md5.h> #include <openssl/md5.h>
#elif defined(CONFIG_GNUTLS_OPENSSL_COMPAT) #elif defined(CONFIG_GNUTLS_OPENSSL_COMPAT)
#include <gnutls/openssl.h> #include <gnutls/openssl.h>
#endif #else
#define CONFIG_MD5 1
#endif #endif
/* GNU TLS doesn't define this */ /* GNU TLS doesn't define this */

8
src/util/sha1.h
View File

@ -36,10 +36,12 @@
/* Optionally SHA1 support can depend on external implementation when linking /* Optionally SHA1 support can depend on external implementation when linking
* against a SSL library that supports it. */ * against a SSL library that supports it. */
#ifndef CONFIG_SHA1 #if defined(CONFIG_OWN_LIBC)
#if defined(CONFIG_OPENSSL) #define CONFIG_SHA1 1
#elif defined(CONFIG_OPENSSL)
#include <openssl/sha.h> #include <openssl/sha.h>
#endif #else
#define CONFIG_SHA1 1
#endif #endif
#ifndef SHA_DIGEST_LENGTH #ifndef SHA_DIGEST_LENGTH