Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12

3 files changed, 15 insertions, 50 deletions

diff --git a/include/keys/big_key-type.h b/include/keys/big_key-type.h
deleted file mode 100644
index d69bc8a..0000000
--- a/include/keys/big_key-type.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Big capacity key type.
- *
- * Copyright (C) 2013 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#ifndef _KEYS_BIG_KEY_TYPE_H
-#define _KEYS_BIG_KEY_TYPE_H
-
-#include <linux/key-type.h>
-
-extern struct key_type key_type_big_key;
-
-extern int big_key_instantiate(struct key *key, struct key_preparsed_payload *prep);
-extern void big_key_revoke(struct key *key);
-extern void big_key_destroy(struct key *key);
-extern void big_key_describe(const struct key *big_key, struct seq_file *m);
-extern long big_key_read(const struct key *key, char __user *buffer, size_t buflen);
-
-#endif /* _KEYS_BIG_KEY_TYPE_H */
diff --git a/include/keys/keyring-type.h b/include/keys/keyring-type.h
index fca5c62..cf49159 100644
--- a/include/keys/keyring-type.h
+++ b/include/keys/keyring-type.h
@@ -1,6 +1,6 @@
 /* Keyring key type
  *
- * Copyright (C) 2008, 2013 Red Hat, Inc. All Rights Reserved.
+ * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
  * Written by David Howells (dhowells@redhat.com)
  *
  * This program is free software; you can redistribute it and/or
@@ -13,6 +13,19 @@
 #define _KEYS_KEYRING_TYPE_H
 
 #include <linux/key.h>
-#include <linux/assoc_array.h>
+#include <linux/rcupdate.h>
+
+/*
+ * the keyring payload contains a list of the keys to which the keyring is
+ * subscribed
+ */
+struct keyring_list {
+	struct rcu_head	rcu;		/* RCU deletion hook */
+	unsigned short	maxkeys;	/* max keys this list can hold */
+	unsigned short	nkeys;		/* number of keys currently held */
+	unsigned short	delkey;		/* key to be unlinked by RCU */
+	struct key __rcu *keys[0];
+};
+
 
 #endif /* _KEYS_KEYRING_TYPE_H */
diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h
deleted file mode 100644
index 8dabc39..0000000
--- a/include/keys/system_keyring.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* System keyring containing trusted public keys.
- *
- * Copyright (C) 2013 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-
-#ifndef _KEYS_SYSTEM_KEYRING_H
-#define _KEYS_SYSTEM_KEYRING_H
-
-#ifdef CONFIG_SYSTEM_TRUSTED_KEYRING
-
-#include <linux/key.h>
-
-extern struct key *system_trusted_keyring;
-
-#endif
-
-#endif /* _KEYS_SYSTEM_KEYRING_H */