Skip to content

Commit 2dbacb7

Browse files
committed
fixup! src: deduplicate X509 getter implementations
1 parent 95806b5 commit 2dbacb7

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

src/crypto/crypto_common.cc

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ MaybeLocal<Value> GetModulusString(
492492
}
493493
} // namespace
494494

495-
MaybeLocal<Object> GetRawDERCertificate(Environment* env, X509* cert) {
495+
MaybeLocal<Value> GetRawDERCertificate(Environment* env, X509* cert) {
496496
int size = i2d_X509(cert, nullptr);
497497

498498
std::unique_ptr<BackingStore> bs;
@@ -1386,18 +1386,14 @@ MaybeLocal<Object> X509ToObject(
13861386
info,
13871387
env->fingerprint512_string(),
13881388
GetFingerprintDigest(env, EVP_sha512(), cert)) ||
1389-
!Set<Value>(context,
1390-
info,
1391-
env->ext_key_usage_string(),
1392-
GetKeyUsage(env, cert)) ||
1389+
!Set<Value>(
1390+
context, info, env->ext_key_usage_string(), GetKeyUsage(env, cert)) ||
13931391
!Set<Value>(context,
13941392
info,
13951393
env->serial_number_string(),
13961394
GetSerialNumber(env, cert)) ||
1397-
!Set<Object>(context,
1398-
info,
1399-
env->raw_string(),
1400-
GetRawDERCertificate(env, cert))) {
1395+
!Set<Value>(
1396+
context, info, env->raw_string(), GetRawDERCertificate(env, cert))) {
14011397
return MaybeLocal<Object>();
14021398
}
14031399

src/crypto/crypto_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ v8::MaybeLocal<v8::Value> GetCurrentCipherVersion(Environment* env,
118118

119119
v8::MaybeLocal<v8::Value> GetSerialNumber(Environment* env, X509* cert);
120120

121-
v8::MaybeLocal<v8::Object> GetRawDERCertificate(Environment* env, X509* cert);
121+
v8::MaybeLocal<v8::Value> GetRawDERCertificate(Environment* env, X509* cert);
122122

123123
v8::Local<v8::Value> ToV8Value(Environment* env, const BIOPointer& bio);
124124
bool SafeX509SubjectAltNamePrint(const BIOPointer& out, X509_EXTENSION* ext);

0 commit comments

Comments
 (0)