X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fcrypto%2Fserv_crypto.c;h=eea501d39207fe030b52815f32e2d5c083102099;hb=11a53969428899d72b4ef7f37bfef47d81a710fa;hp=21ccd82517b20e0f55fb3a489a3be215b1b89bdd;hpb=8c47559cb5ae97ec0fa35660ee16fd61a9451c72;p=citadel.git diff --git a/citadel/modules/crypto/serv_crypto.c b/citadel/modules/crypto/serv_crypto.c index 21ccd8251..eea501d39 100644 --- a/citadel/modules/crypto/serv_crypto.c +++ b/citadel/modules/crypto/serv_crypto.c @@ -1,20 +1,13 @@ -/* $Id$ - * - * Copyright (c) 1987-2009 by the citadel.org team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. +/* + * Copyright (c) 1987-2015 by the citadel.org team * - * 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. + * 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. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 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 @@ -80,7 +73,7 @@ void destruct_ssl(void) void init_ssl(void) { - SSL_METHOD *ssl_method; + const SSL_METHOD *ssl_method; DH *dh; RSA *rsa=NULL; X509_REQ *req = NULL; @@ -94,14 +87,13 @@ void init_ssl(void) RAND_egd(EGD_POOL); if (!RAND_status()) { - CtdlLogPrintf(CTDL_CRIT, - "PRNG not adequately seeded, won't do SSL/TLS\n"); + syslog(LOG_CRIT, "PRNG not adequately seeded, won't do SSL/TLS"); return; } SSLCritters = malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t *)); if (!SSLCritters) { - CtdlLogPrintf(CTDL_EMERG, "citserver: can't allocate memory!!\n"); + syslog(LOG_EMERG, "citserver: can't allocate memory!!"); /* Nothing's been initialized, just die */ exit(1); } else { @@ -110,8 +102,7 @@ void init_ssl(void) for (a = 0; a < CRYPTO_num_locks(); a++) { SSLCritters[a] = malloc(sizeof(pthread_mutex_t)); if (!SSLCritters[a]) { - CtdlLogPrintf(CTDL_EMERG, - "citserver: can't allocate memory!!\n"); + syslog(LOG_EMERG, "citserver: can't allocate memory!!"); /* Nothing's been initialized, just die */ exit(1); } @@ -126,12 +117,11 @@ void init_ssl(void) SSL_load_error_strings(); ssl_method = SSLv23_server_method(); if (!(ssl_ctx = SSL_CTX_new(ssl_method))) { - CtdlLogPrintf(CTDL_CRIT, "SSL_CTX_new failed: %s\n", - ERR_reason_error_string(ERR_get_error())); + syslog(LOG_CRIT, "SSL_CTX_new failed: %s", ERR_reason_error_string(ERR_get_error())); return; } if (!(SSL_CTX_set_cipher_list(ssl_ctx, CIT_CIPHERS))) { - CtdlLogPrintf(CTDL_CRIT, "SSL: No ciphers available\n"); + syslog(LOG_CRIT, "SSL: No ciphers available"); SSL_CTX_free(ssl_ctx); ssl_ctx = NULL; return; @@ -149,22 +139,19 @@ void init_ssl(void) /* Load DH parameters into the context */ dh = DH_new(); if (!dh) { - CtdlLogPrintf(CTDL_CRIT, "init_ssl() can't allocate a DH object: %s\n", - ERR_reason_error_string(ERR_get_error())); + syslog(LOG_CRIT, "init_ssl() can't allocate a DH object: %s", ERR_reason_error_string(ERR_get_error())); SSL_CTX_free(ssl_ctx); ssl_ctx = NULL; return; } if (!(BN_hex2bn(&(dh->p), DH_P))) { - CtdlLogPrintf(CTDL_CRIT, "init_ssl() can't assign DH_P: %s\n", - ERR_reason_error_string(ERR_get_error())); + syslog(LOG_CRIT, "init_ssl() can't assign DH_P: %s", ERR_reason_error_string(ERR_get_error())); SSL_CTX_free(ssl_ctx); ssl_ctx = NULL; return; } if (!(BN_hex2bn(&(dh->g), DH_G))) { - CtdlLogPrintf(CTDL_CRIT, "init_ssl() can't assign DH_G: %s\n", - ERR_reason_error_string(ERR_get_error())); + syslog(LOG_CRIT, "init_ssl() can't assign DH_G: %s", ERR_reason_error_string(ERR_get_error())); SSL_CTX_free(ssl_ctx); ssl_ctx = NULL; return; @@ -182,14 +169,13 @@ void init_ssl(void) * Generate a key pair if we don't have one. */ if (access(file_crpt_file_key, R_OK) != 0) { - CtdlLogPrintf(CTDL_INFO, "Generating RSA key pair.\n"); + syslog(LOG_INFO, "Generating RSA key pair."); rsa = RSA_generate_key(1024, /* modulus size */ 65537, /* exponent */ NULL, /* no callback */ NULL); /* no callback */ if (rsa == NULL) { - CtdlLogPrintf(CTDL_CRIT, "Key generation failed: %s\n", - ERR_reason_error_string(ERR_get_error())); + syslog(LOG_CRIT, "Key generation failed: %s", ERR_reason_error_string(ERR_get_error())); } if (rsa != NULL) { fp = fopen(file_crpt_file_key, "w"); @@ -203,8 +189,7 @@ void init_ssl(void) NULL, /* no callbk */ NULL /* no callbk */ ) != 1) { - CtdlLogPrintf(CTDL_CRIT, "Cannot write key: %s\n", - ERR_reason_error_string(ERR_get_error())); + syslog(LOG_CRIT, "Cannot write key: %s", ERR_reason_error_string(ERR_get_error())); unlink(file_crpt_file_key); } fclose(fp); @@ -219,7 +204,7 @@ void init_ssl(void) * the CSR in this step so that the next step may commence. */ if ( (access(file_crpt_file_cer, R_OK) != 0) && (access(file_crpt_file_csr, R_OK) != 0) ) { - CtdlLogPrintf(CTDL_INFO, "Generating a certificate signing request.\n"); + syslog(LOG_INFO, "Generating a generic certificate signing request."); /* * Read our key from the file. No, we don't just keep this @@ -247,36 +232,17 @@ void init_ssl(void) name = X509_REQ_get_subject_name(req); /* Tell it who we are */ - - /* - X509_NAME_add_entry_by_txt(name, "C", - MBSTRING_ASC, "US", -1, -1, 0); - - X509_NAME_add_entry_by_txt(name, "ST", - MBSTRING_ASC, "New York", -1, -1, 0); - - X509_NAME_add_entry_by_txt(name, "L", - MBSTRING_ASC, "Mount Kisco", -1, -1, 0); - */ - - X509_NAME_add_entry_by_txt(name, "O", - MBSTRING_ASC, config.c_humannode, -1, -1, 0); - - X509_NAME_add_entry_by_txt(name, "OU", - MBSTRING_ASC, "Citadel server", -1, -1, 0); - - /* 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_NAME_add_entry_by_txt(name, "C", MBSTRING_ASC, (unsigned const char *)"ZZ", -1, -1, 0); + X509_NAME_add_entry_by_txt(name, "ST", MBSTRING_ASC, (unsigned const char *)"The World", -1, -1, 0); + X509_NAME_add_entry_by_txt(name, "L", MBSTRING_ASC, (unsigned const char *)"My Location", -1, -1, 0); + X509_NAME_add_entry_by_txt(name, "O", MBSTRING_ASC, (unsigned const char *)"Generic certificate", -1, -1, 0); + X509_NAME_add_entry_by_txt(name, "OU", MBSTRING_ASC, (unsigned const char *)"Citadel server", -1, -1, 0); + X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, (unsigned const char *)"*", -1, -1, 0); X509_REQ_set_subject_name(req, name); /* Sign the CSR */ if (!X509_REQ_sign(req, pk, EVP_md5())) { - CtdlLogPrintf(CTDL_CRIT, "X509_REQ_sign(): error\n"); + syslog(LOG_CRIT, "X509_REQ_sign(): error"); } else { /* Write it to disk. */ @@ -296,7 +262,7 @@ void init_ssl(void) } else { - CtdlLogPrintf(CTDL_CRIT, "Unable to read private key.\n"); + syslog(LOG_CRIT, "Unable to read private key."); } } @@ -306,7 +272,7 @@ void init_ssl(void) * Generate a self-signed certificate if we don't have one. */ if (access(file_crpt_file_cer, R_OK) != 0) { - CtdlLogPrintf(CTDL_INFO, "Generating a self-signed certificate.\n"); + syslog(LOG_INFO, "Generating a generic self-signed certificate."); /* Same deal as before: always read the key from disk because * it may or may not have just been generated. @@ -346,7 +312,7 @@ void init_ssl(void) /* Sign the cert */ if (!X509_sign(cer, pk, EVP_md5())) { - CtdlLogPrintf(CTDL_CRIT, "X509_sign(): error\n"); + syslog(LOG_CRIT, "X509_sign(): error"); } else { /* Write it to disk. */ @@ -372,22 +338,21 @@ void init_ssl(void) 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) ) { - CtdlLogPrintf(CTDL_CRIT, "Cannot install certificate: %s\n", - ERR_reason_error_string(ERR_get_error())); + syslog(LOG_CRIT, "Cannot install certificate: %s", ERR_reason_error_string(ERR_get_error())); } /* Finally let the server know we're here */ CtdlRegisterProtoHook(cmd_stls, "STLS", "Start SSL/TLS session"); CtdlRegisterProtoHook(cmd_gtls, "GTLS", "Get SSL/TLS session status"); - CtdlRegisterSessionHook(endtls, EVT_STOP); + CtdlRegisterSessionHook(endtls, EVT_STOP, PRIO_STOP + 10); } /* * client_write_ssl() Send binary data to the client encrypted. */ -void client_write_ssl(char *buf, int nbytes) +void client_write_ssl(const char *buf, int nbytes) { int retval; int nremain; @@ -398,7 +363,7 @@ void client_write_ssl(char *buf, int nbytes) while (nremain > 0) { if (SSL_want_write(CC->ssl)) { if ((SSL_read(CC->ssl, junk, 0)) < 1) { - CtdlLogPrintf(CTDL_DEBUG, "SSL_read in client_write: %s\n", ERR_reason_error_string(ERR_get_error())); + syslog(LOG_DEBUG, "SSL_read in client_write: %s", ERR_reason_error_string(ERR_get_error())); } } retval = @@ -412,9 +377,9 @@ void client_write_ssl(char *buf, int nbytes) sleep(1); continue; } - CtdlLogPrintf(CTDL_DEBUG, "SSL_write got error %ld, ret %d\n", errval, retval); + syslog(LOG_DEBUG, "SSL_write got error %ld, ret %d", errval, retval); if (retval == -1) - CtdlLogPrintf(CTDL_DEBUG, "errno is %d\n", errno); + syslog(LOG_DEBUG, "errno is %d", errno); endtls(); client_write(&buf[nbytes - nremain], nremain); return; @@ -425,62 +390,198 @@ void client_write_ssl(char *buf, int nbytes) /* - * client_read_ssl() - read data from the encrypted layer. + * read data from the encrypted layer. */ -int client_read_ssl(char *buf, int bytes, int timeout) +int client_read_sslbuffer(StrBuf *buf, int timeout) { -#if 0 - fd_set rfds; - struct timeval tv; - int retval; - int s; -#endif - int len, rlen; + char sbuf[16384]; /* OpenSSL communicates in 16k blocks, so let's speak its native tongue. */ + int rlen; char junk[1]; + SSL *pssl = CC->ssl; - len = 0; - while (len < bytes) { -#if 0 - /* - * This code is disabled because we don't need it when - * using blocking reads (which we are). -IO - */ - FD_ZERO(&rfds); - s = BIO_get_fd(CC->ssl->rbio, NULL); - FD_SET(s, &rfds); - tv.tv_sec = timeout; - tv.tv_usec = 0; - - retval = select(s + 1, &rfds, NULL, NULL, &tv); - - if (FD_ISSET(s, &rfds) == 0) { - return (0); - } + if (pssl == NULL) return(-1); -#endif - if (SSL_want_read(CC->ssl)) { - if ((SSL_write(CC->ssl, junk, 0)) < 1) { - CtdlLogPrintf(CTDL_DEBUG, "SSL_write in client_read: %s\n", ERR_reason_error_string(ERR_get_error())); + while (1) { + if (SSL_want_read(pssl)) { + if ((SSL_write(pssl, junk, 0)) < 1) { + syslog(LOG_DEBUG, "SSL_write in client_read"); } } - rlen = SSL_read(CC->ssl, &buf[len], bytes - len); + rlen = SSL_read(pssl, sbuf, sizeof(sbuf)); if (rlen < 1) { long errval; - errval = SSL_get_error(CC->ssl, rlen); - if (errval == SSL_ERROR_WANT_READ || - errval == SSL_ERROR_WANT_WRITE) { + errval = SSL_get_error(pssl, rlen); + if (errval == SSL_ERROR_WANT_READ || errval == SSL_ERROR_WANT_WRITE) { sleep(1); continue; } - CtdlLogPrintf(CTDL_DEBUG, "SSL_read got error %ld\n", errval); + syslog(LOG_DEBUG, "SSL_read got error %ld", errval); endtls(); - return (client_read_to - (&buf[len], bytes - len, timeout)); + return (-1); + } + StrBufAppendBufPlain(buf, sbuf, rlen, 0); + return rlen; + } + return (0); +} + +int client_readline_sslbuffer(StrBuf *Line, StrBuf *IOBuf, const char **Pos, int timeout) +{ + CitContext *CCC = CC; + const char *pos = NULL; + const char *pLF; + int len, rlen; + int nSuccessLess = 0; + const char *pch = NULL; + + if ((Line == NULL) || + (Pos == NULL) || + (IOBuf == NULL)) + { + if (Pos != NULL) + *Pos = NULL; +// *Error = ErrRBLF_PreConditionFailed; + return -1; + } + + pos = *Pos; + if ((StrLength(IOBuf) > 0) && + (pos != NULL) && + (pos < ChrPtr(IOBuf) + StrLength(IOBuf))) + { + pch = pos; + pch = strchr(pch, '\n'); + + if (pch == NULL) { + StrBufAppendBufPlain(Line, pos, + StrLength(IOBuf) - (pos - ChrPtr(IOBuf)), 0); + FlushStrBuf(IOBuf); + *Pos = NULL; + } + else { + int n = 0; + if ((pch > ChrPtr(IOBuf)) && + (*(pch - 1) == '\r')) { + n = 1; + } + StrBufAppendBufPlain(Line, pos, + (pch - pos - n), 0); + + if (StrLength(IOBuf) <= (pch - ChrPtr(IOBuf) + 1)) { + FlushStrBuf(IOBuf); + *Pos = NULL; + } + else + *Pos = pch + 1; + return StrLength(Line); + } + } + + pLF = NULL; + while ((nSuccessLess < timeout) && + (pLF == NULL) && + (CCC->ssl != NULL)) { + + rlen = client_read_sslbuffer(IOBuf, timeout); + if (rlen < 1) { +// *Error = strerror(errno); +// close(*fd); +// *fd = -1; + return -1; + } + else if (rlen > 0) { + pLF = strchr(ChrPtr(IOBuf), '\n'); + } + } + *Pos = NULL; + if (pLF != NULL) { + pos = ChrPtr(IOBuf); + len = pLF - pos; + if (len > 0 && (*(pLF - 1) == '\r') ) + len --; + StrBufAppendBufPlain(Line, pos, len, 0); + if (pLF + 1 >= ChrPtr(IOBuf) + StrLength(IOBuf)) + { + FlushStrBuf(IOBuf); + } + else + *Pos = pLF + 1; + return StrLength(Line); + } +// *Error = ErrRBLF_NotEnoughSentFromServer; + return -1; +} + + + +int client_read_sslblob(StrBuf *Target, long bytes, int timeout) +{ + long baselen; + long RemainRead; + int retval = 0; + CitContext *CCC = CC; + + baselen = StrLength(Target); + + if (StrLength(CCC->RecvBuf.Buf) > 0) + { + long RemainLen; + long TotalLen; + const char *pchs; + + if (CCC->RecvBuf.ReadWritePointer == NULL) + CCC->RecvBuf.ReadWritePointer = ChrPtr(CCC->RecvBuf.Buf); + pchs = ChrPtr(CCC->RecvBuf.Buf); + TotalLen = StrLength(CCC->RecvBuf.Buf); + RemainLen = TotalLen - (pchs - CCC->RecvBuf.ReadWritePointer); + if (RemainLen > bytes) + RemainLen = bytes; + if (RemainLen > 0) + { + StrBufAppendBufPlain(Target, + CCC->RecvBuf.ReadWritePointer, + RemainLen, 0); + CCC->RecvBuf.ReadWritePointer += RemainLen; + } + if ((ChrPtr(CCC->RecvBuf.Buf) + StrLength(CCC->RecvBuf.Buf)) <= CCC->RecvBuf.ReadWritePointer) + { + CCC->RecvBuf.ReadWritePointer = NULL; + FlushStrBuf(CCC->RecvBuf.Buf); + } + } + + if (StrLength(Target) >= bytes + baselen) + return 1; + + CCC->RecvBuf.ReadWritePointer = NULL; + + while ((StrLength(Target) < bytes + baselen) && + (retval >= 0)) + { + retval = client_read_sslbuffer(CCC->RecvBuf.Buf, timeout); + if (retval >= 0) { + RemainRead = bytes - (StrLength (Target) - baselen); + if (RemainRead < StrLength(CCC->RecvBuf.Buf)) + { + StrBufAppendBufPlain( + Target, + ChrPtr(CCC->RecvBuf.Buf), + RemainRead, 0); + CCC->RecvBuf.ReadWritePointer = ChrPtr(CCC->RecvBuf.Buf) + RemainRead; + break; + } + StrBufAppendBuf(Target, CCC->RecvBuf.Buf, 0); /* todo: Buf > bytes? */ + FlushStrBuf(CCC->RecvBuf.Buf); + } + else + { + FlushStrBuf(CCC->RecvBuf.Buf); + return -1; + } - len += rlen; } - return (1); + return 1; } @@ -495,19 +596,18 @@ void CtdlStartTLS(char *ok_response, char *nosup_response, int retval, bits, alg_bits; if (!ssl_ctx) { - CtdlLogPrintf(CTDL_CRIT, "SSL failed: no ssl_ctx exists?\n"); + syslog(LOG_CRIT, "SSL failed: no ssl_ctx exists?"); if (nosup_response != NULL) cprintf("%s", nosup_response); return; } if (!(CC->ssl = SSL_new(ssl_ctx))) { - CtdlLogPrintf(CTDL_CRIT, "SSL_new failed: %s\n", + syslog(LOG_CRIT, "SSL_new failed: %s", ERR_reason_error_string(ERR_get_error())); if (error_response != NULL) cprintf("%s", error_response); return; } if (!(SSL_set_fd(CC->ssl, CC->client_socket))) { - CtdlLogPrintf(CTDL_CRIT, "SSL_set_fd failed: %s\n", - ERR_reason_error_string(ERR_get_error())); + syslog(LOG_CRIT, "SSL_set_fd failed: %s", ERR_reason_error_string(ERR_get_error())); SSL_free(CC->ssl); CC->ssl = NULL; if (error_response != NULL) cprintf("%s", error_response); @@ -525,7 +625,7 @@ void CtdlStartTLS(char *ok_response, char *nosup_response, char error_string[128]; errval = SSL_get_error(CC->ssl, retval); - CtdlLogPrintf(CTDL_CRIT, "SSL_accept failed: retval=%d, errval=%ld, err=%s\n", + syslog(LOG_CRIT, "SSL_accept failed: retval=%d, errval=%ld, err=%s", retval, errval, ERR_error_string(errval, error_string) @@ -536,7 +636,7 @@ void CtdlStartTLS(char *ok_response, char *nosup_response, } BIO_set_close(CC->ssl->rbio, BIO_NOCLOSE); bits = SSL_CIPHER_get_bits(SSL_get_current_cipher(CC->ssl), &alg_bits); - CtdlLogPrintf(CTDL_INFO, "SSL/TLS using %s on %s (%d of %d bits)\n", + syslog(LOG_INFO, "SSL/TLS using %s on %s (%d of %d bits)", SSL_CIPHER_get_name(SSL_get_current_cipher(CC->ssl)), SSL_CIPHER_get_version(SSL_get_current_cipher(CC->ssl)), bits, alg_bits); @@ -603,7 +703,7 @@ void endtls(void) return; } - CtdlLogPrintf(CTDL_INFO, "Ending SSL/TLS\n"); + syslog(LOG_INFO, "Ending SSL/TLS"); SSL_shutdown(CC->ssl); SSL_free(CC->ssl); CC->ssl = NULL;