API: s/SSL/TLS/g. (#10)

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
pull/12/head
Piotr Sikora 8 years ago committed by htuch
parent f2250e84d1
commit be872a4113
  1. 8
      api/BUILD
  2. 4
      api/cds.proto
  3. 6
      api/lds.proto
  4. 4
      api/rds.proto
  5. 20
      api/tls_context.proto

@ -17,8 +17,8 @@ api_proto_library(
)
api_proto_library(
name = "ssl_context",
srcs = ["ssl_context.proto"],
name = "tls_context",
srcs = ["tls_context.proto"],
)
api_proto_library(
@ -28,7 +28,7 @@ api_proto_library(
":address",
":base",
":health_check",
":ssl_context",
":tls_context",
],
)
@ -38,7 +38,7 @@ api_proto_library(
deps = [
":address",
":base",
":ssl_context",
":tls_context",
],
)

@ -3,7 +3,7 @@ syntax = "proto3";
import "api/address.proto";
import "api/base.proto";
import "api/health_check.proto";
import "api/ssl_context.proto";
import "api/tls_context.proto";
import "google/protobuf/wrappers.proto";
@ -115,7 +115,7 @@ message Cluster {
// The TLS configuration for connections to the upstream cluster. If no TLS
// configuration is specified, TLS will not be used for new connections.
UpstreamSslContext ssl_context = 10;
UpstreamTlsContext tls_context = 10;
oneof protocol_options {
TcpProtocolOptions tcp_protocol_options = 11;

@ -6,7 +6,7 @@ syntax = "proto3";
import "api/address.proto";
import "api/base.proto";
import "api/ssl_context.proto";
import "api/tls_context.proto";
import "google/protobuf/struct.proto";
import "google/protobuf/wrappers.proto";
@ -64,11 +64,11 @@ message FilterChainMatch {
google.protobuf.UInt32Value suffix_len = 5;
}
// Grouping of FilterChainMatch criteria, DownstreamSslContext, the actual filter chain
// Grouping of FilterChainMatch criteria, DownstreamTlsContext, the actual filter chain
// and related parameters.
message FilterChain {
FilterChainMatch filter_chain_match = 1;
DownstreamSslContext ssl_context = 2;
DownstreamTlsContext tls_context = 2;
// A list of individual network filters that make up the filter chain for
// connections established with the listener. Order matters as the filters are
// processed sequentially as connection events happen. Note: If the filter

@ -356,7 +356,7 @@ message VirtualHost {
// The first route that matches will be used.
repeated Route routes = 3;
enum SslRequirementType {
enum TlsRequirementType {
// No TLS requirement for the virtual host.
NONE = 0;
// External requests must use TLS. If a request is external and it is not
@ -367,7 +367,7 @@ message VirtualHost {
ALL = 2;
}
// Specifies the type of TLS enforcement the virtual host expects.
SslRequirementType require_ssl = 4;
TlsRequirementType require_tls = 4;
// A list of virtual clusters defined for this virtual host. Virtual clusters
// are used for additional statistics gathering.

@ -29,9 +29,9 @@ message TlsParameters {
repeated google.protobuf.StringValue ecdh_curves = 4;
}
// SSL certs can be loaded from file or delivered inline [V2-API-DIFF]. Individual fields may
// TLS certs can be loaded from file or delivered inline [V2-API-DIFF]. Individual fields may
// be loaded from either.
message SslCertificate {
message TlsCertificate {
DataSource cert_chain = 1;
DataSource private_key = 2;
DataSource ocsp_staple = 3;
@ -39,7 +39,7 @@ message SslCertificate {
}
message CertificateValidationContext {
// SSL certificate data containing certificate authority certificates to use
// TLS certificate data containing certificate authority certificates to use
// in verifying a presented certificate. If not specified and a certificate is
// presented it will not be verified.
DataSource ca_cert = 1;
@ -59,9 +59,9 @@ message CertificateValidationContext {
google.protobuf.BoolValue require_signed_certificate_timestamp = 5;
}
message UpstreamSslContext {
message UpstreamTlsContext {
// Client certificate to present to backend.
SslCertificate client_certificate = 1;
TlsCertificate client_certificate = 1;
// SNI string to use when creating TLS backend connections.
google.protobuf.StringValue sni = 2;
@ -77,12 +77,12 @@ message UpstreamSslContext {
}
// [V2-API-DIFF] This has been reworked to support alternative modes of
// certificate/key delivery, for consistency with the upstream SSL context and
// to segregate the client/server aspects of the SSL context.
message DownstreamSslContext {
// Multiple SSL certificates can be associated with the same context, e.g. to
// certificate/key delivery, for consistency with the upstream TLS context and
// to segregate the client/server aspects of the TLS context.
message DownstreamTlsContext {
// Multiple TLS certificates can be associated with the same context, e.g. to
// allow both RSA and ECDSA certificates for the same SNI [V2-API-DIFF].
repeated SslCertificate ssl_certificates = 1;
repeated TlsCertificate tls_certificates = 1;
// Supplies the list of ALPN protocols that the listener should expose.
repeated google.protobuf.StringValue alpn_protocols = 2;
Loading…
Cancel
Save