diff options
| author | Rosen Penev | 2020-08-05 21:25:36 +0000 |
|---|---|---|
| committer | Rosen Penev | 2020-08-05 21:31:20 +0000 |
| commit | 9e5c3877edabe052056980c9519b1b1d8ac04ae1 (patch) | |
| tree | fe18ef841f2d1aa8e87f23547c3b77b0974ae454 | |
| parent | c23f9197318feef558f2587a09ce4d683b40f6b1 (diff) | |
| download | telephony-9e5c3877edabe052056980c9519b1b1d8ac04ae1.tar.gz | |
re: fix compilation without deprecated OpenSSL APIs
Signed-off-by: Rosen Penev <rosenp@gmail.com>
| -rw-r--r-- | libs/re/Makefile | 2 | ||||
| -rw-r--r-- | libs/re/patches/010-openssl-deprecated.patch | 54 |
2 files changed, 55 insertions, 1 deletions
diff --git a/libs/re/Makefile b/libs/re/Makefile index 385d3eb..ff5c7c1 100644 --- a/libs/re/Makefile +++ b/libs/re/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=re PKG_VERSION:=0.6.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.creytiv.com/pub diff --git a/libs/re/patches/010-openssl-deprecated.patch b/libs/re/patches/010-openssl-deprecated.patch new file mode 100644 index 0000000..bff18b9 --- /dev/null +++ b/libs/re/patches/010-openssl-deprecated.patch @@ -0,0 +1,54 @@ +--- a/src/main/openssl.c ++++ b/src/main/openssl.c +@@ -103,6 +103,7 @@ static void dynlock_destroy_handler(struct CRYPTO_dynlock_value *l, + #endif + + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + #ifdef SIGPIPE + static void sigpipe_handler(int x) + { +@@ -110,10 +111,11 @@ static void sigpipe_handler(int x) + (void)signal(SIGPIPE, sigpipe_handler); + } + #endif +- ++#endif + + int openssl_init(void) + { ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + #if defined (HAVE_PTHREAD) && (OPENSSL_VERSION_NUMBER < 0x10100000L) + int err, i; + +@@ -151,6 +153,7 @@ int openssl_init(void) + + SSL_library_init(); + SSL_load_error_strings(); ++#endif + + return 0; + } +@@ -158,7 +161,9 @@ int openssl_init(void) + + void openssl_close(void) + { ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + ERR_free_strings(); ++#endif + #if defined (HAVE_PTHREAD) && (OPENSSL_VERSION_NUMBER < 0x10100000L) + lockv = mem_deref(lockv); + #endif +--- a/src/tls/openssl/tls.c ++++ b/src/tls/openssl/tls.c +@@ -291,8 +291,8 @@ int tls_set_selfsigned(struct tls *tls, const char *cn) + !X509_set_subject_name(cert, subj)) + goto out; + +- if (!X509_gmtime_adj(X509_get_notBefore(cert), -3600*24*365) || +- !X509_gmtime_adj(X509_get_notAfter(cert), 3600*24*365*10)) ++ if (!X509_gmtime_adj(X509_getm_notBefore(cert), -3600*24*365) || ++ !X509_gmtime_adj(X509_getm_notAfter(cert), 3600*24*365*10)) + goto out; + + if (!X509_set_pubkey(cert, key)) |