Change scoped_ptr_openssl_void (et al.) → bssl::UniquePtr

net/quic/core/crypto/channel_id.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/core/crypto/channel_id.h"
 
 #include "crypto/openssl_util.h"
 #include "third_party/boringssl/src/include/openssl/bn.h"
 #include "third_party/boringssl/src/include/openssl/ec.h"
 #include "third_party/boringssl/src/include/openssl/ec_key.h"
@@ skipping 43 matching lines @@
       reinterpret_cast<const uint8_t*>(signature.data());
 
   if (BN_bin2bn(key_bytes + 0, 32, x.get()) == nullptr ||
       BN_bin2bn(key_bytes + 32, 32, y.get()) == nullptr ||
       BN_bin2bn(signature_bytes + 0, 32, sig.r) == nullptr ||
       BN_bin2bn(signature_bytes + 32, 32, sig.s) == nullptr) {
     return false;
   }
 
   bssl::UniquePtr<EC_POINT> point(EC_POINT_new(p256.get()));
-  if (!point ||
+  if (point.get() == nullptr ||
       !EC_POINT_set_affine_coordinates_GFp(p256.get(), point.get(), x.get(),
                                            y.get(), nullptr)) {
     return false;
   }
 
   bssl::UniquePtr<EC_KEY> ecdsa_key(EC_KEY_new());
   if (ecdsa_key.get() == nullptr ||
       !EC_KEY_set_group(ecdsa_key.get(), p256.get()) ||
       !EC_KEY_set_public_key(ecdsa_key.get(), point.get())) {
     return false;
   }
 
   SHA256_CTX sha256;
   SHA256_Init(&sha256);
   if (is_channel_id_signature) {
     SHA256_Update(&sha256, kContextStr, strlen(kContextStr) + 1);
     SHA256_Update(&sha256, kClientToServerStr, strlen(kClientToServerStr) + 1);
   }
   SHA256_Update(&sha256, signed_data.data(), signed_data.size());
 
   unsigned char digest[SHA256_DIGEST_LENGTH];
   SHA256_Final(digest, &sha256);
 
   return ECDSA_do_verify(digest, sizeof(digest), &sig, ecdsa_key.get()) == 1;
 }
 
 }  // namespace net