commit b40dc58a831284dce9f85104409c73f4574d6d0d
author Hanno Becker <hanno.becker@arm.com> Wed Feb 20 09:38:45 2019 +0000
committer Hanno Becker <hanno.becker@arm.com> Tue Jun 25 09:00:25 2019 +0100
tree 6a5fe3db62e1a8d6224d79a0c54b3b72675348ff
parent ace04a6dc3dd079935163ce4d566ef960fd3d1d9

Introduce a helper macro to check for ASN.1 string tags

This commit introduces a macro `MBEDTLS_ASN1_IS_STRING_TAG`
that can be used to check if an ASN.1 tag is among the list
of string tags:
- MBEDTLS_ASN1_BMP_STRING
- MBEDTLS_ASN1_UTF8_STRING
- MBEDTLS_ASN1_T61_STRING
- MBEDTLS_ASN1_IA5_STRING
- MBEDTLS_ASN1_UNIVERSAL_STRING
- MBEDTLS_ASN1_PRINTABLE_STRING
- MBEDTLS_ASN1_BIT_STRING

library/x509.c

diff --git a/library/x509.c b/library/x509.c
index 2e7bd57..9d9db23 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -375,12 +375,11 @@
         return( MBEDTLS_ERR_X509_INVALID_NAME +
                 MBEDTLS_ERR_ASN1_OUT_OF_DATA );
 
-    if( **p != MBEDTLS_ASN1_BMP_STRING && **p != MBEDTLS_ASN1_UTF8_STRING      &&
-        **p != MBEDTLS_ASN1_T61_STRING && **p != MBEDTLS_ASN1_PRINTABLE_STRING &&
-        **p != MBEDTLS_ASN1_IA5_STRING && **p != MBEDTLS_ASN1_UNIVERSAL_STRING &&
-        **p != MBEDTLS_ASN1_BIT_STRING )
+    if( !MBEDTLS_ASN1_IS_STRING_TAG( **p ) )
+    {
         return( MBEDTLS_ERR_X509_INVALID_NAME +
                 MBEDTLS_ERR_ASN1_UNEXPECTED_TAG );
+    }
 
     val = &cur->val;
     val->tag = *(*p)++;