# Append the PGP boundary header and the signature text to re-form the
# original signed block [needs to convert to \r\n]
- Output = "-----BEGIN PGP SIGNED MESSAGE-----\r\n\r\n" + Signed.getvalue() + Signature;
+ 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 + "\r\n";
+ Output = Output + Signed.getvalue() + Signature;
return (Output,1);
else:
# Just return the message body
Result = [];
Owner = "";
KeyID = "";
+ Hits = {};
try:
Strm = os.popen(string.join(Args," "),"r");
# Output the key
if Split[0] == 'fpr':
+ if Hits.has_key(Split[9]):
+ continue;
+ Hits[Split[9]] = None;
Result.append( (KeyID,Split[9],Owner,Length) );
finally:
if Strm != None: