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();
char buf[SIZ];
int rv = 0;
+#ifndef OPENSSL_NO_EGD
if (!access("/var/run/egd-pool", F_OK)) {
RAND_egd("/var/run/egd-pool");
}
+#endif
if (!RAND_status()) {
syslog(LOG_WARNING, "PRNG not adequately seeded, won't do SSL/TLS\n");
for (a = 0; a < CRYPTO_num_locks(); a++) {
SSLCritters[a] = malloc(sizeof(pthread_mutex_t));
if (!SSLCritters[a]) {
- syslog(1,
+ syslog(LOG_ERR,
"citserver: can't allocate memory!!\n");
/** Nothing's been initialized, just die */
ShutDownWebcit();
if (!strcasecmp(ctdlhost, "uds")) {
sprintf(buf, "%s/keys/citadel.key", ctdlport);
rv = symlink(buf, CTDL_KEY_PATH);
- if (!rv) syslog(1, "%s\n", strerror(errno));
+ if (!rv) syslog(LOG_DEBUG, "%s\n", strerror(errno));
sprintf(buf, "%s/keys/citadel.csr", ctdlport);
rv = symlink(buf, CTDL_CSR_PATH);
- if (!rv) syslog(1, "%s\n", strerror(errno));
+ if (!rv) syslog(LOG_DEBUG, "%s\n", strerror(errno));
sprintf(buf, "%s/keys/citadel.cer", ctdlport);
rv = symlink(buf, CTDL_CER_PATH);
- if (!rv) syslog(1, "%s\n", strerror(errno));
+ if (!rv) syslog(LOG_DEBUG, "%s\n", strerror(errno));
}
/*
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_set_issuer_name(cer, X509_REQ_get_subject_name(req));
+ X509_set_subject_name(cer, X509_REQ_get_subject_name(req));
X509_gmtime_adj(X509_get_notBefore(cer), 0);
X509_gmtime_adj(X509_get_notAfter(cer),(long)60*60*24*SIGN_DAYS);
else {
syslog(LOG_INFO, "SSL_accept success\n");
}
- /*r = */BIO_set_close(newssl->rbio, BIO_NOCLOSE);
+ /*r = */BIO_set_close(SSL_get_rbio(newssl), BIO_NOCLOSE);
bits = SSL_CIPHER_get_bits(SSL_get_current_cipher(newssl), &alg_bits);
syslog(LOG_INFO, "SSL/TLS using %s on %s (%d of %d bits)\n",
SSL_CIPHER_get_name(SSL_get_current_cipher(newssl)),
/* I don't think this is needed, and it crashes the server anyway
*
* if (ctx != NULL) {
- * syslog(9, "Freeing CTX at %x\n", (int)ctx );
+ * syslog(LOG_DEBUG, "Freeing CTX at %x\n", (int)ctx );
* SSL_CTX_free(ctx);
* }
*/
/*
* 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;
long nbytes;
char junk[1];
- if (THREADSSL == NULL) return;
+ if (THREADSSL == NULL) return -1;
nbytes = nremain = StrLength(Buf);
buf = ChrPtr(Buf);
syslog(LOG_WARNING, "errno is %d\n", errno);
}
endtls();
- return;
+ return -1;
}
nremain -= retval;
}
+ return 0;
}