diff --git a/tests/api.c b/tests/api.c index dbee20fab..f52200e40 100644 --- a/tests/api.c +++ b/tests/api.c @@ -16369,6 +16369,199 @@ static void test_wc_PKCS7_Degenerate(void) #endif } /* END test_wc_PKCS7_Degenerate() */ +#if defined(HAVE_PKCS7) && !defined(NO_FILESYSTEM) && \ + defined(ASN_BER_TO_DER) && !defined(NO_DES3) +static byte berContent[] = { + 0x30, 0x80, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, + 0xF7, 0x0D, 0x01, 0x07, 0x03, 0xA0, 0x80, 0x30, + 0x80, 0x02, 0x01, 0x00, 0x31, 0x82, 0x01, 0x48, + 0x30, 0x82, 0x01, 0x44, 0x02, 0x01, 0x00, 0x30, + 0x81, 0xAC, 0x30, 0x81, 0x9E, 0x31, 0x0B, 0x30, + 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, + 0x55, 0x53, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, + 0x55, 0x04, 0x08, 0x0C, 0x07, 0x4D, 0x6F, 0x6E, + 0x74, 0x61, 0x6E, 0x61, 0x31, 0x10, 0x30, 0x0E, + 0x06, 0x03, 0x55, 0x04, 0x07, 0x0C, 0x07, 0x42, + 0x6F, 0x7A, 0x65, 0x6D, 0x61, 0x6E, 0x31, 0x15, + 0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x0C, + 0x0C, 0x77, 0x6F, 0x6C, 0x66, 0x53, 0x53, 0x4C, + 0x5F, 0x31, 0x30, 0x32, 0x34, 0x31, 0x19, 0x30, + 0x17, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x0C, 0x10, + 0x50, 0x72, 0x6F, 0x67, 0x72, 0x61, 0x6D, 0x6D, + 0x69, 0x6E, 0x67, 0x2D, 0x31, 0x30, 0x32, 0x34, + 0x31, 0x18, 0x30, 0x16, 0x06, 0x03, 0x55, 0x04, + 0x03, 0x0C, 0x0F, 0x77, 0x77, 0x77, 0x2E, 0x77, + 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, + 0x6F, 0x6D, 0x31, 0x1F, 0x30, 0x1D, 0x06, 0x09, + 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09, + 0x01, 0x16, 0x10, 0x69, 0x6E, 0x66, 0x6F, 0x40, + 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, + 0x63, 0x6F, 0x6D, 0x02, 0x09, 0x00, 0xBB, 0xD3, + 0x10, 0x03, 0xE6, 0x9D, 0x28, 0x03, 0x30, 0x0D, + 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, + 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x81, 0x80, + 0x2F, 0xF9, 0x77, 0x4F, 0x04, 0x5C, 0x16, 0x62, + 0xF0, 0x77, 0x8D, 0x95, 0x4C, 0xB1, 0x44, 0x9A, + 0x8C, 0x3C, 0x8C, 0xE4, 0xD1, 0xC1, 0x14, 0x72, + 0xD0, 0x4A, 0x1A, 0x94, 0x27, 0x0F, 0xAA, 0xE8, + 0xD0, 0xA2, 0xE7, 0xED, 0x4C, 0x7F, 0x0F, 0xC7, + 0x1B, 0xFB, 0x81, 0x0E, 0x76, 0x8F, 0xDD, 0x32, + 0x11, 0x68, 0xA0, 0x13, 0xD2, 0x8D, 0x95, 0xEF, + 0x80, 0x53, 0x81, 0x0E, 0x1F, 0xC8, 0xD6, 0x76, + 0x5C, 0x31, 0xD3, 0x77, 0x33, 0x29, 0xA6, 0x1A, + 0xD3, 0xC6, 0x14, 0x36, 0xCA, 0x8E, 0x7D, 0x72, + 0xA0, 0x29, 0x4C, 0xC7, 0x3A, 0xAF, 0xFE, 0xF7, + 0xFC, 0xD7, 0xE2, 0x8F, 0x6A, 0x20, 0x46, 0x09, + 0x40, 0x22, 0x2D, 0x79, 0x38, 0x11, 0xB1, 0x4A, + 0xE3, 0x48, 0xE8, 0x10, 0x37, 0xA0, 0x22, 0xF7, + 0xB4, 0x79, 0xD1, 0xA9, 0x3D, 0xC2, 0xAB, 0x37, + 0xAE, 0x82, 0x68, 0x1A, 0x16, 0xEF, 0x33, 0x0C, + 0x30, 0x80, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, + 0xF7, 0x0D, 0x01, 0x07, 0x01, 0x30, 0x14, 0x06, + 0x08, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x03, + 0x07, 0x04, 0x08, 0xAD, 0xD0, 0x38, 0x9B, 0x16, + 0x4B, 0x7F, 0x99, 0xA0, 0x80, 0x04, 0x82, 0x03, + 0xE8, 0x6D, 0x48, 0xFB, 0x8A, 0xBD, 0xED, 0x6C, + 0xCD, 0xC6, 0x48, 0xFD, 0xB7, 0xB0, 0x7C, 0x86, + 0x2C, 0x8D, 0xF0, 0x23, 0x12, 0xD8, 0xA3, 0x2A, + 0x21, 0x6F, 0x8B, 0x75, 0xBB, 0x47, 0x7F, 0xC9, + 0xBA, 0xBA, 0xFF, 0x91, 0x09, 0x01, 0x7A, 0x5C, + 0x96, 0x02, 0xB8, 0x8E, 0xF8, 0x67, 0x7E, 0x8F, + 0xF9, 0x51, 0x0E, 0xFF, 0x8E, 0xE2, 0x61, 0xC0, + 0xDF, 0xFA, 0xE2, 0x4C, 0x50, 0x90, 0xAE, 0xA1, + 0x15, 0x38, 0x3D, 0xBE, 0x88, 0xD7, 0x57, 0xC0, + 0x11, 0x44, 0xA2, 0x61, 0x05, 0x49, 0x6A, 0x94, + 0x04, 0x10, 0xD9, 0xC2, 0x2D, 0x15, 0x20, 0x0D, + 0xBD, 0xA2, 0xEF, 0xE4, 0x68, 0xFA, 0x39, 0x75, + 0x7E, 0xD8, 0x64, 0x44, 0xCB, 0xE0, 0x00, 0x6D, + 0x57, 0x4E, 0x8A, 0x17, 0xA9, 0x83, 0x6C, 0x7F, + 0xFE, 0x01, 0xEE, 0xDE, 0x99, 0x3A, 0xB2, 0xFF, + 0xD3, 0x72, 0x78, 0xBA, 0xF1, 0x23, 0x54, 0x48, + 0x02, 0xD8, 0x38, 0xA9, 0x54, 0xE5, 0x4A, 0x81, + 0xB9, 0xC0, 0x67, 0xB2, 0x7D, 0x3C, 0x6F, 0xCE, + 0xA4, 0xDD, 0x34, 0x5F, 0x60, 0xB1, 0xA3, 0x7A, + 0xE4, 0x43, 0xF2, 0x89, 0x64, 0x35, 0x09, 0x32, + 0x51, 0xFB, 0x5C, 0x67, 0x0C, 0x3B, 0xFC, 0x36, + 0x6B, 0x37, 0x43, 0x6C, 0x03, 0xCD, 0x44, 0xC7, + 0x2B, 0x62, 0xD6, 0xD1, 0xF4, 0x07, 0x7B, 0x19, + 0x91, 0xF0, 0xD7, 0xF5, 0x54, 0xBC, 0x0F, 0x42, + 0x6B, 0x69, 0xF7, 0xA3, 0xC8, 0xEE, 0xB9, 0x7A, + 0x9E, 0x3D, 0xDF, 0x53, 0x47, 0xF7, 0x50, 0x67, + 0x00, 0xCF, 0x2B, 0x3B, 0xE9, 0x85, 0xEE, 0xBD, + 0x4C, 0x64, 0x66, 0x0B, 0x77, 0x80, 0x9D, 0xEF, + 0x11, 0x32, 0x77, 0xA8, 0xA4, 0x5F, 0xEE, 0x2D, + 0xE0, 0x43, 0x87, 0x76, 0x87, 0x53, 0x4E, 0xD7, + 0x1A, 0x04, 0x7B, 0xE1, 0xD1, 0xE1, 0xF5, 0x87, + 0x51, 0x13, 0xE0, 0xC2, 0xAA, 0xA3, 0x4B, 0xAA, + 0x9E, 0xB4, 0xA6, 0x1D, 0x4E, 0x28, 0x57, 0x0B, + 0x80, 0x90, 0x81, 0x4E, 0x04, 0xF5, 0x30, 0x8D, + 0x51, 0xCE, 0x57, 0x2F, 0x88, 0xC5, 0x70, 0xC4, + 0x06, 0x8F, 0xDD, 0x37, 0xC1, 0x34, 0x1E, 0x0E, + 0x15, 0x32, 0x23, 0x92, 0xAB, 0x40, 0xEA, 0xF7, + 0x43, 0xE2, 0x1D, 0xE2, 0x4B, 0xC9, 0x91, 0xF4, + 0x63, 0x21, 0x34, 0xDB, 0xE9, 0x86, 0x83, 0x1A, + 0xD2, 0x52, 0xEF, 0x7A, 0xA2, 0xEE, 0xA4, 0x11, + 0x56, 0xD3, 0x6C, 0xF5, 0x6D, 0xE4, 0xA5, 0x2D, + 0x99, 0x02, 0x10, 0xDF, 0x29, 0xC5, 0xE3, 0x0B, + 0xC4, 0xA1, 0xEE, 0x5F, 0x4A, 0x10, 0xEE, 0x85, + 0x73, 0x2A, 0x92, 0x15, 0x2C, 0xC8, 0xF4, 0x8C, + 0xD7, 0x3D, 0xBC, 0xAD, 0x18, 0xE0, 0x59, 0xD3, + 0xEE, 0x75, 0x90, 0x1C, 0xCC, 0x76, 0xC6, 0x64, + 0x17, 0xD2, 0xD0, 0x91, 0xA6, 0xD0, 0xC1, 0x4A, + 0xAA, 0x58, 0x22, 0xEC, 0x45, 0x98, 0xF2, 0xCC, + 0x4C, 0xE4, 0xBF, 0xED, 0xF6, 0x44, 0x72, 0x36, + 0x65, 0x3F, 0xE3, 0xB5, 0x8B, 0x3E, 0x54, 0x9C, + 0x82, 0x86, 0x5E, 0xB0, 0xF2, 0x12, 0xE5, 0x69, + 0xFA, 0x46, 0xA2, 0x54, 0xFC, 0xF5, 0x4B, 0xE0, + 0x24, 0x3B, 0x99, 0x04, 0x1A, 0x7A, 0xF7, 0xD1, + 0xFF, 0x68, 0x97, 0xB2, 0x85, 0x82, 0x95, 0x27, + 0x2B, 0xF4, 0xE7, 0x1A, 0x74, 0x19, 0xEC, 0x8C, + 0x4E, 0xA7, 0x0F, 0xAD, 0x4F, 0x5A, 0x02, 0x80, + 0xC1, 0x6A, 0x9E, 0x54, 0xE4, 0x8E, 0xA3, 0x41, + 0x3F, 0x6F, 0x9C, 0x82, 0x9F, 0x83, 0xB0, 0x44, + 0x01, 0x5F, 0x10, 0x9D, 0xD3, 0xB6, 0x33, 0x5B, + 0xAF, 0xAC, 0x6B, 0x57, 0x2A, 0x01, 0xED, 0x0E, + 0x17, 0xB9, 0x80, 0x76, 0x12, 0x1C, 0x51, 0x56, + 0xDD, 0x6D, 0x94, 0xAB, 0xD2, 0xE5, 0x15, 0x2D, + 0x3C, 0xC5, 0xE8, 0x62, 0x05, 0x8B, 0x40, 0xB1, + 0xC2, 0x83, 0xCA, 0xAC, 0x4B, 0x8B, 0x39, 0xF7, + 0xA0, 0x08, 0x43, 0x5C, 0xF7, 0xE8, 0xED, 0x40, + 0x72, 0x73, 0xE3, 0x6B, 0x18, 0x67, 0xA0, 0xB6, + 0x0F, 0xED, 0x8F, 0x9A, 0xE4, 0x27, 0x62, 0x23, + 0xAA, 0x6D, 0x6C, 0x31, 0xC9, 0x9D, 0x6B, 0xE0, + 0xBF, 0x9D, 0x7D, 0x2E, 0x76, 0x71, 0x06, 0x39, + 0xAC, 0x96, 0x1C, 0xAF, 0x30, 0xF2, 0x62, 0x9C, + 0x84, 0x3F, 0x43, 0x5E, 0x19, 0xA8, 0xE5, 0x3C, + 0x9D, 0x43, 0x3C, 0x43, 0x41, 0xE8, 0x82, 0xE7, + 0x5B, 0xF3, 0xE2, 0x15, 0xE3, 0x52, 0x20, 0xFD, + 0x0D, 0xB2, 0x4D, 0x48, 0xAD, 0x53, 0x7E, 0x0C, + 0xF0, 0xB9, 0xBE, 0xC9, 0x58, 0x4B, 0xC8, 0xA8, + 0xA3, 0x36, 0xF1, 0x2C, 0xD2, 0xE1, 0xC8, 0xC4, + 0x3C, 0x48, 0x70, 0xC2, 0x6D, 0x6C, 0x3D, 0x99, + 0xAC, 0x43, 0x19, 0x69, 0xCA, 0x67, 0x1A, 0xC9, + 0xE1, 0x47, 0xFA, 0x0A, 0xE6, 0x5B, 0x6F, 0x61, + 0xD0, 0x03, 0xE4, 0x03, 0x4B, 0xFD, 0xE2, 0xA5, + 0x8D, 0x83, 0x01, 0x7E, 0xC0, 0x7B, 0x2E, 0x0B, + 0x29, 0xDD, 0xD6, 0xDC, 0x71, 0x46, 0xBD, 0x9A, + 0x40, 0x46, 0x1E, 0x0A, 0xB1, 0x00, 0xE7, 0x71, + 0x29, 0x77, 0xFC, 0x9A, 0x76, 0x8A, 0x5F, 0x66, + 0x9B, 0x63, 0x91, 0x12, 0x78, 0xBF, 0x67, 0xAD, + 0xA1, 0x72, 0x9E, 0xC5, 0x3E, 0xE5, 0xCB, 0xAF, + 0xD6, 0x5A, 0x0D, 0xB6, 0x9B, 0xA3, 0x78, 0xE8, + 0xB0, 0x8F, 0x69, 0xED, 0xC1, 0x73, 0xD5, 0xE5, + 0x1C, 0x18, 0xA0, 0x58, 0x4C, 0x49, 0xBD, 0x91, + 0xCE, 0x15, 0x0D, 0xAA, 0x5A, 0x07, 0xEA, 0x1C, + 0xA7, 0x4B, 0x11, 0x31, 0x80, 0xAF, 0xA1, 0x0A, + 0xED, 0x6C, 0x70, 0xE4, 0xDB, 0x75, 0x86, 0xAE, + 0xBF, 0x4A, 0x05, 0x72, 0xDE, 0x84, 0x8C, 0x7B, + 0x59, 0x81, 0x58, 0xE0, 0xC0, 0x15, 0xB5, 0xF3, + 0xD5, 0x73, 0x78, 0x83, 0x53, 0xDA, 0x92, 0xC1, + 0xE6, 0x71, 0x74, 0xC7, 0x7E, 0xAA, 0x36, 0x06, + 0xF0, 0xDF, 0xBA, 0xFB, 0xEF, 0x54, 0xE8, 0x11, + 0xB2, 0x33, 0xA3, 0x0B, 0x9E, 0x0C, 0x59, 0x75, + 0x13, 0xFA, 0x7F, 0x88, 0xB9, 0x86, 0xBD, 0x1A, + 0xDB, 0x52, 0x12, 0xFB, 0x6D, 0x1A, 0xCB, 0x49, + 0x94, 0x94, 0xC4, 0xA9, 0x99, 0xC0, 0xA4, 0xB6, + 0x60, 0x36, 0x09, 0x94, 0x2A, 0xD5, 0xC4, 0x26, + 0xF4, 0xA3, 0x6A, 0x0E, 0x57, 0x8B, 0x7C, 0xA4, + 0x1D, 0x75, 0xE8, 0x2A, 0xF3, 0xC4, 0x3C, 0x7D, + 0x45, 0x6D, 0xD8, 0x24, 0xD1, 0x3B, 0xF7, 0xCF, + 0xE4, 0x45, 0x2A, 0x55, 0xE5, 0xA9, 0x1F, 0x1C, + 0x8F, 0x55, 0x8D, 0xC1, 0xF7, 0x74, 0xCC, 0x26, + 0xC7, 0xBA, 0x2E, 0x5C, 0xC1, 0x71, 0x0A, 0xAA, + 0xD9, 0x6D, 0x76, 0xA7, 0xF9, 0xD1, 0x18, 0xCB, + 0x5A, 0x52, 0x98, 0xA8, 0x0D, 0x3F, 0x06, 0xFC, + 0x49, 0x11, 0x21, 0x5F, 0x86, 0x19, 0x33, 0x81, + 0xB5, 0x7A, 0xDA, 0xA1, 0x47, 0xBF, 0x7C, 0xD7, + 0x05, 0x96, 0xC7, 0xF5, 0xC1, 0x61, 0xE5, 0x18, + 0xA5, 0x38, 0x68, 0xED, 0xB4, 0x17, 0x62, 0x0D, + 0x01, 0x5E, 0xC3, 0x04, 0xA6, 0xBA, 0xB1, 0x01, + 0x60, 0x5C, 0xC1, 0x3A, 0x34, 0x97, 0xD6, 0xDB, + 0x67, 0x73, 0x4D, 0x33, 0x96, 0x01, 0x67, 0x44, + 0xEA, 0x47, 0x5E, 0x44, 0xB5, 0xE5, 0xD1, 0x6C, + 0x20, 0xA9, 0x6D, 0x4D, 0xBC, 0x02, 0xF0, 0x70, + 0xE4, 0xDD, 0xE9, 0xD5, 0x5C, 0x28, 0x29, 0x0B, + 0xB4, 0x60, 0x2A, 0xF1, 0xF7, 0x1A, 0xF0, 0x36, + 0xAE, 0x51, 0x3A, 0xAE, 0x6E, 0x48, 0x7D, 0xC7, + 0x5C, 0xF3, 0xDC, 0xF6, 0xED, 0x27, 0x4E, 0x8E, + 0x48, 0x18, 0x3E, 0x08, 0xF1, 0xD8, 0x3D, 0x0D, + 0xE7, 0x2F, 0x65, 0x8A, 0x6F, 0xE2, 0x1E, 0x06, + 0xC1, 0x04, 0x58, 0x7B, 0x4A, 0x75, 0x60, 0x92, + 0x13, 0xC6, 0x40, 0x2D, 0x3A, 0x8A, 0xD1, 0x03, + 0x05, 0x1F, 0x28, 0x66, 0xC2, 0x57, 0x2A, 0x4C, + 0xE1, 0xA3, 0xCB, 0xA1, 0x95, 0x30, 0x10, 0xED, + 0xDF, 0xAE, 0x70, 0x49, 0x4E, 0xF6, 0xB4, 0x5A, + 0xB6, 0x22, 0x56, 0x37, 0x05, 0xE7, 0x3E, 0xB2, + 0xE3, 0x96, 0x62, 0xEC, 0x09, 0x53, 0xC0, 0x50, + 0x3D, 0xA7, 0xBC, 0x9B, 0x39, 0x02, 0x26, 0x16, + 0xB5, 0x34, 0x17, 0xD4, 0xCA, 0xFE, 0x1D, 0xE4, + 0x5A, 0xDA, 0x4C, 0xC2, 0xCA, 0x8E, 0x79, 0xBF, + 0xD8, 0x4C, 0xBB, 0xFA, 0x30, 0x7B, 0xA9, 0x3E, + 0x52, 0x19, 0xB1, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00 +}; +#endif /* HAVE_PKCS7 && !NO_FILESYSTEM && ASN_BER_TO_DER && !NO_DES3 */ + /* * Testing wc_PKCS7_BER() */ @@ -16380,6 +16573,9 @@ static void test_wc_PKCS7_BER(void) char fName[] = "./certs/test-ber-exp02-05-2022.p7b"; XFILE f; byte der[4096]; +#ifndef NO_DES3 + byte decoded[1024]; +#endif word32 derSz; int ret; @@ -16396,6 +16592,26 @@ static void test_wc_PKCS7_BER(void) AssertIntEQ(wc_PKCS7_VerifySignedData(pkcs7, der, derSz), 0); wc_PKCS7_Free(pkcs7); +#ifndef NO_DES3 + /* decode BER content */ + AssertNotNull(f = XFOPEN("./certs/1024/client-cert.der", "rb")); + AssertIntGT((ret = (int)fread(der, 1, sizeof(der), f)), 0); + derSz = (word32)ret; + XFCLOSE(f); + AssertNotNull(pkcs7 = wc_PKCS7_New(HEAP_HINT, devId)); + AssertIntEQ(wc_PKCS7_InitWithCert(pkcs7, der, derSz), 0); + + AssertNotNull(f = XFOPEN("./certs/1024/client-key.der", "rb")); + AssertIntGT((ret = (int)fread(der, 1, sizeof(der), f)), 0); + derSz = (word32)ret; + XFCLOSE(f); + pkcs7->privateKey = der; + pkcs7->privateKeySz = derSz; + AssertIntGT(wc_PKCS7_DecodeEnvelopedData(pkcs7, berContent, + sizeof(berContent), decoded, sizeof(decoded)), 0); + wc_PKCS7_Free(pkcs7); +#endif /* !NO_DES3 */ + printf(resultFmt, passed); #endif } /* END test_wc_PKCS7_BER() */ diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c index 72b6c7ed1..2ae7632aa 100644 --- a/wolfcrypt/src/pkcs7.c +++ b/wolfcrypt/src/pkcs7.c @@ -344,6 +344,16 @@ static long wc_PKCS7_GetMaxStream(PKCS7* pkcs7, byte flag, byte* in, NO_USER_CHECK)) < 0) { return ret; } + + #ifdef ASN_BER_TO_DER + if (length == 0 && ret == 0) { + idx = 0; + if ((ret = wc_BerToDer(pt, defSz, NULL, + (word32*)&length)) != LENGTH_ONLY_E) { + return ret; + } + } + #endif /* ASN_BER_TO_DER */ pkcs7->stream->maxLen = length + idx; } } @@ -8883,9 +8893,10 @@ static int wc_PKCS7_ParseToRecipientInfoSet(PKCS7* pkcs7, byte* in, if (ret < 0) return ret; - pkiMsg = pkcs7->der; - pkiMsgSz = len; + pkiMsg = in = pkcs7->der; + pkiMsgSz = pkcs7->derSz = len; *idx = 0; + if (GetSequence(pkiMsg, idx, &length, pkiMsgSz) < 0) return ASN_PARSE_E; #else @@ -9114,6 +9125,12 @@ WOLFSSL_API int wc_PKCS7_DecodeEnvelopedData(PKCS7* pkcs7, byte* in, break; } + #ifdef ASN_BER_TO_DER + /* check if content was BER and has been converted to DER */ + if (pkcs7->derSz > 0) + pkiMsg = in = pkcs7->der; + #endif + decryptedKey = (byte*)XMALLOC(MAX_ENCRYPTED_KEY_SZ, pkcs7->heap, DYNAMIC_TYPE_PKCS7); if (decryptedKey == NULL)