add support for unlocking TrueCrypt and VeraCrypt volumes without mou…

…nting them
mhogomchungu · Oct 21, 2017 · e662915 · e662915
1 parent d931ee4
commit e662915
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/zuluCrypt-cli/bin/open_volume.c b/zuluCrypt-cli/bin/open_volume.c
@@ -518,8 +518,9 @@ int zuluCryptEXEOpenVolume( const struct_opts * opts,const char * mapping_name,u
 	volume.iteration_count = v_info.iteration_count ;
 
 	volume.veraCrypt_volume = StringAtLeastOneMatch( v_info.type,"vcrypt","veracrypt","vera",NULL ) ;
+	volume.trueCrypt_volume = StringAtLeastOneMatch( v_info.type,"tcrypt","truecrypt",NULL ) ;
 
-	if( !volume.veraCrypt_volume ){
+	if( !volume.veraCrypt_volume && !volume.trueCrypt_volume ){
 
 		if( opts->offset != NULL ){
 

diff --git a/zuluCrypt-cli/lib/includes.h b/zuluCrypt-cli/lib/includes.h
@@ -80,6 +80,7 @@ typedef struct{
 	int general_detached_header ;
 	int tcrypt_keyfiles_count ;
 	int veraCrypt_volume ;
+	int trueCrypt_volume ;
 	int tcrypt_system ;
 	const char * const * tcrypt_keyfiles ;
 	unsigned long m_flags ;

diff --git a/zuluCrypt-cli/lib/open_volume.c b/zuluCrypt-cli/lib/open_volume.c
@@ -195,7 +195,12 @@ int zuluCryptOpenVolume_2( const open_struct_t * opts )
 		 */
 		r = zuluCryptOpenVolume_0( zuluCryptOpenPlain_1,opts ) ;
 	}else{
-		r = zuluCryptOpenVolume_1( opts ) ;
+		if( opts->veraCrypt_volume || opts->trueCrypt_volume ){
+
+			r = 4 ;
+		}else{
+			r = zuluCryptOpenVolume_1( opts ) ;
+		}
 
 		if( r == 4 && zuluCryptVolumeIsNotLuks( opts->device ) ){