aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Monnerat <pm@datasphere.ch>2014-10-08 15:47:04 +0200
committerPatrick Monnerat <pm@datasphere.ch>2014-10-08 15:47:04 +0200
commit548811cb19dfdb92977dba9567752a7a238a85ed (patch)
tree0201f189b5d42901ec0dcb8c49611f98bb59497f
parentb74205d022cb4b3e2e3ca8b43bce23aff885dac5 (diff)
OS400: upgrade interface for pinned public key (no implementation yet)
-rw-r--r--packages/OS400/README.OS4001
-rw-r--r--packages/OS400/ccsidcurl.c1
-rw-r--r--packages/OS400/curl.inc.in4
3 files changed, 6 insertions, 0 deletions
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400
index 06e6632a2..b0bdf8e75 100644
--- a/packages/OS400/README.OS400
+++ b/packages/OS400/README.OS400
@@ -91,6 +91,7 @@ options:
CURLOPT_NETRC_FILE
CURLOPT_NOPROXY
CURLOPT_PASSWORD
+ CURLOPT_PINNEDPUBLICKEY
CURLOPT_PROXY
CURLOPT_PROXYPASSWORD
CURLOPT_PROXYUSERNAME
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index 34ca8dc23..6cbbaa77d 100644
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -1154,6 +1154,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
case CURLOPT_NETRC_FILE:
case CURLOPT_NOPROXY:
case CURLOPT_PASSWORD:
+ case CURLOPT_PINNEDPUBLICKEY:
case CURLOPT_PROXY:
case CURLOPT_PROXYPASSWORD:
case CURLOPT_PROXYUSERNAME:
diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in
index 3f973cc2c..f77bcae10 100644
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -511,6 +511,8 @@
d c 88
d CURLE_NO_CONNECTION_AVAILABLE...
d c 89
+ d CURLE_SSL_PINNEDPUBKEYNOTMATCH...
+ d c 90
*
/if not defined(CURL_NO_OLDIES)
d CURLE_URL_MALFORMAT_USER...
@@ -1189,6 +1191,8 @@
d c 10228
d CURLOPT_HEADEROPT...
d c 00229
+ d CURLOPT_PINNEDPUBLICKEY...
+ d c 10230
*
/if not defined(CURL_NO_OLDIES)
d CURLOPT_FILE c 10001