[Rt-commit] r8724 - in rt/branches/3.7-EXPERIMENTAL-TUNIS: lib/RT/Crypt

[sartak at bestpractical.com]

Author: sartak
Date: Fri Aug 24 15:15:52 2007
New Revision: 8724

Modified:
   rt/branches/3.7-EXPERIMENTAL-TUNIS/   (props changed)
   rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Crypt/GnuPG.pm

Log:
 r19914 at onn:  sartak | 2007-08-24 15:15:42 -0400
 Handle "false" passphrases better (in particular the empty string)


Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Crypt/GnuPG.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Crypt/GnuPG.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Crypt/GnuPG.pm	Fri Aug 24 15:15:52 2007
@@ -403,7 +403,8 @@
     my $entity = $args{'Entity'};
 
     # handling passphrase in GnupGOptions
-    $args{'Passphrase'} ||= delete $opt{'passphrase'};
+    $args{'Passphrase'} = delete $opt{'passphrase'}
+        if !defined $args{'Passphrase'};
 
     if ( $args{'Sign'} && !defined $args{'Passphrase'} ) {
         $args{'Passphrase'} = GetPassphrase( Address => $args{'Signer'} );
@@ -578,7 +579,8 @@
     );
 
     # handling passphrase in GnupGOptions
-    $args{'Passphrase'} ||= delete $opt{'passphrase'};
+    $args{'Passphrase'} = delete $opt{'passphrase'}
+        if !defined($args{'Passphrase'});
 
     if ( $args{'Sign'} && !defined $args{'Passphrase'} ) {
         $args{'Passphrase'} = GetPassphrase( Address => $args{'Signer'} );
@@ -665,7 +667,8 @@
     );
 
     # handling passphrase in GnupGOptions
-    $args{'Passphrase'} ||= delete $opt{'passphrase'};
+    $args{'Passphrase'} = delete $opt{'passphrase'}
+        if !defined($args{'Passphrase'});
 
     if ( $args{'Sign'} && !defined $args{'Passphrase'} ) {
         $args{'Passphrase'} = GetPassphrase( Address => $args{'Signer'} );
@@ -1033,7 +1036,8 @@
     }
 
     # handling passphrase in GnupGOptions
-    $args{'Passphrase'} ||= delete $opt{'passphrase'};
+    $args{'Passphrase'} = delete $opt{'passphrase'}
+        if !defined($args{'Passphrase'});
 
     $args{'Passphrase'} = GetPassphrase()
         unless defined $args{'Passphrase'};
@@ -1106,7 +1110,8 @@
     }
 
     # handling passphrase in GnupGOptions
-    $args{'Passphrase'} ||= delete $opt{'passphrase'};
+    $args{'Passphrase'} = delete $opt{'passphrase'}
+        if !defined($args{'Passphrase'});
 
     $args{'Passphrase'} = GetPassphrase()
         unless defined $args{'Passphrase'};