8000 core, refactor: optimise reference counting caused by unnecessary obj… · fibjs/fibjs@03fd0ff · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit 03fd0ff

Browse files
xicilionxicilion
committed
core, refactor: optimise reference counting caused by unnecessary obj_ptr.
1 parent db30d57 commit 03fd0ff

16 files changed

+36
-36
lines changed

‎fibjs/src/crypto/BlsKey.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ result_t BlsKey_base::aggregateSignature(v8::Local<v8::Array> sigs, obj_ptr<Buff
4141
return hr;
4242

4343
obj_ptr<Buffer> agg;
44-
obj_ptr<Buffer> sig = Buffer::Cast(buf);
44+
Buffer* sig = Buffer::Cast(buf);
4545
len = sig->length();
4646
if (len == 48) {
4747
blst_p1 point;

‎fibjs/src/crypto/BlsKey_g1.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ result_t BlsKey_g1::sign(Buffer_base* data, v8::Local<v8::Object> opts, obj_ptr<
113113
mbedtls_mpi_write_binary(&ecp->d, k, 32);
114114
blst_scalar_from_bendian(&sk, k);
115115

116-
obj_ptr<Buffer> buf = Buffer::Cast(data);
116+
Buffer* buf = Buffer::Cast(data);
117117

118118
blst_p2 point;
119119
blst_hash_to_g2(&point, buf->data(), buf->length(),
@@ -135,8 +135,8 @@ result_t BlsKey_g1::verify(Buffer_base* data, Buffer_base* sign, v8::Local<v8::O
135135
unsigned char k[96];
136136
mbedtls_ecp_keypair* ecp = mbedtls_pk_ec(m_key);
137137

138-
obj_ptr<Buffer> buf = Buffer::Cast(data);
139-
obj_ptr<Buffer> sig = Buffer::Cast(sign);
138+
Buffer* buf = Buffer::Cast(data);
139+
Buffer* sig = Buffer::Cast(sign);
140140

141141
blst_p1_affine pk;
142142
mbedtls_mpi_write_binary(&ecp->Q.X, k, 48);

‎fibjs/src/crypto/BlsKey_g2.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ result_t BlsKey_g2::sign(Buffer_base* data, v8::Local<v8::Object> opts, obj_ptr<
113113
mbedtls_mpi_write_binary(&ecp->d, k, 32);
114114
blst_scalar_from_bendian(&sk, k);
115115

116-
obj_ptr<Buffer> buf = Buffer::Cast(data);
116+
Buffer* buf = Buffer::Cast(data);
117117

118118
blst_p1 point;
119119
blst_hash_to_g1(&point, buf->data(), buf->length(),
@@ -135,8 +135,8 @@ result_t BlsKey_g2::verify(Buffer_base* data, Buffer_base* sign, v8::Local<v8::O
135135
unsigned char k[96];
136136
mbedtls_ecp_keypair* ecp = mbedtls_pk_ec(m_key);
137137

138-
obj_ptr<Buffer> buf = Buffer::Cast(data);
139-
obj_ptr<Buffer> sig = Buffer::Cast(sign);
138+
Buffer* buf = Buffer::Cast(data);
139+
Buffer* sig = Buffer::Cast(sign);
140140

141141
blst_p2_affine pk;
142142
mbedtls_mpi_write_binary(&ecp->Q.X, k, 96);

‎fibjs/src/crypto/Cipher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ result_t Cipher::process(const mbedtls_operation_t operation, Buffer_base* data,
226226
unsigned char buffer[1024];
227227
size_t olen, ilen, offset, block_size, data_size;
228228

229-
obj_ptr<Buffer> data_buf = Buffer::Cast(data);
229+
Buffer* data_buf = Buffer::Cast(data);
230230
data_size = data_buf->length();
231231

232232
block_size = mbedtls_cipher_get_block_size(&m_ctx);

‎fibjs/src/crypto/Digest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ result_t Digest::update(Buffer_base* data, obj_ptr<Digest_base>& retVal)
5050
if (m_iAlgo < 0)
5151
return CHECK_ERROR(CALL_E_INVALID_CALL);
5252

53-
obj_ptr<Buffer> buf = Buffer::Cast(data);
53+
Buffer* buf = Buffer::Cast(data);
5454
_md_update(&m_ctx, buf->data(), buf->length());
5555

5656
retVal = this;

‎fibjs/src/crypto/ECKey.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ result_t ECKey::sign(Buffer_base* data, v8::Local<v8::Object> opts, obj_ptr<Buff
522522
exlib::string output;
523523
size_t olen = MBEDTLS_ECDSA_MAX_SIG_LEN(mbedtls_pk_get_bitlen(&m_key));
524524

525-
obj_ptr<Buffer> buf_data = Buffer::Cast(data);
525+
Buffer* buf_data = Buffer::Cast(data);
526526
output.resize(olen);
527527

528528
// alg=0~9 see https://tls.mbed.org/api/md_8h.html enum mbedtls_md_type_t
@@ -554,7 +554,7 @@ result_t ECKey::verify(Buffer_base* data, Buffer_base* sign, v8::Local<v8::Objec
554554
int32_t ret;
555555
exlib::string strsign;
556556

557-
obj_ptr<Buffer> buf_data = Buffer::Cast(data);
557+
Buffer* buf_data = Buffer::Cast(data);
558558
sign->toString(strsign);
559559

560560
if (ac->m_ctx[0].string() == "raw") {

‎fibjs/src/crypto/ECKey_p256k1.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ result_t ECKey_p256k1::sign(Buffer_base* data, v8::Local<v8::Object> opts, obj_p
114114
if (fmt != "raw")
115115
return CHECK_ERROR(Runtime::setError(exlib::string("unsupported format \'") + fmt + "\'."));
116116

117-
obj_ptr<Buffer> buf_data = Buffer::Cast(data);
117+
Buffer* buf_data = Buffer::Cast(data);
118118

119119
const unsigned char* hash = buf_data->data();
120120
size_t hlen = buf_data->length();
@@ -144,8 +144,8 @@ result_t ECKey_base::recover(Buffer_base* data, Buffer_base* sig, obj_ptr<ECKey_
144144
if (ac->isSync())
145145
return CHECK_ERROR(CALL_E_NOSYNC);
146146

147-
obj_ptr<Buffer> buf_data = Buffer::Cast(data);
148-
obj_ptr<Buffer> buf_sig = Buffer::Cast(sig);
147+
Buffer* buf_data = Buffer::Cast(data);
148+
Buffer* buf_sig = Buffer::Cast(sig);
149149
if (buf_sig->length() != 65)
150150
return CALL_RETURN_NULL;
151151

‎fibjs/src/crypto/Ed5519Key.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ result_t Ed25519Key::from(Buffer_base* DerKey, obj_ptr<PKey_base>& retVal)
224224
mbedtls_pk_init(&ctx);
225225

226226
do {
227-
obj_ptr<Buffer> buf_key = Buffer::Cast(DerKey);
227+
Buffer* buf_key = Buffer::Cast(DerKey);
228228

229229
ret = parse_key(ctx, buf_key->data(), buf_key->length());
230230
if (ret != MBEDTLS_ERR_PK_KEY_INVALID_FORMAT)
@@ -377,7 +377,7 @@ result_t Ed25519Key::sign(Buffer_base* data, v8::Local<v8::Object> opts, obj_ptr
377377
mbedtls_mpi_write_binary(&ecp->d, sk, ed25519_public_key_size);
378378
mbedtls_mpi_write_binary(&ecp->Q.X, sk + ed25519_public_key_size, ed25519_public_key_size);
379379

380-
obj_ptr<Buffer> buf_data = Buffer::Cast(data);
380+
Buffer* buf_data = Buffer::Cast(data);
381381

382382
sig.resize(ed25519_signature_size);
383383
ed25519_SignMessage((unsigned char*)sig.c_buffer(), sk, NULL, buf_data->data(), buf_data->length());
@@ -416,7 +416,7 @@ result_t Ed25519Key::verify(Buffer_base* data, Buffer_base* sign, v8::Local<v8::
416416
}
417417
}
418418

419-
obj_ptr<Buffer> buf_data = Buffer::Cast(data);
419+
Buffer* buf_data = Buffer::Cast(data);
420420
mbedtls_mpi_write_binary(&ecp->Q.X, pk, ed25519_public_key_size);
421421

422422
retVal = ed25519_VerifySignature((const unsigned char*)sig.c_str(), pk, buf_data->data(), buf_data->length());

‎fibjs/src/crypto/PKey.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ result_t PKey::encrypt(Buffer_base* data, obj_ptr<Buffer_base>& retVal, AsyncEve
167167
exlib::string output;
168168
size_t olen;
169169

170-
obj_ptr<Buffer> buf_data = Buffer::Cast(data);
170+
Buffer* buf_data = Buffer::Cast(data);
171171
output.resize(MBEDTLS_PREMASTER_SIZE);
172172

173173
ret = mbedtls_pk_encrypt(&m_key, buf_data->data(), buf_data->length(),
@@ -200,7 +200,7 @@ result_t PKey::decrypt(Buffer_base* data, obj_ptr<Buffer_base>& retVal, AsyncEve
200200
exlib::string output;
201201
size_t olen;
202202

203-
obj_ptr<Buffer> buf_data = Buffer::Cast(data);
203+
Buffer* buf_data = Buffer::Cast(data);
204204
output.resize(MBEDTLS_PREMASTER_SIZE * 2);
205205

206206
ret = mbedtls_pk_decrypt(&m_key, buf_data->data(), buf_data->length(),

‎fibjs/src/crypto/PKey_der.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ result_t PKey_base::from(Buffer_base* DerKey, exlib::string password, obj_ptr<PK
2828
if (hr >= 0)
2929
return hr;
3030

31-
obj_ptr<Buffer> buf_key = Buffer::Cast(DerKey);
31+
Buffer* buf_key = Buffer::Cast(DerKey);
3232

3333
ret = mbedtls_pk_parse_key(&ctx, buf_key->data(), buf_key->length(),
3434
!password.empty() ? (unsigned char*)password.c_str() : NULL,

‎fibjs/src/crypto/PKey_rsa.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ result_t PKey_rsa::sign(Buffer_base* data, v8::Local<v8::Object> opts, obj_ptr<B
168168
exlib::string output;
169169
size_t olen = (mbedtls_pk_get_bitlen(&m_key) + 7) / 8;
170170

171-
obj_ptr<Buffer> buf_data = Buffer::Cast(data);
171+
Buffer* buf_data = Buffer::Cast(data);
172172
output.resize(olen);
173173

174174
// alg=0~9 see https://tls.mbed.org/api/md_8h.html enum mbedtls_md_type_t
@@ -192,8 +192,8 @@ result_t PKey_rsa::verify(Buffer_base* data, Buffer_base* sign, v8::Local<v8::Ob
192192

193193
int32_t ret;
194194

195-
obj_ptr<Buffer> buf_data = Buffer::Cast(data);
196-
obj_ptr<Buffer> buf_sign = Buffer::Cast(sign);
195+
Buffer* buf_data = Buffer::Cast(data);
196+
Buffer* buf_sign = Buffer::Cast(sign);
197197

198198
ret = mbedtls_pk_verify(&m_key, (mbedtls_md_type_t)alg, buf_data->data(), buf_data->length(),
199199
buf_sign->data(), buf_sign->length());

‎fibjs/src/crypto/X509Req.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ result_t X509Req::import(Buffer_base* derReq)
125125

126126
clear();
127127

128-
obj_ptr<Buffer> buf_csr = Buffer::Cast(derReq);
128+
Buffer* buf_csr = Buffer::Cast(derReq);
129129
ret = mbedtls_x509_csr_parse(&m_csr, buf_csr->data(), buf_csr->length());
130130
if (ret != 0)
131131
return CHECK_ERROR(_ssl::setError(ret));

‎fibjs/src/crypto/crypto.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ result_t crypto_base::randomArt(Buffer_base* data, exlib::string title,
261261
if (size < 1 || size > 128)
262262
return CHECK_ERROR(CALL_E_OUTRANGE);
263263

264-
obj_ptr<Buffer> buf = Buffer::Cast(data);
264+
Buffer* buf = Buffer::Cast(data);
265265
char* str = randomart(buf->data(), buf->length(), title, size);
266266

267267
if (str) {
@@ -360,8 +360,8 @@ result_t crypto_base::pbkdf1(Buffer_base* password, Buffer_base* salt, int32_t i
360360
if (ac->isSync())
361361
return CHECK_ERROR(CALL_E_NOSYNC);
362362

363-
obj_ptr<Buffer> buf_pass = Buffer::Cast(password);
364-
obj_ptr<Buffer> buf_salt = Buffer::Cast(salt);
363+
Buffer* buf_pass = Buffer::Cast(password);
364+
Buffer* buf_salt = Buffer::Cast(salt);
365365
obj_ptr<Buffer> buf_key = new Buffer(NULL, size);
366366

367367
mbedtls_md_context_t ctx;
@@ -405,8 +405,8 @@ result_t crypto_base::pbkdf2(Buffer_base* password, Buffer_base* salt, int32_t i
405405
if (ac->isSync())
406406
return CHECK_ERROR(CALL_E_NOSYNC);
407407

408-
obj_ptr<Buffer> buf_pass = Buffer::Cast(password);
409-
obj_ptr<Buffer> buf_salt = Buffer::Cast(salt);
408+
Buffer* buf_pass = Buffer::Cast(password);
409+
Buffer* buf_salt = Buffer::Cast(salt);
410410
obj_ptr<Buffer> buf_key = new Buffer(NULL, size);
411411

412412
mbedtls_md_context_t ctx;

‎fibjs/src/crypto/hash.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ result_t hash_base::hmac(int32_t algo, Buffer_base* key, Buffer_base* data,
7777
if (algo < MBEDTLS_MD_MD5 || algo >= MBEDTLS_MD_MAX)
7878
return CHECK_ERROR(CALL_E_INVALIDARG);
7979

80-
obj_ptr<Buffer> buf_key = Buffer::Cast(key);
80+
Buffer* buf_key = Buffer::Cast(key);
8181

8282
retVal = new Digest((mbedtls_md_type_t)algo, (const char*)buf_key->data(), buf_key->length());
8383

‎fibjs/src/encoding/encoding.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static void hexEncode(exlib::string data, bool upper, exlib::string& retVal)
4444

4545
result_t hex_base::encode(Buffer_base* data, exlib::string& retVal)
4646
{
47-
obj_ptr<Buffer> buf = Buffer::Cast(data);
47+
Buffer* buf = Buffer::Cast(data);
4848
hexEncode((const char*)buf->data(), buf->length(), false, retVal);
4949
return 0;
5050
}
@@ -181,7 +181,7 @@ static void base32Encode(const char* data, size_t sz, bool upper, bool padding,
181181

182182
result_t base32_base::encode(Buffer_base* data, exlib::string& retVal)
183183
{
184-
obj_ptr<Buffer> buf = Buffer::Cast(data);
184+
Buffer* buf = Buffer::Cast(data);
185185
base32Encode((const char*)buf->data(), buf->length(), false, false, retVal);
186186
return 0;
187187
}
@@ -251,7 +251,7 @@ static void base64Decode(const char* data, size_t sz, obj_ptr<Buffer_base>& retV
251251

252252
result_t base64_base::encode(Buffer_base* data, bool url, exlib::string& retVal)
253253
{
254-
obj_ptr<Buffer> buf = Buffer::Cast(data);
254+
Buffer* buf = Buffer::Cast(data);
255255
base64Encode((const char*)buf->data(), buf->length(), url, !url, retVal);
256256
return 0;
257257
}
@@ -282,14 +282,14 @@ static void base58Encode(const char* data, size_t sz, exlib::string& retVal)
282282

283283
result_t base58_base::encode(Buffer_base* data, exlib::string& retVal)
284284
{
285-
obj_ptr<Buffer> buf = Buffer::Cast(data);
285+
Buffer* buf = Buffer::Cast(data);
286286
base58Encode((const char*)buf->data(), buf->length(), retVal);
287287
return 0;
288288
}
289289

290290
result_t base58_base::encode(Buffer_base* data, int32_t chk_ver, exlib::string& retVal)
291291
{
292-
obj_ptr<Buffer> buf = Buffer::Cast(data);
292+
Buffer* buf = Buffer::Cast(data);
293293

294294
size_t b58sz = (size_t)((buf->length() + 5) * 8 / log2l(58) + 2);
295295

‎fibjs/src/encoding/encoding_msgpack.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ result_t msgpack_base::decode(Buffer_base* data, v8::Local<v8::Value>& retVal)
214214

215215
result_t unpack(Buffer_base* data)
216216
{
217-
obj_ptr<Buffer> buf = Buffer::Cast(data);
217+
Buffer* buf = Buffer::Cast(data);
218218
msgpack_unpack_return ret = msgpack_unpack((const char*)buf->data(), buf->length(), NULL, &mempool, &deserialized);
219219
if (ret != 2)
220220
return -1;

0 commit comments

Comments
 (0)
0