summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--3rd_party/libsrp6a-sha512/Makefile.am2
-rw-r--r--3rd_party/libsrp6a-sha512/t_math.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/3rd_party/libsrp6a-sha512/Makefile.am b/3rd_party/libsrp6a-sha512/Makefile.am
index 8c6e2f5..d304585 100644
--- a/3rd_party/libsrp6a-sha512/Makefile.am
+++ b/3rd_party/libsrp6a-sha512/Makefile.am
@@ -9,7 +9,7 @@ include_HEADERS = srp.h srp_aux.h cstr.h
9 9
10AM_CFLAGS = -DHAVE_CONFIG_H 10AM_CFLAGS = -DHAVE_CONFIG_H
11if HAVE_OPENSSL 11if HAVE_OPENSSL
12AM_CFLAGS += -DOPENSSL=1 -DOPENSSL_ENGINE=1 $(openssl_CFLAGS) 12AM_CFLAGS += -DOPENSSL=1 $(openssl_CFLAGS)
13else 13else
14if HAVE_GCRYPT 14if HAVE_GCRYPT
15AM_CFLAGS += -DGCRYPT=1 $(libgcrypt_CFLAGS) 15AM_CFLAGS += -DGCRYPT=1 $(libgcrypt_CFLAGS)
diff --git a/3rd_party/libsrp6a-sha512/t_math.c b/3rd_party/libsrp6a-sha512/t_math.c
index 88ae12f..e655daa 100644
--- a/3rd_party/libsrp6a-sha512/t_math.c
+++ b/3rd_party/libsrp6a-sha512/t_math.c
@@ -39,7 +39,8 @@ typedef BIGNUM * BigInteger;
39typedef BN_CTX * BigIntegerCtx; 39typedef BN_CTX * BigIntegerCtx;
40typedef BN_MONT_CTX * BigIntegerModAccel; 40typedef BN_MONT_CTX * BigIntegerModAccel;
41#include <limits.h> 41#include <limits.h>
42# ifdef OPENSSL_ENGINE 42# ifndef OPENSSL_NO_ENGINE
43# define OPENSSL_ENGINE
43# include "openssl/engine.h" 44# include "openssl/engine.h"
44static ENGINE * default_engine = NULL; 45static ENGINE * default_engine = NULL;
45# endif /* OPENSSL_ENGINE */ 46# endif /* OPENSSL_ENGINE */
@@ -951,7 +952,7 @@ BigIntegerModAccelFree(accel)
951BigIntegerResult 952BigIntegerResult
952BigIntegerInitialize() 953BigIntegerInitialize()
953{ 954{
954#if OPENSSL_VERSION_NUMBER >= 0x00907000 955#if OPENSSL_VERSION_NUMBER >= 0x00907000 && defined(OPENSSL_ENGINE)
955 ENGINE_load_builtin_engines(); 956 ENGINE_load_builtin_engines();
956#endif 957#endif
957 return BIG_INTEGER_SUCCESS; 958 return BIG_INTEGER_SUCCESS;