moved more code to tlscommon, fixed a couple of minor lint warnings

[radsecproxy.git] / radsecproxy.h

diff --git a/radsecproxy.h b/radsecproxy.h
index 35a7b99..5bba34a 100644 (file)
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -8,6 +8,7 @@
 
 #include "tlv11.h"
 #include "radmsg.h"
+#include "gconfig.h"
 
 #define DEBUG_LEVEL 3
 
@@ -106,6 +107,8 @@ struct clsrvconf {
     struct server *servers;
 };
 
+#include "tlscommon.h"
+
 struct client {
     struct clsrvconf *conf;
     int sock;
@@ -151,23 +154,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;
@@ -221,8 +207,5 @@ void freebios(struct queue *q);
 struct request *newrequest();
 void freerq(struct request *rq);
 int radsrv(struct request *rq);
-X509 *verifytlscert(SSL *ssl);
-int verifyconfcert(X509 *cert, struct clsrvconf *conf);
 void replyh(struct server *server, unsigned char *buf);
-SSL_CTX *tlsgetctx(uint8_t type, struct tls *t);
 struct addrinfo *resolve_hostport_addrinfo(uint8_t type, char *hostport);