diff options
| author | johans <johans@FreeBSD.org> | 2008-11-23 01:05:15 +0800 |
|---|---|---|
| committer | johans <johans@FreeBSD.org> | 2008-11-23 01:05:15 +0800 |
| commit | 08c89a4f8c77ac23ec43c2b6aa93f957c5ac2610 (patch) | |
| tree | 8e07be0e7684c80509a7d6908acb18d81eaba5d3 /www | |
| parent | d19132ef9f0b13ddb7cf27a07aace43526232f76 (diff) | |
| download | freebsd-ports-gnome-08c89a4f8c77ac23ec43c2b6aa93f957c5ac2610.tar.gz freebsd-ports-gnome-08c89a4f8c77ac23ec43c2b6aa93f957c5ac2610.tar.zst freebsd-ports-gnome-08c89a4f8c77ac23ec43c2b6aa93f957c5ac2610.zip | |
Avoid MD5_CTX conflict when both md5.h and openssl/md5.h get included
Reported by: ed
Diffstat (limited to 'www')
| -rw-r--r-- | www/xshttpd-devel/files/patch-src_ssl.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/www/xshttpd-devel/files/patch-src_ssl.c b/www/xshttpd-devel/files/patch-src_ssl.c new file mode 100644 index 000000000000..3c9c09806bf3 --- /dev/null +++ b/www/xshttpd-devel/files/patch-src_ssl.c @@ -0,0 +1,29 @@ +--- src/ssl.c.orig 2008-11-22 17:49:07.000000000 +0100 ++++ src/ssl.c 2008-11-22 17:50:17.000000000 +0100 +@@ -16,11 +16,13 @@ + #endif /* HAVE_ERR_H */ + + #ifdef HANDLE_SSL ++# define MD5_CTX OpenSSL_MD5_CTX + #include <openssl/rand.h> + #include <openssl/err.h> + #include <openssl/conf.h> + #include <openssl/ssl.h> + #include <openssl/tls1.h> ++# undef MD5_CTX + #endif /* HANDLE_SSL */ + + #include "htconfig.h" +--- src/ssl.h.orig 2008-11-22 17:49:11.000000000 +0100 ++++ src/ssl.h 2008-11-22 17:50:17.000000000 +0100 +@@ -11,8 +11,10 @@ + # define OPENSSL_NO_MD5 + # define HEADER_MD5_H /* trick older openssl */ + # endif /* Not USE_OPENSSL_MD5 */ ++# define MD5_CTX OpenSSL_MD5_CTX + # include <openssl/ssl.h> + # include <openssl/tls1.h> ++# undef MD5_CTX + # ifdef TLSEXT_NAMETYPE_host_name + # ifndef OPENSSL_NO_TLSEXT + # define HANDLE_SSL_TLSEXT |