#include "server.h"
#include "serv_crypto.h"
#include "sysdep_decls.h"
-#include "serv_extensions.h"
#include "citadel.h"
#include "config.h"
+#include "ctdl_module.h"
+/* TODO: should we use the standard module init stuff to start this? */
+/* TODO: should we register an event handler to call destruct_ssl? */
+
#ifdef HAVE_OPENSSL
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)
+void destruct_ssl(void)
{
- 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);
+ int a;
+ CtdlUnregisterProtoHook(cmd_stls, "STLS");
+ CtdlUnregisterProtoHook(cmd_gtls, "GTLS");
+ for (a = 0; a < CRYPTO_num_locks(); a++)
+ free(SSLCritters[a]);
+ free (SSLCritters);
}
-
void init_ssl(void)
{
SSL_METHOD *ssl_method;
X509_NAME *name = NULL;
FILE *fp;
- if (!access("/var/run/egd-pool", F_OK))
- RAND_egd("/var/run/egd-pool");
+ if (!access(EGD_POOL, F_OK))
+ RAND_egd(EGD_POOL);
if (!RAND_status()) {
- lprintf(2,
+ lprintf(CTDL_CRIT,
"PRNG not adequately seeded, won't do SSL/TLS\n");
return;
}
SSLCritters =
- mallok(CRYPTO_num_locks() * sizeof(pthread_mutex_t *));
+ malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t *));
if (!SSLCritters) {
- lprintf(1, "citserver: can't allocate memory!!\n");
+ lprintf(CTDL_EMERG, "citserver: can't allocate memory!!\n");
/* Nothing's been initialized, just die */
exit(1);
} else {
int a;
for (a = 0; a < CRYPTO_num_locks(); a++) {
- SSLCritters[a] = mallok(sizeof(pthread_mutex_t));
+ SSLCritters[a] = malloc(sizeof(pthread_mutex_t));
if (!SSLCritters[a]) {
- lprintf(1,
+ lprintf(CTDL_EMERG,
"citserver: can't allocate memory!!\n");
/* Nothing's been initialized, just die */
exit(1);
SSL_load_error_strings();
ssl_method = SSLv23_server_method();
if (!(ssl_ctx = SSL_CTX_new(ssl_method))) {
- lprintf(2, "SSL_CTX_new failed: %s\n",
+ lprintf(CTDL_CRIT, "SSL_CTX_new failed: %s\n",
ERR_reason_error_string(ERR_get_error()));
return;
}
if (!(SSL_CTX_set_cipher_list(ssl_ctx, CIT_CIPHERS))) {
- lprintf(2, "SSL: No ciphers available\n");
+ lprintf(CTDL_CRIT, "SSL: No ciphers available\n");
SSL_CTX_free(ssl_ctx);
ssl_ctx = NULL;
return;
/* Load DH parameters into the context */
dh = DH_new();
if (!dh) {
- lprintf(2, "init_ssl() can't allocate a DH object: %s\n",
+ lprintf(CTDL_CRIT, "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(2, "init_ssl() can't assign DH_P: %s\n",
+ lprintf(CTDL_CRIT, "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(2, "init_ssl() can't assign DH_G: %s\n",
+ lprintf(CTDL_CRIT, "init_ssl() can't assign DH_G: %s\n",
ERR_reason_error_string(ERR_get_error()));
SSL_CTX_free(ssl_ctx);
ssl_ctx = NULL;
/* Get our certificates in order.
* First, create the key/cert directory if it's not there already...
*/
- mkdir(CTDL_CRYPTO_DIR, 0700);
+ mkdir(ctdl_key_dir, 0700);
/*
* Generate a key pair if we don't have one.
*/
- if (access(CTDL_KEY_PATH, R_OK) != 0) {
- lprintf(3, "Generating RSA key pair.\n");
+ if (access(file_crpt_file_key, R_OK) != 0) {
+ lprintf(CTDL_INFO, "Generating RSA key pair.\n");
rsa = RSA_generate_key(1024, /* modulus size */
65537, /* exponent */
NULL, /* no callback */
NULL); /* no callback */
if (rsa == NULL) {
- lprintf(2, "Key generation failed: %s\n",
+ lprintf(CTDL_CRIT, "Key generation failed: %s\n",
ERR_reason_error_string(ERR_get_error()));
}
if (rsa != NULL) {
- fp = fopen(CTDL_KEY_PATH, "w");
+ fp = fopen(file_crpt_file_key, "w");
if (fp != NULL) {
- chmod(CTDL_KEY_PATH, 0600);
+ chmod(file_crpt_file_key, 0600);
if (PEM_write_RSAPrivateKey(fp, /* the file */
rsa, /* the key */
NULL, /* no enc */
NULL, /* no callbk */
NULL /* no callbk */
) != 1) {
- lprintf(2, "Cannot write key: %s\n",
+ lprintf(CTDL_CRIT, "Cannot write key: %s\n",
ERR_reason_error_string(ERR_get_error()));
- unlink(CTDL_KEY_PATH);
+ unlink(file_crpt_file_key);
}
fclose(fp);
}
/*
* Generate a CSR if we don't have one.
*/
- if (access(CTDL_CSR_PATH, R_OK) != 0) {
- lprintf(3, "Generating a certificate signing request.\n");
+ if (access(file_crpt_file_csr, R_OK) != 0) {
+ lprintf(CTDL_INFO, "Generating a certificate signing request.\n");
/*
* Read our key from the file. No, we don't just keep this
* there is the possibility that the key was already on disk
* and we didn't just generate it now.
*/
- fp = fopen(CTDL_KEY_PATH, "r");
+ fp = fopen(file_crpt_file_key, "r");
if (fp) {
rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
fclose(fp);
X509_NAME_add_entry_by_txt(name, "OU",
MBSTRING_ASC, "Citadel server", -1, -1, 0);
- X509_NAME_add_entry_by_txt(name, "CN",
+ /* X509_NAME_add_entry_by_txt(name, "CN",
MBSTRING_ASC, config.c_fqdn, -1, -1, 0);
+ */
+
+ X509_NAME_add_entry_by_txt(name, "CN",
+ MBSTRING_ASC, "*", -1, -1, 0);
X509_REQ_set_subject_name(req, name);
/* Sign the CSR */
if (!X509_REQ_sign(req, pk, EVP_md5())) {
- lprintf(3, "X509_REQ_sign(): error\n");
+ lprintf(CTDL_CRIT, "X509_REQ_sign(): error\n");
}
else {
/* Write it to disk. */
- fp = fopen(CTDL_CSR_PATH, "w");
+ fp = fopen(file_crpt_file_csr, "w");
if (fp != NULL) {
- chmod(CTDL_CSR_PATH, 0600);
+ chmod(file_crpt_file_csr, 0600);
PEM_write_X509_REQ(fp, req);
fclose(fp);
}
}
else {
- lprintf(3, "Unable to read private key.\n");
+ lprintf(CTDL_CRIT, "Unable to read private key.\n");
}
}
/*
* Generate a self-signed certificate if we don't have one.
*/
- if (access(CTDL_CER_PATH, R_OK) != 0) {
- lprintf(3, "Generating a self-signed certificate.\n");
+ if (access(file_crpt_file_cer, R_OK) != 0) {
+ lprintf(CTDL_INFO, "Generating a self-signed certificate.\n");
/* Same deal as before: always read the key from disk because
* it may or may not have just been generated.
*/
- fp = fopen(CTDL_KEY_PATH, "r");
+ fp = fopen(file_crpt_file_key, "r");
if (fp) {
rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
fclose(fp);
EVP_PKEY_assign_RSA(pk, rsa);
}
- fp = fopen(CTDL_CSR_PATH, "r");
+ fp = fopen(file_crpt_file_csr, "r");
if (fp) {
req = PEM_read_X509_REQ(fp, NULL, NULL, NULL);
fclose(fp);
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);
/* Sign the cert */
if (!X509_sign(cer, pk, EVP_md5())) {
- lprintf(3, "X509_sign(): error\n");
+ lprintf(CTDL_CRIT, "X509_sign(): error\n");
}
else {
/* Write it to disk. */
- fp = fopen(CTDL_CER_PATH, "w");
+ fp = fopen(file_crpt_file_cer, "w");
if (fp != NULL) {
- chmod(CTDL_CER_PATH, 0600);
+ chmod(file_crpt_file_cer, 0600);
PEM_write_X509(fp, cer);
fclose(fp);
}
/*
* Now try to bind to the key and certificate.
*/
- if (ctdl_install_certificate(ssl_ctx,
- CTDL_CER_PATH,
- CTDL_KEY_PATH) != 1)
- {
- lprintf(2, "Cannot install certificate: %s\n",
+ SSL_CTX_use_certificate_chain_file(ssl_ctx, file_crpt_file_cer);
+ SSL_CTX_use_PrivateKey_file(ssl_ctx, file_crpt_file_key, 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");
while (nremain > 0) {
if (SSL_want_write(CC->ssl)) {
if ((SSL_read(CC->ssl, junk, 0)) < 1) {
- lprintf(9, "SSL_read in client_write:\n");
- ERR_print_errors_fp(stderr);
+ lprintf(CTDL_DEBUG, "SSL_read in client_write: %s\n", ERR_reason_error_string(ERR_get_error()));
}
}
retval =
sleep(1);
continue;
}
- lprintf(9, "SSL_write got error %ld, ret %d\n", errval, retval);
+ lprintf(CTDL_DEBUG, "SSL_write got error %ld, ret %d\n", errval, retval);
if (retval == -1)
- lprintf(9, "errno is %d\n", errno);
+ lprintf(CTDL_DEBUG, "errno is %d\n", errno);
endtls();
client_write(&buf[nbytes - nremain], nremain);
return;
#endif
if (SSL_want_read(CC->ssl)) {
if ((SSL_write(CC->ssl, junk, 0)) < 1) {
- lprintf(9, "SSL_write in client_read:\n");
- ERR_print_errors_fp(stderr);
+ lprintf(CTDL_DEBUG, "SSL_write in client_read: %s\n", ERR_reason_error_string(ERR_get_error()));
}
}
rlen = SSL_read(CC->ssl, &buf[len], bytes - len);
sleep(1);
continue;
}
- lprintf(9, "SSL_read got error %ld\n", errval);
+ lprintf(CTDL_DEBUG, "SSL_read got error %ld\n", errval);
endtls();
return (client_read_to
(&buf[len], bytes - len, timeout));
int retval, bits, alg_bits;
if (!ssl_ctx) {
- cprintf("%s", nosup_response);
+ lprintf(CTDL_CRIT, "SSL failed: no ssl_ctx exists?\n");
+ if (nosup_response != NULL) cprintf("%s", nosup_response);
return;
}
if (!(CC->ssl = SSL_new(ssl_ctx))) {
- lprintf(2, "SSL_new failed: %s\n",
+ lprintf(CTDL_CRIT, "SSL_new failed: %s\n",
ERR_reason_error_string(ERR_get_error()));
- cprintf("%s", error_response);
+ if (error_response != NULL) cprintf("%s", error_response);
return;
}
if (!(SSL_set_fd(CC->ssl, CC->client_socket))) {
- lprintf(2, "SSL_set_fd failed: %s\n",
+ lprintf(CTDL_CRIT, "SSL_set_fd failed: %s\n",
ERR_reason_error_string(ERR_get_error()));
SSL_free(CC->ssl);
CC->ssl = NULL;
- cprintf("%s", error_response);
+ if (error_response != NULL) cprintf("%s", error_response);
return;
}
- cprintf("%s", ok_response);
+ if (ok_response != NULL) cprintf("%s", ok_response);
retval = SSL_accept(CC->ssl);
if (retval < 1) {
/*
* revert to unencrypted communications.
*/
long errval;
+ char error_string[128];
errval = SSL_get_error(CC->ssl, retval);
- lprintf(2, "SSL_accept failed: %s\n",
- ERR_reason_error_string(ERR_get_error()));
+ lprintf(CTDL_CRIT, "SSL_accept failed: retval=%d, errval=%ld, err=%s\n",
+ retval,
+ errval,
+ ERR_error_string(errval, error_string)
+ );
SSL_free(CC->ssl);
CC->ssl = NULL;
return;
}
BIO_set_close(CC->ssl->rbio, BIO_NOCLOSE);
- bits =
- SSL_CIPHER_get_bits(SSL_get_current_cipher(CC->ssl),
- &alg_bits);
- lprintf(3, "SSL/TLS using %s on %s (%d of %d bits)\n",
+ bits = SSL_CIPHER_get_bits(SSL_get_current_cipher(CC->ssl), &alg_bits);
+ lprintf(CTDL_INFO, "SSL/TLS using %s on %s (%d of %d bits)\n",
SSL_CIPHER_get_name(SSL_get_current_cipher(CC->ssl)),
SSL_CIPHER_get_version(SSL_get_current_cipher(CC->ssl)),
bits, alg_bits);
char nosup_response[SIZ];
char error_response[SIZ];
+ unbuffer_output();
+
sprintf(ok_response,
"%d Begin TLS negotiation now\n",
CIT_OK);
*/
void endtls(void)
{
- lprintf(7, "Ending SSL/TLS\n");
-
if (!CC->ssl) {
CC->redirect_ssl = 0;
return;
}
+ lprintf(CTDL_INFO, "Ending SSL/TLS\n");
SSL_shutdown(CC->ssl);
SSL_free(CC->ssl);
CC->ssl = NULL;
projects / citadel.git / blobdiff