← Back to branch summary

~ubuntu-branches/debian/sid/ecryptfs-utils/sid

« back to all changes in this revision

Viewing changes to tests/lib/etl_add_passphrase_key_to_keyring.c

  • Committer: Package Import Robot
  • Author(s): Laszlo Boszormenyi (GCS), Dustin Kirkland and Martin Pitt, Fernando Seiti Furusato
  • Date: 2015-06-15 15:50:05 UTC
  • mfrom: (1.5.12)
  • Revision ID: package-import@ubuntu.com-20150615155005-vxvg3ezl7ibfdoes
Tags: 106-1
http://bugs.debian.org/764927
https://launchpad.net/bugs/953875
http://bugs.debian.org/751989
* New upstream release.
* Transition from libecryptfs0 to libecryptfs1 .
* Remove unused libgcrypt11-dev build dependency (closes: #764927).
* Remove bashism from the postinst of ecryptfs-utils .
* Add watch file.
* Put myself as the primary maintainer.
* Update Standards-Version to 3.9.6 .

[ Dustin Kirkland and Martin Pitt ]
* debian/ecryptfs-utils.postinst: LP: #953875
  - detect and clean up after nonexisting cryptswap devices

[ Fernando Seiti Furusato <ferseiti@br.ibm.com> ]
* Use autoreconf instead of autotools-dev (closes: #751989).

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/lib/etl_add_passphrase_key_to_keyring.c
36
36
                return EINVAL;
37
37
        }
38
38
 
 
39
        rc = ecryptfs_validate_keyring();
 
40
        if (rc)
 
41
                return errno;
 
42
 
39
43
        from_hex(salt, argv[2], ECRYPTFS_SALT_SIZE);
40
44
        rc = ecryptfs_add_passphrase_key_to_keyring(auth_tok_sig_hex, argv[1],
41
45
                                                    salt);