commit ff29f9c8255dfc9872bd4f3547594d3dc4826e6d
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Sep 18 16:13:02 2013 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Sep 18 16:13:02 2013 +0200
tree 55cf13c8259406ba6335e13bedf669e30225211e
parent 4fc090af9c5025c423865cc2ce5e2a8c1ee5add8

Compute public key if absent when reading EC key

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index f123b6c..9160e85 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -513,7 +513,7 @@
     }
 
     /*
-     * Is 'publickey' present?
+     * Is 'publickey' present? If not, create it from the private key.
      */
     if( ( ret = asn1_get_tag( &p, end, &len,
                     ASN1_CONTEXT_SPECIFIC | ASN1_CONSTRUCTED | 1 ) ) == 0 )
@@ -535,6 +535,12 @@
         ecp_keypair_free( eck );
         return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
     }
+    else if( ( ret = ecp_mul( &eck->grp, &eck->Q, &eck->d, &eck->grp.G,
+                              NULL, NULL ) ) != 0 )
+    {
+        ecp_keypair_free( eck );
+        return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + ret );
+    }
 
     if( ( ret = ecp_check_privkey( &eck->grp, &eck->d ) ) != 0 )
     {