Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(510)

Side by Side Diff: net/quic/crypto/p256_key_exchange.h

Issue 1535363003: Switch to standard integer types in net/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: stddef Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/quic/crypto/null_encrypter.h ('k') | net/quic/crypto/p256_key_exchange_nss.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_QUIC_CRYPTO_P256_KEY_EXCHANGE_H_ 5 #ifndef NET_QUIC_CRYPTO_P256_KEY_EXCHANGE_H_
6 #define NET_QUIC_CRYPTO_P256_KEY_EXCHANGE_H_ 6 #define NET_QUIC_CRYPTO_P256_KEY_EXCHANGE_H_
7 7
8 #include <stdint.h>
9
8 #include <string> 10 #include <string>
9 11
12 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
11 #include "base/strings/string_piece.h" 14 #include "base/strings/string_piece.h"
12 #include "net/base/net_export.h" 15 #include "net/base/net_export.h"
13 #include "net/quic/crypto/key_exchange.h" 16 #include "net/quic/crypto/key_exchange.h"
14 17
15 #if defined(USE_OPENSSL) 18 #if defined(USE_OPENSSL)
16 #include "crypto/openssl_util.h" 19 #include "crypto/openssl_util.h"
17 #include "crypto/scoped_openssl_types.h" 20 #include "crypto/scoped_openssl_types.h"
18 #else 21 #else
19 #include "crypto/ec_private_key.h" 22 #include "crypto/ec_private_key.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 // that the point is uncompressed) followed by two, 32-byte field 55 // that the point is uncompressed) followed by two, 32-byte field
53 // elements. 56 // elements.
54 kUncompressedP256PointBytes = 1 + 2 * kP256FieldBytes, 57 kUncompressedP256PointBytes = 1 + 2 * kP256FieldBytes,
55 // The first byte in an uncompressed P-256 point. 58 // The first byte in an uncompressed P-256 point.
56 kUncompressedECPointForm = 0x04, 59 kUncompressedECPointForm = 0x04,
57 }; 60 };
58 61
59 #if defined(USE_OPENSSL) 62 #if defined(USE_OPENSSL)
60 // P256KeyExchange takes ownership of |private_key|, and expects 63 // P256KeyExchange takes ownership of |private_key|, and expects
61 // |public_key| consists of |kUncompressedP256PointBytes| bytes. 64 // |public_key| consists of |kUncompressedP256PointBytes| bytes.
62 P256KeyExchange(EC_KEY* private_key, const uint8* public_key); 65 P256KeyExchange(EC_KEY* private_key, const uint8_t* public_key);
63 66
64 crypto::ScopedEC_KEY private_key_; 67 crypto::ScopedEC_KEY private_key_;
65 #else 68 #else
66 // P256KeyExchange takes ownership of |key_pair|, and expects 69 // P256KeyExchange takes ownership of |key_pair|, and expects
67 // |public_key| consists of |kUncompressedP256PointBytes| bytes. 70 // |public_key| consists of |kUncompressedP256PointBytes| bytes.
68 P256KeyExchange(crypto::ECPrivateKey* key_pair, const uint8* public_key); 71 P256KeyExchange(crypto::ECPrivateKey* key_pair, const uint8_t* public_key);
69 72
70 scoped_ptr<crypto::ECPrivateKey> key_pair_; 73 scoped_ptr<crypto::ECPrivateKey> key_pair_;
71 #endif 74 #endif
72 // The public key stored as an uncompressed P-256 point. 75 // The public key stored as an uncompressed P-256 point.
73 uint8 public_key_[kUncompressedP256PointBytes]; 76 uint8_t public_key_[kUncompressedP256PointBytes];
74 77
75 DISALLOW_COPY_AND_ASSIGN(P256KeyExchange); 78 DISALLOW_COPY_AND_ASSIGN(P256KeyExchange);
76 }; 79 };
77 80
78 } // namespace net 81 } // namespace net
79 #endif // NET_QUIC_CRYPTO_P256_KEY_EXCHANGE_H_ 82 #endif // NET_QUIC_CRYPTO_P256_KEY_EXCHANGE_H_
OLDNEW
« no previous file with comments | « net/quic/crypto/null_encrypter.h ('k') | net/quic/crypto/p256_key_exchange_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698