From: Art Cancro <ajc@citadel.org>
Date: Wed, 21 Apr 2004 03:00:06 +0000 (+0000)
Subject: * Replace ctdl_install_certificate() with convenience functions found
X-Git-Tag: v7.86~5456
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=1d8c1cb65044e12b6b9683058c2963b06cc81b4b;p=citadel.git

* Replace ctdl_install_certificate() with convenience functions found
  in the OpenSSL library.
---

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 5fb06fc0d..91d0f0ace 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 620.20  2004/04/21 03:00:06  ajc
+ * Replace ctdl_install_certificate() with convenience functions found
+   in the OpenSSL library.
+
  Revision 620.19  2004/04/20 02:42:54  ajc
  * techdoc/binaries.txt : updated, now includes WebCit instructions
  * setup.c: detect when setup is run from within the Citadel/UX Ridiculously
@@ -5708,3 +5712,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
 	* Initial CVS import
+
diff --git a/citadel/serv_crypto.c b/citadel/serv_crypto.c
index daffe8995..24d5bd242 100644
--- a/citadel/serv_crypto.c
+++ b/citadel/serv_crypto.c
@@ -49,44 +49,6 @@ static unsigned long id_callback(void)
 	return (unsigned long) pthread_self();
 }
 
- /*
-  * Set up the cert things on the server side. We do need both the
-  * private key (in key_file) and the cert (in cert_file).
-  * Both files may be identical.
-  *
-  * This function is taken from OpenSSL apps/s_cb.c
-  */
-
-static int ctdl_install_certificate(SSL_CTX * ctx,
-			  const char *cert_file, const char *key_file)
-{
-	if (cert_file != NULL) {
-		if (SSL_CTX_use_certificate_file(ctx, cert_file,
-						 SSL_FILETYPE_PEM) <= 0) {
-			lprintf(CTDL_CRIT, "unable to get certificate from '%s'",
-				cert_file);
-			return (0);
-		}
-		if (key_file == NULL)
-			key_file = cert_file;
-		if (SSL_CTX_use_PrivateKey_file(ctx, key_file,
-						SSL_FILETYPE_PEM) <= 0) {
-			lprintf(CTDL_CRIT, "unable to get private key from '%s'",
-				key_file);
-			return (0);
-		}
-		/* Now we know that a key and cert have been set against
-		 * the SSL context */
-		if (!SSL_CTX_check_private_key(ctx)) {
-			lprintf(CTDL_CRIT,
-				"Private key does not match the certificate public key");
-			return (0);
-		}
-	}
-	return (1);
-}
-
-
 void init_ssl(void)
 {
 	SSL_METHOD *ssl_method;
@@ -371,13 +333,12 @@ void init_ssl(void)
 	/*
 	 * Now try to bind to the key and certificate.
 	 */
-	if (ctdl_install_certificate(ssl_ctx,
-			CTDL_CER_PATH,
-			CTDL_KEY_PATH) != 1)
-	{
+        SSL_CTX_use_certificate_file(ssl_ctx, CTDL_CER_PATH, SSL_FILETYPE_PEM);
+        SSL_CTX_use_PrivateKey_file(ssl_ctx, CTDL_KEY_PATH, SSL_FILETYPE_PEM);
+        if ( !SSL_CTX_check_private_key(ssl_ctx) ) {
 		lprintf(CTDL_CRIT, "Cannot install certificate: %s\n",
 				ERR_reason_error_string(ERR_get_error()));
-	}
+        }
 
 	/* Finally let the server know we're here */
 	CtdlRegisterProtoHook(cmd_stls, "STLS", "Start SSL/TLS session");