forked from pool/openssh
6cd875acfc
- spec file cleanup (don't pointelssly build whole OpenSSH)
- spec file and patch cleanup
* removing obsoleted auditing patch
(openssh-%{version}-audit.patch)
- added patches from SLE
* GSSAPI key exchange
* FIPS enablement (currently disabled)
* small bugfixes
- split the LDAP helper into a separate package: openssh-akc-ldap
OBS-URL: https://build.opensuse.org/request/show/199679
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=55
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.2p2/audit-linux.c b/openssh-6.2p2/audit-linux.c
|
|
--- a/openssh-6.2p2/audit-linux.c
|
|
+++ b/openssh-6.2p2/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.2p2/compat-libaudit.h b/openssh-6.2p2/compat-libaudit.h
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/openssh-6.2p2/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_ */
|
|
+
|