712ccf3395
- Update of the underlying OpenSSH to 6.4p1 - Update to 6.4p1 Features since 6.2p2: * ssh-agent(1) support in sshd(8); allows encrypted hostkeys, or hostkeys on smartcards. * ssh(1)/sshd(8): allow optional time-based rekeying via a second argument to the existing RekeyLimit option. RekeyLimit is now supported in sshd_config as well as on the client. * sshd(8): standardise logging of information during user authentication. * The presented key/cert and the remote username (if available) is now logged in the authentication success/failure message on the same log line as the local username, remote host/port and protocol in use. Certificates contents and the key fingerprint of the signing CA are logged too. * ssh(1) ability to query what cryptographic algorithms are supported in the binary. * ssh(1): ProxyCommand=- for cases where stdin and stdout already point to the proxy. * ssh(1): allow IdentityFile=none * ssh(1)/sshd(8): -E option to append debugging logs to a specified file instead of stderr or syslog. * sftp(1): support resuming partial downloads with the "reget" command and on the sftp commandline or on the "get" commandline with the "-a" (append) option. * ssh(1): "IgnoreUnknown" configuration option to selectively suppress errors arising from unknown configuration directives. * sshd(8): support for submethods to be appended to required authentication methods listed via AuthenticationMethods. OBS-URL: https://build.opensuse.org/request/show/220466 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=58
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
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
|
|
|
|
diff --git a/openssh-6.4p1/entropy.c b/openssh-6.4p1/entropy.c
|
|
--- a/openssh-6.4p1/entropy.c
|
|
+++ b/openssh-6.4p1/entropy.c
|
|
@@ -212,22 +212,23 @@ seed_rng(void)
|
|
#endif
|
|
/*
|
|
* OpenSSL version numbers: MNNFFPPS: major minor fix patch status
|
|
* We match major, minor, fix and status (not patch) for <1.0.0.
|
|
* After that, we acceptable compatible fix versions (so we
|
|
* allow 1.0.1 to work with 1.0.0). Going backwards is only allowed
|
|
* within a patch series.
|
|
*/
|
|
+#if 0
|
|
u_long version_mask = SSLeay() >= 0x1000000f ? ~0xffff0L : ~0xff0L;
|
|
if (((SSLeay() ^ OPENSSL_VERSION_NUMBER) & version_mask) ||
|
|
(SSLeay() >> 12) < (OPENSSL_VERSION_NUMBER >> 12))
|
|
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");
|
|
return;
|
|
}
|
|
|
|
if (seed_from_prngd(buf, sizeof(buf)) == -1)
|
|
fatal("Could not obtain seed from PRNGd");
|