Fix potential undefined references to FILE, for libopkg users.

[oweals/opkg-lede.git] / libopkg / opkg_pathfinder.c

diff --git a/libopkg/opkg_pathfinder.c b/libopkg/opkg_pathfinder.c
index 6198c0414714469fdadf5682cff5e55c3e7afb77..bf7dab68a55dff1061fd72df4f2c9416dabf09b5 100644 (file)
--- a/libopkg/opkg_pathfinder.c
+++ b/libopkg/opkg_pathfinder.c
@@ -17,12 +17,12 @@
 
 #include <openssl/ssl.h>
 #include <libpathfinder.h>
-
+#include <stdlib.h>
 #if defined(HAVE_SSLCURL)
 #include <curl/curl.h>
 #endif
 
-#include "includes.h"
+#include "libbb/libbb.h"
 #include "opkg_message.h"
 
 #if defined(HAVE_SSLCURL) || defined(HAVE_OPENSSL)
@@ -37,9 +37,9 @@ static int pathfinder_verify_callback(X509_STORE_CTX *ctx, void *arg)
     const char *hex = "0123456789ABCDEF";
     size_t size = i2d_X509(ctx->cert, NULL);
     unsigned char *keybuf, *iend;
-    iend = keybuf = malloc(size);
+    iend = keybuf = xmalloc(size);
     i2d_X509(ctx->cert, &iend);
-    char *certdata_str = malloc(size * 2 + 1);
+    char *certdata_str = xmalloc(size * 2 + 1);
     unsigned char *cp = keybuf;
     char *certdata_str_i = certdata_str;
     while (cp < iend)
@@ -55,7 +55,7 @@ static int pathfinder_verify_callback(X509_STORE_CTX *ctx, void *arg)
     int validated = pathfinder_dbus_verify(certdata_str, policy, 0, 0, &errmsg);
 
     if (!validated)
-        fprintf(stderr, "curlcb_pathfinder: Path verification failed: %s\n", errmsg);
+        opkg_msg(ERROR, "Path verification failed: %s.\n", errmsg);
 
     free(certdata_str);
     free(errmsg);