@@ -573,17 +573,13 @@ int SSL_CTX_use_certificate_chain(SSL_CTX* ctx,
573
573
if (ret) {
574
574
// If we could set up our certificate, now proceed to
575
575
// the CA certificates.
576
- int r;
577
-
578
576
SSL_CTX_clear_extra_chain_certs (ctx);
579
577
580
578
for (int i = 0 ; i < sk_X509_num (extra_certs); i++) {
581
579
X509* ca = sk_X509_value (extra_certs, i);
582
580
583
581
// NOTE: Increments reference count on `ca`
584
- r = SSL_CTX_add1_chain_cert (ctx, ca);
585
-
586
- if (!r) {
582
+ if (!SSL_CTX_add1_chain_cert (ctx, ca)) {
587
583
ret = 0 ;
588
584
issuer = nullptr ;
589
585
break ;
@@ -1576,15 +1572,11 @@ static Local<Object> X509ToObject(Environment* env, X509* cert) {
1576
1572
if (index < 0 )
1577
1573
continue ;
1578
1574
1579
- X509_EXTENSION* ext;
1580
- int rv;
1581
-
1582
- ext = X509_get_ext (cert, index );
1575
+ X509_EXTENSION* ext = X509_get_ext (cert, index );
1583
1576
CHECK_NOT_NULL (ext);
1584
1577
1585
1578
if (!SafeX509ExtPrint (bio.get (), ext)) {
1586
- rv = X509V3_EXT_print (bio.get (), ext, 0 , 0 );
1587
- CHECK_EQ (rv, 1 );
1579
+ CHECK_EQ (1 , X509V3_EXT_print (bio.get (), ext, 0 , 0 ));
1588
1580
}
1589
1581
1590
1582
BIO_get_mem_ptr (bio.get (), &mem);
@@ -3754,7 +3746,6 @@ SignBase::Error Verify::VerifyFinal(const char* key_pem,
3754
3746
EVPKeyPointer pkey;
3755
3747
unsigned char m[EVP_MAX_MD_SIZE];
3756
3748
unsigned int m_len;
3757
- int r = 0 ;
3758
3749
*verify_result = false ;
3759
3750
EVPMDPointer mdctx = std::move (mdctx_);
3760
3751
@@ -3770,11 +3761,11 @@ SignBase::Error Verify::VerifyFinal(const char* key_pem,
3770
3761
ApplyRSAOptions (pkey, pkctx.get (), padding, saltlen) &&
3771
3762
EVP_PKEY_CTX_set_signature_md (pkctx.get (),
3772
3763
EVP_MD_CTX_md (mdctx.get ())) > 0 ) {
3773
- r = EVP_PKEY_verify (pkctx.get (),
3774
- reinterpret_cast <const unsigned char *>(sig),
3775
- siglen,
3776
- m,
3777
- m_len);
3764
+ const int r = EVP_PKEY_verify (pkctx.get (),
3765
+ reinterpret_cast <const unsigned char *>(sig),
3766
+ siglen,
3767
+ m,
3768
+ m_len);
3778
3769
*verify_result = r == 1 ;
3779
3770
}
3780
3771
0 commit comments