Updated documentation for gnutls_pubkey.

diff --git a/doc/cha-cert-auth2.texi b/doc/cha-cert-auth2.texi
index 9d246b04bb4a5231adc905941d87d5808cb72036..b9e13eb3b8c3c3d497fdab074bed6b8363842564 100644 (file)
--- a/doc/cha-cert-auth2.texi
+++ b/doc/cha-cert-auth2.texi
@@ -579,7 +579,8 @@ or through an ASN.1 encoding of the X.509 @code{SubjectPublicKeyInfo}
 sequence.
 
 @showfuncdesc{gnutls_pubkey_import_x509}
-@showfuncD{gnutls_pubkey_import_openpgp,gnutls_pubkey_import_pkcs11,gnutls_pubkey_import_pkcs11_url,gnutls_pubkey_import_privkey}
+@showfuncE{gnutls_pubkey_import_openpgp,gnutls_pubkey_import_pkcs11,gnutls_pubkey_import_pkcs11_url,gnutls_pubkey_import_privkey,gnutls_pubkey_import}
+@showfuncdesc{gnutls_pubkey_export}
 
 Additional functions are available that will return
 information over a public key.

diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c
index 5e7f94a7e70f9a956bc3bb88efc2f28e78a70584..7bebc3562a6cf0d57bf0ab4ebc36609d21be36c7 100644 (file)
--- a/lib/gnutls_pubkey.c
+++ b/lib/gnutls_pubkey.c
@@ -465,7 +465,9 @@ gnutls_pubkey_get_openpgp_key_id (gnutls_pubkey_t key, unsigned int flags,
  * @output_data_size: holds the size of output_data (and will be
  *   replaced by the actual size of parameters)
  *
- * This function will export the certificate to DER or PEM format.
+ * This function will export the public key to DER or PEM format.
+ * The contents of the exported data is the SubjectPublicKeyInfo
+ * X.509 structure.
  *
  * If the buffer provided is not long enough to hold the output, then
  * *output_data_size is updated and %GNUTLS_E_SHORT_MEMORY_BUFFER will
@@ -801,10 +803,11 @@ int gnutls_pubkey_get_pk_ecc_x962 (gnutls_pubkey_t key, gnutls_datum_t* paramete
  * @data: The DER or PEM encoded certificate. 
  * @format: One of DER or PEM 
  * 
- * This function will convert the given DER or PEM encoded Public key 
- * to the native gnutls_pubkey_t format.The output will be stored 
- * in @key. 
- * If the Certificate is PEM encoded it should have a header of "PUBLIC KEY". 
+ * This function will import the provided public key in
+ * a SubjectPublicKeyInfo X.509 structure to a native
+ * %gnutls_pubkey_t structure. The output will be stored 
+ * in @key. If the public key is PEM encoded it should have a header 
+ * of "PUBLIC KEY". 
  * 
  * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
  * negative error value.