642f5e8889
- Cleanup with spec-cleaner - Update of the master OpenSSH to 7.1p2 - Take refreshed and updated audit patch from redhat * Remove our old patches: + openssh-6.6p1-audit1-remove_duplicit_audit.patch + openssh-6.6p1-audit2-better_audit_of_user_actions.patch + openssh-6.6p1-audit3-key_auth_usage-fips.patch + openssh-6.6p1-audit3-key_auth_usage.patch + openssh-6.6p1-audit4-kex_results-fips.patch + openssh-6.6p1-audit4-kex_results.patch + openssh-6.6p1-audit5-session_key_destruction.patch + openssh-6.6p1-audit6-server_key_destruction.patch + openssh-6.6p1-audit7-libaudit_compat.patch + openssh-6.6p1-audit8-libaudit_dns_timeouts.patch * add openssh-6.7p1-audit.patch - Reenable the openssh-6.6p1-ldap.patch - Update the fips patch from RH build openssh-6.6p1-fips.patch - Update and refresh openssh-6.6p1-gssapi_key_exchange.patch - Remove fips-check patch as it is merged to fips patch * openssh-6.6p1-fips-checks.patch - Rebase and enable chroot patch: * openssh-6.6p1-sftp_homechroot.patch - Reenable rebased patch for linux seed: * openssh-6.6p1-seed-prng.patch - Reenable key converting patch: * openssh-6.6p1-key-converter.patch - Version update to 7.1p2: * various upstream bugfixes and cleanups OBS-URL: https://build.opensuse.org/request/show/354941 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=95
22 lines
704 B
Diff
22 lines
704 B
Diff
# disable run-time check for OpenSSL ABI by version number as that is not a
|
|
# reliable indicator of ABI changes and doesn't make much sense in a
|
|
# distribution package
|
|
|
|
Index: b/entropy.c
|
|
===================================================================
|
|
--- a/entropy.c
|
|
+++ b/entropy.c
|
|
@@ -213,10 +213,11 @@ seed_rng(void)
|
|
#ifndef OPENSSL_PRNG_ONLY
|
|
unsigned char buf[RANDOM_SEED_SIZE];
|
|
#endif
|
|
+#if 0
|
|
if (!ssh_compatible_openssl(OPENSSL_VERSION_NUMBER, SSLeay()))
|
|
fatal("OpenSSL version mismatch. Built against %lx, you "
|
|
"have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
|
|
-
|
|
+#endif
|
|
#ifndef OPENSSL_PRNG_ONLY
|
|
if (RAND_status() == 1) {
|
|
debug3("RNG is ready, skipping seeding");
|