react-native-quick-crypto 0.7.0-rc.9 → 0.7.1

package/cpp/MGLKeys.h

@@ -101,7 +101,8 @@ class ManagedEVPPKey {
       KeyEncodingContext context);
   //
   static ManagedEVPPKey GetParsedKey(jsi::Runtime &runtime,
-                                     EVPKeyPointer &&pkey, ParseKeyResult ret,
+                                     EVPKeyPointer &&pkey,
+                                     ParseKeyResult ret,
                                      const char *default_msg);
 
   static ManagedEVPPKey GetPublicOrPrivateKeyFromJs(jsi::Runtime &runtime,
@@ -113,17 +114,17 @@ class ManagedEVPPKey {
                                             unsigned int *offset,
                                             bool allow_key_object);
 
-  static OptionJSVariant ToEncodedPublicKey(
-      jsi::Runtime &runtime, ManagedEVPPKey key,
-      const PublicKeyEncodingConfig &config);
+  static jsi::Value ToEncodedPublicKey(jsi::Runtime &runtime,
+                                       ManagedEVPPKey key,
+                                       const PublicKeyEncodingConfig &config);
 
-  static OptionJSVariant ToEncodedPrivateKey(
-      jsi::Runtime &runtime, ManagedEVPPKey key,
-      const PrivateKeyEncodingConfig &config);
+  static jsi::Value ToEncodedPrivateKey(jsi::Runtime &runtime,
+                                        ManagedEVPPKey key,
+                                        const PrivateKeyEncodingConfig &config);
 
  private:
-  //  size_t size_of_private_key() const;
-  //  size_t size_of_public_key() const;
+   size_t size_of_private_key() const;
+   size_t size_of_public_key() const;
 
   EVPKeyPointer pkey_;
 };
@@ -167,25 +168,36 @@ class JSI_EXPORT KeyObjectHandle: public jsi::HostObject {
     jsi::Value get(jsi::Runtime &rt, const jsi::PropNameID &propNameID);
     const std::shared_ptr<KeyObjectData>& Data();
 
+    static std::shared_ptr<KeyObjectHandle> Create(std::shared_ptr<KeyObjectData> data);
+
  protected:
     jsi::Value Export(jsi::Runtime &rt);
     jsi::Value ExportJWK(jsi::Runtime &rt);
-    OptionJSVariant ExportPublicKey(
+    jsi::Value ExportPublicKey(
       jsi::Runtime& rt,
       const PublicKeyEncodingConfig& config) const;
-    OptionJSVariant ExportPrivateKey(
+    jsi::Value ExportPrivateKey(
       jsi::Runtime& rt,
       const PrivateKeyEncodingConfig& config) const;
-    OptionJSVariant ExportSecretKey(jsi::Runtime& rt) const;
+    jsi::Value ExportSecretKey(jsi::Runtime& rt) const;
+    jsi::Value GetKeyDetail(jsi::Runtime &rt);
+    jsi::Value GetAsymmetricKeyType(jsi::Runtime &rt) const;
     jsi::Value Init(jsi::Runtime &rt);
     jsi::Value InitECRaw(jsi::Runtime &rt);
     jsi::Value InitJWK(jsi::Runtime &rt);
-    jsi::Value GetKeyDetail(jsi::Runtime &rt);
 
  private:
     std::shared_ptr<KeyObjectData> data_;
 };
 
+WebCryptoKeyExportStatus PKEY_SPKI_Export(
+    KeyObjectData* key_data,
+    ByteSource* out);
+
+WebCryptoKeyExportStatus PKEY_PKCS8_Export(
+    KeyObjectData* key_data,
+    ByteSource* out);
+
 }  // namespace margelo
 
 #endif /* MGLCipherKeys_h */

package/cpp/MGLQuickCryptoHostObject.cpp

@@ -113,12 +113,12 @@ MGLQuickCryptoHostObject::MGLQuickCryptoHostObject(
   // createVerify
   this->fields.push_back(getVerifyFieldDefinition(jsCallInvoker, workerQueue));
 
-  // subtle API created from a simple jsi::Object
-  // because this FieldDefinition is only good for returning
-  // objects and too convoluted
-    this->fields.push_back(JSI_VALUE("webcrypto", {
-      return createWebCryptoObject(runtime);
-    }));
+  // subtle API
+  this->fields.push_back(JSI_VALUE("webcrypto", {
+    auto hostObject = std::make_shared<MGLWebCryptoHostObject>(
+        jsCallInvoker, workerQueue);
+    return jsi::Object::createFromHostObject(runtime, hostObject);
+  }));
 }
 
 }  // namespace margelo