5113806e5f
add fix-for-newer-gcc.patch, openSSL-1.0.1-compatibility.patch OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:wbem/openwbem?expand=0&rev=86
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From f419f85fa237761b8a5e957199fa6226fe2e7644 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
|
|
Date: Tue, 29 May 2018 14:26:42 +0200
|
|
Subject: [PATCH 2/2] openSSL > 1.0.1 compatibility
|
|
|
|
---
|
|
src/common/OW_CryptographicRandomNumber.cpp | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/common/OW_CryptographicRandomNumber.cpp b/src/common/OW_CryptographicRandomNumber.cpp
|
|
index a85c59da8844..5ece4a158b8d 100644
|
|
--- a/src/common/OW_CryptographicRandomNumber.cpp
|
|
+++ b/src/common/OW_CryptographicRandomNumber.cpp
|
|
@@ -591,6 +591,7 @@ CryptographicRandomNumber::initRandomness()
|
|
|
|
#ifndef OW_WIN32
|
|
// OpenSSL 0.9.7 does this automatically, so only try if we've got an older version of OpenSSL.
|
|
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
|
|
if (::SSLeay() < 0x00907000L)
|
|
{
|
|
// now try adding in /dev/random
|
|
@@ -622,7 +623,7 @@ CryptographicRandomNumber::initRandomness()
|
|
return;
|
|
}
|
|
}
|
|
-
|
|
+#endif
|
|
// try loading up randomness from a previous run.
|
|
char randFile[MAXPATHLEN];
|
|
const char* rval = ::RAND_file_name(randFile, MAXPATHLEN);
|
|
--
|
|
2.17.0
|
|
|