move 2.5.13 into trunk

apache2/re_tfns.c

@@ -1,6 +1,6 @@
 /*
  * ModSecurity for Apache 2.x, http://www.modsecurity.org/
- * Copyright (c) 2004-2010 Breach Security, Inc. (http://www.breach.com/)
+ * Copyright (c) 2004-2010 Trustwave Holdings, Inc. (http://www.trustwave.com/)
  *
  * This product is released under the terms of the General Public Licence,
  * version 2 (GPLv2). Please refer to the file LICENSE (included with this
@@ -12,8 +12,8 @@
  * distribution.
  *
  * If any of the files related to licensing are missing or if you have any
- * other questions related to licensing please contact Breach Security, Inc.
- * directly using the email address support@breach.com.
+ * other questions related to licensing please contact Trustwave Holdings, Inc.
+ * directly using the email address support@trustwave.com.
  *
  */
 #include <ctype.h>
@@ -572,6 +572,28 @@ static int msre_fn_parityOdd7bit_execute(apr_pool_t *mptmp, unsigned char *input
     return changed;
 }
 
+/*
+* \brief Base64 transformation function based on RFC2045
+*
+* \param mptmp Pointer to resource poil
+* \param input Pointer to input data
+* \param input_len Input data length
+* \param rval Pointer to decoded buffer
+* \param rval_len Decoded buffer length
+*
+* \retval 0 On failure
+* \retval 1 On Success
+*/
+static int msre_fn_decodeBase64Ext_execute(apr_pool_t *mptmp, unsigned char *input, long int input_len, char **rval, long int *rval_len)
+{
+    *rval_len = input_len;
+    *rval = apr_palloc(mptmp, *rval_len);
+    *rval_len = decode_base64_ext(*rval, (const char *)input, input_len);
+
+    return *rval_len ? 1 : 0;
+}
+
+
 /* ------------------------------------------------------------------------------ */
 
 /**
@@ -787,4 +809,11 @@ void msre_engine_register_default_tfns(msre_engine *engine) {
         "urlEncode",
         msre_fn_urlEncode_execute
     );
+
+    /* decodeBase64Ext */
+    msre_engine_tfn_register(engine,
+        "decodeBase64Ext",
+        msre_fn_decodeBase64Ext_execute
+    );
+
 }