diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-01-06 08:26:17 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2017-01-15 10:58:45 +0100 |
| commit | 68554d80c99a49a2c4f7253a83e82e74663e9774 (patch) | |
| tree | c4a7b6cdef58b21742f01df50337cde56096f8de /doc/cha-tokens.texi | |
| parent | ac3de8f509a7d86289fccd64a998deec1199e016 (diff) | |
| download | gnutls-68554d80c99a49a2c4f7253a83e82e74663e9774.tar.gz | |
doc: removed documentation related to OpenPGP
Also added section explaining why OpenPGP is being deprecated.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'doc/cha-tokens.texi')
| -rw-r--r-- | doc/cha-tokens.texi | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/doc/cha-tokens.texi b/doc/cha-tokens.texi index dd8158ae67..a5c647d0d3 100644 --- a/doc/cha-tokens.texi +++ b/doc/cha-tokens.texi @@ -86,7 +86,7 @@ an existing structure like @code{gnutls_x509_crt_t}, or through an ASN.1 encoding of the X.509 @code{SubjectPublicKeyInfo} sequence. -@showfuncC{gnutls_pubkey_import_x509,gnutls_pubkey_import_openpgp,gnutls_pubkey_import_pkcs11} +@showfuncB{gnutls_pubkey_import_x509,gnutls_pubkey_import_pkcs11} @showfuncD{gnutls_pubkey_import_url,gnutls_pubkey_import_privkey,gnutls_pubkey_import,gnutls_pubkey_export} @@ -95,7 +95,7 @@ sequence. Other helper functions that allow directly importing from raw X.509 or OpenPGP structures are shown below. -@showfuncB{gnutls_pubkey_import_x509_raw,gnutls_pubkey_import_openpgp_raw} +@showfuncA{gnutls_pubkey_import_x509_raw} An important function is @funcref{gnutls_pubkey_import_url} which will import public keys from URLs that identify objects stored in tokens (see @ref{Smart cards and HSMs} and @ref{Trusted Platform Module}). @@ -128,17 +128,15 @@ but unlike public keys it cannot be exported. That is to allow abstraction over keys stored in hardware that makes available only operations. -@showfuncC{gnutls_privkey_import_x509,gnutls_privkey_import_openpgp,gnutls_privkey_import_pkcs11} +@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 can be imported from a hardware module using URLs. -@showfuncB{gnutls_privkey_import_x509_raw,gnutls_privkey_import_openpgp_raw} - @showfuncdesc{gnutls_privkey_import_url} -@showfuncC{gnutls_privkey_get_pk_algorithm,gnutls_privkey_get_type,gnutls_privkey_status} +@showfuncD{gnutls_privkey_import_x509_raw,gnutls_privkey_get_pk_algorithm,gnutls_privkey_get_type,gnutls_privkey_status} In order to support cryptographic operations using an external API, the following function is provided. |