undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bc/csprng-mktemps'

Browse Source 
Build fix.

* bc/csprng-mktemps:
  git-compat-util: really support openssl as a source of entropy
This commit is contained in:
Junio C Hamano 2022-04-06 15:21:58 -07:00
commit 95acb13a55
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -1972,6 +1972,7 @@ endif
ifneq ($(findstring openssl,$(CSPRNG_METHOD)),) ifneq ($(findstring openssl,$(CSPRNG_METHOD)),)
BASIC_CFLAGS += -DHAVE_OPENSSL_CSPRNG BASIC_CFLAGS += -DHAVE_OPENSSL_CSPRNG
EXTLIBS += -lcrypto -lssl
endif endif
ifneq ($(PROCFS_EXECUTABLE_PATH),) ifneq ($(PROCFS_EXECUTABLE_PATH),)

4
git-compat-util.h
View File

@ -525,6 +525,10 @@ void warning_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
#include <openssl/x509v3.h> #include <openssl/x509v3.h>
#endif /* NO_OPENSSL */ #endif /* NO_OPENSSL */
#ifdef HAVE_OPENSSL_CSPRNG
#include <openssl/rand.h>
#endif
/* /*
* Let callers be aware of the constant return value; this can help * Let callers be aware of the constant return value; this can help
* gcc with -Wuninitialized analysis. We restrict this trick to gcc, though, * gcc with -Wuninitialized analysis. We restrict this trick to gcc, though,

2
imap-send.c
View File

@ -27,7 +27,7 @@
#include "exec-cmd.h" #include "exec-cmd.h"
#include "run-command.h" #include "run-command.h"
#include "parse-options.h" #include "parse-options.h"
#ifdef NO_OPENSSL #if defined(NO_OPENSSL) && !defined(HAVE_OPENSSL_CSPRNG)
typedef void *SSL; typedef void *SSL;
#endif #endif
#ifdef USE_CURL_FOR_IMAP_SEND #ifdef USE_CURL_FOR_IMAP_SEND