Quellcode durchsuchen

2010-01-23 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Fixed compile error without GNUTLS/OpenSSL.
	* src/util.cc
Tatsuhiro Tsujikawa vor 15 Jahren
Ursprung
Commit
226160f84f
2 geänderte Dateien mit 12 neuen und 1 gelöschten Zeilen
  1. 5 0
      ChangeLog
  2. 7 1
      src/util.cc

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+2010-01-23  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Fixed compile error without GNUTLS/OpenSSL.
+	* src/util.cc
+
 2010-01-23  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Changed compression level to Z_DEFAULT_COMPRESSION.

+ 7 - 1
src/util.cc

@@ -75,7 +75,9 @@
 #include "A2STR.h"
 #include "array_fun.h"
 #include "a2functional.h"
-#include "MessageDigestHelper.h"
+#ifdef ENABLE_MESSAGE_DIGEST
+# include "MessageDigestHelper.h"
+#endif // ENABLE_MESSAGE_DIGEST
 
 // For libc6 which doesn't define ULLONG_MAX properly because of broken limits.h
 #ifndef ULLONG_MAX
@@ -1020,10 +1022,14 @@ std::string fixTaintedBasename(const std::string& src)
 
 void generateRandomKey(unsigned char* key)
 {
+#ifdef ENABLE_MESSAGE_DIGEST
   unsigned char bytes[40];
   generateRandomData(bytes, sizeof(bytes));
   MessageDigestHelper::digest
     (key, 20, MessageDigestContext::SHA1, bytes, sizeof(bytes));
+#else // !ENABLE_MESSAGE_DIGEST
+  generateRandomData(key, 20);
+#endif // !ENABLE_MESSAGE_DIGEST
 }
 
 } // namespace util