X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libopkg%2Fopkg_conf.c;h=589fc49479dab696bc8f4a973d91a6b0479d00bc;hb=6e28563d0023ce0261e2756e5eb120790c5fe6e9;hp=dd4f189c670a42d618987504d644ac113dfe4ef8;hpb=e2e66a62227b2805c4577b33e36ee4fc7d090e86;p=oweals%2Fopkg-lede.git

diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
index dd4f189..589fc49 100644
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
@@ -70,25 +70,6 @@ opkg_option_t options[] = {
 	{"size", OPKG_OPT_TYPE_BOOL, &_conf.size},
 	{"tmp_dir", OPKG_OPT_TYPE_STRING, &_conf.tmp_dir},
 	{"verbosity", OPKG_OPT_TYPE_INT, &_conf.verbosity},
-#if defined(HAVE_OPENSSL)
-	{"signature_ca_file", OPKG_OPT_TYPE_STRING, &_conf.signature_ca_file},
-	{"signature_ca_path", OPKG_OPT_TYPE_STRING, &_conf.signature_ca_path},
-#endif
-#if defined(HAVE_PATHFINDER)
-	{"check_x509_path", OPKG_OPT_TYPE_BOOL, &_conf.check_x509_path},
-#endif
-#if defined(HAVE_SSLCURL) && defined(HAVE_CURL)
-	{"ssl_engine", OPKG_OPT_TYPE_STRING, &_conf.ssl_engine},
-	{"ssl_cert", OPKG_OPT_TYPE_STRING, &_conf.ssl_cert},
-	{"ssl_cert_type", OPKG_OPT_TYPE_STRING, &_conf.ssl_cert_type},
-	{"ssl_key", OPKG_OPT_TYPE_STRING, &_conf.ssl_key},
-	{"ssl_key_type", OPKG_OPT_TYPE_STRING, &_conf.ssl_key_type},
-	{"ssl_key_passwd", OPKG_OPT_TYPE_STRING, &_conf.ssl_key_passwd},
-	{"ssl_ca_file", OPKG_OPT_TYPE_STRING, &_conf.ssl_ca_file},
-	{"ssl_ca_path", OPKG_OPT_TYPE_STRING, &_conf.ssl_ca_path},
-	{"ssl_dont_verify_peer", OPKG_OPT_TYPE_BOOL,
-	 &_conf.ssl_dont_verify_peer},
-#endif
 	{NULL, 0, NULL}
 };
 
@@ -491,9 +472,6 @@ int opkg_conf_load(void)
 
 	conf->restrict_to_default_dest = 0;
 	conf->default_dest = NULL;
-#if defined(HAVE_PATHFINDER)
-	conf->check_x509_path = 1;
-#endif
 
 	if (!conf->offline_root)
 		conf->offline_root = xstrdup(getenv("OFFLINE_ROOT"));