Skip to content

Commit 1e380dd

Browse files
Vietor Liugitster
authored andcommitted
imap-send.c: fix compiler warnings for OpenSSL 1.0
The openssl/CHANGES file says: Let the TLSv1_method() etc. functions return a 'const' SSL_METHOD pointer and make the SSL_METHOD parameter in SSL_CTX_new, SSL_CTX_set_ssl_version and SSL_set_ssl_method 'const'. In older versions, unqualified pointers were used, so we unfortunately cannot unconditionally update the type of the variable we use. Signed-off-by: Vietor Liu <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d52dc4b commit 1e380dd

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

imap-send.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,12 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int ve
272272
#ifdef NO_OPENSSL
273273
fprintf(stderr, "SSL requested but SSL support not compiled in\n");
274274
return -1;
275+
#else
276+
#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
277+
const SSL_METHOD *meth;
275278
#else
276279
SSL_METHOD *meth;
280+
#endif
277281
SSL_CTX *ctx;
278282
int ret;
279283

0 commit comments

Comments
 (0)