From 9210f77a1a8b67803d56065f49a359527487ac39 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@kn-bremen.de>
Date: Fri, 1 Mar 2019 19:14:09 +0100
Subject: [PATCH] fix bcrypt use

---
 process/epasswd.py | 6 +++---
 src/reports.c      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/process/epasswd.py b/process/epasswd.py
index 496eb8331..bdb3c4a6d 100755
--- a/process/epasswd.py
+++ b/process/epasswd.py
@@ -70,9 +70,9 @@ class EPasswd:
         pw = self.get_passwd(id)
         if pw[0:4]=='$2a$' or pw[0:4]=='$2y$':
             try:
-                h1 = pw.encode('utf8')
-                h2 = passwd.encode('utf8')
-                return bcrypt.checkpw(h1, h2)
+                uhash = pw.encode('utf8')
+                upass = passwd.encode('utf8')
+                return bcrypt.checkpw(upass, uhash)
             except:
                 return False
         return pw == passwd
diff --git a/src/reports.c b/src/reports.c
index 10d00600b..056ee8dd0 100644
--- a/src/reports.c
+++ b/src/reports.c
@@ -1606,7 +1606,7 @@ int write_reports(faction * f)
     if (f->lastorders == 0 || f->age <= 1) {
         /* neue Parteien, oder solche die noch NIE einen Zug gemacht haben,
          * kriegen ein neues Passwort: */
-        password = faction_genpassword(f);
+        password = faction_genpassword(f, buffer);
     }
     prepare_report(&ctx, f, password);
     get_addresses(&ctx);