X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcrypto.c;h=427b4d93e7268dadb52c5f97e25b746e30a4f809;hb=826a38d67f663f93844309e91778f036903dcce4;hp=2e630849160fb3266a5fe998cc294125050183fa;hpb=17a68afec45a6dfb55daeb04ad727047d7091ca7;p=citadel.git diff --git a/webcit/crypto.c b/webcit/crypto.c index 2e6308491..427b4d93e 100644 --- a/webcit/crypto.c +++ b/webcit/crypto.c @@ -1,5 +1,13 @@ /* - * $Id$ + * Copyright (c) 1996-2012 by the citadel.org team + * + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. */ #include "sysdep.h" @@ -17,9 +25,12 @@ SSL_CTX *ssl_ctx; /* SSL context */ pthread_mutex_t **SSLCritters; /* Things needing locking */ +char *ssl_cipher_list = DEFAULT_SSL_CIPHER_LIST; pthread_key_t ThreadSSL; /* Per-thread SSL context */ +void ssl_lock(int mode, int n, const char *file, int line); + static unsigned long id_callback(void) { return (unsigned long) pthread_self(); @@ -43,7 +54,7 @@ void shutdown_ssl(void) */ void init_ssl(void) { - SSL_METHOD *ssl_method; + const SSL_METHOD *ssl_method; RSA *rsa=NULL; X509_REQ *req = NULL; X509 *cer = NULL; @@ -52,18 +63,19 @@ void init_ssl(void) X509_NAME *name = NULL; FILE *fp; char buf[SIZ]; + int rv = 0; if (!access("/var/run/egd-pool", F_OK)) { RAND_egd("/var/run/egd-pool"); } if (!RAND_status()) { - lprintf(3, "PRNG not adequately seeded, won't do SSL/TLS\n"); + syslog(LOG_WARNING, "PRNG not adequately seeded, won't do SSL/TLS\n"); return; } SSLCritters = malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t *)); if (!SSLCritters) { - lprintf(1, "citserver: can't allocate memory!!\n"); + syslog(LOG_ERR, "citserver: can't allocate memory!!\n"); /* Nothing's been initialized, just die */ ShutDownWebcit(); exit(WC_EXIT_SSL); @@ -73,7 +85,7 @@ void init_ssl(void) for (a = 0; a < CRYPTO_num_locks(); a++) { SSLCritters[a] = malloc(sizeof(pthread_mutex_t)); if (!SSLCritters[a]) { - lprintf(1, + syslog(LOG_ERR, "citserver: can't allocate memory!!\n"); /** Nothing's been initialized, just die */ ShutDownWebcit(); @@ -90,8 +102,13 @@ void init_ssl(void) SSL_load_error_strings(); 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())); + syslog(LOG_WARNING, "SSL_CTX_new failed: %s\n", ERR_reason_error_string(ERR_get_error())); + return; + } + + syslog(LOG_INFO, "Requesting cipher list: %s\n", ssl_cipher_list); + if (!(SSL_CTX_set_cipher_list(ssl_ctx, ssl_cipher_list))) { + syslog(LOG_WARNING, "SSL_CTX_set_cipher_list failed: %s\n", ERR_reason_error_string(ERR_get_error())); return; } @@ -114,25 +131,28 @@ void init_ssl(void) */ if (!strcasecmp(ctdlhost, "uds")) { sprintf(buf, "%s/keys/citadel.key", ctdlport); - symlink(buf, CTDL_KEY_PATH); + rv = symlink(buf, CTDL_KEY_PATH); + if (!rv) syslog(LOG_DEBUG, "%s\n", strerror(errno)); sprintf(buf, "%s/keys/citadel.csr", ctdlport); - symlink(buf, CTDL_CSR_PATH); + rv = symlink(buf, CTDL_CSR_PATH); + if (!rv) syslog(LOG_DEBUG, "%s\n", strerror(errno)); sprintf(buf, "%s/keys/citadel.cer", ctdlport); - symlink(buf, CTDL_CER_PATH); + rv = symlink(buf, CTDL_CER_PATH); + if (!rv) syslog(LOG_DEBUG, "%s\n", strerror(errno)); } /* * 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"); + syslog(LOG_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(3, "Key generation failed: %s\n", ERR_reason_error_string(ERR_get_error())); + syslog(LOG_WARNING, "Key generation failed: %s\n", ERR_reason_error_string(ERR_get_error())); } if (rsa != NULL) { fp = fopen(CTDL_KEY_PATH, "w"); @@ -146,14 +166,14 @@ void init_ssl(void) NULL, /* no callbk */ NULL /* no callbk */ ) != 1) { - lprintf(3, "Cannot write key: %s\n", - ERR_reason_error_string(ERR_get_error())); + syslog(LOG_WARNING, "Cannot write key: %s\n", + ERR_reason_error_string(ERR_get_error())); unlink(CTDL_KEY_PATH); } fclose(fp); } else { - lprintf(3, "Cannot write key: %s\n", CTDL_KEY_PATH); + syslog(LOG_WARNING, "Cannot write key: %s\n", CTDL_KEY_PATH); ShutDownWebcit(); exit(0); } @@ -167,7 +187,7 @@ void init_ssl(void) * the CSR in this step so that the next step may commence. */ if ( (access(CTDL_CER_PATH, R_OK) != 0) && (access(CTDL_CSR_PATH, R_OK) != 0) ) { - lprintf(5, "Generating a certificate signing request.\n"); + syslog(LOG_INFO, "Generating a certificate signing request.\n"); /* * Read our key from the file. No, we don't just keep this @@ -187,7 +207,7 @@ void init_ssl(void) if (pk=EVP_PKEY_new(), pk != NULL) { EVP_PKEY_assign_RSA(pk, rsa); if (req = X509_REQ_new(), req != NULL) { - + const char *env; /* Set the public key */ X509_REQ_set_pubkey(req, pk); X509_REQ_set_version(req, 0L); @@ -211,31 +231,44 @@ void init_ssl(void) MBSTRING_ASC, "Mount Kisco", -1, -1, 0); */ + env = getenv("O"); + if (env == NULL) + env = "Organization name", + X509_NAME_add_entry_by_txt( name, "O", MBSTRING_ASC, - (unsigned char*)"Organization name", + (unsigned char*)env, -1, -1, 0 ); + env = getenv("OU"); + if (env == NULL) + env = "Citadel server"; + X509_NAME_add_entry_by_txt( name, "OU", MBSTRING_ASC, - (unsigned char*)"Citadel server1", + (unsigned char*)env, -1, -1, 0 ); + env = getenv("CN"); + if (env == NULL) + env = "*"; + X509_NAME_add_entry_by_txt( name, "CN", MBSTRING_ASC, - (unsigned char*)"*", -1, -1, 0 + (unsigned char*)env, + -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"); + syslog(LOG_WARNING, "X509_REQ_sign(): error\n"); } else { /* Write it to disk. */ @@ -246,7 +279,7 @@ void init_ssl(void) fclose(fp); } else { - lprintf(3, "Cannot write key: %s\n", CTDL_CSR_PATH); + syslog(LOG_WARNING, "Cannot write key: %s\n", CTDL_CSR_PATH); ShutDownWebcit(); exit(0); } @@ -260,7 +293,7 @@ void init_ssl(void) } else { - lprintf(3, "Unable to read private key.\n"); + syslog(LOG_WARNING, "Unable to read private key.\n"); } } @@ -270,7 +303,7 @@ void init_ssl(void) * Generate a self-signed certificate if we don't have one. */ if (access(CTDL_CER_PATH, R_OK) != 0) { - lprintf(5, "Generating a self-signed certificate.\n"); + syslog(LOG_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. @@ -311,7 +344,7 @@ void init_ssl(void) /* Sign the cert */ if (!X509_sign(cer, pk, EVP_md5())) { - lprintf(3, "X509_sign(): error\n"); + syslog(LOG_WARNING, "X509_sign(): error\n"); } else { /* Write it to disk. */ @@ -322,7 +355,7 @@ void init_ssl(void) fclose(fp); } else { - lprintf(3, "Cannot write key: %s\n", CTDL_CER_PATH); + syslog(LOG_WARNING, "Cannot write key: %s\n", CTDL_CER_PATH); ShutDownWebcit(); exit(0); } @@ -343,7 +376,7 @@ void init_ssl(void) 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", + syslog(LOG_WARNING, "Cannot install certificate: %s\n", ERR_reason_error_string(ERR_get_error())); } @@ -354,7 +387,7 @@ void init_ssl(void) * starts SSL/TLS encryption for the current session. */ int starttls(int sock) { - int retval, bits, alg_bits, r; + int retval, bits, alg_bits;/*r; */ SSL *newssl; pthread_setspecific(ThreadSSL, NULL); @@ -363,11 +396,11 @@ int starttls(int sock) { return(1); } if (!(newssl = SSL_new(ssl_ctx))) { - lprintf(3, "SSL_new failed: %s\n", ERR_reason_error_string(ERR_get_error())); + syslog(LOG_WARNING, "SSL_new failed: %s\n", ERR_reason_error_string(ERR_get_error())); return(2); } if (!(SSL_set_fd(newssl, sock))) { - lprintf(3, "SSL_set_fd failed: %s\n", ERR_reason_error_string(ERR_get_error())); + syslog(LOG_WARNING, "SSL_set_fd failed: %s\n", ERR_reason_error_string(ERR_get_error())); SSL_free(newssl); return(3); } @@ -384,10 +417,10 @@ int starttls(int sock) { errval = SSL_get_error(newssl, retval); ssl_error_reason = ERR_reason_error_string(ERR_get_error()); if (ssl_error_reason == NULL) { - lprintf(3, "SSL_accept failed: errval=%i, retval=%i %s\n", errval, retval, strerror(errval)); + syslog(LOG_WARNING, "SSL_accept failed: errval=%ld, retval=%d %s\n", errval, retval, strerror(errval)); } else { - lprintf(3, "SSL_accept failed: %s\n", ssl_error_reason); + syslog(LOG_WARNING, "SSL_accept failed: %s\n", ssl_error_reason); } sleeeeeeeeeep(1); retval = SSL_accept(newssl); @@ -399,27 +432,27 @@ int starttls(int sock) { errval = SSL_get_error(newssl, retval); ssl_error_reason = ERR_reason_error_string(ERR_get_error()); if (ssl_error_reason == NULL) { - lprintf(3, "SSL_accept failed: errval=%i, retval=%i (%s)\n", errval, retval, strerror(errval)); + syslog(LOG_WARNING, "SSL_accept failed: errval=%ld, retval=%d (%s)\n", errval, retval, strerror(errval)); } else { - lprintf(3, "SSL_accept failed: %s\n", ssl_error_reason); + syslog(LOG_WARNING, "SSL_accept failed: %s\n", ssl_error_reason); } SSL_free(newssl); newssl = NULL; return(4); } else { - lprintf(15, "SSL_accept success\n"); + syslog(LOG_INFO, "SSL_accept success\n"); } - r = BIO_set_close(newssl->rbio, BIO_NOCLOSE); + /*r = */BIO_set_close(newssl->rbio, BIO_NOCLOSE); bits = SSL_CIPHER_get_bits(SSL_get_current_cipher(newssl), &alg_bits); - lprintf(15, "SSL/TLS using %s on %s (%d of %d bits)\n", + syslog(LOG_INFO, "SSL/TLS using %s on %s (%d of %d bits)\n", SSL_CIPHER_get_name(SSL_get_current_cipher(newssl)), SSL_CIPHER_get_version(SSL_get_current_cipher(newssl)), bits, alg_bits); pthread_setspecific(ThreadSSL, newssl); - lprintf(15, "SSL started\n"); + syslog(LOG_INFO, "SSL started\n"); return(0); } @@ -433,18 +466,18 @@ int starttls(int sock) { */ void endtls(void) { - SSL_CTX *ctx = NULL; + /*SSL_CTX *ctx;*/ if (THREADSSL == NULL) return; - lprintf(15, "Ending SSL/TLS\n"); + syslog(LOG_INFO, "Ending SSL/TLS\n"); SSL_shutdown(THREADSSL); - ctx = SSL_get_SSL_CTX(THREADSSL); + /*ctx = */SSL_get_SSL_CTX(THREADSSL); /* I don't think this is needed, and it crashes the server anyway * * if (ctx != NULL) { - * lprintf(9, "Freeing CTX at %x\n", (int)ctx ); + * syslog(LOG_DEBUG, "Freeing CTX at %x\n", (int)ctx ); * SSL_CTX_free(ctx); * } */ @@ -470,7 +503,7 @@ void ssl_lock(int mode, int n, const char *file, int line) /* * Send binary data to the client encrypted. */ -void client_write_ssl(const StrBuf *Buf) +int client_write_ssl(const StrBuf *Buf) { const char *buf; int retval; @@ -478,7 +511,7 @@ void client_write_ssl(const StrBuf *Buf) long nbytes; char junk[1]; - if (THREADSSL == NULL) return; + if (THREADSSL == NULL) return -1; nbytes = nremain = StrLength(Buf); buf = ChrPtr(Buf); @@ -486,7 +519,7 @@ void client_write_ssl(const StrBuf *Buf) while (nremain > 0) { if (SSL_want_write(THREADSSL)) { if ((SSL_read(THREADSSL, junk, 0)) < 1) { - lprintf(9, "SSL_read in client_write: %s\n", + syslog(LOG_WARNING, "SSL_read in client_write: %s\n", ERR_reason_error_string(ERR_get_error())); } } @@ -499,15 +532,16 @@ void client_write_ssl(const StrBuf *Buf) sleeeeeeeeeep(1); continue; } - lprintf(9, "SSL_write got error %ld, ret %d\n", errval, retval); + syslog(LOG_WARNING, "SSL_write got error %ld, ret %d\n", errval, retval); if (retval == -1) { - lprintf(9, "errno is %d\n", errno); + syslog(LOG_WARNING, "errno is %d\n", errno); } endtls(); - return; + return -1; } nremain -= retval; } + return 0; } @@ -526,7 +560,7 @@ int client_read_sslbuffer(StrBuf *buf, int timeout) while (1) { if (SSL_want_read(pssl)) { if ((SSL_write(pssl, junk, 0)) < 1) { - lprintf(9, "SSL_write in client_read\n"); + syslog(LOG_WARNING, "SSL_write in client_read\n"); } } rlen = SSL_read(pssl, sbuf, sizeof(sbuf)); @@ -538,7 +572,7 @@ int client_read_sslbuffer(StrBuf *buf, int timeout) sleeeeeeeeeep(1); continue; } - lprintf(9, "SSL_read got error %ld\n", errval); + syslog(LOG_WARNING, "SSL_read got error %ld\n", errval); endtls(); return (-1); }