split out code that is needed only when tls or dtls is used

git-svn-id: https://svn.testnett.uninett.no/radsecproxy/trunk@445 e88ac4ed-0b26-0410-9574-a7f39faa03bf

8 files changed, 455 insertions, 394 deletions

diff --git a/Makefile b/Makefile
index 5be1a33..a7f1627 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 CFLAGS = -g -Wall -pedantic -pthread -DRADPROT_UDP -DRADPROT_TCP -DRADPROT_TLS -DRADPROT_DTLS
 LDFLAGS = -lssl
-OBJ = util.o debug.o list.o hash.o gconfig.o tlv11.o radmsg.o udp.o tcp.o tls.o dtls.o radsecproxy.o
+OBJ = util.o debug.o list.o hash.o gconfig.o tlv11.o radmsg.o udp.o tcp.o tls.o dtls.o tlscommon.o radsecproxy.o
 
 all: radsecproxy
 
diff --git a/Makefile.am b/Makefile.am
index 2e7d1cc..5361f24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ radsecproxy_SOURCES = radsecproxy.c \
 		      tls.h \
 		      dtls.h
 
-radsecproxy_CFLAGS  = -g -Wall -pedantic -pthread @SSL_CFLAGS@ @TARGET_CFLAGS@
+radsecproxy_CFLAGS  = -g -Wall -pedantic -pthread -DRADPROT_UDP -DRADPROT_TCP -DRADPROT_TLS -DRADPROT_DTLS @SSL_CFLAGS@ @TARGET_CFLAGS@
 radsecproxy_LDFLAGS = @SSL_LDFLAGS@ @TARGET_LDFLAGS@
 radsecproxy_LDADD   = @SSL_LIBS@
 
diff --git a/dtls.c b/dtls.c
index 0fdbc3a..49519ec 100644
--- a/dtls.c
+++ b/dtls.c
@@ -6,7 +6,6 @@
  * copyright notice and this permission notice appear in all copies.
  */
 
-#ifdef RADPROT_DTLS
 #include <signal.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -27,12 +26,14 @@
 #include <pthread.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
-#include "debug.h"
 #include "list.h"
 #include "hash.h"
-#include "util.h"
 #include "radsecproxy.h"
 
+#ifdef RADPROT_DTLS
+#include "debug.h"
+#include "util.h"
+
 static void setprotoopts(struct commonprotoopts *opts);
 static char **getlistenerargs();
 void *udpdtlsserverrd(void *arg);
diff --git a/radsecproxy.c b/radsecproxy.c
index 2417baa..375d54d 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -76,11 +76,12 @@
 #include "tcp.h"
 #include "tls.h"
 #include "dtls.h"
+#include "tlscommon.h"
 
 static struct options options;
 static struct list *clconfs, *srvconfs;
-struct list *realms;
-struct hash *tlsconfs, *rewriteconfs;
+static struct list *realms;
+static struct hash *rewriteconfs;
 
 static pthread_mutex_t *ssl_locks = NULL;
 static long *ssl_lock_count;
@@ -122,68 +123,6 @@ void ssl_locking_callback(int mode, int type, const char *file, int line) {
 	pthread_mutex_unlock(&ssl_locks[type]);
 }
 
-static int pem_passwd_cb(char *buf, int size, int rwflag, void *userdata) {
-    int pwdlen = strlen(userdata);
-    if (rwflag != 0 || pwdlen > size) /* not for decryption or too large */
-	return 0;
-    memcpy(buf, userdata, pwdlen);
-    return pwdlen;
-}
-
-static int verify_cb(int ok, X509_STORE_CTX *ctx) {
-    char *buf = NULL;
-    X509 *err_cert;
-    int err, depth;
-
-    err_cert = X509_STORE_CTX_get_current_cert(ctx);
-    err = X509_STORE_CTX_get_error(ctx);
-    depth = X509_STORE_CTX_get_error_depth(ctx);
-
-    if (depth > MAX_CERT_DEPTH) {
-	ok = 0;
-	err = X509_V_ERR_CERT_CHAIN_TOO_LONG;
-	X509_STORE_CTX_set_error(ctx, err);
-    }
-
-    if (!ok) {
-	if (err_cert)
-	    buf = X509_NAME_oneline(X509_get_subject_name(err_cert), NULL, 0);
-	debug(DBG_WARN, "verify error: num=%d:%s:depth=%d:%s", err, X509_verify_cert_error_string(err), depth, buf ? buf : "");
-	free(buf);
-	buf = NULL;
-	
-	switch (err) {
-	case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
-	    if (err_cert) {
-		buf = X509_NAME_oneline(X509_get_issuer_name(err_cert), NULL, 0);
-		if (buf) {
-		    debug(DBG_WARN, "\tIssuer=%s", buf);
-		    free(buf);
-		    buf = NULL;
-		}
-	    }
-	    break;
-	case X509_V_ERR_CERT_NOT_YET_VALID:
-	case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
-	    debug(DBG_WARN, "\tCertificate not yet valid");
-	    break;
-	case X509_V_ERR_CERT_HAS_EXPIRED:
-	    debug(DBG_WARN, "Certificate has expired");
-	    break;
-	case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
-	    debug(DBG_WARN, "Certificate no longer valid (after notAfter)");
-	    break;
-	case X509_V_ERR_NO_EXPLICIT_POLICY:
-	    debug(DBG_WARN, "No Explicit Certificate Policy");
-	    break;
-	}
-    }
-#ifdef DEBUG  
-    printf("certificate verify returns %d\n", ok);
-#endif  
-    return ok;
-}
-
 int resolvepeer(struct clsrvconf *conf, int ai_flags) {
     struct addrinfo hints, *addrinfo, *res;
     char *slash, *s;
@@ -592,9 +531,11 @@ int addserver(struct clsrvconf *conf) {
     conf->servers->conf = conf;
 
     type = conf->type;
+    
+#ifdef DRADPROT_TLS    
     if (type == RAD_DTLS)
 	conf->servers->rbios = newqueue();
-
+#endif
     conf->pdef->setsrcres();
 
     conf->servers->sock = -1;
@@ -2351,35 +2292,6 @@ void createlisteners(uint8_t type) {
 	createlistener(type, NULL);
 }
 
-#ifdef DEBUG
-void ssl_info_callback(const SSL *ssl, int where, int ret) {
-    const char *s;
-    int w;
-
-    w = where & ~SSL_ST_MASK;
-
-    if (w & SSL_ST_CONNECT)
-	s = "SSL_connect";
-    else if (w & SSL_ST_ACCEPT)
-	s = "SSL_accept";
-    else
-	s = "undefined";
-
-    if (where & SSL_CB_LOOP)
-	debug(DBG_DBG, "%s:%s\n", s, SSL_state_string_long(ssl));
-    else if (where & SSL_CB_ALERT) {
-	s = (where & SSL_CB_READ) ? "read" : "write";
-	debug(DBG_DBG, "SSL3 alert %s:%s:%s\n", s, SSL_alert_type_string_long(ret), SSL_alert_desc_string_long(ret));
-    }
-    else if (where & SSL_CB_EXIT) {
-	if (ret == 0)
-	    debug(DBG_DBG, "%s:failed in %s\n", s, SSL_state_string_long(ssl));
-	else if (ret < 0)
-	    debug(DBG_DBG, "%s:error in %s\n", s, SSL_state_string_long(ssl));
-    }
-}
-#endif
-
 void sslinit() {
     int i;
     time_t t;
@@ -2405,195 +2317,6 @@ void sslinit() {
     }
 }
 
-X509_VERIFY_PARAM *createverifyparams(char **poids) {
-    X509_VERIFY_PARAM *pm;
-    ASN1_OBJECT *pobject;
-    int i;
-    
-    pm = X509_VERIFY_PARAM_new();
-    if (!pm)
-	return NULL;
-    
-    for (i = 0; poids[i]; i++) {
-	pobject = OBJ_txt2obj(poids[i], 0);
-	if (!pobject) {
-	    X509_VERIFY_PARAM_free(pm);
-	    return NULL;
-	}
-	X509_VERIFY_PARAM_add0_policy(pm, pobject);
-    }
-
-    X509_VERIFY_PARAM_set_flags(pm, X509_V_FLAG_POLICY_CHECK | X509_V_FLAG_EXPLICIT_POLICY);
-    return pm;
-}
-
-int tlsaddcacrl(SSL_CTX *ctx, struct tls *conf) {
-    STACK_OF(X509_NAME) *calist;
-    X509_STORE *x509_s;
-    unsigned long error;
-
-    if (!SSL_CTX_load_verify_locations(ctx, conf->cacertfile, conf->cacertpath)) {
-	while ((error = ERR_get_error()))
-	    debug(DBG_ERR, "SSL: %s", ERR_error_string(error, NULL));
-	debug(DBG_ERR, "tlsaddcacrl: Error updating TLS context %s", conf->name);
-	return 0;
-    }
-
-    calist = conf->cacertfile ? SSL_load_client_CA_file(conf->cacertfile) : NULL;
-    if (!conf->cacertfile || calist) {
-	if (conf->cacertpath) {
-	    if (!calist)
-		calist = sk_X509_NAME_new_null();
-	    if (!SSL_add_dir_cert_subjects_to_stack(calist, conf->cacertpath)) {
-		sk_X509_NAME_free(calist);
-		calist = NULL;
-	    }
-	}
-    }
-    if (!calist) {
-	while ((error = ERR_get_error()))
-	    debug(DBG_ERR, "SSL: %s", ERR_error_string(error, NULL));
-	debug(DBG_ERR, "tlsaddcacrl: Error adding CA subjects in TLS context %s", conf->name);
-	return 0;
-    }
-    ERR_clear_error(); /* add_dir_cert_subj returns errors on success */
-    SSL_CTX_set_client_CA_list(ctx, calist);
-
-    SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, verify_cb);
-    SSL_CTX_set_verify_depth(ctx, MAX_CERT_DEPTH + 1);
-
-    if (conf->crlcheck || conf->vpm) {
-	x509_s = SSL_CTX_get_cert_store(ctx);
-	if (conf->crlcheck)
-	    X509_STORE_set_flags(x509_s, X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL);
-	if (conf->vpm)
-	    X509_STORE_set1_param(x509_s, conf->vpm);
-    }
-
-    debug(DBG_DBG, "tlsaddcacrl: updated TLS context %s", conf->name);
-    return 1;
-}
-
-SSL_CTX *tlscreatectx(uint8_t type, struct tls *conf) {
-    SSL_CTX *ctx = NULL;
-    unsigned long error;
-
-    if (!ssl_locks)
-	sslinit();
-
-    switch (type) {
-#ifdef RADPROT_TLS	
-    case RAD_TLS:
-	ctx = SSL_CTX_new(TLSv1_method());
-#ifdef DEBUG	
-	SSL_CTX_set_info_callback(ctx, ssl_info_callback);
-#endif	
-	break;
-#endif	
-#ifdef RADPROT_DTLS	
-    case RAD_DTLS:
-	ctx = SSL_CTX_new(DTLSv1_method());
-#ifdef DEBUG	
-	SSL_CTX_set_info_callback(ctx, ssl_info_callback);
-#endif	
-	SSL_CTX_set_read_ahead(ctx, 1);
-	break;
-#endif	
-    }
-    if (!ctx) {
-	debug(DBG_ERR, "tlscreatectx: Error initialising SSL/TLS in TLS context %s", conf->name);
-	return NULL;
-    }
-    
-    if (conf->certkeypwd) {
-	SSL_CTX_set_default_passwd_cb_userdata(ctx, conf->certkeypwd);
-	SSL_CTX_set_default_passwd_cb(ctx, pem_passwd_cb);
-    }
-    if (!SSL_CTX_use_certificate_chain_file(ctx, conf->certfile) ||
-	!SSL_CTX_use_PrivateKey_file(ctx, conf->certkeyfile, SSL_FILETYPE_PEM) ||
-	!SSL_CTX_check_private_key(ctx)) {
-	while ((error = ERR_get_error()))
-	    debug(DBG_ERR, "SSL: %s", ERR_error_string(error, NULL));
-	debug(DBG_ERR, "tlscreatectx: Error initialising SSL/TLS in TLS context %s", conf->name);
-	SSL_CTX_free(ctx);
-	return NULL;
-    }
-
-    if (conf->policyoids) {
-	if (!conf->vpm) {
-	    conf->vpm = createverifyparams(conf->policyoids);
-	    if (!conf->vpm) {
-		debug(DBG_ERR, "tlsaddcacrl: Failed to add policyOIDs in TLS context %s", conf->name);
-		SSL_CTX_free(ctx);
-		return NULL;
-	    }
-	}
-    }
-
-    if (!tlsaddcacrl(ctx, conf)) {
-	if (conf->vpm) {
-	    X509_VERIFY_PARAM_free(conf->vpm);
-	    conf->vpm = NULL;
-	}
-	SSL_CTX_free(ctx);
-	return NULL;
-    }
-
-    debug(DBG_DBG, "tlscreatectx: created TLS context %s", conf->name);
-    return ctx;
-}
-
-struct tls *tlsgettls(char *alt1, char *alt2) {
-    struct tls *t;
-
-    t = hash_read(tlsconfs, alt1, strlen(alt1));
-    if (!t)
-	t = hash_read(tlsconfs, alt2, strlen(alt2));
-    return t;
-}
-
-SSL_CTX *tlsgetctx(uint8_t type, struct tls *t) {
-    struct timeval now;
-    
-    if (!t)
-	return NULL;
-    gettimeofday(&now, NULL);
-    
-    switch (type) {
-#ifdef RADPROT_TLS
-    case RAD_TLS:
-	if (t->tlsexpiry && t->tlsctx) {
-	    if (t->tlsexpiry < now.tv_sec) {
-		t->tlsexpiry = now.tv_sec + t->cacheexpiry;
-		tlsaddcacrl(t->tlsctx, t);
-	    }
-	}
-	if (!t->tlsctx) {
-	    t->tlsctx = tlscreatectx(RAD_TLS, t);
-	    if (t->cacheexpiry)
-		t->tlsexpiry = now.tv_sec + t->cacheexpiry;
-	}
-	return t->tlsctx;
-#endif
-#ifdef RADPROT_DTLS
-    case RAD_DTLS:
-	if (t->dtlsexpiry && t->dtlsctx) {
-	    if (t->dtlsexpiry < now.tv_sec) {
-		t->dtlsexpiry = now.tv_sec + t->cacheexpiry;
-		tlsaddcacrl(t->dtlsctx, t);
-	    }
-	}
-	if (!t->dtlsctx) {
-	    t->dtlsctx = tlscreatectx(RAD_DTLS, t);
-	    if (t->cacheexpiry)
-		t->dtlsexpiry = now.tv_sec + t->cacheexpiry;
-	}
-	return t->dtlsctx;
-#endif
-    }
-    return NULL;
-}
-
 struct list *addsrvconfs(char *value, char **names) {
     struct list *conflist;
     int n;
@@ -3256,7 +2979,8 @@ int confclient_cb(struct gconffile **cf, void *arg, char *block, char *opt, char
 	debugx(1, DBG_ERR, "error in block %s, unknown transport %s", block, conftype);
     free(conftype);
     conf->pdef = protodefs[conf->type];
-    
+
+#if defined(RADPROT_TLS) || defined(RADPROT_DTLS)    
     if (conf->type == RAD_TLS || conf->type == RAD_DTLS) {
 	conf->tlsconf = conf->tls ? tlsgettls(conf->tls, NULL) : tlsgettls("defaultclient", "default");
 	if (!conf->tlsconf)
@@ -3264,6 +2988,7 @@ int confclient_cb(struct gconffile **cf, void *arg, char *block, char *opt, char
 	if (conf->matchcertattr && !addmatchcertattr(conf))
 	    debugx(1, DBG_ERR, "error in block %s, invalid MatchCertificateAttributeValue", block);
     }
+#endif
     
     if (dupinterval != LONG_MIN) {
 	if (dupinterval < 0 || dupinterval > 255)
@@ -3314,6 +3039,7 @@ int confclient_cb(struct gconffile **cf, void *arg, char *block, char *opt, char
 }
 
 int compileserverconfig(struct clsrvconf *conf, const char *block) {
+#if defined(RADPROT_TLS) || defined(RADPROT_DTLS)    
     if (conf->type == RAD_TLS || conf->type == RAD_DTLS) {
     	conf->tlsconf = conf->tls ? tlsgettls(conf->tls, NULL) : tlsgettls("defaultserver", "default");
 	if (!conf->tlsconf) {
@@ -3325,7 +3051,8 @@ int compileserverconfig(struct clsrvconf *conf, const char *block) {
 	    return 0;
 	}
     }
-
+#endif
+    
     if (!conf->port) {
 	conf->port = stringcopy(conf->pdef->portdefault, 0);
 	if (!conf->port) {
@@ -3512,75 +3239,6 @@ int confrealm_cb(struct gconffile **cf, void *arg, char *block, char *opt, char
     return 1;
 }
 
-int conftls_cb(struct gconffile **cf, void *arg, char *block, char *opt, char *val) {
-    struct tls *conf;
-    long int expiry = LONG_MIN;
-    
-    debug(DBG_DBG, "conftls_cb called for %s", block);
-    
-    conf = malloc(sizeof(struct tls));
-    if (!conf) {
-	debug(DBG_ERR, "conftls_cb: malloc failed");
-	return 0;
-    }
-    memset(conf, 0, sizeof(struct tls));
-    
-    if (!getgenericconfig(cf, block,
-			  "CACertificateFile", CONF_STR, &conf->cacertfile,
-			  "CACertificatePath", CONF_STR, &conf->cacertpath,
-			  "CertificateFile", CONF_STR, &conf->certfile,
-			  "CertificateKeyFile", CONF_STR, &conf->certkeyfile,
-			  "CertificateKeyPassword", CONF_STR, &conf->certkeypwd,
-			  "CacheExpiry", CONF_LINT, &expiry,
-			  "CRLCheck", CONF_BLN, &conf->crlcheck,
-			  "PolicyOID", CONF_MSTR, &conf->policyoids,
-			  NULL
-			  )) {
-	debug(DBG_ERR, "conftls_cb: configuration error in block %s", val);
-	goto errexit;
-    }
-    if (!conf->certfile || !conf->certkeyfile) {
-	debug(DBG_ERR, "conftls_cb: TLSCertificateFile and TLSCertificateKeyFile must be specified in block %s", val);
-	goto errexit;
-    }
-    if (!conf->cacertfile && !conf->cacertpath) {
-	debug(DBG_ERR, "conftls_cb: CA Certificate file or path need to be specified in block %s", val);
-	goto errexit;
-    }
-    if (expiry != LONG_MIN) {
-	if (expiry < 0) {
-	    debug(DBG_ERR, "error in block %s, value of option CacheExpiry is %ld, may not be negative", val, expiry);
-	    goto errexit;
-	}
-	conf->cacheexpiry = expiry;
-    }    
-
-    conf->name = stringcopy(val, 0);
-    if (!conf->name) {
-	debug(DBG_ERR, "conftls_cb: malloc failed");
-	goto errexit;
-    }
-
-    if (!hash_insert(tlsconfs, val, strlen(val), conf)) {
-	debug(DBG_ERR, "conftls_cb: malloc failed");
-	goto errexit;
-    }
-    if (!tlsgetctx(RAD_TLS, conf))
-	debug(DBG_ERR, "conftls_cb: error creating ctx for TLS block %s", val);
-    debug(DBG_DBG, "conftls_cb: added TLS block %s", val);
-    return 1;
-
- errexit:
-    free(conf->cacertfile);
-    free(conf->cacertpath);
-    free(conf->certfile);
-    free(conf->certkeyfile);
-    free(conf->certkeypwd);
-    freegconfmstr(conf->policyoids);
-    free(conf);
-    return 0;
-}
-
 int confrewrite_cb(struct gconffile **cf, void *arg, char *block, char *opt, char *val) {
     char **rmattrs = NULL, **rmvattrs = NULL, **addattrs = NULL, **modattrs = NULL;
     
@@ -3635,10 +3293,6 @@ void getmainconfig(const char *configfile) {
     if (!realms)
 	debugx(1, DBG_ERR, "malloc failed");    
  
-    tlsconfs = hash_create();
-    if (!tlsconfs)
-	debugx(1, DBG_ERR, "malloc failed");
-    
     rewriteconfs = hash_create();
     if (!rewriteconfs)
 	debugx(1, DBG_ERR, "malloc failed");    
@@ -3646,26 +3300,18 @@ void getmainconfig(const char *configfile) {
     if (!getgenericconfig(&cfs, NULL,
 #ifdef RADPROT_UDP			  
 			  "ListenUDP", CONF_MSTR, &listenargs[RAD_UDP],
-#endif			  
-#ifdef RADPROT_TCP			  
-			  "ListenTCP", CONF_MSTR, &listenargs[RAD_TCP],
-#endif			  
-#ifdef RADPROT_TLS
-			  "ListenTLS", CONF_MSTR, &listenargs[RAD_TLS],
-#endif			  
-#ifdef RADPROT_DTLS
-			  "ListenDTLS", CONF_MSTR, &listenargs[RAD_DTLS],
-#endif			  
-#ifdef RADPROT_UDP			  
 			  "SourceUDP", CONF_STR, &sourcearg[RAD_UDP],
 #endif			  
 #ifdef RADPROT_TCP			  
+			  "ListenTCP", CONF_MSTR, &listenargs[RAD_TCP],
 			  "SourceTCP", CONF_STR, &sourcearg[RAD_TCP],
 #endif			  
 #ifdef RADPROT_TLS
+			  "ListenTLS", CONF_MSTR, &listenargs[RAD_TLS],
 			  "SourceTLS", CONF_STR, &sourcearg[RAD_TLS],
 #endif			  
 #ifdef RADPROT_DTLS
+			  "ListenDTLS", CONF_MSTR, &listenargs[RAD_DTLS],
 			  "SourceDTLS", CONF_STR, &sourcearg[RAD_DTLS],
 #endif			  
 			  "TTLAttribute", CONF_STR, &options.ttlattr,
@@ -3676,7 +3322,9 @@ void getmainconfig(const char *configfile) {
 			  "Client", CONF_CBK, confclient_cb, NULL,
 			  "Server", CONF_CBK, confserver_cb, NULL,
 			  "Realm", CONF_CBK, confrealm_cb, NULL,
+#if defined(RADPROT_TLS) || defined(RADPROT_DTLS)			  
 			  "TLS", CONF_CBK, conftls_cb, NULL,
+#endif			  
 			  "Rewrite", CONF_CBK, confrewrite_cb, NULL,
 			  NULL
 			  ))
@@ -3785,6 +3433,9 @@ int main(int argc, char **argv) {
 
     for (i = 0; i < RAD_PROTOCOUNT; i++)
 	protodefs[i] = protoinits[i](i);
+
+    /* needed even if no TLS/DTLS transport */
+    sslinit();
     
     getargs(argc, argv, &foreground, &pretend, &loglevel, &configfile);
     if (loglevel)
diff --git a/radsecproxy.h b/radsecproxy.h
index 35a7b99..1c3135f 100644
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -151,23 +151,6 @@ struct realm {
     struct list *accsrvconfs;
 };
 
-struct tls {
-    char *name;
-    char *cacertfile;
-    char *cacertpath;
-    char *certfile;
-    char *certkeyfile;
-    char *certkeypwd;
-    uint8_t crlcheck;
-    char **policyoids;
-    uint32_t cacheexpiry;
-    uint32_t tlsexpiry;
-    uint32_t dtlsexpiry;
-    X509_VERIFY_PARAM *vpm;
-    SSL_CTX *tlsctx;
-    SSL_CTX *dtlsctx;
-};
-
 struct modattr {
     uint8_t t;
     char *replacement;
diff --git a/tls.c b/tls.c
index 5a97960..d49e94b 100644
--- a/tls.c
+++ b/tls.c
@@ -6,7 +6,6 @@
  * copyright notice and this permission notice appear in all copies.
  */
 
-#ifdef RADPROT_TLS
 #include <signal.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -27,11 +26,13 @@
 #include <pthread.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
-#include "debug.h"
 #include "list.h"
-#include "util.h"
 #include "radsecproxy.h"
 
+#ifdef RADPROT_TLS
+#include "debug.h"
+#include "util.h"
+
 static void setprotoopts(struct commonprotoopts *opts);
 static char **getlistenerargs();
 void *tlslistener(void *arg);
diff --git a/tlscommon.c b/tlscommon.c
new file mode 100644
index 0000000..d934269
--- /dev/null
+++ b/tlscommon.c
@@ -0,0 +1,412 @@
+/*
+ * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ */
+
+#if defined(RADPROT_TLS) || defined(RADPROT_DTLS)
+#include <signal.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <string.h>
+#include <unistd.h>
+#include <limits.h>
+#ifdef SYS_SOLARIS9
+#include <fcntl.h>
+#endif
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/select.h>
+#include <ctype.h>
+#include <sys/wait.h>
+#include <arpa/inet.h>
+#include <regex.h>
+#include <libgen.h>
+#include <pthread.h>
+#include <openssl/ssl.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
+#include <openssl/md5.h>
+#include <openssl/hmac.h>
+#include <openssl/x509v3.h>
+#include "debug.h"
+#include "list.h"
+#include "hash.h"
+#include "util.h"
+#include "gconfig.h"
+#include "radsecproxy.h"
+
+struct tls {
+    char *name;
+    char *cacertfile;
+    char *cacertpath;
+    char *certfile;
+    char *certkeyfile;
+    char *certkeypwd;
+    uint8_t crlcheck;
+    char **policyoids;
+    uint32_t cacheexpiry;
+    uint32_t tlsexpiry;
+    uint32_t dtlsexpiry;
+    X509_VERIFY_PARAM *vpm;
+    SSL_CTX *tlsctx;
+    SSL_CTX *dtlsctx;
+};
+
+static struct hash *tlsconfs = NULL;
+
+static int pem_passwd_cb(char *buf, int size, int rwflag, void *userdata) {
+    int pwdlen = strlen(userdata);
+    if (rwflag != 0 || pwdlen > size) /* not for decryption or too large */
+	return 0;
+    memcpy(buf, userdata, pwdlen);
+    return pwdlen;
+}
+
+static int verify_cb(int ok, X509_STORE_CTX *ctx) {
+    char *buf = NULL;
+    X509 *err_cert;
+    int err, depth;
+
+    err_cert = X509_STORE_CTX_get_current_cert(ctx);
+    err = X509_STORE_CTX_get_error(ctx);
+    depth = X509_STORE_CTX_get_error_depth(ctx);
+
+    if (depth > MAX_CERT_DEPTH) {
+	ok = 0;
+	err = X509_V_ERR_CERT_CHAIN_TOO_LONG;
+	X509_STORE_CTX_set_error(ctx, err);
+    }
+
+    if (!ok) {
+	if (err_cert)
+	    buf = X509_NAME_oneline(X509_get_subject_name(err_cert), NULL, 0);
+	debug(DBG_WARN, "verify error: num=%d:%s:depth=%d:%s", err, X509_verify_cert_error_string(err), depth, buf ? buf : "");
+	free(buf);
+	buf = NULL;
+	
+	switch (err) {
+	case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
+	    if (err_cert) {
+		buf = X509_NAME_oneline(X509_get_issuer_name(err_cert), NULL, 0);
+		if (buf) {
+		    debug(DBG_WARN, "\tIssuer=%s", buf);
+		    free(buf);
+		    buf = NULL;
+		}
+	    }
+	    break;
+	case X509_V_ERR_CERT_NOT_YET_VALID:
+	case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
+	    debug(DBG_WARN, "\tCertificate not yet valid");
+	    break;
+	case X509_V_ERR_CERT_HAS_EXPIRED:
+	    debug(DBG_WARN, "Certificate has expired");
+	    break;
+	case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
+	    debug(DBG_WARN, "Certificate no longer valid (after notAfter)");
+	    break;
+	case X509_V_ERR_NO_EXPLICIT_POLICY:
+	    debug(DBG_WARN, "No Explicit Certificate Policy");
+	    break;
+	}
+    }
+#ifdef DEBUG  
+    printf("certificate verify returns %d\n", ok);
+#endif  
+    return ok;
+}
+
+#ifdef DEBUG
+static void ssl_info_callback(const SSL *ssl, int where, int ret) {
+    const char *s;
+    int w;
+
+    w = where & ~SSL_ST_MASK;
+
+    if (w & SSL_ST_CONNECT)
+	s = "SSL_connect";
+    else if (w & SSL_ST_ACCEPT)
+	s = "SSL_accept";
+    else
+	s = "undefined";
+
+    if (where & SSL_CB_LOOP)
+	debug(DBG_DBG, "%s:%s\n", s, SSL_state_string_long(ssl));
+    else if (where & SSL_CB_ALERT) {
+	s = (where & SSL_CB_READ) ? "read" : "write";
+	debug(DBG_DBG, "SSL3 alert %s:%s:%s\n", s, SSL_alert_type_string_long(ret), SSL_alert_desc_string_long(ret));
+    }
+    else if (where & SSL_CB_EXIT) {
+	if (ret == 0)
+	    debug(DBG_DBG, "%s:failed in %s\n", s, SSL_state_string_long(ssl));
+	else if (ret < 0)
+	    debug(DBG_DBG, "%s:error in %s\n", s, SSL_state_string_long(ssl));
+    }
+}
+#endif
+
+static X509_VERIFY_PARAM *createverifyparams(char **poids) {
+    X509_VERIFY_PARAM *pm;
+    ASN1_OBJECT *pobject;
+    int i;
+    
+    pm = X509_VERIFY_PARAM_new();
+    if (!pm)
+	return NULL;
+    
+    for (i = 0; poids[i]; i++) {
+	pobject = OBJ_txt2obj(poids[i], 0);
+	if (!pobject) {
+	    X509_VERIFY_PARAM_free(pm);
+	    return NULL;
+	}
+	X509_VERIFY_PARAM_add0_policy(pm, pobject);
+    }
+
+    X509_VERIFY_PARAM_set_flags(pm, X509_V_FLAG_POLICY_CHECK | X509_V_FLAG_EXPLICIT_POLICY);
+    return pm;
+}
+
+static int tlsaddcacrl(SSL_CTX *ctx, struct tls *conf) {
+    STACK_OF(X509_NAME) *calist;
+    X509_STORE *x509_s;
+    unsigned long error;
+
+    if (!SSL_CTX_load_verify_locations(ctx, conf->cacertfile, conf->cacertpath)) {
+	while ((error = ERR_get_error()))
+	    debug(DBG_ERR, "SSL: %s", ERR_error_string(error, NULL));
+	debug(DBG_ERR, "tlsaddcacrl: Error updating TLS context %s", conf->name);
+	return 0;
+    }
+
+    calist = conf->cacertfile ? SSL_load_client_CA_file(conf->cacertfile) : NULL;
+    if (!conf->cacertfile || calist) {
+	if (conf->cacertpath) {
+	    if (!calist)
+		calist = sk_X509_NAME_new_null();
+	    if (!SSL_add_dir_cert_subjects_to_stack(calist, conf->cacertpath)) {
+		sk_X509_NAME_free(calist);
+		calist = NULL;
+	    }
+	}
+    }
+    if (!calist) {
+	while ((error = ERR_get_error()))
+	    debug(DBG_ERR, "SSL: %s", ERR_error_string(error, NULL));
+	debug(DBG_ERR, "tlsaddcacrl: Error adding CA subjects in TLS context %s", conf->name);
+	return 0;
+    }
+    ERR_clear_error(); /* add_dir_cert_subj returns errors on success */
+    SSL_CTX_set_client_CA_list(ctx, calist);
+
+    SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, verify_cb);
+    SSL_CTX_set_verify_depth(ctx, MAX_CERT_DEPTH + 1);
+
+    if (conf->crlcheck || conf->vpm) {
+	x509_s = SSL_CTX_get_cert_store(ctx);
+	if (conf->crlcheck)
+	    X509_STORE_set_flags(x509_s, X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL);
+	if (conf->vpm)
+	    X509_STORE_set1_param(x509_s, conf->vpm);
+    }
+
+    debug(DBG_DBG, "tlsaddcacrl: updated TLS context %s", conf->name);
+    return 1;
+}
+
+static SSL_CTX *tlscreatectx(uint8_t type, struct tls *conf) {
+    SSL_CTX *ctx = NULL;
+    unsigned long error;
+
+    switch (type) {
+#ifdef RADPROT_TLS	
+    case RAD_TLS:
+	ctx = SSL_CTX_new(TLSv1_method());
+#ifdef DEBUG	
+	SSL_CTX_set_info_callback(ctx, ssl_info_callback);
+#endif	
+	break;
+#endif	
+#ifdef RADPROT_DTLS	
+    case RAD_DTLS:
+	ctx = SSL_CTX_new(DTLSv1_method());
+#ifdef DEBUG	
+	SSL_CTX_set_info_callback(ctx, ssl_info_callback);
+#endif	
+	SSL_CTX_set_read_ahead(ctx, 1);
+	break;
+#endif	
+    }
+    if (!ctx) {
+	debug(DBG_ERR, "tlscreatectx: Error initialising SSL/TLS in TLS context %s", conf->name);
+	return NULL;
+    }
+    
+    if (conf->certkeypwd) {
+	SSL_CTX_set_default_passwd_cb_userdata(ctx, conf->certkeypwd);
+	SSL_CTX_set_default_passwd_cb(ctx, pem_passwd_cb);
+    }
+    if (!SSL_CTX_use_certificate_chain_file(ctx, conf->certfile) ||
+	!SSL_CTX_use_PrivateKey_file(ctx, conf->certkeyfile, SSL_FILETYPE_PEM) ||
+	!SSL_CTX_check_private_key(ctx)) {
+	while ((error = ERR_get_error()))
+	    debug(DBG_ERR, "SSL: %s", ERR_error_string(error, NULL));
+	debug(DBG_ERR, "tlscreatectx: Error initialising SSL/TLS in TLS context %s", conf->name);
+	SSL_CTX_free(ctx);
+	return NULL;
+    }
+
+    if (conf->policyoids) {
+	if (!conf->vpm) {
+	    conf->vpm = createverifyparams(conf->policyoids);
+	    if (!conf->vpm) {
+		debug(DBG_ERR, "tlscreatectx: Failed to add policyOIDs in TLS context %s", conf->name);
+		SSL_CTX_free(ctx);
+		return NULL;
+	    }
+	}
+    }
+
+    if (!tlsaddcacrl(ctx, conf)) {
+	if (conf->vpm) {
+	    X509_VERIFY_PARAM_free(conf->vpm);
+	    conf->vpm = NULL;
+	}
+	SSL_CTX_free(ctx);
+	return NULL;
+    }
+
+    debug(DBG_DBG, "tlscreatectx: created TLS context %s", conf->name);
+    return ctx;
+}
+
+struct tls *tlsgettls(char *alt1, char *alt2) {
+    struct tls *t;
+
+    t = hash_read(tlsconfs, alt1, strlen(alt1));
+    if (!t)
+	t = hash_read(tlsconfs, alt2, strlen(alt2));
+    return t;
+}
+
+SSL_CTX *tlsgetctx(uint8_t type, struct tls *t) {
+    struct timeval now;
+    
+    if (!t)
+	return NULL;
+    gettimeofday(&now, NULL);
+    
+    switch (type) {
+#ifdef RADPROT_TLS
+    case RAD_TLS:
+	if (t->tlsexpiry && t->tlsctx) {
+	    if (t->tlsexpiry < now.tv_sec) {
+		t->tlsexpiry = now.tv_sec + t->cacheexpiry;
+		tlsaddcacrl(t->tlsctx, t);
+	    }
+	}
+	if (!t->tlsctx) {
+	    t->tlsctx = tlscreatectx(RAD_TLS, t);
+	    if (t->cacheexpiry)
+		t->tlsexpiry = now.tv_sec + t->cacheexpiry;
+	}
+	return t->tlsctx;
+#endif
+#ifdef RADPROT_DTLS
+    case RAD_DTLS:
+	if (t->dtlsexpiry && t->dtlsctx) {
+	    if (t->dtlsexpiry < now.tv_sec) {
+		t->dtlsexpiry = now.tv_sec + t->cacheexpiry;
+		tlsaddcacrl(t->dtlsctx, t);
+	    }
+	}
+	if (!t->dtlsctx) {
+	    t->dtlsctx = tlscreatectx(RAD_DTLS, t);
+	    if (t->cacheexpiry)
+		t->dtlsexpiry = now.tv_sec + t->cacheexpiry;
+	}
+	return t->dtlsctx;
+#endif
+    }
+    return NULL;
+}
+
+int conftls_cb(struct gconffile **cf, void *arg, char *block, char *opt, char *val) {
+    struct tls *conf;
+    long int expiry = LONG_MIN;
+    
+    debug(DBG_DBG, "conftls_cb called for %s", block);
+    
+    conf = malloc(sizeof(struct tls));
+    if (!conf) {
+	debug(DBG_ERR, "conftls_cb: malloc failed");
+	return 0;
+    }
+    memset(conf, 0, sizeof(struct tls));
+    
+    if (!getgenericconfig(cf, block,
+			  "CACertificateFile", CONF_STR, &conf->cacertfile,
+			  "CACertificatePath", CONF_STR, &conf->cacertpath,
+			  "CertificateFile", CONF_STR, &conf->certfile,
+			  "CertificateKeyFile", CONF_STR, &conf->certkeyfile,
+			  "CertificateKeyPassword", CONF_STR, &conf->certkeypwd,
+			  "CacheExpiry", CONF_LINT, &expiry,
+			  "CRLCheck", CONF_BLN, &conf->crlcheck,
+			  "PolicyOID", CONF_MSTR, &conf->policyoids,
+			  NULL
+			  )) {
+	debug(DBG_ERR, "conftls_cb: configuration error in block %s", val);
+	goto errexit;
+    }
+    if (!conf->certfile || !conf->certkeyfile) {
+	debug(DBG_ERR, "conftls_cb: TLSCertificateFile and TLSCertificateKeyFile must be specified in block %s", val);
+	goto errexit;
+    }
+    if (!conf->cacertfile && !conf->cacertpath) {
+	debug(DBG_ERR, "conftls_cb: CA Certificate file or path need to be specified in block %s", val);
+	goto errexit;
+    }
+    if (expiry != LONG_MIN) {
+	if (expiry < 0) {
+	    debug(DBG_ERR, "error in block %s, value of option CacheExpiry is %ld, may not be negative", val, expiry);
+	    goto errexit;
+	}
+	conf->cacheexpiry = expiry;
+    }    
+
+    conf->name = stringcopy(val, 0);
+    if (!conf->name) {
+	debug(DBG_ERR, "conftls_cb: malloc failed");
+	goto errexit;
+    }
+
+    if (!tlsconfs)
+	tlsconfs = hash_create();
+    if (!hash_insert(tlsconfs, val, strlen(val), conf)) {
+	debug(DBG_ERR, "conftls_cb: malloc failed");
+	goto errexit;
+    }
+    if (!tlsgetctx(RAD_TLS, conf))
+	debug(DBG_ERR, "conftls_cb: error creating ctx for TLS block %s", val);
+    debug(DBG_DBG, "conftls_cb: added TLS block %s", val);
+    return 1;
+
+ errexit:
+    free(conf->cacertfile);
+    free(conf->cacertpath);
+    free(conf->certfile);
+    free(conf->certkeyfile);
+    free(conf->certkeypwd);
+    freegconfmstr(conf->policyoids);
+    free(conf);
+    return 0;
+}
+#else
+/* Just to makes file non-empty, should rather avoid compiling this file when not needed */
+static void tlsdummy() {
+}
+#endif
diff --git a/tlscommon.h b/tlscommon.h
new file mode 100644
index 0000000..2b7a5e4
--- /dev/null
+++ b/tlscommon.h
@@ -0,0 +1,13 @@
+/*
+ * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ */
+
+#if defined(RADPROT_TLS) || defined(RADPROT_DTLS)
+struct tls *tlsgettls(char *alt1, char *alt2);
+SSL_CTX *tlsgetctx(uint8_t type, struct tls *t);
+int conftls_cb(struct gconffile **cf, void *arg, char *block, char *opt, char *val);
+#endif