Merge branch 'vl/maint-openssl-signature-change' into maint

* vl/maint-openssl-signature-change:
imap-send.c: fix compiler warnings for OpenSSL 1.0

diff --git a/imap-send.c b/imap-send.c
index 3847fd151df6e9f41fdb0b95573882a7d9ac992a..f805c6ed813bbc6130bcd2d9f89bdb44ad9625e1 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -272,8 +272,12 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int ve
 #ifdef NO_OPENSSL
        fprintf(stderr, "SSL requested but SSL support not compiled in\n");
        return -1;
+#else
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+       const SSL_METHOD *meth;
 #else
        SSL_METHOD *meth;
+#endif
        SSL_CTX *ctx;
        int ret;