From 41dc0d0ca4f9ffdefa2b8f74eca2bb4a5de5a58f Mon Sep 17 00:00:00 2001
From: Michel Oosterhof <michel@oosterhof.net>
Date: Wed, 18 Feb 2015 13:28:24 +0000
Subject: [PATCH] better exception handling moduli file

---
 kippo/core/ssh.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kippo/core/ssh.py b/kippo/core/ssh.py
index 6059199..adc1546 100644
--- a/kippo/core/ssh.py
+++ b/kippo/core/ssh.py
@@ -121,9 +121,13 @@ class HoneyPotSSHFactory(factory.SSHFactory):
 
         t.supportedPublicKeys = self.privateKeys.keys()
 
-        if ( os.path.exists( _moduli ) ):
+        try:
             self.primes = primes.parseModuliFile( _moduli )
+        except IOError as err:
+            log.err( err )
+
         if not self.primes:
+            log.msg( "Disabling diffie-hellman-group-exchange-sha1" )
             ske = t.supportedKeyExchanges[:]
             ske.remove('diffie-hellman-group-exchange-sha1')
             t.supportedKeyExchanges = ske