[Freeswitch-svn] [commit] r10085 - in freeswitch/trunk: libs/apr-util/include libs/win32/apr-util src src/include

[Freeswitch SVN]

Author: mikej
Date: Mon Oct 20 18:45:09 2008
New Revision: 10085

Modified:
   freeswitch/trunk/libs/apr-util/include/apu.hw
   freeswitch/trunk/libs/win32/apr-util/libaprutil.2008.vcproj
   freeswitch/trunk/src/include/switch_apr.h
   freeswitch/trunk/src/switch_apr.c

Log:
add switch_md5

Modified: freeswitch/trunk/libs/apr-util/include/apu.hw
==============================================================================
--- freeswitch/trunk/libs/apr-util/include/apu.hw	(original)
+++ freeswitch/trunk/libs/apr-util/include/apu.hw	Mon Oct 20 18:45:09 2008
@@ -95,7 +95,7 @@
 #endif
 
 
-#define APU_HAVE_APR_ICONV     1
+#define APU_HAVE_APR_ICONV     0
 #define APU_HAVE_ICONV         0
 #define APR_HAS_XLATE          (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
 

Modified: freeswitch/trunk/libs/win32/apr-util/libaprutil.2008.vcproj
==============================================================================
--- freeswitch/trunk/libs/win32/apr-util/libaprutil.2008.vcproj	(original)
+++ freeswitch/trunk/libs/win32/apr-util/libaprutil.2008.vcproj	Mon Oct 20 18:45:09 2008
@@ -545,7 +545,6 @@
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
-						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -555,7 +554,6 @@
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release|Win32"
-						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -569,7 +567,6 @@
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
-						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -579,7 +576,6 @@
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release|Win32"
-						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -593,7 +589,6 @@
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
-						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -603,7 +598,6 @@
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release|Win32"
-						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -865,7 +859,6 @@
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
-						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -875,7 +868,6 @@
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release|Win32"
-						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1311,7 +1303,6 @@
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
-						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1321,7 +1312,6 @@
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release|Win32"
-						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"

Modified: freeswitch/trunk/src/include/switch_apr.h
==============================================================================
--- freeswitch/trunk/src/include/switch_apr.h	(original)
+++ freeswitch/trunk/src/include/switch_apr.h	Mon Oct 20 18:45:09 2008
@@ -509,6 +509,8 @@
 /** UUIDs are formatted as: 00112233-4455-6677-8899-AABBCCDDEEFF */
 #define SWITCH_UUID_FORMATTED_LENGTH 36
 
+#define SWITCH_MD5_DIGESTSIZE 16
+
 /**
  * Format a UUID into a string, following the standard format
  * @param buffer The buffer to place the formatted UUID string into. It must
@@ -531,6 +533,14 @@
  */
 SWITCH_DECLARE(switch_status_t) switch_uuid_parse(switch_uuid_t *uuid, const char *uuid_str);
 
+/**
+ * MD5 in one step
+ * @param digest The final MD5 digest
+ * @param input The message block to use
+ * @param inputLen The length of the message block
+ */
+SWITCH_DECLARE(switch_status_t) switch_md5(unsigned char digest[SWITCH_MD5_DIGESTSIZE], const void *input, switch_size_t inputLen);
+
 /** @} */
 
 /**

Modified: freeswitch/trunk/src/switch_apr.c
==============================================================================
--- freeswitch/trunk/src/switch_apr.c	(original)
+++ freeswitch/trunk/src/switch_apr.c	Mon Oct 20 18:45:09 2008
@@ -63,6 +63,7 @@
 /* apr-util headers */
 #include <apr_queue.h>
 #include <apr_uuid.h>
+#include <apr_md5.h>
 
 /* apr stubs */
 
@@ -807,6 +808,12 @@
 	return apr_uuid_parse((apr_uuid_t *) uuid, uuid_str);
 }
 
+SWITCH_DECLARE(switch_status_t) switch_md5(unsigned char digest[SWITCH_MD5_DIGESTSIZE], const void *input, switch_size_t inputLen)
+{
+	return apr_md5(digest, input, inputLen);
+}
+
+
 /* FIFO queues (apr-util) */
 
 SWITCH_DECLARE(switch_status_t) switch_queue_create(switch_queue_t **queue, unsigned int queue_capacity, switch_memory_pool_t *pool)