diff --git a/library/pkparse.c b/library/pkparse.c
index dbef18a..fce5ad7 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -978,7 +978,14 @@
         }
     }
 
-    //TODO: Do we need to support derived public keys with uecc?
+    if( !pubkey_done )
+    {
+        ret = uECC_compute_public_key( keypair->private_key,
+                                       keypair->public_key,
+                                       uECC_secp256r1() );
+        if( ret == 0 )
+            return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+    }
 
     return( 0 );
 }