mirror of
https://github.com/git/git.git
synced 2024-10-28 04:49:43 +01:00
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
This commit is contained in:
commit
4c22e57bab
1 changed files with 4 additions and 3 deletions
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue