| 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 241acae4941fd0df80a2b4755add13ed6b0ea6d9..47f2aba5cd5619f687c4d8e1c5f24945e68773ea 100644
|
| --- a/net/quic/crypto/channel_id_openssl.cc
|
| +++ b/net/quic/crypto/channel_id_openssl.cc
|
| @@ -28,8 +28,7 @@ bool ChannelIDVerifier::VerifyRaw(StringPiece key,
|
| StringPiece signed_data,
|
| StringPiece signature,
|
| bool is_channel_id_signature) {
|
| - if (key.size() != 32 * 2 ||
|
| - signature.size() != 32 * 2) {
|
| + if (key.size() != 32 * 2 || signature.size() != 32 * 2) {
|
| return false;
|
| }
|
|
|
| @@ -39,8 +38,8 @@ bool ChannelIDVerifier::VerifyRaw(StringPiece key,
|
| return false;
|
| }
|
|
|
| - crypto::ScopedOpenSSL<BIGNUM, BN_free> x(BN_new()), y(BN_new()),
|
| - r(BN_new()), s(BN_new());
|
| + crypto::ScopedOpenSSL<BIGNUM, BN_free> x(BN_new()), y(BN_new()), r(BN_new()),
|
| + s(BN_new());
|
|
|
| ECDSA_SIG sig;
|
| sig.r = r.get();
|
| @@ -50,9 +49,9 @@ 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 ||
|
| + 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) {
|
| return false;
|
| }
|
| @@ -60,8 +59,8 @@ bool ChannelIDVerifier::VerifyRaw(StringPiece key,
|
| crypto::ScopedOpenSSL<EC_POINT, EC_POINT_free> point(
|
| EC_POINT_new(p256.get()));
|
| if (point.get() == NULL ||
|
| - !EC_POINT_set_affine_coordinates_GFp(p256.get(), point.get(), x.get(),
|
| - y.get(), NULL)) {
|
| + !EC_POINT_set_affine_coordinates_GFp(
|
| + p256.get(), point.get(), x.get(), y.get(), NULL)) {
|
| return false;
|
| }
|
|
|
|
|