Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: binary MIME-Version: 1.0 X-Mailer: MIME-tools 5.427 (Entity 5.427) RT-Send-CC: X-RT-Original-Encoding: iso-8859-1 Content-Length: 227 A much cleaner, but more invasive, fix would be to stop using SALT_TYPE_AFS_LENGTH to tag AFS salts, and instead use s2kparams along all code paths. Some care would be required to preserve the '@' hack for afs3-salt values.