Browse Source

Merge pull request #7658 from neheb/chaos

chaosvpn: Fix compilation without deprecated OpenSSL APIs
lilik-openwrt-22.03
Hannu Nyman 6 years ago
committed by GitHub
parent
commit
ca6fe95dbb
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 1 deletions
  1. +1
    -1
      net/chaosvpn/Makefile
  2. +47
    -0
      net/chaosvpn/patches/010-openssl-deprecated.patch

+ 1
- 1
net/chaosvpn/Makefile View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=chaosvpn
PKG_VERSION:=2.19
PKG_RELEASE=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/ryd/chaosvpn/tar.gz/v$(PKG_VERSION)?


+ 47
- 0
net/chaosvpn/patches/010-openssl-deprecated.patch View File

@ -0,0 +1,47 @@
--- a/crypto.c
+++ b/crypto.c
@@ -14,6 +14,12 @@
#include <openssl/pem.h>
#include <openssl/ssl.h>
+#ifndef OPENSSL_VERSION
+#define OPENSSL_VERSION SSLEAY_VERSION
+#define OpenSSL_version(x) SSLeay_version(x)
+#define OpenSSL_version_num SSLeay
+#endif
+
/*
This checks data in a struct string against a signature in a second
@@ -250,14 +256,18 @@ bail_out:
void
crypto_init(void)
{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
/* Just load the crypto library error strings, not SSL */
ERR_load_crypto_strings();
+#endif
}
void
crypto_finish(void)
{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
ERR_free_strings();
+#endif
}
void
@@ -268,10 +278,10 @@ crypto_warn_openssl_version_changed(void)
* OpenSSL library used.
* Output a warning if not.
*/
- if (SSLeay() != OPENSSL_VERSION_NUMBER) {
+ if (OpenSSL_version_num() != OPENSSL_VERSION_NUMBER) {
log_info("Note: compiled using OpenSSL version '%s' headers, but linked to "
"OpenSSL version '%s' library",
OPENSSL_VERSION_TEXT,
- SSLeay_version(SSLEAY_VERSION));
+ OpenSSL_version(OPENSSL_VERSION));
}
}

Loading…
Cancel
Save