"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "apache2/msc_status_engine.c" between
modsecurity-2.9.6.tar.gz and modsecurity-2.9.7.tar.gz

About: ModSecurity is an intrusion detection and prevention module (web application firewall) for the Apache (and Nginx) Web servers.

msc_status_engine.c  (modsecurity-2.9.6):msc_status_engine.c  (modsecurity-2.9.7)
/* /*
* ModSecurity for Apache 2.x, http://www.modsecurity.org/ * ModSecurity for Apache 2.x, http://www.modsecurity.org/
* Copyright (c) 2004-2013 Trustwave Holdings, Inc. (http://www.trustwave.com/) * Copyright (c) 2004-2022 Trustwave Holdings, Inc. (http://www.trustwave.com/)
* *
* You may not use this file except in compliance with * You may not use this file except in compliance with
* the License.  You may obtain a copy of the License at * the License.  You may obtain a copy of the License at
* *
*     http://www.apache.org/licenses/LICENSE-2.0 *     http://www.apache.org/licenses/LICENSE-2.0
* *
* If any of the files related to licensing are missing or if you have any * If any of the files related to licensing are missing or if you have any
* other questions related to licensing please contact Trustwave Holdings, Inc. * other questions related to licensing please contact Trustwave Holdings, Inc.
* directly using the email address security@modsecurity.org. * directly using the email address security@modsecurity.org.
*/ */
skipping to change at line 48 skipping to change at line 48
#endif #endif
#if (defined(__linux__) || defined(__gnu_linux__)) #if (defined(__linux__) || defined(__gnu_linux__))
#include <linux/if.h> #include <linux/if.h>
#include <linux/sockios.h> #include <linux/sockios.h>
#endif #endif
#ifdef HAVE_SYS_UTSNAME_H #ifdef HAVE_SYS_UTSNAME_H
#include <sys/utsname.h> #include <sys/utsname.h>
#endif #endif
#ifdef APLOG_USE_MODULE
APLOG_USE_MODULE(security2);
#endif
// Bese32 encode, based on: // Bese32 encode, based on:
// https://code.google.com/p/google-authenticator/source/browse/libpam/base32.c // https://code.google.com/p/google-authenticator/source/browse/libpam/base32.c
int DSOLOCAL msc_status_engine_base32_encode(char *encoded, int DSOLOCAL msc_status_engine_base32_encode(char *encoded,
const char *data, int len) { const char *data, int len) {
int buffer; int buffer;
int count = 0; int count = 0;
char *result = encoded; char *result = encoded;
int length = strlen(data); int length = strlen(data);
buffer = data[0]; buffer = data[0];
skipping to change at line 347 skipping to change at line 351
const char *pcre_loaded = NULL; const char *pcre_loaded = NULL;
char *lua = NULL; char *lua = NULL;
char *libxml = NULL; char *libxml = NULL;
char *modsec = NULL; char *modsec = NULL;
const char *apache = NULL; const char *apache = NULL;
char id[(APR_SHA1_DIGESTSIZE*2) + 1]; char id[(APR_SHA1_DIGESTSIZE*2) + 1];
int beacon_string_len = -1; int beacon_string_len = -1;
apr = APR_VERSION_STRING; apr = APR_VERSION_STRING;
apr_loaded = apr_version_string(); apr_loaded = apr_version_string();
#ifdef WITH_PCRE2
apr_snprintf(pcre, 7, "%d.%d", PCRE2_MAJOR, PCRE2_MINOR);
pcre_loaded = ""; /* complete this if/when status reactivated */
#else
apr_snprintf(pcre, 7, "%d.%d", PCRE_MAJOR, PCRE_MINOR); apr_snprintf(pcre, 7, "%d.%d", PCRE_MAJOR, PCRE_MINOR);
pcre_loaded = pcre_version(); pcre_loaded = pcre_version();
#endif
#ifdef WITH_LUA #ifdef WITH_LUA
lua = LUA_VERSION; lua = LUA_VERSION;
#endif #endif
libxml = LIBXML_DOTTED_VERSION; libxml = LIBXML_DOTTED_VERSION;
modsec = MODSEC_VERSION; modsec = MODSEC_VERSION;
#ifdef VERSION_IIS #ifdef VERSION_IIS
apache = "IIS"; apache = "IIS";
#elif VERSION_NGINX #elif VERSION_NGINX
apache = "nginx"; apache = "nginx";
#else #else
 End of changes. 4 change blocks. 
1 lines changed or deleted 10 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)