uclient: add helper function for getting ustream-ssl context/ops

[project/uclient.git] / uclient-fetch.c

diff --git a/uclient-fetch.c b/uclient-fetch.c
index 1e51ff3e8e46cecdc98f3341e24ba09065baf193..359715c2db9bf87d0e286ced841bdf71b807acd8 100644 (file)
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -21,7 +21,6 @@
 #include <sys/socket.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <dlfcn.h>
 #include <getopt.h>
 #include <fcntl.h>
 #include <glob.h>
@@ -35,12 +34,6 @@
 #include "uclient.h"
 #include "uclient-utils.h"
 
-#ifdef __APPLE__
-#define LIB_EXT "dylib"
-#else
-#define LIB_EXT "so"
-#endif
-
 #ifndef strdupa
 #define strdupa(x) strcpy(alloca(strlen(x)+1),x)
 #endif
@@ -513,21 +506,6 @@ static void init_ca_cert(void)
        globfree(&gl);
 }
 
-static void init_ustream_ssl(void)
-{
-       void *dlh;
-
-       dlh = dlopen("libustream-ssl." LIB_EXT, RTLD_LAZY | RTLD_LOCAL);
-       if (!dlh)
-               return;
-
-       ssl_ops = dlsym(dlh, "ustream_ssl_ops");
-       if (!ssl_ops)
-               return;
-
-       ssl_ctx = ssl_ops->context_new(false);
-}
-
 static int no_ssl(const char *progname)
 {
        fprintf(stderr,
@@ -590,7 +568,7 @@ int main(int argc, char **argv)
        int af = -1;
 
        signal(SIGPIPE, SIG_IGN);
-       init_ustream_ssl();
+       ssl_ctx = uclient_new_ssl_context(&ssl_ops);
 
        while ((ch = getopt_long(argc, argv, "46cO:P:qsT:U:Y:", longopts, &longopt_idx)) != -1) {
                switch(ch) {