diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-09-20 11:16:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-20 11:16:31 -0700 |
| commit | 4c22e57bab8861fc9fb713f6f2a9a35edf003c57 (patch) | |
| tree | 428e97bec490641e0b2059b5c892d2a2b6755253 /imap-send.c | |
| parent | 16c0906e8cd9b32b95dfe68058bcdaad3e4458e4 (diff) | |
| parent | 997950a750837843db5eb9c88e41ddb62a8639ba (diff) | |
| download | git-4c22e57bab8861fc9fb713f6f2a9a35edf003c57.tar.gz | |
Merge branch 'jk/no-openssl-with-openssl-sha1'
The "imap-send" now allows to be compiled with NO_OPENSSL and
OPENSSL_SHA1 defined together.
* jk/no-openssl-with-openssl-sha1:
imap-send: handle NO_OPENSSL even when openssl exists
Diffstat (limited to 'imap-send.c')
| -rw-r--r-- | imap-send.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/imap-send.c b/imap-send.c index 2dd42807cd..ec68a06687 100644 --- a/imap-send.c +++ b/imap-send.c @@ -31,9 +31,6 @@ #include "parse-options.h" #include "setup.h" #include "strbuf.h" -#if defined(NO_OPENSSL) && !defined(HAVE_OPENSSL_CSPRNG) -typedef void *SSL; -#endif #ifdef USE_CURL_FOR_IMAP_SEND #include "http.h" #endif @@ -85,7 +82,11 @@ struct imap_server_conf { struct imap_socket { int fd[2]; +#if defined(NO_OPENSSL) && !defined(HAVE_OPENSSL_CSPRNG) + void *ssl; +#else SSL *ssl; +#endif }; struct imap_buffer { |