From 55d45f0542595061b2bd55a6f8837120127cec1c Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Wed, 5 Feb 2014 16:51:30 +0100
Subject: [PATCH] Check if private key matches cert only if both key and cert
 are set

---
 src/ssl.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ssl.lua b/src/ssl.lua
index 7de8fc2..0b465e2 100644
--- a/src/ssl.lua
+++ b/src/ssl.lua
@@ -58,12 +58,12 @@ function newcontext(cfg)
    end
    -- Load the certificate
    if cfg.certificate then
-      succ, msg = context.loadcert(ctx, cfg.certificate)
-      if not succ then return nil, msg end
-   end
-   if context.checkkey then
-     succ = context.checkkey(ctx)
-     if not succ then return nil, "private key does not match public key" end
+     succ, msg = context.loadcert(ctx, cfg.certificate)
+     if not succ then return nil, msg end
+     if cfg.key and context.checkkey then
+       succ = context.checkkey(ctx)
+       if not succ then return nil, "private key does not match public key" end
+     end
    end
    -- Load the CA certificates
    if cfg.cafile or cfg.capath then