EVP_PKEY: Treat pss_params as params for RSA-PSS keys For consistency, `pss_params` for RSA-PSS keys should be in scope for EVP_PKEY operations on "parameters". Change-Id: Iafabc2edfce8956345f33d610a861cbd6a6a6964 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/93927 Presubmit-BoringSSL-Verified: boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Auto-Submit: Lily Chen <chlily@google.com> Commit-Queue: Lily Chen <chlily@google.com> Reviewed-by: Adam Langley <agl@google.com>
diff --git a/crypto/evp/evp_extra_test.cc b/crypto/evp/evp_extra_test.cc index 27a918b..995435e 100644 --- a/crypto/evp/evp_extra_test.cc +++ b/crypto/evp/evp_extra_test.cc
@@ -248,6 +248,230 @@ 0x08, 0xf1, 0x2d, 0x86, 0x9d, 0xa5, 0x20, 0x1b, 0xe5, 0xdf, }; +// kExampleRSAPSSKeySHA256 is an RSA private key constrained to PSS with +// SHA-256, and salt length >= 32, in PKCS#8 format. Of course, you should never +// use this key anywhere but in an example. +static const uint8_t kExampleRSAPSSKeySHA256[] = { + 0x30, 0x82, 0x04, 0xf0, 0x02, 0x01, 0x00, 0x30, 0x41, 0x06, 0x09, 0x2a, + 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0a, 0x30, 0x34, 0xa0, 0x0f, + 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, + 0x01, 0x05, 0x00, 0xa1, 0x1c, 0x30, 0x1a, 0x06, 0x09, 0x2a, 0x86, 0x48, + 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x08, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, + 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0xa2, 0x03, 0x02, + 0x01, 0x20, 0x04, 0x82, 0x04, 0xa6, 0x30, 0x82, 0x04, 0xa2, 0x02, 0x01, + 0x00, 0x02, 0x82, 0x01, 0x01, 0x00, 0xcd, 0x00, 0x81, 0xea, 0x7b, 0x2a, + 0xe1, 0xea, 0x06, 0xd5, 0x9f, 0x7c, 0x73, 0xd9, 0xff, 0xb9, 0x4a, 0x09, + 0x61, 0x5c, 0x2e, 0x4b, 0xa7, 0xc6, 0x36, 0xce, 0xf0, 0x8d, 0xd3, 0x53, + 0x3e, 0xc3, 0x18, 0x55, 0x25, 0xb0, 0x15, 0xc7, 0x69, 0xb9, 0x9a, 0x77, + 0xd6, 0x72, 0x5b, 0xf9, 0xc3, 0x53, 0x2a, 0x9b, 0x6e, 0x5f, 0x66, 0x27, + 0xd5, 0xfb, 0x85, 0x16, 0x07, 0x68, 0xd3, 0xdd, 0xa9, 0xcb, 0xd3, 0x59, + 0x74, 0x51, 0x17, 0x17, 0xdc, 0x3d, 0x30, 0x9d, 0x2f, 0xc4, 0x7e, 0xe4, + 0x1f, 0x97, 0xe3, 0x2a, 0xdb, 0x7f, 0x9d, 0xd8, 0x64, 0xa1, 0xc4, 0x76, + 0x7a, 0x66, 0x6e, 0xcd, 0x71, 0xbc, 0x1a, 0xac, 0xf5, 0xe7, 0x51, 0x7f, + 0x4b, 0x38, 0x59, 0x4f, 0xea, 0x9b, 0x05, 0xe4, 0x2d, 0x5a, 0xda, 0x99, + 0x12, 0x00, 0x80, 0x13, 0xe4, 0x53, 0x16, 0xa4, 0xd9, 0xbb, 0x8e, 0xd0, + 0x86, 0xb8, 0x8d, 0x28, 0x75, 0x8b, 0xac, 0xaf, 0x92, 0x2d, 0x46, 0xa8, + 0x68, 0xb4, 0x85, 0xd2, 0x39, 0xc9, 0xba, 0xeb, 0x0e, 0x2b, 0x64, 0x59, + 0x27, 0x10, 0xf4, 0x2b, 0x2d, 0x1e, 0xa0, 0xa4, 0xb4, 0x80, 0x2c, 0x0b, + 0xec, 0xab, 0x32, 0x8f, 0x8a, 0x68, 0xb0, 0x07, 0x3b, 0xdb, 0x54, 0x6f, + 0xee, 0xa9, 0x80, 0x9d, 0x28, 0x49, 0x91, 0x2b, 0x39, 0x0c, 0x15, 0x32, + 0xbc, 0x7e, 0x29, 0xc7, 0x65, 0x8f, 0x81, 0x75, 0xfa, 0xe4, 0x6f, 0x34, + 0x33, 0x2f, 0xf8, 0x7b, 0xca, 0xb3, 0xe4, 0x06, 0x49, 0xb9, 0x85, 0x77, + 0x86, 0x9d, 0xa0, 0xea, 0x71, 0x83, 0x53, 0xf0, 0x72, 0x27, 0x54, 0x88, + 0x69, 0x13, 0x64, 0x87, 0x60, 0xd1, 0x22, 0xbe, 0x67, 0x6e, 0x0f, 0xc4, + 0x83, 0xdd, 0x20, 0xff, 0xc3, 0x1b, 0xda, 0x96, 0xa3, 0x19, 0x66, 0xc9, + 0xaa, 0x2e, 0x75, 0xad, 0x03, 0xde, 0x47, 0xe1, 0xc4, 0x4f, 0x02, 0x03, + 0x01, 0x00, 0x01, 0x02, 0x82, 0x01, 0x00, 0x60, 0x29, 0x7a, 0xc7, 0x99, + 0x1b, 0x16, 0x7a, 0x06, 0xd6, 0xb2, 0x47, 0x58, 0xb8, 0xcb, 0xe2, 0x08, + 0xbe, 0xb9, 0xb2, 0xd9, 0xec, 0x97, 0x38, 0xbd, 0x80, 0xf9, 0x0a, 0x2e, + 0x35, 0x00, 0x5d, 0xd7, 0xce, 0x29, 0x2d, 0x9e, 0x29, 0xba, 0x88, 0x5b, + 0xd3, 0x16, 0xfe, 0xf1, 0xf2, 0x09, 0x13, 0xbc, 0x0a, 0xc9, 0x0d, 0x6b, + 0x08, 0x08, 0xb2, 0x41, 0x4d, 0x82, 0x10, 0x44, 0x41, 0xd8, 0x62, 0x4a, + 0x33, 0xce, 0x02, 0x33, 0xc8, 0xf7, 0x80, 0xa4, 0x8b, 0x37, 0x5a, 0xff, + 0x02, 0xd7, 0x67, 0x12, 0x22, 0x8a, 0x70, 0x24, 0x84, 0xdb, 0x3f, 0x9e, + 0xbe, 0xcc, 0xcf, 0xbb, 0xee, 0x17, 0x09, 0xdb, 0xa1, 0x82, 0x80, 0x0d, + 0x94, 0x9e, 0x9e, 0x42, 0x16, 0xe0, 0xbf, 0xf3, 0x55, 0x83, 0x88, 0xf8, + 0xbd, 0x90, 0xda, 0x37, 0x3a, 0x1d, 0x82, 0x74, 0x3e, 0xc3, 0xfb, 0xdd, + 0x14, 0x27, 0xfd, 0x16, 0x82, 0x5a, 0x65, 0x7a, 0x31, 0x69, 0x12, 0xe8, + 0x69, 0x53, 0x65, 0x11, 0x7c, 0xa2, 0xf8, 0x45, 0xc9, 0x09, 0x40, 0x5f, + 0xca, 0xc5, 0x5f, 0x89, 0x5f, 0xc1, 0x5d, 0x20, 0x38, 0x6c, 0x26, 0xee, + 0x78, 0xc9, 0xe9, 0x90, 0x75, 0x02, 0x9a, 0x17, 0x8a, 0x6c, 0x1e, 0x4c, + 0xf0, 0xc2, 0x00, 0xe8, 0xa9, 0xcf, 0xb2, 0x7e, 0x9d, 0x15, 0x6f, 0x86, + 0xe6, 0xc2, 0xad, 0xc2, 0x2b, 0x1a, 0x84, 0xa1, 0xcd, 0x5c, 0xa5, 0xb2, + 0x79, 0x08, 0x75, 0xd7, 0x94, 0x07, 0xc8, 0x4b, 0x35, 0x23, 0x95, 0xcb, + 0x81, 0xcc, 0x3f, 0xed, 0x5b, 0xb0, 0x43, 0xb6, 0x9e, 0xde, 0x0c, 0x07, + 0x20, 0x45, 0x50, 0x02, 0x5c, 0xee, 0x8c, 0x5f, 0x44, 0x01, 0x70, 0xb6, + 0x12, 0x0b, 0xb4, 0x8e, 0x0f, 0x74, 0x7b, 0xcd, 0x8f, 0x52, 0x21, 0x10, + 0x85, 0x0d, 0xf0, 0x43, 0xc4, 0x28, 0xdf, 0xd1, 0x87, 0x05, 0x31, 0x02, + 0x81, 0x81, 0x00, 0xf6, 0xf9, 0x61, 0xb4, 0x7c, 0xbc, 0x03, 0x5d, 0x3a, + 0xed, 0xeb, 0xc7, 0xde, 0x85, 0x0a, 0x95, 0x6b, 0x65, 0xec, 0xdb, 0x9c, + 0xf6, 0x07, 0x64, 0x06, 0x3f, 0x15, 0xaa, 0x48, 0x55, 0x3c, 0x58, 0xd9, + 0x72, 0xfe, 0x66, 0x75, 0x05, 0x6e, 0x35, 0xdd, 0xfd, 0xc3, 0x7b, 0xf3, + 0xb9, 0xf2, 0xf6, 0x22, 0xee, 0x27, 0x13, 0x37, 0x25, 0x68, 0x49, 0xc9, + 0xbe, 0xf2, 0x17, 0x6f, 0xe8, 0xf7, 0xc3, 0xf8, 0xbb, 0x91, 0xba, 0x37, + 0x4d, 0xd5, 0x3b, 0xaf, 0x3d, 0xec, 0x81, 0x4d, 0x2b, 0xde, 0xc1, 0x0c, + 0x1f, 0xdc, 0x88, 0xcd, 0xd1, 0x68, 0x76, 0xf2, 0x6b, 0x1e, 0xdf, 0xa3, + 0xf0, 0x94, 0x19, 0x7e, 0xdf, 0x4d, 0x42, 0xff, 0x1f, 0xb2, 0x97, 0x11, + 0x03, 0xb8, 0x98, 0xca, 0x85, 0x9c, 0x42, 0x72, 0x87, 0x08, 0x6a, 0x84, + 0x2a, 0xb4, 0x10, 0xbb, 0x69, 0xcf, 0x2d, 0x35, 0xaf, 0x6b, 0xe3, 0x02, + 0x81, 0x81, 0x00, 0xd4, 0x7e, 0x72, 0x4a, 0x7f, 0xf4, 0x10, 0x48, 0xb2, + 0x70, 0xc2, 0x52, 0x4a, 0x41, 0x01, 0x87, 0x8b, 0x73, 0x15, 0x9b, 0xb7, + 0x3d, 0x3d, 0xbc, 0x18, 0x7b, 0x22, 0x0e, 0x63, 0x5b, 0x35, 0x34, 0xf9, + 0x6e, 0x24, 0x3a, 0x18, 0x4d, 0x93, 0xf8, 0x60, 0xb6, 0xbf, 0xbb, 0x6b, + 0x71, 0xc1, 0xed, 0x9a, 0x1e, 0x1f, 0x45, 0x85, 0x83, 0x02, 0x3c, 0x30, + 0x1e, 0x96, 0xa6, 0x92, 0xc1, 0xa0, 0x8b, 0x53, 0xd0, 0xec, 0x9c, 0xa9, + 0x10, 0x10, 0x0d, 0x80, 0x45, 0x1e, 0x3b, 0x7d, 0xc6, 0xa0, 0x1b, 0xac, + 0x4a, 0xec, 0xef, 0x8d, 0xf7, 0x98, 0x84, 0x6b, 0xc2, 0x35, 0xa0, 0x8c, + 0xbb, 0xa2, 0xcf, 0x4c, 0x06, 0x80, 0x4c, 0xc1, 0x12, 0x19, 0xe9, 0x56, + 0x08, 0xc7, 0x14, 0xe3, 0xf1, 0x43, 0x0d, 0x49, 0x1f, 0xad, 0xbb, 0xa3, + 0x2a, 0x57, 0x51, 0xa0, 0x4f, 0x97, 0x74, 0x58, 0x34, 0xc9, 0xa5, 0x02, + 0x81, 0x80, 0x21, 0xf2, 0x45, 0x2b, 0xb9, 0xb9, 0x5d, 0xfd, 0x02, 0x8c, + 0x91, 0x4b, 0xf7, 0x99, 0xf1, 0xca, 0x77, 0xe8, 0x9a, 0x95, 0xd5, 0x0d, + 0x3c, 0x16, 0xd3, 0x84, 0xf8, 0x45, 0x5f, 0x8b, 0xd7, 0xaf, 0x9e, 0xb3, + 0xdf, 0xa3, 0xd5, 0x91, 0xd9, 0x84, 0x2d, 0xef, 0x23, 0x5f, 0x76, 0x30, + 0xa8, 0xe4, 0x8c, 0x08, 0x8f, 0xf6, 0x64, 0x2e, 0x10, 0x17, 0x94, 0x53, + 0x5a, 0x93, 0x3e, 0x1e, 0x97, 0x6f, 0xa8, 0x50, 0x9f, 0xc7, 0x28, 0xb2, + 0xda, 0x0c, 0x4a, 0x1a, 0x08, 0xd7, 0xfc, 0xf3, 0x7a, 0xba, 0xae, 0x1f, + 0xf3, 0x00, 0x1a, 0xca, 0x1d, 0xc1, 0xbb, 0xb0, 0x5d, 0x9d, 0xff, 0xba, + 0xa1, 0xa0, 0x9f, 0x7f, 0xb1, 0xee, 0xf3, 0x82, 0x37, 0xd9, 0xeb, 0xcc, + 0xc7, 0x22, 0xb9, 0x33, 0x84, 0x36, 0xdd, 0xe7, 0x11, 0x91, 0x12, 0x79, + 0x8c, 0x26, 0x80, 0x9c, 0x1a, 0x8d, 0xec, 0x43, 0x20, 0x61, 0x02, 0x81, + 0x80, 0x1f, 0x75, 0x10, 0xaa, 0x62, 0xc2, 0xd8, 0xde, 0x4a, 0x3c, 0x53, + 0x28, 0x27, 0x81, 0xf4, 0x1e, 0x02, 0xd0, 0xe8, 0xb4, 0x02, 0xae, 0x78, + 0x43, 0x2e, 0x44, 0x9c, 0x48, 0x11, 0x01, 0x61, 0xa1, 0x14, 0x03, 0xf0, + 0x2d, 0x01, 0x88, 0x0a, 0x8d, 0xcc, 0x93, 0x81, 0x52, 0xd7, 0x97, 0x21, + 0xa4, 0x71, 0x1a, 0x60, 0x7a, 0xc4, 0x47, 0x1e, 0xbf, 0x96, 0x48, 0x10, + 0xf9, 0x5b, 0xe4, 0x7a, 0x45, 0xe6, 0x04, 0x99, 0xe2, 0x9f, 0x4c, 0x97, + 0x73, 0xc8, 0x37, 0x73, 0x40, 0x4f, 0x60, 0x66, 0x37, 0x72, 0x8c, 0x2d, + 0x03, 0x51, 0xbb, 0x03, 0xc3, 0x26, 0xc8, 0xbb, 0x73, 0xa7, 0x21, 0xe7, + 0xfa, 0x54, 0x40, 0xea, 0x21, 0x72, 0xbb, 0xa1, 0x46, 0x5f, 0xcc, 0x30, + 0xdc, 0xb0, 0xd9, 0xf8, 0x99, 0x30, 0xe8, 0x15, 0xaa, 0x1f, 0x7f, 0x97, + 0x29, 0xa8, 0x57, 0xe0, 0x0e, 0x03, 0x38, 0xdd, 0x59, 0x02, 0x81, 0x80, + 0x4d, 0x1f, 0x0d, 0x75, 0x6f, 0xe7, 0x7e, 0x01, 0x09, 0x9a, 0x65, 0x2f, + 0x50, 0xa8, 0x8b, 0x7b, 0x68, 0x5d, 0xc5, 0xbf, 0x00, 0x98, 0x1d, 0x5d, + 0x23, 0x76, 0xfd, 0x0c, 0x6f, 0xe2, 0x9c, 0xd5, 0xb6, 0x38, 0x73, 0x44, + 0x79, 0x30, 0x5a, 0x73, 0xad, 0x3c, 0x15, 0x99, 0xd3, 0x9e, 0xae, 0x3b, + 0xae, 0x03, 0x5f, 0xbd, 0x6f, 0xed, 0x07, 0xc2, 0x8d, 0xe7, 0x05, 0x93, + 0x38, 0x79, 0xa0, 0x6e, 0x48, 0xe6, 0xa6, 0x03, 0x68, 0x6e, 0xd8, 0xe2, + 0x56, 0x0a, 0x5f, 0x6a, 0xf1, 0xf2, 0xc2, 0x4f, 0xaf, 0x4a, 0xa9, 0x60, + 0xe3, 0x82, 0x18, 0x6f, 0x15, 0xee, 0xdc, 0xe9, 0xa2, 0x49, 0x1a, 0xe7, + 0x30, 0x68, 0x0d, 0xd4, 0xcf, 0x77, 0x8b, 0x70, 0xfa, 0xa8, 0x68, 0x26, + 0xab, 0x32, 0x23, 0x47, 0x7c, 0xc9, 0x13, 0x77, 0xb1, 0x9a, 0x6d, 0x5a, + 0x2e, 0xae, 0xa2, 0x19, 0x76, 0x0b, 0xee, 0xd5, +}; + +// kExampleRSAPSSKeySHA384 is an RSA private key constrained to PSS with +// SHA-384, and salt length >= 48, in PKCS#8 format. Of course, you should never +// use this key anywhere but in an example. +static const uint8_t kExampleRSAPSSKeySHA384[] = { + 0x30, 0x82, 0x04, 0xf0, 0x02, 0x01, 0x00, 0x30, 0x41, 0x06, 0x09, 0x2a, + 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0a, 0x30, 0x34, 0xa0, 0x0f, + 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, + 0x02, 0x05, 0x00, 0xa1, 0x1c, 0x30, 0x1a, 0x06, 0x09, 0x2a, 0x86, 0x48, + 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x08, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, + 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02, 0x05, 0x00, 0xa2, 0x03, 0x02, + 0x01, 0x30, 0x04, 0x82, 0x04, 0xa6, 0x30, 0x82, 0x04, 0xa2, 0x02, 0x01, + 0x00, 0x02, 0x82, 0x01, 0x01, 0x00, 0xcd, 0x00, 0x81, 0xea, 0x7b, 0x2a, + 0xe1, 0xea, 0x06, 0xd5, 0x9f, 0x7c, 0x73, 0xd9, 0xff, 0xb9, 0x4a, 0x09, + 0x61, 0x5c, 0x2e, 0x4b, 0xa7, 0xc6, 0x36, 0xce, 0xf0, 0x8d, 0xd3, 0x53, + 0x3e, 0xc3, 0x18, 0x55, 0x25, 0xb0, 0x15, 0xc7, 0x69, 0xb9, 0x9a, 0x77, + 0xd6, 0x72, 0x5b, 0xf9, 0xc3, 0x53, 0x2a, 0x9b, 0x6e, 0x5f, 0x66, 0x27, + 0xd5, 0xfb, 0x85, 0x16, 0x07, 0x68, 0xd3, 0xdd, 0xa9, 0xcb, 0xd3, 0x59, + 0x74, 0x51, 0x17, 0x17, 0xdc, 0x3d, 0x30, 0x9d, 0x2f, 0xc4, 0x7e, 0xe4, + 0x1f, 0x97, 0xe3, 0x2a, 0xdb, 0x7f, 0x9d, 0xd8, 0x64, 0xa1, 0xc4, 0x76, + 0x7a, 0x66, 0x6e, 0xcd, 0x71, 0xbc, 0x1a, 0xac, 0xf5, 0xe7, 0x51, 0x7f, + 0x4b, 0x38, 0x59, 0x4f, 0xea, 0x9b, 0x05, 0xe4, 0x2d, 0x5a, 0xda, 0x99, + 0x12, 0x00, 0x80, 0x13, 0xe4, 0x53, 0x16, 0xa4, 0xd9, 0xbb, 0x8e, 0xd0, + 0x86, 0xb8, 0x8d, 0x28, 0x75, 0x8b, 0xac, 0xaf, 0x92, 0x2d, 0x46, 0xa8, + 0x68, 0xb4, 0x85, 0xd2, 0x39, 0xc9, 0xba, 0xeb, 0x0e, 0x2b, 0x64, 0x59, + 0x27, 0x10, 0xf4, 0x2b, 0x2d, 0x1e, 0xa0, 0xa4, 0xb4, 0x80, 0x2c, 0x0b, + 0xec, 0xab, 0x32, 0x8f, 0x8a, 0x68, 0xb0, 0x07, 0x3b, 0xdb, 0x54, 0x6f, + 0xee, 0xa9, 0x80, 0x9d, 0x28, 0x49, 0x91, 0x2b, 0x39, 0x0c, 0x15, 0x32, + 0xbc, 0x7e, 0x29, 0xc7, 0x65, 0x8f, 0x81, 0x75, 0xfa, 0xe4, 0x6f, 0x34, + 0x33, 0x2f, 0xf8, 0x7b, 0xca, 0xb3, 0xe4, 0x06, 0x49, 0xb9, 0x85, 0x77, + 0x86, 0x9d, 0xa0, 0xea, 0x71, 0x83, 0x53, 0xf0, 0x72, 0x27, 0x54, 0x88, + 0x69, 0x13, 0x64, 0x87, 0x60, 0xd1, 0x22, 0xbe, 0x67, 0x6e, 0x0f, 0xc4, + 0x83, 0xdd, 0x20, 0xff, 0xc3, 0x1b, 0xda, 0x96, 0xa3, 0x19, 0x66, 0xc9, + 0xaa, 0x2e, 0x75, 0xad, 0x03, 0xde, 0x47, 0xe1, 0xc4, 0x4f, 0x02, 0x03, + 0x01, 0x00, 0x01, 0x02, 0x82, 0x01, 0x00, 0x60, 0x29, 0x7a, 0xc7, 0x99, + 0x1b, 0x16, 0x7a, 0x06, 0xd6, 0xb2, 0x47, 0x58, 0xb8, 0xcb, 0xe2, 0x08, + 0xbe, 0xb9, 0xb2, 0xd9, 0xec, 0x97, 0x38, 0xbd, 0x80, 0xf9, 0x0a, 0x2e, + 0x35, 0x00, 0x5d, 0xd7, 0xce, 0x29, 0x2d, 0x9e, 0x29, 0xba, 0x88, 0x5b, + 0xd3, 0x16, 0xfe, 0xf1, 0xf2, 0x09, 0x13, 0xbc, 0x0a, 0xc9, 0x0d, 0x6b, + 0x08, 0x08, 0xb2, 0x41, 0x4d, 0x82, 0x10, 0x44, 0x41, 0xd8, 0x62, 0x4a, + 0x33, 0xce, 0x02, 0x33, 0xc8, 0xf7, 0x80, 0xa4, 0x8b, 0x37, 0x5a, 0xff, + 0x02, 0xd7, 0x67, 0x12, 0x22, 0x8a, 0x70, 0x24, 0x84, 0xdb, 0x3f, 0x9e, + 0xbe, 0xcc, 0xcf, 0xbb, 0xee, 0x17, 0x09, 0xdb, 0xa1, 0x82, 0x80, 0x0d, + 0x94, 0x9e, 0x9e, 0x42, 0x16, 0xe0, 0xbf, 0xf3, 0x55, 0x83, 0x88, 0xf8, + 0xbd, 0x90, 0xda, 0x37, 0x3a, 0x1d, 0x82, 0x74, 0x3e, 0xc3, 0xfb, 0xdd, + 0x14, 0x27, 0xfd, 0x16, 0x82, 0x5a, 0x65, 0x7a, 0x31, 0x69, 0x12, 0xe8, + 0x69, 0x53, 0x65, 0x11, 0x7c, 0xa2, 0xf8, 0x45, 0xc9, 0x09, 0x40, 0x5f, + 0xca, 0xc5, 0x5f, 0x89, 0x5f, 0xc1, 0x5d, 0x20, 0x38, 0x6c, 0x26, 0xee, + 0x78, 0xc9, 0xe9, 0x90, 0x75, 0x02, 0x9a, 0x17, 0x8a, 0x6c, 0x1e, 0x4c, + 0xf0, 0xc2, 0x00, 0xe8, 0xa9, 0xcf, 0xb2, 0x7e, 0x9d, 0x15, 0x6f, 0x86, + 0xe6, 0xc2, 0xad, 0xc2, 0x2b, 0x1a, 0x84, 0xa1, 0xcd, 0x5c, 0xa5, 0xb2, + 0x79, 0x08, 0x75, 0xd7, 0x94, 0x07, 0xc8, 0x4b, 0x35, 0x23, 0x95, 0xcb, + 0x81, 0xcc, 0x3f, 0xed, 0x5b, 0xb0, 0x43, 0xb6, 0x9e, 0xde, 0x0c, 0x07, + 0x20, 0x45, 0x50, 0x02, 0x5c, 0xee, 0x8c, 0x5f, 0x44, 0x01, 0x70, 0xb6, + 0x12, 0x0b, 0xb4, 0x8e, 0x0f, 0x74, 0x7b, 0xcd, 0x8f, 0x52, 0x21, 0x10, + 0x85, 0x0d, 0xf0, 0x43, 0xc4, 0x28, 0xdf, 0xd1, 0x87, 0x05, 0x31, 0x02, + 0x81, 0x81, 0x00, 0xf6, 0xf9, 0x61, 0xb4, 0x7c, 0xbc, 0x03, 0x5d, 0x3a, + 0xed, 0xeb, 0xc7, 0xde, 0x85, 0x0a, 0x95, 0x6b, 0x65, 0xec, 0xdb, 0x9c, + 0xf6, 0x07, 0x64, 0x06, 0x3f, 0x15, 0xaa, 0x48, 0x55, 0x3c, 0x58, 0xd9, + 0x72, 0xfe, 0x66, 0x75, 0x05, 0x6e, 0x35, 0xdd, 0xfd, 0xc3, 0x7b, 0xf3, + 0xb9, 0xf2, 0xf6, 0x22, 0xee, 0x27, 0x13, 0x37, 0x25, 0x68, 0x49, 0xc9, + 0xbe, 0xf2, 0x17, 0x6f, 0xe8, 0xf7, 0xc3, 0xf8, 0xbb, 0x91, 0xba, 0x37, + 0x4d, 0xd5, 0x3b, 0xaf, 0x3d, 0xec, 0x81, 0x4d, 0x2b, 0xde, 0xc1, 0x0c, + 0x1f, 0xdc, 0x88, 0xcd, 0xd1, 0x68, 0x76, 0xf2, 0x6b, 0x1e, 0xdf, 0xa3, + 0xf0, 0x94, 0x19, 0x7e, 0xdf, 0x4d, 0x42, 0xff, 0x1f, 0xb2, 0x97, 0x11, + 0x03, 0xb8, 0x98, 0xca, 0x85, 0x9c, 0x42, 0x72, 0x87, 0x08, 0x6a, 0x84, + 0x2a, 0xb4, 0x10, 0xbb, 0x69, 0xcf, 0x2d, 0x35, 0xaf, 0x6b, 0xe3, 0x02, + 0x81, 0x81, 0x00, 0xd4, 0x7e, 0x72, 0x4a, 0x7f, 0xf4, 0x10, 0x48, 0xb2, + 0x70, 0xc2, 0x52, 0x4a, 0x41, 0x01, 0x87, 0x8b, 0x73, 0x15, 0x9b, 0xb7, + 0x3d, 0x3d, 0xbc, 0x18, 0x7b, 0x22, 0x0e, 0x63, 0x5b, 0x35, 0x34, 0xf9, + 0x6e, 0x24, 0x3a, 0x18, 0x4d, 0x93, 0xf8, 0x60, 0xb6, 0xbf, 0xbb, 0x6b, + 0x71, 0xc1, 0xed, 0x9a, 0x1e, 0x1f, 0x45, 0x85, 0x83, 0x02, 0x3c, 0x30, + 0x1e, 0x96, 0xa6, 0x92, 0xc1, 0xa0, 0x8b, 0x53, 0xd0, 0xec, 0x9c, 0xa9, + 0x10, 0x10, 0x0d, 0x80, 0x45, 0x1e, 0x3b, 0x7d, 0xc6, 0xa0, 0x1b, 0xac, + 0x4a, 0xec, 0xef, 0x8d, 0xf7, 0x98, 0x84, 0x6b, 0xc2, 0x35, 0xa0, 0x8c, + 0xbb, 0xa2, 0xcf, 0x4c, 0x06, 0x80, 0x4c, 0xc1, 0x12, 0x19, 0xe9, 0x56, + 0x08, 0xc7, 0x14, 0xe3, 0xf1, 0x43, 0x0d, 0x49, 0x1f, 0xad, 0xbb, 0xa3, + 0x2a, 0x57, 0x51, 0xa0, 0x4f, 0x97, 0x74, 0x58, 0x34, 0xc9, 0xa5, 0x02, + 0x81, 0x80, 0x21, 0xf2, 0x45, 0x2b, 0xb9, 0xb9, 0x5d, 0xfd, 0x02, 0x8c, + 0x91, 0x4b, 0xf7, 0x99, 0xf1, 0xca, 0x77, 0xe8, 0x9a, 0x95, 0xd5, 0x0d, + 0x3c, 0x16, 0xd3, 0x84, 0xf8, 0x45, 0x5f, 0x8b, 0xd7, 0xaf, 0x9e, 0xb3, + 0xdf, 0xa3, 0xd5, 0x91, 0xd9, 0x84, 0x2d, 0xef, 0x23, 0x5f, 0x76, 0x30, + 0xa8, 0xe4, 0x8c, 0x08, 0x8f, 0xf6, 0x64, 0x2e, 0x10, 0x17, 0x94, 0x53, + 0x5a, 0x93, 0x3e, 0x1e, 0x97, 0x6f, 0xa8, 0x50, 0x9f, 0xc7, 0x28, 0xb2, + 0xda, 0x0c, 0x4a, 0x1a, 0x08, 0xd7, 0xfc, 0xf3, 0x7a, 0xba, 0xae, 0x1f, + 0xf3, 0x00, 0x1a, 0xca, 0x1d, 0xc1, 0xbb, 0xb0, 0x5d, 0x9d, 0xff, 0xba, + 0xa1, 0xa0, 0x9f, 0x7f, 0xb1, 0xee, 0xf3, 0x82, 0x37, 0xd9, 0xeb, 0xcc, + 0xc7, 0x22, 0xb9, 0x33, 0x84, 0x36, 0xdd, 0xe7, 0x11, 0x91, 0x12, 0x79, + 0x8c, 0x26, 0x80, 0x9c, 0x1a, 0x8d, 0xec, 0x43, 0x20, 0x61, 0x02, 0x81, + 0x80, 0x1f, 0x75, 0x10, 0xaa, 0x62, 0xc2, 0xd8, 0xde, 0x4a, 0x3c, 0x53, + 0x28, 0x27, 0x81, 0xf4, 0x1e, 0x02, 0xd0, 0xe8, 0xb4, 0x02, 0xae, 0x78, + 0x43, 0x2e, 0x44, 0x9c, 0x48, 0x11, 0x01, 0x61, 0xa1, 0x14, 0x03, 0xf0, + 0x2d, 0x01, 0x88, 0x0a, 0x8d, 0xcc, 0x93, 0x81, 0x52, 0xd7, 0x97, 0x21, + 0xa4, 0x71, 0x1a, 0x60, 0x7a, 0xc4, 0x47, 0x1e, 0xbf, 0x96, 0x48, 0x10, + 0xf9, 0x5b, 0xe4, 0x7a, 0x45, 0xe6, 0x04, 0x99, 0xe2, 0x9f, 0x4c, 0x97, + 0x73, 0xc8, 0x37, 0x73, 0x40, 0x4f, 0x60, 0x66, 0x37, 0x72, 0x8c, 0x2d, + 0x03, 0x51, 0xbb, 0x03, 0xc3, 0x26, 0xc8, 0xbb, 0x73, 0xa7, 0x21, 0xe7, + 0xfa, 0x54, 0x40, 0xea, 0x21, 0x72, 0xbb, 0xa1, 0x46, 0x5f, 0xcc, 0x30, + 0xdc, 0xb0, 0xd9, 0xf8, 0x99, 0x30, 0xe8, 0x15, 0xaa, 0x1f, 0x7f, 0x97, + 0x29, 0xa8, 0x57, 0xe0, 0x0e, 0x03, 0x38, 0xdd, 0x59, 0x02, 0x81, 0x80, + 0x4d, 0x1f, 0x0d, 0x75, 0x6f, 0xe7, 0x7e, 0x01, 0x09, 0x9a, 0x65, 0x2f, + 0x50, 0xa8, 0x8b, 0x7b, 0x68, 0x5d, 0xc5, 0xbf, 0x00, 0x98, 0x1d, 0x5d, + 0x23, 0x76, 0xfd, 0x0c, 0x6f, 0xe2, 0x9c, 0xd5, 0xb6, 0x38, 0x73, 0x44, + 0x79, 0x30, 0x5a, 0x73, 0xad, 0x3c, 0x15, 0x99, 0xd3, 0x9e, 0xae, 0x3b, + 0xae, 0x03, 0x5f, 0xbd, 0x6f, 0xed, 0x07, 0xc2, 0x8d, 0xe7, 0x05, 0x93, + 0x38, 0x79, 0xa0, 0x6e, 0x48, 0xe6, 0xa6, 0x03, 0x68, 0x6e, 0xd8, 0xe2, + 0x56, 0x0a, 0x5f, 0x6a, 0xf1, 0xf2, 0xc2, 0x4f, 0xaf, 0x4a, 0xa9, 0x60, + 0xe3, 0x82, 0x18, 0x6f, 0x15, 0xee, 0xdc, 0xe9, 0xa2, 0x49, 0x1a, 0xe7, + 0x30, 0x68, 0x0d, 0xd4, 0xcf, 0x77, 0x8b, 0x70, 0xfa, 0xa8, 0x68, 0x26, + 0xab, 0x32, 0x23, 0x47, 0x7c, 0xc9, 0x13, 0x77, 0xb1, 0x9a, 0x6d, 0x5a, + 0x2e, 0xae, 0xa2, 0x19, 0x76, 0x0b, 0xee, 0xd5, +}; + // kExampleECKeyDER is a sample EC private key encoded as an ECPrivateKey // structure. static const uint8_t kExampleECKeyDER[] = { @@ -1211,6 +1435,35 @@ // Two null parameters should compare as equal. EXPECT_EQ(1, EVP_PKEY_parameters_eq(rsa.get(), rsa2.get())); + // RSA-PSS keys have parameters. + EVP_PKEY_ALG const *alg = EVP_pkey_rsa_pss_sha256(); + UniquePtr<EVP_PKEY> rsa_pss_sha256(EVP_PKEY_from_private_key_info( + kExampleRSAPSSKeySHA256, sizeof(kExampleRSAPSSKeySHA256), &alg, 1u)); + ASSERT_TRUE(rsa_pss_sha256); + EXPECT_FALSE(EVP_PKEY_missing_parameters(rsa_pss_sha256.get())); + UniquePtr<EVP_PKEY> rsa_pss_sha256_2(EVP_PKEY_from_private_key_info( + kExampleRSAPSSKeySHA256, sizeof(kExampleRSAPSSKeySHA256), &alg, 1u)); + ASSERT_TRUE(rsa_pss_sha256_2); + EXPECT_TRUE( + EVP_PKEY_parameters_eq(rsa_pss_sha256.get(), rsa_pss_sha256_2.get())); + EXPECT_TRUE( + EVP_PKEY_copy_parameters(rsa_pss_sha256.get(), rsa_pss_sha256_2.get())); + + // RSA-PSS keys' parameters are not compatible with RSA keys. + EXPECT_FALSE(EVP_PKEY_parameters_eq(rsa_pss_sha256.get(), rsa.get())); + EXPECT_FALSE(EVP_PKEY_copy_parameters(rsa_pss_sha256.get(), rsa.get())); + + // Different RSA-PSS key types are not compatible. + alg = EVP_pkey_rsa_pss_sha384(); + UniquePtr<EVP_PKEY> rsa_pss_sha384(EVP_PKEY_from_private_key_info( + kExampleRSAPSSKeySHA384, sizeof(kExampleRSAPSSKeySHA384), &alg, 1u)); + ASSERT_TRUE(rsa_pss_sha384); + EXPECT_FALSE(EVP_PKEY_missing_parameters(rsa_pss_sha384.get())); + EXPECT_FALSE( + EVP_PKEY_parameters_eq(rsa_pss_sha256.get(), rsa_pss_sha384.get())); + EXPECT_FALSE( + EVP_PKEY_copy_parameters(rsa_pss_sha256.get(), rsa_pss_sha384.get())); + // EC keys have parameters, but it is possible to initialize an |EVP_PKEY| // with a completely empty |EC_KEY|. UniquePtr<EVP_PKEY> ec_no_params(EVP_PKEY_new());
diff --git a/crypto/evp/p_rsa.cc b/crypto/evp/p_rsa.cc index 044fe31..9003853 100644 --- a/crypto/evp/p_rsa.cc +++ b/crypto/evp/p_rsa.cc
@@ -286,6 +286,46 @@ pkey->pkey = nullptr; } +static int rsa_pss_params_missing(const EvpPkey *pkey) { + const RSA *rsa = reinterpret_cast<const RSA *>(pkey->pkey); + return rsa == nullptr || FromOpaque(rsa)->pss_params == rsa_pss_none; +} + +static int rsa_pss_params_copy(EvpPkey *to, const EvpPkey *from) { + const RSA *from_key = reinterpret_cast<const RSA *>(from->pkey); + if (from_key == nullptr) { + OPENSSL_PUT_ERROR(EVP, EVP_R_NO_KEY_SET); + return 0; + } + rsa_pss_params_t pss_params = FromOpaque(from_key)->pss_params; + if (pss_params == rsa_pss_none) { + OPENSSL_PUT_ERROR(EVP, EVP_R_MISSING_PARAMETERS); + return 0; + } + if (to->pkey == nullptr) { + to->pkey = RSA_new(); + if (to->pkey == nullptr) { + return 0; + } + } + FromOpaque(reinterpret_cast<RSA *>(to->pkey))->pss_params = pss_params; + return 1; +} + +static bool rsa_pss_params_equal(const EvpPkey *a, const EvpPkey *b) { + const RSA *a_rsa = reinterpret_cast<const RSA *>(a->pkey); + const RSA *b_rsa = reinterpret_cast<const RSA *>(b->pkey); + if (a_rsa == nullptr || b_rsa == nullptr) { + return false; + } + rsa_pss_params_t a_pss_params = FromOpaque(a_rsa)->pss_params; + rsa_pss_params_t b_pss_params = FromOpaque(b_rsa)->pss_params; + if (a_pss_params == rsa_pss_none || b_pss_params == rsa_pss_none) { + return false; + } + return a_pss_params == b_pss_params; +} + const EVP_PKEY_ASN1_METHOD rsa_asn1_meth = { EVP_PKEY_RSA, // 1.2.840.113549.1.1.1 @@ -357,9 +397,9 @@ int_rsa_size, rsa_bits, - /*param_missing=*/nullptr, - /*param_copy=*/nullptr, - /*param_equal=*/nullptr, + rsa_pss_params_missing, + rsa_pss_params_copy, + rsa_pss_params_equal, int_rsa_free, };