aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-12-08 13:06:01 +0000
committerlloyd <[email protected]>2012-12-08 13:06:01 +0000
commit71e60dbdb404b715532a9e5d70efdff393602470 (patch)
tree7f3ccaf241f85ae55a703cd1617af07f643c6703
parent0011d342f3e1c589bd226c3637c10c15b2b7cf73 (diff)
Example compile fixes
-rw-r--r--doc/examples/asio_tls_server.cpp2
-rw-r--r--doc/examples/asn1.cpp3
-rw-r--r--doc/examples/eax_test.cpp2
-rw-r--r--doc/x509.rst18
4 files changed, 20 insertions, 5 deletions
diff --git a/doc/examples/asio_tls_server.cpp b/doc/examples/asio_tls_server.cpp
index d7d49c0e0..3ceadf663 100644
--- a/doc/examples/asio_tls_server.cpp
+++ b/doc/examples/asio_tls_server.cpp
@@ -167,7 +167,7 @@ class tls_server_session : public boost::enable_shared_from_this<tls_server_sess
bool tls_handshake_complete(const Botan::TLS::Session& session)
{
- m_hostname = session.sni_hostname();
+ m_hostname = session.server_info().hostname();
return true;
}
diff --git a/doc/examples/asn1.cpp b/doc/examples/asn1.cpp
index 2bb3a620c..12ba43e15 100644
--- a/doc/examples/asn1.cpp
+++ b/doc/examples/asn1.cpp
@@ -2,7 +2,8 @@
#include <botan/bigint.h>
#include <botan/der_enc.h>
#include <botan/ber_dec.h>
-#include <botan/asn1_obj.h>
+#include <botan/asn1_time.h>
+#include <botan/asn1_str.h>
#include <botan/oids.h>
#include <botan/pem.h>
#include <botan/hex.h>
diff --git a/doc/examples/eax_test.cpp b/doc/examples/eax_test.cpp
index 763d2f642..228ece286 100644
--- a/doc/examples/eax_test.cpp
+++ b/doc/examples/eax_test.cpp
@@ -234,7 +234,7 @@ void run_tests(std::istream& in)
int main()
{
- std::ifstream in("eax_vecs.txt")
+ std::ifstream in("eax_vecs.txt");
Botan::LibraryInitializer init;
diff --git a/doc/x509.rst b/doc/x509.rst
index be93c604c..48fe5637e 100644
--- a/doc/x509.rst
+++ b/doc/x509.rst
@@ -11,8 +11,22 @@ signature on the certificate, which is placed there by some authority
the certificate really "owns" the private key corresponding to the
public key in the certificate.
-The major certificate format in use today is X.509v3, designed by ISO
-and further hacked on by dozens (hundreds?) of other organizations.
+The major certificate format in use today is X.509v3, used for instance
+in the :doc:`tls` protocol. A X.509 certificate is represented by
+
+.. cpp:class:: X509_Certificate
+
+ .. cpp:function:: Public_Key* subject_public_key() const
+
+ Returns the public key of the subject
+
+ .. cpp:function:: X509_DN subject_dn() const
+
+ Returns the distinguished name of the issuer
+
+ .. cpp:function:: X509_DN subject_dn() const
+
+ Returns the distinguished name of the issuer
When working with certificates, the main class to remember is
``X509_Certificate``. You can read an object of this type, but you