Changeset 71

Timestamp:

09/23/06 22:37:59 (2 years ago)

Author:

dmik

Message:

QCA: Applied somebody's patch (from psi-im.org's Wiki) to fix MSVC 7 build.

Location:

qca/trunk/src

Files:

• qca.cpp (modified) (1 diff)
• qca.h (modified) (5 diffs)

qca/trunk/src/qca.cpp

@@ -456 +456 @@
 // SHA256
 //----------------------------------------------------------------------------
+#if !defined(MSC_NET_HOTFIX)
 SHA256::SHA256()
 :Hash((QCA_HashContext *)getContext(CAP_SHA256))
 {
 }
+#endif
 
 

qca/trunk/src/qca.h

@@ -55 +55 @@
 #endif
 
+#if defined(_MSC_VER) && _MSC_VER >= 1300
+#define MSC_NET_HOTFIX
+#endif
+
 class QHostAddress;
 class QStringList;
@@ -116 +120 @@
         };
 
+#if !defined(MSC_NET_HOTFIX)
         template <class T>
         class QCA_EXPORT HashStatic
@@ -146 +151 @@
                 }
         };
+#endif
 
         class QCA_EXPORT Cipher
@@ -187 +193 @@
         };
 
-        class QCA_EXPORT SHA1 : public Hash, public HashStatic<SHA1>
+        class QCA_EXPORT SHA1 : public Hash
+#if !defined(MSC_NET_HOTFIX)
+                , public HashStatic<SHA1>
+#endif
         {
         public:
                 SHA1();
-        };
-
+
+#if defined(MSC_NET_HOTFIX)
+                static QByteArray hash(const QByteArray &a)
+                {
+                        SHA1 obj;
+                        obj.update(a);
+                        return obj.final();
+                }
+
+                static QByteArray hash(const QCString &cs)
+                {
+                        QByteArray a(cs.length());
+                        memcpy(a.data(), cs.data(), a.size());
+                        return hash(a);
+                }
+
+                static QString hashToString(const QByteArray &a)
+                {
+                        return arrayToHex(hash(a));
+                }
+
+                static QString hashToString(const QCString &cs)
+                {
+                        return arrayToHex(hash(cs));
+                }
+#endif
+        };
+
+#if !defined(MSC_NET_HOTFIX)
         class QCA_EXPORT SHA256 : public Hash, public HashStatic<SHA256>
         {
@@ -198 +234 @@
                 SHA256();
         };
-
-        class QCA_EXPORT MD5 : public Hash, public HashStatic<MD5>
+#endif
+
+        class QCA_EXPORT MD5 : public Hash
+#if !defined(MSC_NET_HOTFIX)
+                , public HashStatic<MD5>
+#endif
         {
         public:
                 MD5();
+
+#if defined(MSC_NET_HOTFIX)
+                static QByteArray hash(const QByteArray &a)
+                {
+                        MD5 obj;
+                        obj.update(a);
+                        return obj.final();
+                }
+
+                static QByteArray hash(const QCString &cs)
+                {
+                        QByteArray a(cs.length());
+                        memcpy(a.data(), cs.data(), a.size());
+                        return hash(a);
+                }
+
+                static QString hashToString(const QByteArray &a)
+                {
+                        return arrayToHex(hash(a));
+                }
+
+                static QString hashToString(const QCString &cs)
+                {
+                        return arrayToHex(hash(cs));
+                }
+#endif
         };