|
 |
9471b77 |
diff -up ecryptfs-utils-108/src/libecryptfs/key_management.c.splitnss ecryptfs-utils-108/src/libecryptfs/key_management.c
|
|
|
9471b77 |
--- ecryptfs-utils-108/src/libecryptfs/key_management.c.splitnss 2015-03-26 14:28:59.000000000 +0100
|
|
|
9471b77 |
+++ ecryptfs-utils-108/src/libecryptfs/key_management.c 2015-08-11 14:43:53.489838127 +0200
|
|
|
9471b77 |
@@ -138,28 +138,8 @@ out:
|
|
|
14f1a4b |
}
|
|
|
14f1a4b |
|
|
|
14f1a4b |
|
|
|
14f1a4b |
-int ecryptfs_remove_auth_tok_from_keyring(char *auth_tok_sig)
|
|
|
14f1a4b |
-{
|
|
|
14f1a4b |
- int rc;
|
|
|
14f1a4b |
+#include "key_management.inc.c"
|
|
|
14f1a4b |
|
|
|
14f1a4b |
- rc = (int)keyctl_search(KEY_SPEC_USER_KEYRING, "user", auth_tok_sig, 0);
|
|
|
14f1a4b |
- if (rc < 0) {
|
|
|
14f1a4b |
- rc = errno;
|
|
|
14f1a4b |
- syslog(LOG_ERR, "Failed to find key with sig [%s]: %m\n",
|
|
|
14f1a4b |
- auth_tok_sig);
|
|
|
14f1a4b |
- goto out;
|
|
|
14f1a4b |
- }
|
|
|
14f1a4b |
- rc = keyctl_unlink(rc, KEY_SPEC_USER_KEYRING);
|
|
|
14f1a4b |
- if (rc < 0) {
|
|
|
14f1a4b |
- rc = errno;
|
|
|
14f1a4b |
- syslog(LOG_ERR, "Failed to unlink key with sig [%s]: %s\n",
|
|
|
14f1a4b |
- auth_tok_sig, strerror(rc));
|
|
|
14f1a4b |
- goto out;
|
|
|
14f1a4b |
- }
|
|
|
14f1a4b |
- rc = 0;
|
|
|
14f1a4b |
-out:
|
|
|
14f1a4b |
- return rc;
|
|
|
14f1a4b |
-}
|
|
|
14f1a4b |
int ecryptfs_add_auth_tok_to_keyring(struct ecryptfs_auth_tok *auth_tok,
|
|
|
14f1a4b |
char *auth_tok_sig)
|
|
|
14f1a4b |
{
|
|
|
9471b77 |
diff -up ecryptfs-utils-108/src/libecryptfs/key_management.inc.c.splitnss ecryptfs-utils-108/src/libecryptfs/key_management.inc.c
|
|
|
9471b77 |
--- ecryptfs-utils-108/src/libecryptfs/key_management.inc.c.splitnss 2015-08-11 14:43:53.489838127 +0200
|
|
|
9471b77 |
+++ ecryptfs-utils-108/src/libecryptfs/key_management.inc.c 2015-08-11 14:43:53.489838127 +0200
|
|
|
14f1a4b |
@@ -0,0 +1,22 @@
|
|
|
14f1a4b |
+int ecryptfs_remove_auth_tok_from_keyring(char *auth_tok_sig)
|
|
|
14f1a4b |
+{
|
|
|
14f1a4b |
+ int rc;
|
|
|
14f1a4b |
+
|
|
|
14f1a4b |
+ rc = (int)keyctl_search(KEY_SPEC_USER_KEYRING, "user", auth_tok_sig, 0);
|
|
|
14f1a4b |
+ if (rc < 0) {
|
|
|
14f1a4b |
+ rc = errno;
|
|
|
14f1a4b |
+ syslog(LOG_ERR, "Failed to find key with sig [%s]: %m\n",
|
|
|
14f1a4b |
+ auth_tok_sig);
|
|
|
14f1a4b |
+ goto out;
|
|
|
14f1a4b |
+ }
|
|
|
14f1a4b |
+ rc = keyctl_unlink(rc, KEY_SPEC_USER_KEYRING);
|
|
|
14f1a4b |
+ if (rc < 0) {
|
|
|
14f1a4b |
+ rc = errno;
|
|
|
14f1a4b |
+ syslog(LOG_ERR, "Failed to unlink key with sig [%s]: %s\n",
|
|
|
14f1a4b |
+ auth_tok_sig, strerror(rc));
|
|
|
14f1a4b |
+ goto out;
|
|
|
14f1a4b |
+ }
|
|
|
14f1a4b |
+ rc = 0;
|
|
|
14f1a4b |
+out:
|
|
|
14f1a4b |
+ return rc;
|
|
|
14f1a4b |
+}
|
|
|
9471b77 |
diff -up ecryptfs-utils-108/src/utils/Makefile.am.splitnss ecryptfs-utils-108/src/utils/Makefile.am
|
|
|
9471b77 |
--- ecryptfs-utils-108/src/utils/Makefile.am.splitnss 2015-02-10 17:59:34.000000000 +0100
|
|
|
9471b77 |
+++ ecryptfs-utils-108/src/utils/Makefile.am 2015-08-11 14:43:53.489838127 +0200
|
|
|
cac1ea8 |
@@ -39,7 +39,7 @@ mount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(K
|
|
|
14f1a4b |
mount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS)
|
|
|
14f1a4b |
umount_ecryptfs_SOURCES = umount.ecryptfs.c
|
|
|
14f1a4b |
umount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS)
|
|
|
14f1a4b |
-umount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
|
|
|
14f1a4b |
+umount_ecryptfs_LDADD = -lkeyutils
|
|
|
14f1a4b |
ecryptfs_manager_SOURCES = manager.c io.c io.h gen_key.c
|
|
|
14f1a4b |
ecryptfs_manager_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) $(LIBGCRYPT_CFLAGS)
|
|
|
14f1a4b |
ecryptfs_manager_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS)
|
|
|
9471b77 |
diff -up ecryptfs-utils-108/src/utils/umount.ecryptfs.c.splitnss ecryptfs-utils-108/src/utils/umount.ecryptfs.c
|
|
|
9471b77 |
--- ecryptfs-utils-108/src/utils/umount.ecryptfs.c.splitnss 2015-02-10 17:59:34.000000000 +0100
|
|
|
9471b77 |
+++ ecryptfs-utils-108/src/utils/umount.ecryptfs.c 2015-08-11 14:43:53.489838127 +0200
|
|
|
14f1a4b |
@@ -24,7 +24,10 @@
|
|
|
14f1a4b |
#include <stdlib.h>
|
|
|
14f1a4b |
#include <string.h>
|
|
|
14f1a4b |
#include <unistd.h>
|
|
|
14f1a4b |
-#include "ecryptfs.h"
|
|
|
14f1a4b |
+#include <keyutils.h>
|
|
|
14f1a4b |
+#include <syslog.h>
|
|
|
14f1a4b |
+
|
|
|
14f1a4b |
+#include "../libecryptfs/key_management.inc.c"
|
|
|
14f1a4b |
|
|
|
14f1a4b |
static void usage()
|
|
|
14f1a4b |
{
|