Fix apr_crypto.h include in modsecurity.h and msc_remote_rules.c

apr_crypto is not always available, configure scripts are looking for
it and setting WITH_APU_CRYPTO in case it is found. There were two
places where apr_crypto.h was included without validating if
WITH_APU_CRYPTO was set. This patch removes the inclusion from the
first place (it seems not to be mandatory) and add the check for
WITH_APU_CRYPTO in the second one. This fix issue #834.
This commit is contained in:
Felipe Zimmerle 2015-02-11 05:56:52 -08:00
parent 2e09b8e542
commit a235b536a4
3 changed files with 9 additions and 1 deletions

View File

@ -1,3 +1,10 @@
XX xxx XXXX - 2.9.0
-------------------
* Fix apr_crypto.h include, now checking if apr_crypto.h is available by
checking the definition WITH_APU_CRYPTO.
[martinjina and ModSecurity team]
15 Dez 2014 - 2.9.0-RC2
-----------------------

View File

@ -52,7 +52,6 @@ typedef struct msc_parm msc_parm;
#include "apr_md5.h"
#include "apr_strings.h"
#include "apr_hash.h"
#include "apr_crypto.h"
#include "httpd.h"
#include "http_config.h"
#include "http_log.h"

View File

@ -24,7 +24,9 @@
#include <apu.h>
#ifdef WITH_REMOTE_RULES
#ifdef WITH_APU_CRYPTO
#include <apr_crypto.h>
#endif
#include <apr_sha1.h>
#endif