1) Change the export encrypted private key function to ask the token the wrap size rather than trying to figure it out ourselves. 2) Fix the soften to correctly return the size. r=wtc, nelsonb git-svn-id: svn://10.0.0.236/trunk@188668 18797224-902f-48f8-a5cc-f745e15eee43