aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSahana Prasad <sahana@redhat.com>2020-01-17 11:49:40 +0100
committerAnderson Toshiyuki Sasaki <ansasaki@redhat.com>2020-02-11 14:25:18 +0100
commit862b2341d7144e17de784937ddd53cb94377f2cf (patch)
tree84806f59e1f3b487b4e079f35817a2f8a115f0dd /src
parent17b518a677c92d943cf016b81272ec10ee1ca368 (diff)
downloadlibssh-862b2341d7144e17de784937ddd53cb94377f2cf.tar.gz
libssh-862b2341d7144e17de784937ddd53cb94377f2cf.tar.xz
libssh-862b2341d7144e17de784937ddd53cb94377f2cf.zip
src: updates documentation incorporate PKCS#11 URIs in import functions.
Signed-off-by: Sahana Prasad <sahana@redhat.com> Reviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Diffstat (limited to 'src')
-rw-r--r--src/pki.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/pki.c b/src/pki.c
index 7ad666c6..5cbd0c06 100644
--- a/src/pki.c
+++ b/src/pki.c
@@ -878,9 +878,10 @@ int ssh_pki_export_privkey_base64(const ssh_key privkey,
}
/**
- * @brief Import a key from a file.
+ * @brief Import a private key from a file or a PKCS #11 device.
*
- * @param[in] filename The filename of the the private key.
+ * @param[in] filename The filename of the private key or the
+ * PKCS #11 URI corresponding to the private key.
*
* @param[in] passphrase The passphrase to decrypt the private key. Set to NULL
* if none is needed or it is unknown.
@@ -1702,9 +1703,10 @@ char *ssh_pki_export_pub_uri_from_priv_uri(const char *priv_uri)
}
/**
- * @brief Import a public key from the given filename.
+ * @brief Import a public key from a file or a PKCS #11 device.
*
- * @param[in] filename The path to the public key.
+ * @param[in] filename The filename of the public key or the
+ * PKCS #11 URI corresponding to the public key.
*
* @param[out] pkey A pointer to store the allocated public key. You need to
* free the memory.