| Index: net/quic/crypto/channel_id_openssl.cc
|
| diff --git a/net/quic/crypto/channel_id_openssl.cc b/net/quic/crypto/channel_id_openssl.cc
|
| index 130f3bd3d0eb7f023af891bc38bc69f7adc966de..f0cdcbfe43c980f4c44e277ce4065dd29e083424 100644
|
| --- a/net/quic/crypto/channel_id_openssl.cc
|
| +++ b/net/quic/crypto/channel_id_openssl.cc
|
| @@ -36,7 +36,7 @@ bool ChannelIDVerifier::VerifyRaw(StringPiece key,
|
|
|
| crypto::ScopedOpenSSL<EC_GROUP, EC_GROUP_free>::Type p256(
|
| EC_GROUP_new_by_curve_name(NID_X9_62_prime256v1));
|
| - if (p256.get() == NULL) {
|
| + if (p256.get() == nullptr) {
|
| return false;
|
| }
|
|
|
| @@ -50,23 +50,23 @@ bool ChannelIDVerifier::VerifyRaw(StringPiece key,
|
| const uint8* signature_bytes =
|
| reinterpret_cast<const uint8*>(signature.data());
|
|
|
| - if (BN_bin2bn(key_bytes + 0, 32, x.get()) == NULL ||
|
| - BN_bin2bn(key_bytes + 32, 32, y.get()) == NULL ||
|
| - BN_bin2bn(signature_bytes + 0, 32, sig.r) == NULL ||
|
| - BN_bin2bn(signature_bytes + 32, 32, sig.s) == NULL) {
|
| + 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;
|
| }
|
|
|
| crypto::ScopedOpenSSL<EC_POINT, EC_POINT_free>::Type point(
|
| EC_POINT_new(p256.get()));
|
| - if (point.get() == NULL ||
|
| + if (point.get() == nullptr ||
|
| !EC_POINT_set_affine_coordinates_GFp(p256.get(), point.get(), x.get(),
|
| - y.get(), NULL)) {
|
| + y.get(), nullptr)) {
|
| return false;
|
| }
|
|
|
| crypto::ScopedEC_KEY ecdsa_key(EC_KEY_new());
|
| - if (ecdsa_key.get() == NULL ||
|
| + 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;
|
|
|