summaryrefslogtreecommitdiff
path: root/doc/cha-tokens.texi
diff options
context:
space:
mode:
Diffstat (limited to 'doc/cha-tokens.texi')
-rw-r--r--doc/cha-tokens.texi11
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/cha-tokens.texi b/doc/cha-tokens.texi
index 511ca75bf1..1b29aea893 100644
--- a/doc/cha-tokens.texi
+++ b/doc/cha-tokens.texi
@@ -17,7 +17,7 @@ stored in such modules.
In GnuTLS the approach is to handle all keys transparently by the high level API, e.g.,
the API that loads a key or certificate from a file.
The high-level API will accept URIs in addition to files that specify keys on an HSM or in TPM,
-and a callback function will be used to obtain any required keys. The URI format is defined in
+and a callback function will be used to obtain any required keys. The URI format is defined in
@xcite{PKCS11URI}.
More information on the API is provided in the next sections. Examples of a URI of a certificate
@@ -42,7 +42,7 @@ manufacturer=EnterSafe;object=test1;type=cert
@cindex abstract types
Since there are many forms of a public or private keys supported by @acronym{GnuTLS} such as
-@acronym{X.509}, @acronym{OpenPGP}, @acronym{PKCS} #11 or TPM it is desirable to allow common operations
+@acronym{X.509}, @acronym{PKCS} #11 or TPM it is desirable to allow common operations
on them. For these reasons the abstract @code{gnutls_privkey_t} and @code{gnutls_pubkey_t} were
introduced in @code{gnutls/@-abstract.h} header. Those types are initialized using a specific type of
key and then can be used to perform operations in an abstract way. For example in order
@@ -92,8 +92,7 @@ sequence.
@showfuncdesc{gnutls_pubkey_export2}
-Other helper functions that allow directly importing from raw X.509 or
-OpenPGP structures are shown below.
+Other helper functions that allow directly importing from raw X.509 structures are shown below.
@showfuncA{gnutls_pubkey_import_x509_raw}
@@ -130,8 +129,8 @@ makes available only operations.
@showfuncB{gnutls_privkey_import_x509,gnutls_privkey_import_pkcs11}
-Other helper functions that allow directly importing from raw X.509 or
-OpenPGP structures are shown below. Again, as with public keys, private keys
+Other helper functions that allow directly importing from raw X.509
+structures are shown below. Again, as with public keys, private keys
can be imported from a hardware module using URLs.
@showfuncdesc{gnutls_privkey_import_url}