From afa64ee31f09a9fd02ed108f2b1dee3e054f2c43 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 6 Feb 2002 09:49:34 +0000 Subject: [PATCH] a few of the SSL options were added in 7.9.3 and it should be noted accordingly --- docs/curl_easy_setopt.3 | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/docs/curl_easy_setopt.3 b/docs/curl_easy_setopt.3 index 38f1f2eb1..4067cec5e 100644 --- a/docs/curl_easy_setopt.3 +++ b/docs/curl_easy_setopt.3 @@ -324,7 +324,8 @@ changed with \fICURLOPT_SSLCERTTYPE\fP. .TP .B CURLOPT_SSLCERTTYPE Pass a pointer to a zero terminated string as parameter. The string should be -the format of your certificate. Supported formats are "PEM" and "DER". +the format of your certificate. Supported formats are "PEM" and "DER". (Added +in 7.9.3) .TP .B CURLOPT_SSLCERTPASSWD Pass a pointer to a zero terminated string as parameter. It will be used as @@ -339,11 +340,12 @@ a certificate but you need one to load your private key. .B CURLOPT_SSLKEY Pass a pointer to a zero terminated string as parameter. The string should be the file name of your private key. The default format is "PEM" and can be -changed with \fICURLOPT_SSLKEYTYPE\fP. +changed with \fICURLOPT_SSLKEYTYPE\fP. (Added in 7.9.3) .TP .B CURLOPT_SSLKEYTYPE Pass a pointer to a zero terminated string as parameter. The string should be the format of your private key. Supported formats are "PEM", "DER" and "ENG". +(Added in 7.9.3) \fBNOTE:\fPThe format "ENG" enables you to load the private key from a crypto engine. in this case \fICURLOPT_SSLKEY\fP is used as an identifier passed to @@ -351,22 +353,25 @@ the engine. You have to set the crypto engine with \fICURLOPT_SSL_ENGINE\fP. .TP .B CURLOPT_SSLKEYASSWD Pass a pointer to a zero terminated string as parameter. It will be used as -the password required to use the \fICURLOPT_SSLKEY\fP private key. If the password -is not supplied, you will be prompted for it. \fICURLOPT_PASSWDFUNCTION\fP can -be used to set your own prompt function. +the password required to use the \fICURLOPT_SSLKEY\fP private key. If the +password is not supplied, you will be prompted for +it. \fICURLOPT_PASSWDFUNCTION\fP can be used to set your own prompt function. +(Added in 7.9.3) .TP .B CURLOPT_SSL_ENGINE Pass a pointer to a zero terminated string as parameter. It will be used as -the identifier for the crypto engine you want to use for your private key. +the identifier for the crypto engine you want to use for your private +key. (Added in 7.9.3) -\fBNOTE:\fPIf the crypto device cannot be loaded, \fICURLE_SSL_ENGINE_NOTFOUND\fP -is returned. +\fBNOTE:\fPIf the crypto device cannot be loaded, +\fICURLE_SSL_ENGINE_NOTFOUND\fP is returned. .TP .B CURLOPT_SSL_ENGINEDEFAULT -Sets the actual crypto engine as the default for (asymetric) crypto operations. +Sets the actual crypto engine as the default for (asymetric) crypto +operations. (Added in 7.9.3) -\fBNOTE:\fPIf the crypto device cannot be set, \fICURLE_SSL_ENGINE_SETFAILED\fP -is returned. +\fBNOTE:\fPIf the crypto device cannot be set, +\fICURLE_SSL_ENGINE_SETFAILED\fP is returned. .TP .B CURLOPT_CRLF Convert Unix newlines to CRLF newlines on FTP uploads.