Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice

Conflicts:

	cpp/src/Slice/VbUtil.cpp

1 files changed, 44 insertions, 0 deletions

diff --git a/cpp/src/Slice/MD5.h b/cpp/src/Slice/MD5.h
new file mode 100644
index 00000000000..ae42456f692
--- /dev/null
+++ b/cpp/src/Slice/MD5.h
@@ -0,0 +1,44 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef SLICE_MD5_H
+#define SLICE_MD5_H
+
+#include <IceUtil/Config.h>
+
+extern "C"
+{
+struct md5_state_s;
+}
+
+namespace Slice
+{
+
+class MD5
+{
+public:
+
+    MD5();
+    MD5(const unsigned char*, int);
+    ~MD5();
+
+    void update(const unsigned char*, int);
+    void finish();
+
+    void getDigest(unsigned char*) const;
+
+private:
+
+    md5_state_s* _state;
+    unsigned char _digest[16];
+};
+
+}
+
+#endif