Small changes to the smime functions