From 8a040fbb754a541665e0a7a51aec17aaf2ea4997 Mon Sep 17 00:00:00 2001 From: Sebastian Lohff Date: Mon, 25 Jun 2012 20:33:21 +0200 Subject: [PATCH] Enhanced error message for broken SSL keyfiles --- servefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servefile b/servefile index 4b7c239..2903953 100755 --- a/servefile +++ b/servefile @@ -782,7 +782,10 @@ class ServeFile(): if self.useSSL: if not self._getKey(): self.genKeyPair() - server = SecureThreadedHTTPServer(self._getCert(), self._getKey(), (listenIp, self.port), handler, False) + try: + server = SecureThreadedHTTPServer(self._getCert(), self._getKey(), (listenIp, self.port), handler, False) + except SSL.Error as e: + raise ServeFileException("SSL Error: Could not read SSL public/private key from file(s) (error was: \"%s\")" % (e[0][0][2],)) else: server = ThreadedHTTPServer((listenIp, self.port), handler, False)