-/* $Id$ */
+/*
+ * $Id$
+ *
+ * Provides HTTPS, when the OpenSSL library is available.
+ */
#ifdef HAVE_OPENSSL
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <pthread.h>
-
-#include <sys/time.h>
#include "webcit.h"
#include "webserver.h"
-#define CTDL_CRYPTO_DIR WEBCITDIR "/keys"
+#define CTDL_CRYPTO_DIR "./keys"
#define CTDL_KEY_PATH CTDL_CRYPTO_DIR "/citadel.key"
#define CTDL_CSR_PATH CTDL_CRYPTO_DIR "/citadel.csr"
#define CTDL_CER_PATH CTDL_CRYPTO_DIR "/citadel.cer"
#define SIGN_DAYS 365
-
-/* Shared Diffie-Hellman parameters */
-#define DH_P "1A74527AEE4EE2568E85D4FB2E65E18C9394B9C80C42507D7A6A0DBE9A9A54B05A9A96800C34C7AA5297095B69C88901EEFD127F969DCA26A54C0E0B5C5473EBAEB00957D2633ECAE3835775425DE66C0DE6D024DBB17445E06E6B0C78415E589B8814F08531D02FD43778451E7685541079CFFB79EF0D26EFEEBBB69D1E80383"
-#define DH_G "2"
-#define DH_L 1024
-
SSL_CTX *ssl_ctx; /* SSL context */
pthread_mutex_t **SSLCritters; /* Things needing locking */
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(3, "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(3, "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(3,
- "Private key does not match the certificate public key");
- return (0);
- }
- }
- return (1);
-}
-
void init_ssl(void)
{
SSL_METHOD *ssl_method;
- DH *dh;
RSA *rsa=NULL;
X509_REQ *req = NULL;
X509 *cer = NULL;
EVP_PKEY *req_pkey = NULL;
X509_NAME *name = NULL;
FILE *fp;
+ char buf[SIZ];
if (!access("/var/run/egd-pool", F_OK))
RAND_egd("/var/run/egd-pool");
* Initialize SSL transport layer
*/
SSL_library_init();
- OpenSSL_add_all_algorithms();
SSL_load_error_strings();
- ssl_method = SSLv2_server_method();
+ ssl_method = SSLv23_server_method();
if (!(ssl_ctx = SSL_CTX_new(ssl_method))) {
lprintf(3, "SSL_CTX_new failed: %s\n",
ERR_reason_error_string(ERR_get_error()));
CRYPTO_set_locking_callback(ssl_lock);
CRYPTO_set_id_callback(id_callback);
- /* Load DH parameters into the context */
- dh = DH_new();
- if (!dh) {
- lprintf(3, "init_ssl() can't allocate a DH object: %s\n",
- ERR_reason_error_string(ERR_get_error()));
- SSL_CTX_free(ssl_ctx);
- ssl_ctx = NULL;
- return;
- }
- if (!(BN_hex2bn(&(dh->p), DH_P))) {
- lprintf(3, "init_ssl() can't assign DH_P: %s\n",
- ERR_reason_error_string(ERR_get_error()));
- SSL_CTX_free(ssl_ctx);
- ssl_ctx = NULL;
- return;
- }
- if (!(BN_hex2bn(&(dh->g), DH_G))) {
- lprintf(3, "init_ssl() can't assign DH_G: %s\n",
- ERR_reason_error_string(ERR_get_error()));
- SSL_CTX_free(ssl_ctx);
- ssl_ctx = NULL;
- return;
- }
- dh->length = DH_L;
- SSL_CTX_set_tmp_dh(ssl_ctx, dh);
- DH_free(dh);
-
/* Get our certificates in order.
* First, create the key/cert directory if it's not there already...
*/
mkdir(CTDL_CRYPTO_DIR, 0700);
/*
- * Generate a key pair if we don't have one.
+ * Before attempting to generate keys/certificates, first try
+ * link to them from the Citadel server if it's on the same host.
+ * We ignore any error return because it either meant that there
+ * was nothing in Citadel to link from (in which case we just
+ * generate new files) or the target files already exist (which
+ * is not fatal either).
+ */
+ if (!strcasecmp(ctdlhost, "uds")) {
+ sprintf(buf, "%s/keys/citadel.key", ctdlport);
+ symlink(buf, CTDL_KEY_PATH);
+ sprintf(buf, "%s/keys/citadel.csr", ctdlport);
+ symlink(buf, CTDL_CSR_PATH);
+ sprintf(buf, "%s/keys/citadel.cer", ctdlport);
+ symlink(buf, CTDL_CER_PATH);
+ }
+
+ /*
+ * If we still don't have a private key, generate one.
*/
if (access(CTDL_KEY_PATH, R_OK) != 0) {
lprintf(5, "Generating RSA key pair.\n");
if (req) {
if (cer = X509_new(), cer != NULL) {
+ ASN1_INTEGER_set(X509_get_serialNumber(cer), 0);
X509_set_issuer_name(cer, req->req_info->subject);
X509_set_subject_name(cer, req->req_info->subject);
- X509_gmtime_adj(X509_get_notBefore(cer),0);
+ X509_gmtime_adj(X509_get_notBefore(cer), 0);
X509_gmtime_adj(X509_get_notAfter(cer),(long)60*60*24*SIGN_DAYS);
+
req_pkey = X509_REQ_get_pubkey(req);
X509_set_pubkey(cer, req_pkey);
EVP_PKEY_free(req_pkey);
}
}
-
/*
* Now try to bind to the key and certificate.
+ * Note that we use SSL_CTX_use_certificate_chain_file() which allows
+ * the certificate file to contain intermediate certificates.
*/
- if (ctdl_install_certificate(ssl_ctx,
- CTDL_CER_PATH,
- CTDL_KEY_PATH) != 1)
- {
+ SSL_CTX_use_certificate_chain_file(ssl_ctx, CTDL_CER_PATH);
+ SSL_CTX_use_PrivateKey_file(ssl_ctx, CTDL_KEY_PATH, SSL_FILETYPE_PEM);
+ if ( !SSL_CTX_check_private_key(ssl_ctx) ) {
lprintf(3, "Cannot install certificate: %s\n",
ERR_reason_error_string(ERR_get_error()));
}
-
+
}
*/
void endtls(void)
{
+ if (THREADSSL == NULL) return;
+
lprintf(5, "Ending SSL/TLS\n");
SSL_shutdown(THREADSSL);
SSL_free(THREADSSL);
int nremain;
char junk[1];
+ if (THREADSSL == NULL) return;
+
nremain = nbytes;
while (nremain > 0) {
if (SSL_want_write(THREADSSL)) {
if ((SSL_read(THREADSSL, junk, 0)) < 1) {
- lprintf(9, "SSL_read in client_write: %s\n", ERR_reason_error_string(ERR_get_error()));
+ lprintf(9, "SSL_read in client_write: %s\n",
+ ERR_reason_error_string(ERR_get_error()));
}
}
- retval =
- SSL_write(THREADSSL, &buf[nbytes - nremain], nremain);
+ retval = SSL_write(THREADSSL, &buf[nbytes - nremain], nremain);
if (retval < 1) {
long errval;
continue;
}
lprintf(9, "SSL_write got error %ld, ret %d\n", errval, retval);
- if (retval == -1)
+ if (retval == -1) {
lprintf(9, "errno is %d\n", errno);
+ }
endtls();
- client_write(&buf[nbytes - nremain], nremain);
return;
}
nremain -= retval;
int len, rlen;
char junk[1];
+ if (THREADSSL == NULL) return(0);
+
len = 0;
while (len < bytes) {
#if 0
}
lprintf(9, "SSL_read got error %ld\n", errval);
endtls();
- return (client_read_to
- (WC->http_sock, &buf[len], bytes - len, timeout));
+ return (0);
}
len += rlen;
}