Changeset 246

Timestamp:

02/18/08 09:29:16 (9 months ago)

Author:

mbr

Message:

- Bugfix to ensure that encrypted directories and actually be decrypted.
- Updated to use the ".asc" extension for encrypted files in --Plain-ascii

mode.

Files:

• gpgdir/trunk/gpgdir (modified) (6 diffs)

gpgdir/trunk/gpgdir

@@ -11 +11 @@
-# Author: Michael Rash (mbr@cipherdyne.com)
-#
-6
+7
-#
-# Copyright (C) 2002-2007 Michael Rash (mbr@cipherdyne.org)
@@ -44 +44 @@
-
-### set the current gpgdir version and file revision numbers
-6
+7
-my $revision_svn = '$Revision$';
-my $rev_num = '1';
@@ -603 +603 @@
-            }
-
+            if ($ascii_armor_mode) {
+                $encrypt_filename = "$filename.asc";
+            }
+
-            if (-e $encrypt_filename and not $overwrite_encrypted) {
-                print "[-] Encrypted file $dir/$encrypt_filename already ",
@@ -657 +661 @@
-
-            ### allow filenames with spaces
-
+
+
+
+
+
+
-
-            if ($obfuscate_mode) {
@@ -979 +988 @@
-    if (-e $file and not -l $file and -s $file != 0
-            and $file !~ m|/\.|) {
-file =~ m|\.gpg| or $file =~ m|\.asc|
-encrypt_mode
+encrypt_mode
+file =~ m|\.gpg| or $file =~ m|\.asc|
-                print "[-] Skipping encrypted file: $file\n" unless $quiet;
-
+
+
+
+
-                print "[-] Skipping unencrypted file: $file\n" unless $quiet;
-}
-return;
- 
+    return;
+}
+
-        my ($atime, $mtime) = (stat($file))[8,9];
-        $files{$file}{'atime'} = $atime;
@@ -1167 +1179 @@
-    -T, --Trial-run             - Show what filesystem actions would take
-                                  place without actually doing them.
+    -P, --Plain-ascii           - Ascii armor mode (creates non-binary
+                                  encrypted files).
-    --Interactive               - Query the user before encrypting,
-                                  decrypting, or deleting any files.