From ff6d181c5f1592b10ff0c87a5448e7f04387c702 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 25 Nov 2018 19:34:57 -0800 Subject: [PATCH] umurmur: Fix compilation without OpenSSL ECC support Signed-off-by: Rosen Penev --- net/umurmur/Makefile | 2 +- .../patches/010-deprecated-openssl.patch | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 net/umurmur/patches/010-deprecated-openssl.patch diff --git a/net/umurmur/Makefile b/net/umurmur/Makefile index b35d29d56..6ce30ff3a 100644 --- a/net/umurmur/Makefile +++ b/net/umurmur/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=umurmur PKG_VERSION:=0.2.17 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/umurmur/umurmur/tar.gz/$(PKG_VERSION)? diff --git a/net/umurmur/patches/010-deprecated-openssl.patch b/net/umurmur/patches/010-deprecated-openssl.patch new file mode 100644 index 000000000..88db5b7c9 --- /dev/null +++ b/net/umurmur/patches/010-deprecated-openssl.patch @@ -0,0 +1,24 @@ +--- a/src/ssli_openssl.c ++++ b/src/ssli_openssl.c +@@ -46,6 +46,9 @@ + #include + #include + #include ++#ifndef OPENSSL_NO_EC ++#include ++#endif + static X509 *x509; + static RSA *rsa; + static SSL_CTX *context; +@@ -253,9 +256,11 @@ void SSLi_init(void) + SSL_CTX_set_options(context, SSL_OP_CIPHER_SERVER_PREFERENCE); + SSL_CTX_set_cipher_list(context, ciphers); + ++#ifndef OPENSSL_NO_EC + EC_KEY *ecdhkey = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); + SSL_CTX_set_tmp_ecdh(context, ecdhkey); + EC_KEY_free(ecdhkey); ++#endif + + char const * sslCAPath = getStrConf(CAPATH); + if(sslCAPath != NULL)