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
108 lines
3.0 KiB
Diff
108 lines
3.0 KiB
Diff
# definitions for AUDIT_CRYPTO_* symbols fom libaudit 2.x
|
|
|
|
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
|
|
@@ -25,16 +25,17 @@
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* Red Hat author: Jan F. Chadima <jchadima@redhat.com>
|
|
*/
|
|
|
|
#include "includes.h"
|
|
#if defined(USE_LINUX_AUDIT)
|
|
#include <libaudit.h>
|
|
+#include "compat-libaudit.h"
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
|
|
#include "log.h"
|
|
#include "audit.h"
|
|
#include "key.h"
|
|
#include "hostfile.h"
|
|
#include "auth.h"
|
|
diff --git a/openssh-6.5p1/compat-libaudit.h b/openssh-6.5p1/compat-libaudit.h
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/openssh-6.5p1/compat-libaudit.h
|
|
@@ -0,0 +1,79 @@
|
|
+/* AUDIT_CRYPTO symbol definitions from libaudit 2.x */
|
|
+/* libaudit.h --
|
|
+ * Copyright 2004-2011 Red Hat Inc., Durham, North Carolina.
|
|
+ * All Rights Reserved.
|
|
+ *
|
|
+ * This library is free software; you can redistribute it and/or
|
|
+ * modify it under the terms of the GNU Lesser General Public
|
|
+ * License as published by the Free Software Foundation; either
|
|
+ * version 2.1 of the License, or (at your option) any later version.
|
|
+ *
|
|
+ * This library is distributed in the hope that it will be useful,
|
|
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
+ * Lesser General Public License for more details.
|
|
+ *
|
|
+ * You should have received a copy of the GNU Lesser General Public
|
|
+ * License along with this library; if not, write to the Free Software
|
|
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
+ *
|
|
+ * Authors:
|
|
+ * Steve Grubb <sgrubb@redhat.com>
|
|
+ * Rickard E. (Rik) Faith <faith@redhat.com>
|
|
+ */
|
|
+#ifndef _COMPAT_LIBAUDIT_H_
|
|
+#define _COMPAT_LIBAUDIT_H_
|
|
+
|
|
+#ifdef __cplusplus
|
|
+extern "C" {
|
|
+#endif
|
|
+
|
|
+#ifndef AUDIT_FIRST_CRYPTO_MSG
|
|
+#define AUDIT_FIRST_CRYPTO_MSG 2400
|
|
+#endif
|
|
+
|
|
+#ifndef AUDIT_CRYPTO_TEST_USER
|
|
+#define AUDIT_CRYPTO_TEST_USER 2400 /* Crypto test results */
|
|
+#endif
|
|
+
|
|
+#ifndef AUDIT_CRYPTO_PARAM_CHANGE_USER
|
|
+#define AUDIT_CRYPTO_PARAM_CHANGE_USER 2401 /* Crypto attribute change */
|
|
+#endif
|
|
+
|
|
+#ifndef AUDIT_CRYPTO_LOGIN
|
|
+#define AUDIT_CRYPTO_LOGIN 2402 /* Logged in as crypto officer */
|
|
+#endif
|
|
+
|
|
+#ifndef AUDIT_CRYPTO_LOGOUT
|
|
+#define AUDIT_CRYPTO_LOGOUT 2403 /* Logged out from crypto */
|
|
+#endif
|
|
+
|
|
+#ifndef AUDIT_CRYPTO_KEY_USER
|
|
+#define AUDIT_CRYPTO_KEY_USER 2404 /* Create,delete,negotiate */
|
|
+#endif
|
|
+
|
|
+#ifndef AUDIT_CRYPTO_FAILURE_USER
|
|
+#define AUDIT_CRYPTO_FAILURE_USER 2405 /* Fail decrypt,encrypt,randomiz */
|
|
+#endif
|
|
+
|
|
+#ifndef AUDIT_CRYPTO_REPLAY_USER
|
|
+#define AUDIT_CRYPTO_REPLAY_USER 2406 /* Crypto replay detected */
|
|
+#endif
|
|
+
|
|
+#ifndef AUDIT_CRYPTO_SESSION
|
|
+#define AUDIT_CRYPTO_SESSION 2407 /* Record parameters set during
|
|
+ TLS session establishment */
|
|
+#endif
|
|
+
|
|
+
|
|
+#ifndef AUDIT_LAST_CRYPTO_MSG
|
|
+#define AUDIT_LAST_CRYPTO_MSG 2499
|
|
+#endif
|
|
+
|
|
+
|
|
+#ifdef __cplusplus
|
|
+}
|
|
+#endif
|
|
+
|
|
+#endif /* _COMPAT_LIBAUDIT_H_ */
|
|
+
|