Move rlm_eap_tls configuration to it's private header file,

	and out of the global header file

diff --git a/src/modules/rlm_eap/libeap/eap_tls.h b/src/modules/rlm_eap/libeap/eap_tls.h
index fe2f1e9..2264685 100644 (file)
--- a/src/modules/rlm_eap/libeap/eap_tls.h
+++ b/src/modules/rlm_eap/libeap/eap_tls.h
@@ -338,41 +338,6 @@ typedef struct tls_packet {
 } EAPTLS_PACKET;
 
 
-/* configured values goes right here */
-typedef struct eap_tls_conf {
-       char            *private_key_password;
-       char            *private_key_file;
-       char            *certificate_file;
-       char            *random_file;
-       char            *ca_path;
-       char            *ca_file;
-       char            *dh_file;
-       char            *rsa_file;
-       int             rsa_key;
-       int             dh_key;
-       int             rsa_key_length;
-       int             dh_key_length;
-       int             verify_depth;
-       int             file_type;
-       int             include_length;
-
-       /*
-        *      Always < 4096 (due to radius limit), 0 by default = 2048
-        */
-       int             fragment_size;
-       int             check_crl;
-       char            *check_cert_cn;
-       char            *cipher_list;
-} EAP_TLS_CONF;
-
-
-/* This structure gets stored in arg */
-typedef struct _eap_tls_t {
-       EAP_TLS_CONF    *conf;
-       SSL_CTX         *ctx;
-} eap_tls_t;
-
-
 /* EAP-TLS framework */
 EAPTLS_PACKET  *eaptls_alloc(void);
 void           eaptls_free(EAPTLS_PACKET **eaptls_packet_ptr);

diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
index c0f4be9..7a8fbc1 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
@@ -22,12 +22,13 @@
  */
 
 #include <freeradius-devel/autoconf.h>
-#include "eap_tls.h"
 
 #ifdef HAVE_OPENSSL_RAND_H
 #include <openssl/rand.h>
 #endif
 
+#include "rlm_eap_tls.h"
+
 static CONF_PARSER module_config[] = {
        { "rsa_key_exchange", PW_TYPE_BOOLEAN,
          offsetof(EAP_TLS_CONF, rsa_key), NULL, "no" },

diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.h b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.h
index da400ac..238f281 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.h
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.h
@@ -25,4 +25,41 @@
 
 #include "eap_tls.h"
 
+#include <freeradius-devel/radiusd.h>
+#include <freeradius-devel/modules.h>
+
+/* configured values goes right here */
+typedef struct eap_tls_conf {
+       char            *private_key_password;
+       char            *private_key_file;
+       char            *certificate_file;
+       char            *random_file;
+       char            *ca_path;
+       char            *ca_file;
+       char            *dh_file;
+       char            *rsa_file;
+       int             rsa_key;
+       int             dh_key;
+       int             rsa_key_length;
+       int             dh_key_length;
+       int             verify_depth;
+       int             file_type;
+       int             include_length;
+
+       /*
+        *      Always < 4096 (due to radius limit), 0 by default = 2048
+        */
+       int             fragment_size;
+       int             check_crl;
+       char            *check_cert_cn;
+       char            *cipher_list;
+} EAP_TLS_CONF;
+
+/* This structure gets stored in arg */
+typedef struct _eap_tls_t {
+       EAP_TLS_CONF    *conf;
+       SSL_CTX         *ctx;
+} eap_tls_t;
+
+
 #endif /* _RLM_EAP_TLS_H */