commit 6fac3515d08fa0a3b4d85fd2a309c158f5adb9ee
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Mar 19 16:39:52 2014 +0100
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Mar 19 16:50:59 2014 +0100
tree 27c48d22c4feca11eb4de8149e2e2bd69028fdf0
parent 5246ee5c59906fc4b021ceab63f09afdedbc66b8

Make support for SpecifiedECDomain optional

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index aed50d1..4e9e400 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -163,8 +163,11 @@
 
     /* Tag may be either OID or SEQUENCE */
     params->tag = **p;
-    if( params->tag != ASN1_OID &&
-        params->tag != ( ASN1_CONSTRUCTED | ASN1_SEQUENCE ) )
+    if( params->tag != ASN1_OID
+#if defined(POLARSSL_PK_PARSE_EC_EXTENDED)
+            && params->tag != ( ASN1_CONSTRUCTED | ASN1_SEQUENCE )
+#endif
+            )
     {
         return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT +
                 POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
@@ -185,6 +188,7 @@
     return( 0 );
 }
 
+#if defined(POLARSSL_PK_PARSE_EC_EXTENDED)
 /*
  * Parse a SpecifiedECDomain (SEC 1 C.2) and (mostly) fill the group with it.
  * WARNING: the resulting group should only be used with
@@ -411,6 +415,7 @@
 
     return( ret );
 }
+#endif /* POLARSSL_PK_PARSE_EC_EXTENDED */
 
 /*
  * Use EC parameters to initialise an EC group
@@ -432,8 +437,12 @@
     }
     else
     {
+#if defined(POLARSSL_PK_PARSE_EC_EXTENDED)
         if( ( ret = pk_group_id_from_specified( params, &grp_id ) ) != 0 )
             return( ret );
+#else
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT );
+#endif
     }
 
     /*