tests: pk: complete testing of pk_sign_ext_verify_ext

Add more positive and negative testing for all the relevant cases.

Signed-off-by: Valerio Setti <vsetti@baylibre.com>

Author: valeriosetti

tests/suites/test_suite_pk.data

@@ -596,49 +596,98 @@ Sign_ext/verify_ext: RSA2048 + PKCS1V15_SIGN(SHA_256), COPY_FROM_PSA, SIGALG_RSA
 depends_on:PSA_WANT_ALG_RSA_PKCS1V15_SIGN:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
 pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PKCS1V15_SIGN(PSA_ALG_SHA_256):TEST_PK_COPY_FROM_PSA:MBEDTLS_PK_SIGALG_RSA_PKCS1V15:MBEDTLS_MD_SHA256:0:0
 
+# Ideally this is a negative test. When PK creates a context by copying it from PSA it assigns
+# PKCS v1.5 signature algorithm to it (no matter if the copied PSA key had PKCS v1.5 or PSS),
+# but here we're trying to do PSS so it's expected to fail.
+# It works only because the PK context is also given PSS algorithm as enrollment algorithm.
+Sign_ext/verify_ext: RSA2048 + PKCS1V15_SIGN(SHA_256), COPY_FROM_PSA, SIGALG_RSA_PSS + MD_SHA256, OK
+depends_on:PSA_WANT_ALG_RSA_PKCS1V15_SIGN:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
+pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PKCS1V15_SIGN(PSA_ALG_SHA_256):TEST_PK_COPY_FROM_PSA:MBEDTLS_PK_SIGALG_RSA_PSS:MBEDTLS_MD_SHA256:0:0
+
+# This is similar to the above, but in this case we're testing with SHA-384 instead of SHA-256. On top
+# of what has been explained above this works because the key in PK context is given an ANY_HASH policy.
+Sign_ext/verify_ext: RSA2048 + PKCS1V15_SIGN(SHA_256), COPY_FROM_PSA, SIGALG_RSA_PSS + MD_SHA384, OK
+depends_on:PSA_WANT_ALG_RSA_PKCS1V15_SIGN:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
+pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PKCS1V15_SIGN(PSA_ALG_SHA_256):TEST_PK_COPY_FROM_PSA:MBEDTLS_PK_SIGALG_RSA_PSS:MBEDTLS_MD_SHA384:0:0
+
+Sign_ext/verify_ext: RSA2048 + PKCS1V15_SIGN(SHA_256), COPY_FROM_PSA, SIGALG_RSA_PKCS1V15 + MD_NONE, No MD
+depends_on:PSA_WANT_ALG_RSA_PKCS1V15_SIGN:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
+pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PKCS1V15_SIGN(PSA_ALG_SHA_256):TEST_PK_COPY_FROM_PSA:MBEDTLS_PK_SIGALG_RSA_PKCS1V15:MBEDTLS_MD_NONE:PSA_ERROR_INVALID_ARGUMENT:0
+
+# This is a positive testing. The fact that verification fails is expected because the feature
+# is not implemented for wrapped RSA keys.
 Sign_ext/verify_ext: RSA2048 + PKCS1V15_SIGN(SHA_256), WRAP_PSA, SIGALG_RSA_PKCS1V15 + MD_SHA256, OK
 depends_on:PSA_WANT_ALG_RSA_PKCS1V15_SIGN:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
 pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PKCS1V15_SIGN(PSA_ALG_SHA_256):TEST_PK_WRAP_PSA:MBEDTLS_PK_SIGALG_RSA_PKCS1V15:MBEDTLS_MD_SHA256:0:MBEDTLS_ERR_PK_TYPE_MISMATCH
 
+Sign_ext/verify_ext: RSA2048 + PKCS1V15_SIGN(SHA_256), WRAP_PSA, SIGALG_RSA_PSS + MD_SHA256, Wrong sigalg
+depends_on:PSA_WANT_ALG_RSA_PKCS1V15_SIGN:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
+pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PKCS1V15_SIGN(PSA_ALG_SHA_256):TEST_PK_WRAP_PSA:MBEDTLS_PK_SIGALG_RSA_PSS:MBEDTLS_MD_SHA256:PSA_ERROR_INVALID_ARGUMENT:0
+
+# This works because the copied PK context is given a PKCS v1.5 algorithm
+Sign_ext/verify_ext: RSA2048 + PSS_ANY_SALT(SHA_256), COPY_FROM_PSA, SIGALG_RSA_PKCS1V15 + MD_SHA256, OK
+depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
+pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PSS_ANY_SALT(PSA_ALG_SHA_256):TEST_PK_COPY_FROM_PSA:MBEDTLS_PK_SIGALG_RSA_PKCS1V15:MBEDTLS_MD_SHA256:0:0
+
+# Ideally this is a negative test. When PK creates a context by copying it from PSA it assigns
+# PKCS v1.5 signature algorithm to it (no matter if the copied PSA key had PKCS v1.5 or PSS),
+# but here we're trying to do PSS so it's expected to fail.
+# It works only because the PK context is also given PSS algorithm as enrollment algorithm.
 Sign_ext/verify_ext: RSA2048 + PSS_ANY_SALT(SHA_256), COPY_FROM_PSA, SIGALG_RSA_PSS + MD_SHA256, OK
 depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
 pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PSS_ANY_SALT(PSA_ALG_SHA_256):TEST_PK_COPY_FROM_PSA:MBEDTLS_PK_SIGALG_RSA_PSS:MBEDTLS_MD_SHA256:0:0
 
+Sign_ext/verify_ext: RSA2048 + PSS_ANY_SALT(SHA_256), COPY_FROM_PSA, SIGALG_RSA_PSS + MD_SHA384, OK
+depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
+pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PSS_ANY_SALT(PSA_ALG_SHA_256):TEST_PK_COPY_FROM_PSA:MBEDTLS_PK_SIGALG_RSA_PSS:MBEDTLS_MD_SHA384:0:0
+
+Sign_ext/verify_ext: RSA2048 + PSS_ANY_SALT(SHA_256), COPY_FROM_PSA, SIGALG_RSA_PSS + MD_NONE, No MD
+depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
+pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PSS_ANY_SALT(PSA_ALG_SHA_256):TEST_PK_COPY_FROM_PSA:MBEDTLS_PK_SIGALG_RSA_PSS:MBEDTLS_MD_NONE:MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE:0
+
+# This is a positive testing. The fact that verification fails is expected because the feature
+# is not implemented for wrapped RSA keys.
 Sign_ext/verify_ext: RSA2048 + PSS_ANY_SALT(SHA_256), WRAP_PSA, SIGALG_RSA_PSS + MD_SHA256, OK
 depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
 pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PSS_ANY_SALT(PSA_ALG_SHA_256):TEST_PK_WRAP_PSA:MBEDTLS_PK_SIGALG_RSA_PSS:MBEDTLS_MD_SHA256:0:MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE
 
-Sign_ext/verify_ext: RSA2048 + PKCS1V15_SIGN(SHA_384), COPY_FROM_PSA, SIGALG_RSA_PKCS1V15 + MD_SHA384, OK
-depends_on:PSA_WANT_ALG_RSA_PKCS1V15_SIGN:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
-pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PKCS1V15_SIGN(PSA_ALG_SHA_384):TEST_PK_COPY_FROM_PSA:MBEDTLS_PK_SIGALG_RSA_PKCS1V15:MBEDTLS_MD_SHA384:0:0
+# This works only because by passing MBEDTLS_PK_SIGALG_RSA_PKCS1V15 to pk_sign_ext(), we're actually
+# falling back to pk_sign() and in that case we use the same algorithm which is associated to the
+# key in PK context. So this should ideally be a negative test, but turns out to be OK.
+#
+# Note: The fact that verification fails is expected because the feature
+# is not implemented for wrapped RSA keys.
+Sign_ext/verify_ext: RSA2048 + PSS_ANY_SALT(SHA_256), WRAP_PSA, SIGALG_RSA_PKCS1V15 + MD_SHA256, OK
+depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
+pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PSS_ANY_SALT(PSA_ALG_SHA_256):TEST_PK_WRAP_PSA:MBEDTLS_PK_SIGALG_RSA_PKCS1V15:MBEDTLS_MD_SHA256:0:MBEDTLS_ERR_PK_TYPE_MISMATCH
 
-Sign_ext/verify_ext: RSA2048 + PKCS1V15_SIGN(SHA_384), WRAP_PSA, SIGALG_RSA_PKCS1V15 + MD_SHA384, OK
-depends_on:PSA_WANT_ALG_RSA_PKCS1V15_SIGN:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
-pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PKCS1V15_SIGN(PSA_ALG_SHA_384):TEST_PK_WRAP_PSA:MBEDTLS_PK_SIGALG_RSA_PKCS1V15:MBEDTLS_MD_SHA384:0:MBEDTLS_ERR_PK_TYPE_MISMATCH
+Sign_ext/verify_ext: RSA2048 + PSS_ANY_SALT(SHA_256), WRAP_PSA, SIGALG_RSA_PSS + MD_SHA256, No MD
+depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
+pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PSS_ANY_SALT(PSA_ALG_SHA_256):TEST_PK_WRAP_PSA:MBEDTLS_PK_SIGALG_RSA_PSS:MBEDTLS_MD_NONE:PSA_ERROR_INVALID_ARGUMENT:0
 
-Sign_ext/verify_ext: RSA2048 + PSS_ANY_SALT(SHA_384), COPY_FROM_PSA, SIGALG_RSA_PSS + MD_SHA384, OK
-depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
-pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PSS_ANY_SALT(PSA_ALG_SHA_384):TEST_PK_COPY_FROM_PSA:MBEDTLS_PK_SIGALG_RSA_PSS:MBEDTLS_MD_SHA384:0:0
+Sign_ext/verify_ext: RSA2048 + PSS_ANY_SALT(SHA_256), WRAP_PSA, SIGALG_RSA_PSS + MD_SHA384, Wrong MD
+depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
+pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PSS_ANY_SALT(PSA_ALG_SHA_256):TEST_PK_WRAP_PSA:MBEDTLS_PK_SIGALG_RSA_PSS:MBEDTLS_MD_SHA384:PSA_ERROR_INVALID_ARGUMENT:0
 
-Sign_ext/verify_ext: RSA2048 + PSS_ANY_SALT(SHA_384), WRAP_PSA, SIGALG_RSA_PSS + MD_SHA384, OK
-depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_384:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
+Sign_ext/verify_ext: RSA2048 + PSS_ANY_SALT(SHA_384), WRAP_PSA, SIGALG_RSA_PSS + MD_SHA384, Wrong MD
+depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
 pk_sign_ext_verify_ext:PSA_KEY_TYPE_RSA_KEY_PAIR:2048:PSA_ALG_RSA_PSS_ANY_SALT(PSA_ALG_SHA_384):TEST_PK_WRAP_PSA:MBEDTLS_PK_SIGALG_RSA_PSS:MBEDTLS_MD_SHA384:0:MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE
 
 Sign_ext/verify_ext: SECP256R1 + ECDSA(SHA_256), COPY_FROM_PSA, SIGALG_ECDSA + MD_SHA256, OK
 depends_on:PSA_HAVE_ALG_ECDSA_SIGN:PSA_WANT_ECC_SECP_R1_256:PSA_WANT_ALG_SHA_256
 pk_sign_ext_verify_ext:PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_SECP_R1):256:MBEDTLS_PK_ALG_ECDSA(PSA_ALG_SHA_256):TEST_PK_COPY_FROM_PSA:MBEDTLS_PK_SIGALG_ECDSA:MBEDTLS_MD_SHA256:0:0
 
+Sign_ext/verify_ext: SECP256R1 + ECDSA(SHA_256), COPY_FROM_PSA, SIGALG_RSA_PSS + MD_SHA256, OK
+depends_on:PSA_HAVE_ALG_ECDSA_SIGN:PSA_WANT_ECC_SECP_R1_256:PSA_WANT_ALG_SHA_256
+pk_sign_ext_verify_ext:PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_SECP_R1):256:MBEDTLS_PK_ALG_ECDSA(PSA_ALG_SHA_256):TEST_PK_COPY_FROM_PSA:MBEDTLS_PK_SIGALG_RSA_PSS:MBEDTLS_MD_SHA256:MBEDTLS_ERR_PK_TYPE_MISMATCH:0
+
 Sign_ext/verify_ext: SECP256R1 + ECDSA(SHA_256), WRAP_PSA, SIGALG_ECDSA + MD_SHA256, OK
 depends_on:PSA_HAVE_ALG_ECDSA_SIGN:PSA_WANT_ECC_SECP_R1_256:PSA_WANT_ALG_SHA_256
 pk_sign_ext_verify_ext:PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_SECP_R1):256:MBEDTLS_PK_ALG_ECDSA(PSA_ALG_SHA_256):TEST_PK_WRAP_PSA:MBEDTLS_PK_SIGALG_ECDSA:MBEDTLS_MD_SHA256:0:0
 
-Sign_ext/verify_ext: SECP384R1 + ECDSA(SHA_384), COPY_FROM_PSA, SIGALG_ECDSA + MD_SHA384, OK
-depends_on:PSA_HAVE_ALG_ECDSA_SIGN:PSA_WANT_ECC_SECP_R1_384:PSA_WANT_ALG_SHA_384
-pk_sign_ext_verify_ext:PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_SECP_R1):384:MBEDTLS_PK_ALG_ECDSA(PSA_ALG_SHA_384):TEST_PK_COPY_FROM_PSA:MBEDTLS_PK_SIGALG_ECDSA:MBEDTLS_MD_SHA384:0:0
-
-Sign_ext/verify_ext: SECP384R1 + ECDSA(SHA_384), WRAP_PSA, SIGALG_ECDSA + MD_SHA384, OK
-depends_on:PSA_HAVE_ALG_ECDSA_SIGN:PSA_WANT_ECC_SECP_R1_384:PSA_WANT_ALG_SHA_384
-pk_sign_ext_verify_ext:PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_SECP_R1):384:MBEDTLS_PK_ALG_ECDSA(PSA_ALG_SHA_384):TEST_PK_WRAP_PSA:MBEDTLS_PK_SIGALG_ECDSA:MBEDTLS_MD_SHA384:0:0
+Sign_ext/verify_ext: SECP256R1 + ECDSA(SHA_256), WRAP_PSA, SIGALG_RSA_PSS + MD_SHA256, OK
+depends_on:PSA_HAVE_ALG_ECDSA_SIGN:PSA_WANT_ECC_SECP_R1_256:PSA_WANT_ALG_SHA_256
+pk_sign_ext_verify_ext:PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_SECP_R1):256:MBEDTLS_PK_ALG_ECDSA(PSA_ALG_SHA_256):TEST_PK_WRAP_PSA:MBEDTLS_PK_SIGALG_RSA_PSS:MBEDTLS_MD_SHA256:MBEDTLS_ERR_PK_TYPE_MISMATCH:0
 
 PSA attributes for pk: NONE (bad)
 pk_get_psa_attributes_fail:MBEDTLS_PK_NONE:FROM_PUBLIC:PSA_KEY_USAGE_SIGN_MESSAGE:MBEDTLS_ERR_PK_BAD_INPUT_DATA