From: Wilfried Göesgens <willi@citadel.org>
Date: Tue, 30 Oct 2007 20:52:09 +0000 (+0000)
Subject: * use the configured key dir
X-Git-Tag: v7.86~2876
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=804eefc1f4258c9018c89e80cf0f856db572606b

* use the configured key dir
* if we can't write there, exit.
---

diff --git a/webcit/crypto.c b/webcit/crypto.c
index 76c80d4de..34aff8293 100644
--- a/webcit/crypto.c
+++ b/webcit/crypto.c
@@ -14,7 +14,7 @@
 #include "webserver.h"
 /** \todo dirify */
 /** where to find the keys */
-#define	CTDL_CRYPTO_DIR		"./keys" 
+#define	CTDL_CRYPTO_DIR		ctdl_key_dir
 #define CTDL_KEY_PATH		file_crpt_file_key /**< the key */
 #define CTDL_CSR_PATH		file_crpt_file_csr /**< the csr file */
 #define CTDL_CER_PATH		file_crpt_file_cer /**< the cer file */
@@ -148,6 +148,10 @@ void init_ssl(void)
 				}
 				fclose(fp);
 			}
+			else {
+				lprintf(3, "Cannot write key: %s\n", CTDL_KEY_PATH);
+				exit(0);
+			}
 			RSA_free(rsa);
 		}
 	}
@@ -221,6 +225,10 @@ void init_ssl(void)
 							PEM_write_X509_REQ(fp, req);
 							fclose(fp);
 						}
+						else {
+							lprintf(3, "Cannot write key: %s\n", CTDL_CSR_PATH);
+							exit(0);
+						}
 					}
 
 					X509_REQ_free(req);
@@ -292,6 +300,10 @@ void init_ssl(void)
 							PEM_write_X509(fp, cer);
 							fclose(fp);
 						}
+						else {
+							lprintf(3, "Cannot write key: %s\n", CTDL_CER_PATH);
+							exit(0);
+						}
 					}
 					X509_free(cer);
 				}