commit 25384a236e2a5c91ef07c0800e72948fd7dfc6e3
author Jaeden Amero <jaeden@patater.com> Thu Jan 10 10:23:21 2019 +0000
committer Jaeden Amero <jaeden.amero@arm.com> Wed Jan 23 17:31:50 2019 +0000
tree 8a865fec1b4adddb1f0f06806059f8221019c99e
parent d3a0c2c7793c514340a96fcb79292d4e0e35e022

psa: Simplify RSA public key format

Remove pkcs-1 and rsaEncryption front matter from RSA public keys. Move
code that was shared between RSA and other key types (like EC keys) to
be used only with non-RSA keys.

tests/suites/test_suite_psa_crypto.function

diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function
index 6916bf4..4d6cefb 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -625,27 +625,6 @@
         uint8_t *p = exported;
         uint8_t *end = exported + exported_length;
         size_t len;
-        mbedtls_asn1_buf alg;
-        mbedtls_asn1_buf params;
-        mbedtls_asn1_bitstring bitstring;
-        /* SubjectPublicKeyInfo  ::=  SEQUENCE  {
-         *      algorithm          AlgorithmIdentifier,
-         *      subjectPublicKey   BIT STRING  }
-         * AlgorithmIdentifier  ::=  SEQUENCE  {
-         *      algorithm          OBJECT IDENTIFIER,
-         *      parameters         ANY DEFINED BY algorithm OPTIONAL  }
-         */
-        TEST_EQUAL( mbedtls_asn1_get_tag( &p, end, &len,
-                                          MBEDTLS_ASN1_SEQUENCE |
-                                          MBEDTLS_ASN1_CONSTRUCTED ),
-                    0 );
-        TEST_EQUAL( p + len, end );
-        TEST_EQUAL( mbedtls_asn1_get_alg( &p, end, &alg, &params ), 0 );
-        if( ! is_oid_of_key_type( type, alg.p, alg.len ) )
-            goto exit;
-        TEST_EQUAL( mbedtls_asn1_get_bitstring( &p, end, &bitstring ), 0 );
-        TEST_EQUAL( p, end );
-        p = bitstring.p;
 #if defined(MBEDTLS_RSA_C)
         if( type == PSA_KEY_TYPE_RSA_PUBLIC_KEY )
         {
@@ -653,7 +632,6 @@
              *      modulus            INTEGER,    -- n
              *      publicExponent     INTEGER  }  -- e
              */
-            TEST_EQUAL( bitstring.unused_bits, 0 );
             TEST_EQUAL( mbedtls_asn1_get_tag( &p, end, &len,
                                               MBEDTLS_ASN1_SEQUENCE |
                                               MBEDTLS_ASN1_CONSTRUCTED ),
@@ -670,6 +648,29 @@
 #if defined(MBEDTLS_ECP_C)
         if( PSA_KEY_TYPE_IS_ECC_PUBLIC_KEY( type ) )
         {
+            mbedtls_asn1_buf alg;
+            mbedtls_asn1_buf params;
+            mbedtls_asn1_bitstring bitstring;
+            /* SubjectPublicKeyInfo  ::=  SEQUENCE  {
+             *      algorithm          AlgorithmIdentifier,
+             *      subjectPublicKey   BIT STRING  }
+             * AlgorithmIdentifier  ::=  SEQUENCE  {
+             *      algorithm          OBJECT IDENTIFIER,
+             *      parameters         ANY DEFINED BY algorithm OPTIONAL  }
+             */
+
+            TEST_EQUAL( mbedtls_asn1_get_tag( &p, end, &len,
+                                              MBEDTLS_ASN1_SEQUENCE |
+                                              MBEDTLS_ASN1_CONSTRUCTED ),
+                        0 );
+            TEST_EQUAL( p + len, end );
+            TEST_EQUAL( mbedtls_asn1_get_alg( &p, end, &alg, &params ), 0 );
+            if( ! is_oid_of_key_type( type, alg.p, alg.len ) )
+                goto exit;
+            TEST_EQUAL( mbedtls_asn1_get_bitstring( &p, end, &bitstring ), 0 );
+            TEST_EQUAL( p, end );
+            p = bitstring.p;
+
             /*   ECPoint ::= ...
              *      -- first 8 bits: 0x04 (uncompressed representation);
              *      -- then x_P as an n-bit string, big endian;