diff --git a/library/x509_crt.c b/library/x509_crt.c
index 97d4b95..e4a35f6 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -990,11 +990,13 @@
     /*
      * SubjectPublicKeyInfo
      */
+    crt->pk_raw.p = p;
     if( ( ret = mbedtls_pk_parse_subpubkey( &p, end, &crt->pk ) ) != 0 )
     {
         mbedtls_x509_crt_free( crt );
         return( ret );
     }
+    crt->pk_raw.len = p - crt->pk_raw.p;
 
     /*
      *  issuerUniqueID  [1]  IMPLICIT UniqueIdentifier OPTIONAL,