update to latest, add pkcs7/pkcs7test.c