@@ -119,7 +119,7 @@ ParseKeyResult ParsePublicKeyPEM(EVPKeyPointer* pkey,
119
119
return ret;
120
120
121
121
// Maybe it is PKCS#1.
122
- CHECK (BIO_reset ( bp.get () ));
122
+ CHECK (bp.resetBio ( ));
123
123
ret = TryParsePublicKey (pkey, bp, " RSA PUBLIC KEY" ,
124
124
[](const unsigned char ** p, long l) { // NOLINT(runtime/int)
125
125
return d2i_PublicKey (EVP_PKEY_RSA, nullptr , p, l);
@@ -128,7 +128,7 @@ ParseKeyResult ParsePublicKeyPEM(EVPKeyPointer* pkey,
128
128
return ret;
129
129
130
130
// X.509 fallback.
131
- CHECK (BIO_reset ( bp.get () ));
131
+ CHECK (bp.resetBio ( ));
132
132
return TryParsePublicKey (pkey, bp, " CERTIFICATE" ,
133
133
[](const unsigned char ** p, long l) { // NOLINT(runtime/int)
134
134
X509Pointer x509 (d2i_X509 (nullptr , p, l));
@@ -270,12 +270,10 @@ ParseKeyResult ParsePrivateKey(EVPKeyPointer* pkey,
270
270
return ParseKeyResult::kParseKeyFailed ;
271
271
}
272
272
273
- MaybeLocal<Value> BIOToStringOrBuffer (
274
- Environment* env,
275
- BIO* bio,
276
- PKFormatType format) {
277
- BUF_MEM* bptr;
278
- BIO_get_mem_ptr (bio, &bptr);
273
+ MaybeLocal<Value> BIOToStringOrBuffer (Environment* env,
274
+ const BIOPointer& bio,
275
+ PKFormatType format) {
276
+ BUF_MEM* bptr = bio;
279
277
if (format == kKeyFormatPEM ) {
280
278
// PEM is an ASCII format, so we will return it as a string.
281
279
return String::NewFromUtf8 (env->isolate (), bptr->data ,
@@ -388,7 +386,7 @@ MaybeLocal<Value> WritePrivateKey(Environment* env,
388
386
ThrowCryptoError (env, ERR_get_error (), " Failed to encode private key" );
389
387
return MaybeLocal<Value>();
390
388
}
391
- return BIOToStringOrBuffer (env, bio. get () , config.format_ );
389
+ return BIOToStringOrBuffer (env, bio, config.format_ );
392
390
}
393
391
394
392
bool WritePublicKeyInner (OSSL3_CONST EVP_PKEY* pkey,
@@ -429,7 +427,7 @@ MaybeLocal<Value> WritePublicKey(Environment* env,
429
427
ThrowCryptoError (env, ERR_get_error (), " Failed to encode public key" );
430
428
return MaybeLocal<Value>();
431
429
}
432
- return BIOToStringOrBuffer (env, bio. get () , config.format_ );
430
+ return BIOToStringOrBuffer (env, bio, config.format_ );
433
431
}
434
432
435
433
Maybe<void > ExportJWKSecretKey (Environment* env,
0 commit comments