Use NSS to generate Origin-Bound Certs on Win and Mac.

crypto/scoped_nss_types.h

Index: crypto/scoped_nss_types.h
diff --git a/crypto/scoped_nss_types.h b/crypto/scoped_nss_types.h
index 3e84cb0e48e7e72c635792b2cf250d51d925a8b2..d8d78b0592d3838810520807b7850c443f7c1502 100644
--- a/crypto/scoped_nss_types.h
+++ b/crypto/scoped_nss_types.h
@@ -6,6 +6,7 @@
 #define CRYPTO_SCOPED_NSS_TYPES_H_
 #pragma once
 
+#include <keyhi.h>
 #include <nss.h>
 #include <pk11pub.h>
 
@@ -39,6 +40,12 @@ typedef scoped_ptr_malloc<
 typedef scoped_ptr_malloc<
     PK11SymKey, NSSDestroyer<PK11SymKey, PK11_FreeSymKey> > ScopedPK11SymKey;
 typedef scoped_ptr_malloc<
+    SECKEYPublicKey, NSSDestroyer<SECKEYPublicKey, SECKEY_DestroyPublicKey> >
+    ScopedSECKEYPublicKey;
+typedef scoped_ptr_malloc<
+    SECKEYPrivateKey, NSSDestroyer<SECKEYPrivateKey, SECKEY_DestroyPrivateKey> >
+    ScopedSECKEYPrivateKey;
+typedef scoped_ptr_malloc<
     SECAlgorithmID, NSSDestroyer1<SECAlgorithmID,
                                   SECOID_DestroyAlgorithmID,
                                   PR_TRUE> > ScopedSECAlgorithmID;