← Back to branch summary

~ubuntu-branches/ubuntu/karmic/cryptsetup/karmic-proposed

« back to all changes in this revision

Viewing changes to luks/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2009-05-10 17:29:32 UTC
  • mfrom: (0.1.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090510172932-1e485f99qk3psrg0
Tags: 2:1.0.6+20090405.svn49-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Ubuntu specific:
    + debian/rules: link dynamically for better security supportability and
      smaller packages.
    + debian/control: Depend on initramfs-tools so system is not potentially
      rendered unbootable.
  - debian/initramfs/cryptroot-script wait for encrypted device to appear,
    report with log_*_msg (debian bug 488271).
  - debian/initramfs/cryptroot-hook: fix support for UUID and LABEL
    correlation between fstab and crypttab (debian bug 522041).
  - debian/askpass.c, debian/initramfs/cryptroot-script: using newline
    escape in passphrase prompt to avoid line-wrapping (debian bug 528133).
* Drop 04_fix_udevsettle_call.patch: fixed upstream differently.

Show diffs side-by-side

added added

removed removed

Lines of Context:
luks/Makefile.am
2
2
 
3
3
noinst_LTLIBRARIES = libluks.la
4
4
 
5
 
libluks_la_CFLAGS = -I sha
 
5
libluks_la_CFLAGS = -I sha -Wall
6
6
 
7
7
libluks_la_SOURCES = \
8
8
        af.c \
125
125
        @../src/cryptsetup -v remove dummy
126
126
        @echo "success"
127
127
 
 
128
# Non-Exclusive Open test
 
129
        @echo Case: Non-Exclusive Open
 
130
        echo "key0" | ../src/cryptsetup -v --readonly luksOpen $(LOOPDEV) dummy1 2>/dev/null
 
131
# must fail
 
132
        echo "key0" | ../src/cryptsetup -v --readonly luksOpen $(LOOPDEV) dummy2 2>/dev/null || true 
 
133
        echo "key0" | ../src/cryptsetup -v --non-exclusive --readonly luksOpen $(LOOPDEV) dummy2 2>/dev/null
 
134
        @../src/cryptsetup -v remove dummy1
 
135
        @../src/cryptsetup -v remove dummy2
 
136
 
 
137
 
128
138
# Key Slot 1 and key material section 1 must change, the rest must not
129
139
        @echo Case: add key test for key files
130
140
        @cp $(IMG) $(ORIG_IMG)