forked from pool/openssh
08f9072513
- Update of the underlying OpenSSH to 6.5p1
- Update to 6.5p1
Features since 6.4p1:
* ssh(1), sshd(8): support for key exchange using ECDH in
Daniel Bernstein's Curve25519; default when both the client
and server support it.
* ssh(1), sshd(8): support for Ed25519 as a public key type fo
rboth server and client. Ed25519 is an EC signature offering
better security than ECDSA and DSA and good performance.
* Add a new private key format that uses a bcrypt KDF to better
protect keys at rest. Used unconditionally for Ed25519 keys,
on demand for other key types via the -o ssh-keygen(1)
option. Intended to become default in the near future.
Details documented in PROTOCOL.key.
* ssh(1), sshd(8): new transport cipher
"chacha20-poly1305@openssh.com" combining Daniel Bernstein's
ChaCha20 stream cipher and Poly1305 MAC to build an
authenticated encryption mode. Details documented
PROTOCOL.chacha20poly1305.
* ssh(1), sshd(8): refuse RSA keys from old proprietary clients
and servers that use the obsolete RSA+MD5 signature scheme.
It will still be possible to connect with these
clients/servers but only DSA keys will be accepted, and
OpenSSH will refuse connection entirely in a future release.
* ssh(1), sshd(8): refuse old proprietary clients and servers
that use a weaker key exchange hash calculation.
* ssh(1): increase the size of the Diffie-Hellman groups
requested for each symmetric key size. New values from NIST
Special Publication 800-57 with the upper limit specified by
OBS-URL: https://build.opensuse.org/request/show/222365
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=63
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
# bnc#752354, bnc#757360
|
|
# prevent timeouts in libaudit code caused by DNS misconfiguration by
|
|
# explicitely disabling DNS lookups in libaudit when UseDNS is false.
|
|
# Note that this particular solution causes the logs to always contain
|
|
# "hostname=?, addr=?" when DNS lookups are disabled.
|
|
|
|
diff --git a/openssh-6.5p1/audit-linux.c b/openssh-6.5p1/audit-linux.c
|
|
--- a/openssh-6.5p1/audit-linux.c
|
|
+++ b/openssh-6.5p1/audit-linux.c
|
|
@@ -62,17 +62,17 @@ linux_audit_user_logxxx(int uid, const c
|
|
if (errno == EINVAL || errno == EPROTONOSUPPORT ||
|
|
errno == EAFNOSUPPORT)
|
|
return; /* No audit support in kernel */
|
|
else
|
|
goto fatal_report; /* Must prevent login */
|
|
}
|
|
rc = audit_log_acct_message(audit_fd, event,
|
|
NULL, "login", username ? username : "(unknown)",
|
|
- username == NULL ? uid : -1, hostname, ip, ttyn, success);
|
|
+ username == NULL ? uid : -1, options.use_dns ? hostname : NULL, ip, ttyn, success);
|
|
saved_errno = errno;
|
|
close(audit_fd);
|
|
/*
|
|
* Do not report error if the error is EPERM and sshd is run as non
|
|
* root user.
|
|
*/
|
|
if ((rc == -EPERM) && (geteuid() != 0))
|
|
rc = 0;
|
|
@@ -114,17 +114,17 @@ linux_audit_user_auth(int uid, const cha
|
|
goto fatal_report; /* Must prevent login */
|
|
}
|
|
|
|
if ((event < 0) || (event > SSH_AUDIT_UNKNOWN))
|
|
event = SSH_AUDIT_UNKNOWN;
|
|
|
|
rc = audit_log_acct_message(audit_fd, AUDIT_USER_AUTH,
|
|
NULL, event_name[event], username ? username : "(unknown)",
|
|
- username == NULL ? uid : -1, hostname, ip, ttyn, success);
|
|
+ username == NULL ? uid : -1, options.use_dns ? hostname : NULL, ip, ttyn, success);
|
|
saved_errno = errno;
|
|
close(audit_fd);
|
|
/*
|
|
* Do not report error if the error is EPERM and sshd is run as non
|
|
* root user.
|
|
*/
|
|
if ((rc == -EPERM) && (geteuid() != 0))
|
|
rc = 0;
|