summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2012-06-04 17:22:26 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2012-06-04 17:22:26 +0200
commitbd42aef3629b50fd911809d98b0b112c32d7d971 (patch)
tree2932f73c1e2c25f8885f7bc49ce80855035226bb
parent4f5ef6219ee371a1f70d13fe4dd14a25377da075 (diff)
downloadgnutls-bd42aef3629b50fd911809d98b0b112c32d7d971.tar.gz
doc updates
-rw-r--r--doc/cha-cert-auth.texi18
-rw-r--r--doc/cha-cert-auth2.texi8
2 files changed, 24 insertions, 2 deletions
diff --git a/doc/cha-cert-auth.texi b/doc/cha-cert-auth.texi
index 93db1ce9fc..9f13182b39 100644
--- a/doc/cha-cert-auth.texi
+++ b/doc/cha-cert-auth.texi
@@ -84,6 +84,7 @@ acceptable. The framework is illustrated on @ref{fig:x509}.
@menu
* X.509 certificate structure::
+* Importing an X.509 certificate::
* X.509 distinguished names::
* Verifying X.509 certificate paths::
* Verifying a certificate in the context of TLS session::
@@ -194,6 +195,23 @@ their prototypes in @file{gnutls/x509.h}. An example program to
demonstrate the @acronym{X.509} parsing capabilities can be found at
@ref{ex:x509-info}.
+@node Importing an X.509 certificate
+@subsection Importing an X.509 certificate
+
+The certificate structure should be initialized using @funcref{gnutls_x509_crt_init}, and
+a certificate structure can be imported using @funcref{gnutls_x509_crt_import}.
+
+@showfuncC{gnutls_x509_crt_init,gnutls_x509_crt_import,gnutls_x509_crt_deinit}
+
+In several functions an array of certificates is required. To assist in initialization
+and import the following two functions are provided.
+
+@showfuncB{gnutls_x509_crt_list_import,gnutls_x509_crt_list_import2}
+
+In all cases after use a certificate must be deinitialized using @funcref{gnutls_x509_crt_deinit}.
+Note that although the functions above apply to @code{gnutls_x509_crt_t} structure, similar functions
+exist for the CRL structure @code{gnutls_x509_crl_t}.
+
@node X.509 distinguished names
@subsection X.509 distinguished names
@cindex X.509 distinguished name
diff --git a/doc/cha-cert-auth2.texi b/doc/cha-cert-auth2.texi
index 0c731a3753..3a2e67cc4b 100644
--- a/doc/cha-cert-auth2.texi
+++ b/doc/cha-cert-auth2.texi
@@ -336,8 +336,12 @@ the holders of the actual data, which may be certificates, private
keys or encrypted data. A bag of type encrypted should be decrypted
in order for its data to be accessed.
-The following functions are available to read a @acronym{PKCS} #12
-structure.
+To reduce the complexity in parsing the structures the simple
+helper function @funcref{gnutls_pkcs12_simple_parse} is provided. For more
+advanced uses, manual parsing of the structure is required using the
+functions below.
+
+@showfuncdesc{gnutls_pkcs12_simple_parse}
@showfuncC{gnutls_pkcs12_get_bag,gnutls_pkcs12_verify_mac,gnutls_pkcs12_bag_decrypt}