NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commita235b53

Felipe Zimmerle

committed

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

apr_crypto is not always available, configure scripts are looking forit and setting WITH_APU_CRYPTO in case it is found. There were twoplaces where apr_crypto.h was included without validating ifWITH_APU_CRYPTO was set. This patch removes the inclusion from thefirst place (it seems not to be mandatory) and add the check forWITH_APU_CRYPTO in the second one. This fix issueowasp-modsecurity#834.

1 parent2e09b8e commita235b53Copy full SHA for a235b53

File tree

3 files changed

-1

lines changed

CHANGES
apache2
- modsecurity.h
- msc_remote_rules.c

3 files changed

-1

lines changed

`‎CHANGES‎`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,10 @@`
	`1`	`+XX xxx XXXX - 2.9.0`
	`2`	`+-------------------`
	`3`	`+`
	`4`	`+ * Fix apr_crypto.h include, now checking if apr_crypto.h is available by`
	`5`	`+ checking the definition WITH_APU_CRYPTO.`
	`6`	`+ [martinjina and ModSecurity team]`
	`7`	`+`
`1`	`8`	`15 Dez 2014 - 2.9.0-RC2`
`2`	`9`	`-----------------------`
`3`	`10`

`‎apache2/modsecurity.h‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ typedef struct msc_parm msc_parm;`
`52`	`52`	`#include"apr_md5.h"`
`53`	`53`	`#include"apr_strings.h"`
`54`	`54`	`#include"apr_hash.h"`
`55`		`-#include"apr_crypto.h"`
`56`	`55`	`#include"httpd.h"`
`57`	`56`	`#include"http_config.h"`
`58`	`57`	`#include"http_log.h"`

`‎apache2/msc_remote_rules.c‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,9 @@`
`24`	`24`	`#include<apu.h>`
`25`	`25`
`26`	`26`	`#ifdefWITH_REMOTE_RULES`
	`27`	`+#ifdefWITH_APU_CRYPTO`
`27`	`28`	`#include<apr_crypto.h>`
	`29`	`+#endif`
`28`	`30`	`#include<apr_sha1.h>`
`29`	`31`	`#endif`
`30`	`32`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita235b53

File tree

3 files changed

3 files changed

`‎CHANGES‎`

`‎apache2/modsecurity.h‎`

`‎apache2/msc_remote_rules.c‎`

0 commit comments