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

Side by Side Diff: net/socket/ssl_server_socket_nss.h

Issue 623213004: replace OVERRIDE and FINAL with override and final in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo unwanted change in comment Created 6 years, 2 months 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/socket/ssl_client_socket_unittest.cc ('k') | net/socket/ssl_server_socket_openssl.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SOCKET_SSL_SERVER_SOCKET_NSS_H_ 5 #ifndef NET_SOCKET_SSL_SERVER_SOCKET_NSS_H_
6 #define NET_SOCKET_SSL_SERVER_SOCKET_NSS_H_ 6 #define NET_SOCKET_SSL_SERVER_SOCKET_NSS_H_
7 7
8 #include <certt.h> 8 #include <certt.h>
9 #include <keyt.h> 9 #include <keyt.h>
10 #include <nspr.h> 10 #include <nspr.h>
(...skipping 13 matching lines...) Expand all
24 public: 24 public:
25 // See comments on CreateSSLServerSocket for details of how these 25 // See comments on CreateSSLServerSocket for details of how these
26 // parameters are used. 26 // parameters are used.
27 SSLServerSocketNSS(scoped_ptr<StreamSocket> socket, 27 SSLServerSocketNSS(scoped_ptr<StreamSocket> socket,
28 scoped_refptr<X509Certificate> certificate, 28 scoped_refptr<X509Certificate> certificate,
29 crypto::RSAPrivateKey* key, 29 crypto::RSAPrivateKey* key,
30 const SSLConfig& ssl_config); 30 const SSLConfig& ssl_config);
31 virtual ~SSLServerSocketNSS(); 31 virtual ~SSLServerSocketNSS();
32 32
33 // SSLServerSocket interface. 33 // SSLServerSocket interface.
34 virtual int Handshake(const CompletionCallback& callback) OVERRIDE; 34 virtual int Handshake(const CompletionCallback& callback) override;
35 35
36 // SSLSocket interface. 36 // SSLSocket interface.
37 virtual int ExportKeyingMaterial(const base::StringPiece& label, 37 virtual int ExportKeyingMaterial(const base::StringPiece& label,
38 bool has_context, 38 bool has_context,
39 const base::StringPiece& context, 39 const base::StringPiece& context,
40 unsigned char* out, 40 unsigned char* out,
41 unsigned int outlen) OVERRIDE; 41 unsigned int outlen) override;
42 virtual int GetTLSUniqueChannelBinding(std::string* out) OVERRIDE; 42 virtual int GetTLSUniqueChannelBinding(std::string* out) override;
43 43
44 // Socket interface (via StreamSocket). 44 // Socket interface (via StreamSocket).
45 virtual int Read(IOBuffer* buf, int buf_len, 45 virtual int Read(IOBuffer* buf, int buf_len,
46 const CompletionCallback& callback) OVERRIDE; 46 const CompletionCallback& callback) override;
47 virtual int Write(IOBuffer* buf, int buf_len, 47 virtual int Write(IOBuffer* buf, int buf_len,
48 const CompletionCallback& callback) OVERRIDE; 48 const CompletionCallback& callback) override;
49 virtual int SetReceiveBufferSize(int32 size) OVERRIDE; 49 virtual int SetReceiveBufferSize(int32 size) override;
50 virtual int SetSendBufferSize(int32 size) OVERRIDE; 50 virtual int SetSendBufferSize(int32 size) override;
51 51
52 // StreamSocket implementation. 52 // StreamSocket implementation.
53 virtual int Connect(const CompletionCallback& callback) OVERRIDE; 53 virtual int Connect(const CompletionCallback& callback) override;
54 virtual void Disconnect() OVERRIDE; 54 virtual void Disconnect() override;
55 virtual bool IsConnected() const OVERRIDE; 55 virtual bool IsConnected() const override;
56 virtual bool IsConnectedAndIdle() const OVERRIDE; 56 virtual bool IsConnectedAndIdle() const override;
57 virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; 57 virtual int GetPeerAddress(IPEndPoint* address) const override;
58 virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; 58 virtual int GetLocalAddress(IPEndPoint* address) const override;
59 virtual const BoundNetLog& NetLog() const OVERRIDE; 59 virtual const BoundNetLog& NetLog() const override;
60 virtual void SetSubresourceSpeculation() OVERRIDE; 60 virtual void SetSubresourceSpeculation() override;
61 virtual void SetOmniboxSpeculation() OVERRIDE; 61 virtual void SetOmniboxSpeculation() override;
62 virtual bool WasEverUsed() const OVERRIDE; 62 virtual bool WasEverUsed() const override;
63 virtual bool UsingTCPFastOpen() const OVERRIDE; 63 virtual bool UsingTCPFastOpen() const override;
64 virtual bool WasNpnNegotiated() const OVERRIDE; 64 virtual bool WasNpnNegotiated() const override;
65 virtual NextProto GetNegotiatedProtocol() const OVERRIDE; 65 virtual NextProto GetNegotiatedProtocol() const override;
66 virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; 66 virtual bool GetSSLInfo(SSLInfo* ssl_info) override;
67 67
68 private: 68 private:
69 enum State { 69 enum State {
70 STATE_NONE, 70 STATE_NONE,
71 STATE_HANDSHAKE, 71 STATE_HANDSHAKE,
72 }; 72 };
73 73
74 int InitializeSSLOptions(); 74 int InitializeSSLOptions();
75 75
76 void OnSendComplete(int result); 76 void OnSendComplete(int result);
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 141
142 State next_handshake_state_; 142 State next_handshake_state_;
143 bool completed_handshake_; 143 bool completed_handshake_;
144 144
145 DISALLOW_COPY_AND_ASSIGN(SSLServerSocketNSS); 145 DISALLOW_COPY_AND_ASSIGN(SSLServerSocketNSS);
146 }; 146 };
147 147
148 } // namespace net 148 } // namespace net
149 149
150 #endif // NET_SOCKET_SSL_SERVER_SOCKET_NSS_H_ 150 #endif // NET_SOCKET_SSL_SERVER_SOCKET_NSS_H_
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_unittest.cc ('k') | net/socket/ssl_server_socket_openssl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698