diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-20 05:25:47 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-20 05:25:47 +0000 |
| commit | 621a27b084ffe1e4561601cdc39de43304be4ee5 (patch) | |
| tree | 96d665a76b901db4890bc75db7f69d93cb1953d1 /net | |
| parent | ebab0c15edc749b2fd8b5aa39d809ad648f902a7 (diff) | |
| download | chromium_src-621a27b084ffe1e4561601cdc39de43304be4ee5.zip chromium_src-621a27b084ffe1e4561601cdc39de43304be4ee5.tar.gz chromium_src-621a27b084ffe1e4561601cdc39de43304be4ee5.tar.bz2 | |
android: Enable -Wunused-const-variable.
BUG=307668
TBR=hans
Review URL: https://codereview.chromium.org/29303007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/cert/jwk_serializer_unittest.cc | 5 | ||||
| -rw-r--r-- | net/quic/crypto/aes_128_gcm_12_decrypter_openssl.cc | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/net/cert/jwk_serializer_unittest.cc b/net/cert/jwk_serializer_unittest.cc index 8059e73..80c2421 100644 --- a/net/cert/jwk_serializer_unittest.cc +++ b/net/cert/jwk_serializer_unittest.cc @@ -10,6 +10,7 @@ namespace net { +#if !defined(USE_OPENSSL) // This is the ASN.1 prefix for a P-256 public key. Specifically it's: // SEQUENCE // SEQUENCE @@ -27,6 +28,7 @@ static const unsigned char kP256SpkiPrefix[] = { 0x42, 0x00, 0x04 }; static const unsigned int kEcCoordinateSize = 32U; +#endif // This is a valid P-256 public key. static const unsigned char kSpkiEc[] = { @@ -44,6 +46,7 @@ static const unsigned char kSpkiEc[] = { 0x05, 0xd3, 0xd2, 0xca, 0xdf, 0x44, 0x2f, 0xf4 }; +#if !defined(USE_OPENSSL) // This is a P-256 public key with 0 X and Y values. static const unsigned char kSpkiEcWithZeroXY[] = { 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, @@ -60,8 +63,6 @@ static const unsigned char kSpkiEcWithZeroXY[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -#if !defined(USE_OPENSSL) - TEST(JwkSerializerNSSTest, ConvertSpkiFromDerToJwkEc) { base::StringPiece spki; base::DictionaryValue public_key_jwk; diff --git a/net/quic/crypto/aes_128_gcm_12_decrypter_openssl.cc b/net/quic/crypto/aes_128_gcm_12_decrypter_openssl.cc index cbc7a84..56317fd 100644 --- a/net/quic/crypto/aes_128_gcm_12_decrypter_openssl.cc +++ b/net/quic/crypto/aes_128_gcm_12_decrypter_openssl.cc @@ -12,14 +12,9 @@ using base::StringPiece; namespace net { -namespace { - -const size_t kKeySize = 16; const size_t kNoncePrefixSize = 4; const size_t kAESNonceSize = 12; -} // namespace - Aes128Gcm12Decrypter::Aes128Gcm12Decrypter() {} Aes128Gcm12Decrypter::~Aes128Gcm12Decrypter() {} |