Remove functions which are deprecated in openssl-1.1.0.

These functions (among others) are deprecated in openssl-1.1.0:
SSL_load_error_strings, ERR_free_strings, RAND_cleanup.  They are not available
in openssl-1.1.0.g unless OPENSSL_API_COMPAT is set to a value lower than
0x10100000L.

2 files changed, 28 insertions, 4 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d48999d6460d..3a71373a54f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,19 @@
 
 pkgname=libu2f-server
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Yubico Universal 2nd Factor (U2F) Server C Library"
 arch=('i686' 'x86_64')
 url='https://developers.yubico.com/libu2f-server/'
 license=('BSD')
 depends=('openssl' 'json-c')
 makedepends=('check' 'gengetopt' 'help2man')
-source=("https://developers.yubico.com/libu2f-server/Releases/${pkgname}-${pkgver}.tar.xz")
-
+source=("https://developers.yubico.com/libu2f-server/Releases/${pkgname}-${pkgver}.tar.xz"
+	'openssl-remove-deprecated.patch')
+prepare() {
+	cd ${pkgname}-${pkgver}/
+	patch -Np1 -i "${srcdir}/openssl-remove-deprecated.patch"
+}
 build() {
 	cd ${pkgname}-${pkgver}/
 
@@ -32,4 +36,5 @@ package() {
 	install -D -m0644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
 
-sha512sums=('ebdb7c8c20727f37f4e31d8f16df7966603374f78478ada723a7b9bec1b0b0622caf6d12a65067ac8651f6088aaad61b2ad6ed51b9d6ef0dc45f031c974d8ff9')
+sha512sums=('ebdb7c8c20727f37f4e31d8f16df7966603374f78478ada723a7b9bec1b0b0622caf6d12a65067ac8651f6088aaad61b2ad6ed51b9d6ef0dc45f031c974d8ff9'
+            '45f66f7a9ecb01d488d59caf3293292e0fbefe6d230c1be686b2e35552eb8a4be82b94dd4aa149d49efb74be66951d2e9b1af235f09ed41cc01ea3a7edba9d68')
diff --git a/openssl-remove-deprecated.patch b/openssl-remove-deprecated.patch
new file mode 100644
index 000000000000..999f5eec8246
--- /dev/null
+++ b/openssl-remove-deprecated.patch
@@ -0,0 +1,19 @@
+diff --git a/u2f-server/openssl.c b/u2f-server/openssl.c
+index 6ff97f8..f0d1bd8 100644
+--- a/u2f-server/openssl.c
++++ b/u2f-server/openssl.c
+@@ -51,13 +51,11 @@ void dumpCert(const u2fs_X509_t * certificate)
+ 
+ void crypto_init(void)
+ {
+-  SSL_load_error_strings();
++
+ }
+ 
+ void crypto_release(void)
+ {
+-  RAND_cleanup();
+-  ERR_free_strings();
+ }
+ 
+ u2fs_rc set_random_bytes(char *data, size_t len)