Improve initialisation of OpenSSL PRNG.

[radsecproxy.git] / lib / radsec.c

diff --git a/lib/radsec.c b/lib/radsec.c
index c7ba68c..83ce6c5 100644 (file)
--- a/lib/radsec.c
+++ b/lib/radsec.c
@@ -1,5 +1,5 @@
-/* Copyright 2010, 2011 NORDUnet A/S. All rights reserved.
-   See the file COPYING for licensing information.  */
+/* Copyright 2010-2013 NORDUnet A/S. All rights reserved.
+   See LICENSE for licensing information. */
 
 #if defined HAVE_CONFIG_H
 #include <config.h>
@@ -12,18 +12,19 @@
 #include <libgen.h>
 #include <assert.h>
 
-#include <freeradius/libradius.h>
+#include <radius/client.h>
 #include <event2/event.h>
 #include <event2/util.h>
 #include <radsec/radsec.h>
 #include <radsec/radsec-impl.h>
 #include "err.h"
 #include "debug.h"
-#include "rsp_debug.h"
+#include "radsecproxy/debug.h"
 #if defined (RS_ENABLE_TLS)
+#include "tls.h"
 #include <regex.h>
-#include "rsp_list.h"
-#include "../radsecproxy.h"
+#include "radsecproxy/list.h"
+#include "radsecproxy/radsecproxy.h"
 #endif
 
 /* Public functions.  */
@@ -32,84 +33,34 @@ rs_context_create (struct rs_context **ctx)
 {
   struct rs_context *h;
 
-  if (ctx)
-    *ctx = NULL;
-  h = (struct rs_context *) malloc (sizeof(struct rs_context));
-  if (!h)
-    return RSE_NOMEM;
-
 #if defined (RS_ENABLE_TLS)
-  ssl_init ();
-#endif
-#if defined (DEBUG)
-  fr_log_fp = stderr;
-  fr_debug_flag = 1;
+  if (tls_init ())
+    return RSE_SSLERR;
 #endif
-  debug_init ("libradsec");    /* radsecproxy compat, FIXME: remove */
 
-  memset (h, 0, sizeof(struct rs_context));
-  fr_randinit (&h->fr_randctx, 0);
-  fr_rand_seed (NULL, 0);
+  h = calloc (1, sizeof(*h));
+  if (h == NULL)
+    return RSE_NOMEM;
 
-  if (ctx)
+  debug_init ("libradsec");    /* radsecproxy compat, FIXME: remove */
+
+  if (ctx != NULL)
     *ctx = h;
 
   return RSE_OK;
 }
 
-/** Initialize freeradius dictionary.  */
-int
-rs_context_init_freeradius_dict (struct rs_context *ctx, const char *dict)
-{
-  int r = RSE_OK;
-  size_t dictlen;
-  char *dir = NULL;
-  char *fn = NULL;
-
-  if (dict == NULL)
-    if (ctx->config != NULL)
-      dict = ctx->config->dictionary;
-
-  if (dict == NULL)
-    return rs_err_ctx_push_fl (ctx, RSE_INVAL, __FILE__, __LINE__,
-                              "missing dictionary");
-
-  dictlen = strlen (dict);
-  dir = rs_calloc (ctx, 1, dictlen + 1);
-  fn = rs_calloc (ctx, 1, dictlen + 1);
-  if (dir == NULL || fn == NULL)
-    {
-      r = rs_err_ctx_push_fl (ctx, RSE_NOMEM, __FILE__, __LINE__, NULL);
-      goto out;
-    }
-  strncpy (dir, dict, dictlen);
-  strncpy (fn, dict, dictlen);
-
-  if (dict_init (dirname (dir), basename (fn)) < 0)
-    {
-      r = rs_err_ctx_push_fl (ctx, RSE_FR, __FILE__, __LINE__, "dict_init");
-      goto out;
-    }
-
- out:
-  if (dir)
-    rs_free (ctx, dir);
-  if (fn)
-    rs_free (ctx, fn);
-  return r;
-}
-
-struct rs_error *         /* FIXME: Return int as all the others?  */
-rs_resolv (struct evutil_addrinfo **addr,
-          rs_conn_type_t type,
-          const char *hostname,
-          const char *service)
+struct rs_error *
+rs_resolve (struct evutil_addrinfo **addr,
+            rs_conn_type_t type,
+            const char *hostname,
+            const char *service)
 {
   int err;
   struct evutil_addrinfo hints, *res = NULL;
 
   memset (&hints, 0, sizeof(struct evutil_addrinfo));
-  hints.ai_family = AF_INET;   /* IPv4 only.  TODO: Set AF_UNSPEC.  */
+  hints.ai_family = AF_UNSPEC;
   hints.ai_flags = AI_ADDRCONFIG;
   switch (type)
     {
@@ -153,12 +104,16 @@ rs_context_destroy (struct rs_context *ctx)
          for (p = r->peers; p; )
            {
              struct rs_peer *tmp = p;
-             if (p->addr)
-               evutil_freeaddrinfo (p->addr);
+             if (p->addr_cache)
+                {
+                  evutil_freeaddrinfo (p->addr_cache);
+                  p->addr_cache = NULL;
+                }
              p = p->next;
              rs_free (ctx, tmp);
            }
-         free (ctx, r->name);
+         free (r->name);
+          rs_free (ctx, r->transport_cred);
          r = r->next;
          rs_free (ctx, tmp);
        }
@@ -174,7 +129,7 @@ rs_context_destroy (struct rs_context *ctx)
       rs_free (ctx, ctx->config);
     }
 
-  rs_free (ctx, ctx);
+  free (ctx);
 }
 
 int