~ubuntu-branches/ubuntu/lucid/ecryptfs-utils/lucid-security

« back to all changes in this revision

Viewing changes to src/include/decision_graph.h

  • Committer: Bazaar Package Importer
  • Author(s): Dustin Kirkland, Dustin Kirkland, Tyler Hicks, Michal Hlavinka, anrxc & Dustin Kirkland, Daniel Baumann & Dustin Kirkland, Arfrever Frehtes Taifersar Arahesis, Frédéric Guihéry
  • Date: 2009-05-02 11:44:56 UTC
  • mfrom: (1.1.20 upstream)
  • Revision ID: james.westby@ubuntu.com-20090502114456-x714at0k2jxgmwae
Tags: 75-0ubuntu1
[ Dustin Kirkland ]
* debian/rules: drop hackery that moves stuff /usr/share/ecryptfs-utils
* src/utils/mount.ecryptfs_private.c: update inline documentation
* debian/changelog, src/libecryptfs/cmd_ln_parser.c,
  src/libecryptfs/key_management.c, src/pam_ecryptfs/pam_ecryptfs.c,
  src/utils/ecryptfs_add_passphrase.c,
  src/utils/ecryptfs_insert_wrapped_passphrase_into_keyring.c,
  src/utils/ecryptfs_rewrap_passphrase.c,
  src/utils/ecryptfs_unwrap_passphrase.c,
  src/utils/ecryptfs_wrap_passphrase.c: silence some useless logging,
  LP: #313330
* include/ecryptfs.h, libecryptfs/key_management.c,
  utils/ecryptfs_insert_wrapped_passphrase_into_keyring.c,
  utils/ecryptfs_unwrap_passphrase.c: if the file to unwrap is
  unspecified, try to use the default ~/.ecryptfs/wrapped-passphrase
  before bailing out, LP: #359997
* src/utils/ecryptfs-setup-private: unix_chkpwd is not always present
  (eg, gentoo), LP: #332341

[ Tyler Hicks ]
* doc/manpage/ecryptfs.7: ecryptfs_encrypted_view option desription
  was wrong LP: #328761

[ Michal Hlavinka ]
* decision_graph.c: fix uninitialized return code
* mount.ecryptfs.c: don't pass verbosity option to kernel

[ anrxc & Dustin Kirkland ]
* doc/Makefile.am, src/desktop/Makefile.am: fix automake installation from
  /usr/share to /usr/share/ecryptfs-utils

[ Daniel Baumann & Dustin Kirkland ]
* debian/rules, debian/control: sync differences between Debian & Ubuntu's
  packaging

[ Arfrever Frehtes Taifersar Arahesis ]
* src/key_mod/ecryptfs_key_mod_gpg.c,
  src/key_mod/ecryptfs_key_mod_pkcs11_helper.c: fix implicit declations

[ Frédéric Guihéry ]
* key_mod/ecryptfs_key_mod_tspi.c, utils/ecryptfs_generate_tpm_key.c:
  the SRK password should be set to 20 bytes of NULL (wellknown
  password), in order for different tools to request key protection
  with the Storage Root Key

Show diffs side-by-side

added added

removed removed

Lines of Context:
75
75
};
76
76
 
77
77
struct param_node {
78
 
#define MOUNT_ERROR -3
79
 
#define NULL_TOK -1
80
 
#define DEFAULT_TOK -2
 
78
#define NULL_TOK 1
 
79
#define DEFAULT_TOK 2
 
80
#define MOUNT_ERROR 3
 
81
#define WRONG_VALUE 4
81
82
        int num_mnt_opt_names;
82
83
#define MAX_NUM_MNT_OPT_NAMES 8
83
84
        char *mnt_opt_names[MAX_NUM_MNT_OPT_NAMES];
102
103
#define ECRYPTFS_DISPLAY_PRETTY_VALS       0x00000400
103
104
#define ECRYPTFS_NO_AUTO_TRANSITION        0x00000800
104
105
#define ECRYPTFS_IMPLICIT_OVERRIDE_DEFAULT 0x00001000
 
106
#define ECRYPTFS_NONEMPTY_VALUE_REQUIRED   0x00002000
105
107
        uint32_t flags;
106
108
        int num_transitions;
107
109
#define MAX_NUM_TRANSITIONS 64