diff options
author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-06-16 10:21:10 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-06-16 15:31:51 +0200 |
commit | 2908e4651e91efdeead9e545fff842b84c687801 (patch) | |
tree | 8e83b9e3229a57916addaa5930e23fa03f132080 /doc/cha-tokens.texi | |
parent | f798a4656386184b83685c357a9a3a0f331c4144 (diff) | |
download | gnutls-2908e4651e91efdeead9e545fff842b84c687801.tar.gz |
doc: removed references to openpgp
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'doc/cha-tokens.texi')
-rw-r--r-- | doc/cha-tokens.texi | 11 |
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} |