1 files changed, 8 insertions, 2 deletions
diff --git a/chromium/third_party/nss/nss/lib/pk11wrap/pk11akey.c b/chromium/third_party/nss/nss/lib/pk11wrap/pk11akey.c
index 8e3935910e0..36ad73cfd42 100644
--- a/chromium/third_party/nss/nss/lib/pk11wrap/pk11akey.c
+++ b/chromium/third_party/nss/nss/lib/pk11wrap/pk11akey.c
@@ -1703,7 +1703,13 @@ done:
 SECKEYPrivateKeyInfo *
 PK11_ExportPrivateKeyInfo(CERTCertificate *cert, void *wincx)
 {
-    return NULL;
+    SECKEYPrivateKeyInfo *pki = NULL;
+    SECKEYPrivateKey     *pk  = PK11_FindKeyByAnyCert(cert, wincx);
+    if (pk != NULL) {
+	pki = PK11_ExportPrivKeyInfo(pk, wincx);
+	SECKEY_DestroyPrivateKey(pk);
+    }
+    return pki;
 }
 
 SECKEYEncryptedPrivateKeyInfo * 
@@ -1882,7 +1888,7 @@ PK11_ExportEncryptedPrivateKeyInfo(
 }
 
 SECItem*
-PK11_DEREncodePublicKey(SECKEYPublicKey *pubk)
+PK11_DEREncodePublicKey(const SECKEYPublicKey *pubk)
 {
     return SECKEY_EncodeDERSubjectPublicKeyInfo(pubk);
 }