fix rng typo and remove encrypt/decrypt from ecc

Author: John Bland

addon/wolfcrypt/ecc.cpp

@@ -178,48 +178,6 @@ Napi::Number bind_wc_ecc_verify_hash(const Napi::CallbackInfo& info)
   return Napi::Number::New( env, res );
 }
 
-Napi::Number bind_wc_ecc_encrypt(const Napi::CallbackInfo& info)
-{
-  int ret;
-  Napi::Env env = info.Env();
-  ecc_key* private_key = (ecc_key*)( info[0].As<Napi::Uint8Array>().Data() );
-  ecc_key* public_key = (ecc_key*)( info[1].As<Napi::Uint8Array>().Data() );
-  uint8_t* msg = info[2].As<Napi::Uint8Array>().Data();
-  unsigned int msg_len = info[3].As<Napi::Number>().Uint32Value();
-  uint8_t* out = info[4].As<Napi::Uint8Array>().Data();
-  unsigned int out_len = info[5].As<Napi::Number>().Uint32Value();
-
-  ret = wc_ecc_encrypt( private_key, public_key, msg, msg_len, out, &out_len, NULL );
-
-  if ( ret < 0 )
-  {
-    out_len = ret;
-  }
-
-  return Napi::Number::New( env, (int)out_len );
-}
-
-Napi::Number bind_wc_ecc_decrypt(const Napi::CallbackInfo& info)
-{
-  int ret;
-  Napi::Env env = info.Env();
-  ecc_key* private_key = (ecc_key*)( info[0].As<Napi::Uint8Array>().Data() );
-  ecc_key* public_key = (ecc_key*)( info[1].As<Napi::Uint8Array>().Data() );
-  uint8_t* msg = info[2].As<Napi::Uint8Array>().Data();
-  unsigned int msg_len = info[3].As<Napi::Number>().Uint32Value();
-  uint8_t* out = info[4].As<Napi::Uint8Array>().Data();
-  unsigned int out_len = info[5].As<Napi::Number>().Uint32Value();
-
-  ret = wc_ecc_decrypt( private_key, public_key, msg, msg_len, out, &out_len, NULL );
-
-  if ( ret < 0 )
-  {
-    out_len = ret;
-  }
-
-  return Napi::Number::New( env, (int)out_len );
-}
-
 Napi::Number bind_wc_ecc_free(const Napi::CallbackInfo& info)
 {
   Napi::Env env = info.Env();

addon/wolfcrypt/h/ecc.h

@@ -34,6 +34,4 @@ Napi::Number bind_wc_ecc_shared_secret(const Napi::CallbackInfo& info);
 Napi::Number bind_wc_ecc_sig_size(const Napi::CallbackInfo& info);
 Napi::Number bind_wc_ecc_sign_hash(const Napi::CallbackInfo& info);
 Napi::Number bind_wc_ecc_verify_hash(const Napi::CallbackInfo& info);
-Napi::Number bind_wc_ecc_encrypt(const Napi::CallbackInfo& info);
-Napi::Number bind_wc_ecc_decrypt(const Napi::CallbackInfo& info);
 Napi::Number bind_wc_ecc_free(const Napi::CallbackInfo& info);

addon/wolfcrypt/main.cpp

@@ -104,8 +104,6 @@ Napi::Object Init(Napi::Env env, Napi::Object exports)
   exports.Set(Napi::String::New(env, "wc_ecc_sig_size"), Napi::Function::New(env, bind_wc_ecc_sig_size));
   exports.Set(Napi::String::New(env, "wc_ecc_sign_hash"), Napi::Function::New(env, bind_wc_ecc_sign_hash));
   exports.Set(Napi::String::New(env, "wc_ecc_verify_hash"), Napi::Function::New(env, bind_wc_ecc_verify_hash));
-  exports.Set(Napi::String::New(env, "wc_ecc_encrypt"), Napi::Function::New(env, bind_wc_ecc_encrypt));
-  exports.Set(Napi::String::New(env, "wc_ecc_decrypt"), Napi::Function::New(env, bind_wc_ecc_decrypt));
   exports.Set(Napi::String::New(env, "wc_ecc_free"), Napi::Function::New(env, bind_wc_ecc_free));
 
   return exports;

addon/wolfcrypt/rsa.cpp

@@ -141,9 +141,9 @@ Napi::Number bind_wc_FreeRsaKey(const Napi::CallbackInfo& info)
   Napi::Env env = info.Env();
   RsaKey* rsa = (RsaKey*)( info[0].As<Napi::Uint8Array>().Data() );
 
-  if ( ecc->rng != NULL )
+  if ( rsa->rng != NULL )
   {
-    wc_rng_free( ecc->rng );
+    wc_rng_free( rsa->rng );
   }
 
   ret = wc_FreeRsaKey( rsa );

interfaces/ecc.js

@@ -192,62 +192,6 @@ class WolfSSLEcc
     return false
   }
 
-  ecc_encrypt( pubEcc, data )
-  {
-    if ( this.ecc == null || pubEcc.ecc == null )
-    {
-      throw 'Ecc not allocated'
-    }
-
-    if ( typeof data == 'string' )
-    {
-      data = Buffer.from( data )
-    }
-
-    let cipherText = Buffer.alloc( this.size * 2 + 1 + data.length + 32 )
-
-    console.log( cipherText.length )
-
-    let ret = wolfcrypt.wc_ecc_encrypt( this.ecc, pubEcc.ecc, data, data.length, cipherText, cipherText.length )
-
-    if ( ret <= 0 )
-    {
-      throw `Failed to wc_ecc_encrypt ${ ret }`
-    }
-
-    console.log( ret )
-
-    cipherText = cipherText.subarray( 0, ret )
-
-    return cipherText;
-  }
-
-  ecc_decrypt( pubEcc, cipherText )
-  {
-    if ( this.ecc == null || pubEcc.ecc == null )
-    {
-      throw 'Ecc not allocated'
-    }
-
-    if ( typeof cipherText == 'string' )
-    {
-      cipherText = Buffer.from( cipherText )
-    }
-
-    let data = Buffer.alloc( cipherText.length )
-
-    let ret = wolfcrypt.wc_ecc_decrypt( this.ecc, pubEcc.ecc, cipherText, cipherText.length, data, data.length )
-
-    if ( ret <= 0 )
-    {
-      throw `Failed to wc_ecc_decrypt ${ ret }`
-    }
-
-    data = data.subarray( 0, ret )
-
-    return cipherText;
-  }
-
   free()
   {
     if ( this.ecc == null )

tests/ecc.js

@@ -130,31 +130,6 @@ const ecc_tests =
     ecc0.free()
     ecc1.free()
   },
-
-  encryptDecrypt: function()
-  {
-    let ecc0 = new WolfSSLEcc()
-    let ecc1 = new WolfSSLEcc()
-    let ecc2 = new WolfSSLEcc()
-
-    ecc0.make_key( 32 )
-    ecc1.make_key( 32 )
-
-    const cipherText = ecc0.ecc_encrypt( ecc1, message16 )
-    const plainText = ecc1.ecc_decrypt( ecc2, cipherText ).toString()
-
-    if ( plainText == message16 )
-    {
-      console.log( 'PASS ecc encryptDecrypt' )
-    }
-    else
-    {
-      console.log( 'FAIL ecc encryptDecrypt', plainText )
-    }
-
-    ecc0.free()
-    ecc1.free()
-  }
 }
 
 module.exports = ecc_tests