DORMANTno replies

[PATCH v4] imap-send.c: fix compiler warnings for OpenSSL 1.0

From: Vietor Liu <hidden>
Date: 2016-06-15 22:47:39
Subsystem: the rest · Maintainer: Linus Torvalds

Fedora 12 has upgraded OpenSSL to 1.0.0-beta3 version.
When compiling git on Fedora 12, the following warning is displayed:

imap-send.c: In function ‘ssl_socket_connect’:
imap-send.c:284: warning: assignment discards qualifiers from pointer target type
imap-send.c:286: warning: assignment discards qualifiers from pointer target type

==============================================
The relevant change in OpenSSL 1.0:

*) 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'.

Signed-off-by: Vietor Liu <redacted>
---
 imap-send.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/imap-send.c b/imap-send.c
index 3847fd1..f805c6e 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -273,7 +273,11 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int ve
 	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;
 
-- 
1.6.5.2
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help