Removed TLS::Session::Properties

- Removed proposed wrapper class to logically group TLS session
  properties.

1 files changed, 9 insertions, 53 deletions

diff --git a/src/lib/tls/tls_client.h b/src/lib/tls/tls_client.h
index 8a45c5444..6452294cd 100644
--- a/src/lib/tls/tls_client.h
+++ b/src/lib/tls/tls_client.h
@@ -37,64 +37,18 @@ class BOTAN_DLL Client final : public Channel
       *
       * @param rng a random number generator
       *
-      * @param properties holds server information and protocol related
-      *        properties.
+      * @param server_info is identifying information about the TLS server
+      *
+      * @param offer_version specifies which version we will offer
+      *        to the TLS server.
+      *
+      * @param next_protocols specifies protocols to advertise with ALPN
       *
       * @param reserved_io_buffer_size This many bytes of memory will
       *        be preallocated for the read and write buffers. Smaller
       *        values just mean reallocations and copies are more likely.
       */
 
-     class Properties
-        {
-            /**
-             * Stores TLS Client properties.
-             *
-             * @param server_info is identifying information about the TLS server
-             *
-             * @param protocol_version specifies which version we will offer
-             *        to the TLS server.
-             *
-             * @param next_protocols specifies protocols to advertise with ALPN
-             */
-
-            public:
-                Properties(const Server_Information& server_info
-                              = Server_Information(),
-                           const Protocol_Version protocol_version
-                              = Protocol_Version::latest_tls_version(),
-                           const std::vector<std::string>& next_versions
-                              = {})
-                    : m_server_info(server_info),
-                      m_protocol_version(protocol_version),
-                      m_next_protocols(next_versions) {}
-
-                const Server_Information& get_server_info()
-                   {
-                   return m_server_info;
-                   }
-
-                const Protocol_Version& get_protocol_version()
-                   {
-                   return m_protocol_version;
-                   }
-
-                const std::vector<std::string>& get_next_protocols()
-                   {
-                   return m_next_protocols;
-                   }
-
-            private:
-                const Server_Information& m_server_info;
-                const Protocol_Version m_protocol_version;
-                const std::vector<std::string>& m_next_protocols;
-        };
-
-      /**
-       * DEPRECATED. This constructor is only provided for backward
-       * compatibility and should not be used in new implementations.
-       */
-      BOTAN_DEPRECATED("Use TLS::Client(TLS::Callbacks ...)")
       Client(output_fn out,
              data_cb app_data_cb,
              alert_cb alert_cb,
@@ -134,7 +88,9 @@ class BOTAN_DLL Client final : public Channel
             Credentials_Manager& creds,
             const Policy& policy,
             RandomNumberGenerator& rng,
-            Properties properties,
+            const Server_Information& server_info = Server_Information(),
+            const Protocol_Version& offer_version = Protocol_Version::latest_tls_version(),
+            const std::vector<std::string>& next_protocols = {},
             size_t reserved_io_buffer_size = TLS::Client::IO_BUF_DEFAULT_SIZE
          );