← Back to branch summary

~ubuntu-branches/ubuntu/trusty/maradns/trusty-proposed

« back to all changes in this revision

Viewing changes to deadwood-3.2.05/update/3.2.05/deadwood-3.2.04-secret.txt.patch

  • Committer: Package Import Robot
  • Author(s): Dariusz Dwornikowski
  • Date: 2014-02-16 19:36:04 UTC
  • mfrom: (1.2.11) (21.1.11 experimental)
  • Revision ID: package-import@ubuntu.com-20140216193604-xtmcopn9pilzszae
Tags: 2.0.09-1
http://bugs.debian.org/739084
http://bugs.debian.org/739755
http://bugs.debian.org/710903
http://bugs.debian.org/709826
http://bugs.debian.org/701657
* New maintainer (Closes: #739084)
* New upstream release to unstable
* Several security bugs (Closes: #739755)
   - security bugfix for CVE-2011-5055, CVE-2011-5056, CVE-2012-0024,
   CVE-2012-1570
   - security bugfix agains blind spoofing attack (no CVE number)
   - security bugfix for packet of death attack (no CVE number)
* Bump standards to 3.9.5
* Updated d/postinst to no longer modify conffiles (Closes: #710903)
* Init script fixed (Closes: #709826)
* --reinstall no longer kills the process (Closes: #701657)
* Updated old d/changelog entries, added information when the CVEs were
  fixed: 2.0.06-1, 2.0.04-1, 1.4.11-1, 1.2.12.06-1, 1.2.12.05-1, 1.0.28-1

Show diffs side-by-side

added added

removed removed

Lines of Context:
deadwood-3.2.05/update/3.2.05/deadwood-3.2.04-secret.txt.patch
 
1
commit 99747dcef140fcb72575763545bc509fa88bea0a
 
2
Author: Sam Trenholme <sam.trenholme@gmail.com>
 
3
Date:   Sat Feb 8 23:07:29 2014 -0800
 
4
 
 
5
    Default random seed file is now secret.txt in Deadwood.exe compiled for Windows
 
6
 
 
7
diff --git a/deadwood-github/src/DwSys.c b/deadwood-github/src/DwSys.c
 
8
index 8f91640..8fd9836 100644
 
9
--- a/deadwood-github/src/DwSys.c
 
10
+++ b/deadwood-github/src/DwSys.c
 
11
@@ -574,7 +574,11 @@ void get_entropy_from_seedfile(uint8_t *noise,int len) {
 
12
         int seed = -1;
 
13
 
 
14
         if(key_s[DWM_S_random_seed_file] == 0) {
 
15
+#ifdef MINGW
 
16
+                filename = "secret.txt"; /* Default filename */
 
17
+#else /* MINGW */
 
18
                 filename = "/dev/urandom"; /* Default filename */
 
19
+#endif /* MINGW */
 
20
         } else {
 
21
                 filename = (char *)dw_to_cstr(key_s[DWM_S_random_seed_file]);
 
22
                 zap = 1;