projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed support for the shadow file since we don't install it in the
[mirror/userdir-ldap.git]
/
userdir_gpg.py
diff --git
a/userdir_gpg.py
b/userdir_gpg.py
index
69ebe34
..
6319d58
100644
(file)
--- a/
userdir_gpg.py
+++ b/
userdir_gpg.py
@@
-17,7
+17,8
@@
import rfc822, time, fcntl, FCNTL, anydbm
# General GPG options
GPGPath = "gpg"
# General GPG options
GPGPath = "gpg"
-GPGBasicOptions = ["--no-options","--batch","--load-extension","rsa",\
+# "--load-extension","rsa",
+GPGBasicOptions = ["--no-options","--batch",
"--no-default-keyring","--always-trust"];
GPGKeyRings = [];
GPGSigOptions = ["--output","-"];
"--no-default-keyring","--always-trust"];
GPGKeyRings = [];
GPGSigOptions = ["--output","-"];
@@
-115,9
+116,9
@@
def GetClearSig(Msg,Paranoid = 0):
Output = "-----BEGIN PGP SIGNED MESSAGE-----\r\n";
# Semi-evil hack to get the proper hash type inserted in the message
if Msg.getparam('micalg') != None:
Output = "-----BEGIN PGP SIGNED MESSAGE-----\r\n";
# Semi-evil hack to get the proper hash type inserted in the message
if Msg.getparam('micalg') != None:
- Output = Output + "Hash: %s\r\n"%(string.upper(Msg.getparam('micalg')[4:]));
+ Output = Output + "Hash:
MD5,SHA1,
%s\r\n"%(string.upper(Msg.getparam('micalg')[4:]));
Output = Output + "\r\n";
Output = Output + "\r\n";
- Output = Output + string.replace(Signed.getvalue(),"\n-
--","\n- --
-") + Signature;
+ Output = Output + string.replace(Signed.getvalue(),"\n-
","\n-
-") + Signature;
return (Output,1);
else:
if Paranoid == 0:
return (Output,1);
else:
if Paranoid == 0: