summaryrefslogtreecommitdiff
path: root/libfetch/common.h
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2017-10-05 13:47:36 +0300
committerTimo Teräs <timo.teras@iki.fi>2017-10-05 16:59:14 +0300
commit531fea4c9082d6542c776dcb6d4ca0a3949ecdd0 (patch)
tree5d7d5ccb6d78c415cc4422569d9f88f0b1cf8bd1 /libfetch/common.h
parentf6860e0e110a82fe61ce46de4fb5a05794e456ab (diff)
downloadapk-tools-531fea4c9082d6542c776dcb6d4ca0a3949ecdd0.tar.gz
apk-tools-531fea4c9082d6542c776dcb6d4ca0a3949ecdd0.tar.bz2
apk-tools-531fea4c9082d6542c776dcb6d4ca0a3949ecdd0.tar.xz
apk-tools-531fea4c9082d6542c776dcb6d4ca0a3949ecdd0.zip
libfetch: remove unwanted code conditionals
Diffstat (limited to 'libfetch/common.h')
-rw-r--r--libfetch/common.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/libfetch/common.h b/libfetch/common.h
index 9a07e35..e36027c 100644
--- a/libfetch/common.h
+++ b/libfetch/common.h
@@ -37,13 +37,11 @@
#define FTP_DEFAULT_PROXY_PORT 21
#define HTTP_DEFAULT_PROXY_PORT 3128
-#ifdef WITH_SSL
#include <openssl/crypto.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
-#endif
#if defined(__GNUC__) && __GNUC__ >= 3
#define LIBFETCH_PRINTFLIKE(fmtarg, firstvararg) \
@@ -70,19 +68,11 @@ struct fetchconn {
char *next_buf; /* pending buffer, e.g. after getln */
size_t next_len; /* size of pending buffer */
int err; /* last protocol reply code */
-#ifdef WITH_SSL
SSL *ssl; /* SSL handle */
SSL_CTX *ssl_ctx; /* SSL context */
X509 *ssl_cert; /* server certificate */
-# if OPENSSL_VERSION_NUMBER < 0x00909000L
- SSL_METHOD *ssl_meth; /* SSL method */
-# else
const SSL_METHOD *ssl_meth; /* SSL method */
-# endif
-#endif
-
char *ftp_home;
-
struct url *cache_url;
int cache_af;
int (*cache_close)(conn_t *);