Commit 9446278
crypto: improve GetECGroupBits signature
Remove the unused ECPointer argument and rename the function since the
current name is misleading.
PR-URL: #53364
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>1 parent 7705efd commit 9446278
1 file changed
Lines changed: 5 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -441,10 +441,7 @@ MaybeLocal<Value> GetECPubKey( | |||
| 441 | 441 | nullptr).FromMaybe(Local<Object>()); | |
| 442 | 442 | } | |
| 443 | 443 | ||
| 444 | - MaybeLocal<Value> GetECGroup( | ||
| 445 | - Environment* env, | ||
| 446 | - const EC_GROUP* group, | ||
| 447 | - const ECPointer& ec) { | ||
| 444 | + MaybeLocal<Value> GetECGroupBits(Environment* env, const EC_GROUP* group) { | ||
| 448 | 445 | if (group == nullptr) | |
| 449 | 446 | return Undefined(env->isolate()); | |
| 450 | 447 | ||
@@ -1324,14 +1321,10 @@ MaybeLocal<Object> X509ToObject( | |||
| 1324 | 1321 | } else if (ec) { | |
| 1325 | 1322 | const EC_GROUP* group = EC_KEY_get0_group(ec.get()); | |
| 1326 | 1323 | ||
| 1327 | - if (!Set<Value>(context, | ||
| 1328 | - info, | ||
| 1329 | - env->bits_string(), | ||
| 1330 | - GetECGroup(env, group, ec)) || | ||
| 1331 | - !Set<Value>(context, | ||
| 1332 | - info, | ||
| 1333 | - env->pubkey_string(), | ||
| 1334 | - GetECPubKey(env, group, ec))) { | ||
| 1324 | + if (!Set<Value>( | ||
| 1325 | + context, info, env->bits_string(), GetECGroupBits(env, group)) || | ||
| 1326 | + !Set<Value>( | ||
| 1327 | + context, info, env->pubkey_string(), GetECPubKey(env, group, ec))) { | ||
| 1335 | 1328 | return MaybeLocal<Object>(); | |
| 1336 | 1329 | } | |
| 1337 | 1330 | ||
0 commit comments