Skip to content

Commit 40c5e0e

Browse files
author
John Bland
committed
switch form custom function to wc_ecc_size for ecc key size
1 parent eb9d1da commit 40c5e0e

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

addon/wolfcrypt/ecc.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,15 @@ Napi::Number sizeof_ecc_point(const Napi::CallbackInfo& info)
3434
return Napi::Number::New( env, sizeof( ecc_point ) );
3535
}
3636

37-
Napi::Number ecc_key_size(const Napi::CallbackInfo& info)
37+
Napi::Number bind_wc_ecc_size(const Napi::CallbackInfo& info)
3838
{
39+
int ret;
3940
Napi::Env env = info.Env();
4041
ecc_key* ecc = (ecc_key*)( info[0].As<Napi::Uint8Array>().Data() );
4142

42-
return Napi::Number::New( env, ecc->dp->size );
43+
ret = wc_ecc_size( ecc );
44+
45+
return Napi::Number::New( env, ret );
4346
}
4447

4548
Napi::Number bind_wc_ecc_init(const Napi::CallbackInfo& info)

addon/wolfcrypt/h/ecc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
Napi::Number sizeof_ecc_key(const Napi::CallbackInfo& info);
2727
Napi::Number sizeof_ecc_point(const Napi::CallbackInfo& info);
28-
Napi::Number ecc_key_size(const Napi::CallbackInfo& info);
28+
Napi::Number bind_wc_ecc_size(const Napi::CallbackInfo& info);
2929
Napi::Number bind_wc_ecc_init(const Napi::CallbackInfo& info);
3030
Napi::Number bind_wc_ecc_make_key(const Napi::CallbackInfo& info);
3131
Napi::Number sizeof_ecc_x963(const Napi::CallbackInfo& info);

addon/wolfcrypt/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Napi::Object Init(Napi::Env env, Napi::Object exports)
100100

101101
exports.Set(Napi::String::New(env, "sizeof_ecc_key"), Napi::Function::New(env, sizeof_ecc_key));
102102
exports.Set(Napi::String::New(env, "sizeof_ecc_point"), Napi::Function::New(env, sizeof_ecc_point));
103-
exports.Set(Napi::String::New(env, "ecc_key_size"), Napi::Function::New(env, ecc_key_size));
103+
exports.Set(Napi::String::New(env, "wc_ecc_size"), Napi::Function::New(env, bind_wc_ecc_size));
104104
exports.Set(Napi::String::New(env, "wc_ecc_init"), Napi::Function::New(env, bind_wc_ecc_init));
105105
exports.Set(Napi::String::New(env, "wc_ecc_make_key"), Napi::Function::New(env, bind_wc_ecc_make_key));
106106
exports.Set(Napi::String::New(env, "sizeof_ecc_x963"), Napi::Function::New(env, sizeof_ecc_x963));

interfaces/ecc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class WolfSSLEcc
113113
throw 'Ecc not allocated'
114114
}
115115

116-
const keySize = wolfcrypt.ecc_key_size( this.ecc )
116+
const keySize = wolfcrypt.wc_ecc_size( this.ecc )
117117

118118
if ( keySize <= 0 )
119119
{

0 commit comments

Comments
 (0)