| Index: net/ssl/ssl_connection_status_flags.h
|
| diff --git a/net/ssl/ssl_connection_status_flags.h b/net/ssl/ssl_connection_status_flags.h
|
| deleted file mode 100644
|
| index d3bfed26f941c0609f4446a0d972b5205fc92146..0000000000000000000000000000000000000000
|
| --- a/net/ssl/ssl_connection_status_flags.h
|
| +++ /dev/null
|
| @@ -1,86 +0,0 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#ifndef NET_SSL_SSL_CONNECTION_STATUS_FLAGS_H_
|
| -#define NET_SSL_SSL_CONNECTION_STATUS_FLAGS_H_
|
| -
|
| -#include "base/logging.h"
|
| -#include "base/macros.h"
|
| -
|
| -namespace net {
|
| -
|
| -// Status flags for SSLInfo::connection_status.
|
| -enum {
|
| - // The lower 16 bits are reserved for the TLS ciphersuite id.
|
| - SSL_CONNECTION_CIPHERSUITE_MASK = 0xffff,
|
| -
|
| - // The next two bits are reserved for the compression used.
|
| - SSL_CONNECTION_COMPRESSION_SHIFT = 16,
|
| - SSL_CONNECTION_COMPRESSION_MASK = 3,
|
| -
|
| - // We fell back to an older protocol version for this connection.
|
| - SSL_CONNECTION_VERSION_FALLBACK = 1 << 18,
|
| -
|
| - // The server doesn't support the renegotiation_info extension. If this bit
|
| - // is not set then either the extension isn't supported, or we don't have any
|
| - // knowledge either way. (The latter case will occur when we use an SSL
|
| - // library that doesn't report it, like SChannel.)
|
| - SSL_CONNECTION_NO_RENEGOTIATION_EXTENSION = 1 << 19,
|
| -
|
| - // The next three bits are reserved for the SSL version.
|
| - SSL_CONNECTION_VERSION_SHIFT = 20,
|
| - SSL_CONNECTION_VERSION_MASK = 7,
|
| -
|
| - // 1 << 31 (the sign bit) is reserved so that the SSL connection status will
|
| - // never be negative.
|
| -};
|
| -
|
| -// NOTE: the SSL version enum constants must be between 0 and
|
| -// SSL_CONNECTION_VERSION_MASK, inclusive.
|
| -enum {
|
| - SSL_CONNECTION_VERSION_UNKNOWN = 0, // Unknown SSL version.
|
| - SSL_CONNECTION_VERSION_SSL2 = 1,
|
| - SSL_CONNECTION_VERSION_SSL3 = 2,
|
| - SSL_CONNECTION_VERSION_TLS1 = 3,
|
| - SSL_CONNECTION_VERSION_TLS1_1 = 4,
|
| - SSL_CONNECTION_VERSION_TLS1_2 = 5,
|
| - // Reserve 6 for TLS 1.3.
|
| - SSL_CONNECTION_VERSION_QUIC = 7,
|
| - SSL_CONNECTION_VERSION_MAX,
|
| -};
|
| -static_assert(SSL_CONNECTION_VERSION_MAX - 1 <= SSL_CONNECTION_VERSION_MASK,
|
| - "SSL_CONNECTION_VERSION_MASK too small");
|
| -
|
| -inline uint16 SSLConnectionStatusToCipherSuite(int connection_status) {
|
| - return static_cast<uint16>(connection_status);
|
| -}
|
| -
|
| -inline int SSLConnectionStatusToVersion(int connection_status) {
|
| - return (connection_status >> SSL_CONNECTION_VERSION_SHIFT) &
|
| - SSL_CONNECTION_VERSION_MASK;
|
| -}
|
| -
|
| -inline void SSLConnectionStatusSetCipherSuite(uint16 cipher_suite,
|
| - int* connection_status) {
|
| - // Clear out the old ciphersuite.
|
| - *connection_status &= ~SSL_CONNECTION_CIPHERSUITE_MASK;
|
| - // Set the new ciphersuite.
|
| - *connection_status |= cipher_suite;
|
| -}
|
| -
|
| -inline void SSLConnectionStatusSetVersion(int version, int* connection_status) {
|
| - DCHECK_GT(version, 0);
|
| - DCHECK_LT(version, SSL_CONNECTION_VERSION_MAX);
|
| -
|
| - // Clear out the old version.
|
| - *connection_status &=
|
| - ~(SSL_CONNECTION_VERSION_MASK << SSL_CONNECTION_VERSION_SHIFT);
|
| - // Set the new version.
|
| - *connection_status |=
|
| - ((version & SSL_CONNECTION_VERSION_MASK) << SSL_CONNECTION_VERSION_SHIFT);
|
| -}
|
| -
|
| -} // namespace net
|
| -
|
| -#endif // NET_SSL_SSL_CONNECTION_STATUS_FLAGS_H_
|
|
|