diff options
| -rw-r--r-- | doc/contents.txt | 3 | ||||
| -rw-r--r-- | doc/examples/asio_tls_server.cpp | 17 | ||||
| -rw-r--r-- | doc/examples/tls_server.cpp | 2 | ||||
| -rw-r--r-- | doc/index.txt | 2 |
4 files changed, 7 insertions, 17 deletions
diff --git a/doc/contents.txt b/doc/contents.txt index dd600d587..141c9188f 100644 --- a/doc/contents.txt +++ b/doc/contents.txt @@ -12,7 +12,8 @@ Contents filters pubkey x509 - ssl + tls + credentials_manager bigint lowlevel secmem diff --git a/doc/examples/asio_tls_server.cpp b/doc/examples/asio_tls_server.cpp index 457460d41..ad8c75036 100644 --- a/doc/examples/asio_tls_server.cpp +++ b/doc/examples/asio_tls_server.cpp @@ -38,10 +38,7 @@ class tls_server_session : public boost::enable_shared_from_this<tls_server_sess ); } - tcp::socket& socket() - { - return m_socket; - } + tcp::socket& socket() { return m_socket; } void start() { @@ -52,10 +49,7 @@ class tls_server_session : public boost::enable_shared_from_this<tls_server_sess asio::placeholders::bytes_transferred)); } - void stop() - { - m_socket.close(); - } + void stop() { m_socket.close(); } private: tls_server_session(asio::io_service& io_service, @@ -151,11 +145,7 @@ class tls_server_session : public boost::enable_shared_from_this<tls_server_sess } } - - - //printf("Got %d bytes: ", (int)buf_len); - - if(buf_len > 4) + if(buf_len > 4) // FIXME: ghetto { std::string out; out += "\r\n"; @@ -176,7 +166,6 @@ class tls_server_session : public boost::enable_shared_from_this<tls_server_sess bool tls_handshake_complete(const Botan::TLS_Session& session) { - //printf("handshake complete\n"); return true; } diff --git a/doc/examples/tls_server.cpp b/doc/examples/tls_server.cpp index 143ba8b64..2dbfb4aeb 100644 --- a/doc/examples/tls_server.cpp +++ b/doc/examples/tls_server.cpp @@ -102,7 +102,7 @@ class Blocking_TLS_Server void write(const byte buf[], size_t buf_len) { - server.queue_for_sending(buf, buf_len); + server.send(buf, buf_len); } void close() { server.close(); } diff --git a/doc/index.txt b/doc/index.txt index 75e2ca434..33de06f55 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -4,7 +4,7 @@ Welcome Botan is a :doc:`BSD-licensed <license>` crypto library for C++. It provides applications with most any :doc:`cryptographic algorithm -<algos>` you might be looking for, along with :doc:`SSL/TLS <ssl>`, +<algos>` you might be looking for, along with :doc:`SSL/TLS <tls>`, :doc:`X.509 certificates and CRLs <x509>`, a :doc:`pipeline-style message processing system <filters>`, and a wide variety of other features. A third party open source implementation of `SSHv2 |