summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_encryption
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-03-23 04:21:47 +0000
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:29 +0100
commit55472e65570b2ebd33a0bd9ca4aebfb0cad203e4 (patch)
treeea6372cd9bcf9b5597584772e9bc671968f67b6c /helpers/lh_binary_encryption
parent13625df75ce06441df9c8e19d104c4fabf69bafe (diff)
downloadlive-build-55472e65570b2ebd33a0bd9ca4aebfb0cad203e4.zip
live-build-55472e65570b2ebd33a0bd9ca4aebfb0cad203e4.tar.gz
Allow LH_ENCRYPTION="disabled" to disable encryption
Diffstat (limited to 'helpers/lh_binary_encryption')
-rwxr-xr-xhelpers/lh_binary_encryption45
1 files changed, 21 insertions, 24 deletions
diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption
index 35bdc24..1de5b94 100755
--- a/helpers/lh_binary_encryption
+++ b/helpers/lh_binary_encryption
@@ -33,10 +33,27 @@ Read_conffile config/source
Read_conffile "${LH_CONFIG}"
Set_defaults
-if [ -z "${LH_ENCRYPTION}" ]
-then
- exit 0
-fi
+case "${LH_ENCRYPTION}" in
+ aes128|aes192|aes256)
+ ;;
+ ""|disabled)
+ exit 0
+ ;;
+ *)
+ Echo_error "Encryption type \"${LH_ENCRYPTION}\" not supported."
+ exit 1
+ ;;
+esac
+
+case "${LH_CHROOT_FILESYSTEM}" in
+ ext2|squashfs)
+ ;;
+
+ *)
+ Echo_error "Encryption not yet supported on ${LH_CHROOT_FILESYSTEM} filesystems."
+ exit 1
+ ;;
+esac
Echo_message "Begin encrypting root filesystem image..."
@@ -63,26 +80,6 @@ case "${LH_INITRAMFS}" in
;;
esac
-case "${LH_CHROOT_FILESYSTEM}" in
- ext2)
- ROOTFS="ext2"
- ;;
-
- jffs2)
- Echo_warning "encryption not yet supported on jffs2 filesystem."
- exit 0
- ;;
-
- plain)
- Echo_warning "encryption not supported on plain filesystem."
- exit 0
- ;;
-
- squashfs)
- ROOTFS="squashfs"
- ;;
-esac
-
# Checking depends
Check_package chroot/usr/bin/aespipe aespipe