os400: support CURLOPT_PROXY_PINNEDPUBLICKEY

Also define it in ILE/RPG binding.

diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400
index e709f40db90edcb3612d6f30617af3683f55a706..5efad0f6b524f039b896bc58a31856f1fb15a9e1 100644 (file)
--- a/packages/OS400/README.OS400
+++ b/packages/OS400/README.OS400
@@ -98,6 +98,7 @@ options:
         CURLOPT_PROXY_CAPATH
         CURLOPT_PROXY_CRLFILE
         CURLOPT_PROXY_KEYPASSWD
+        CURLOPT_PROXY_PINNEDPUBLICKEY
         CURLOPT_PROXY_SERVICE_NAME
         CURLOPT_PROXY_SSLCERT
         CURLOPT_PROXY_SSLCERTTYPE

diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index 60824422b7e14ece7087037a0a1a58ccc96c103a..b1c124434a2471459f7ed2815130e18c86d94ad5 100644 (file)
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -1169,6 +1169,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
   case CURLOPT_PROXY_CAPATH:
   case CURLOPT_PROXY_CRLFILE:
   case CURLOPT_PROXY_KEYPASSWD:
+  case CURLOPT_PROXY_PINNEDPUBLICKEY:
   case CURLOPT_PROXY_SERVICE_NAME:
   case CURLOPT_PROXY_SSLCERT:
   case CURLOPT_PROXY_SSLCERTTYPE:

diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in
index c0b0330a8ce9138f4f4d142f00763c4e92ce71cf..a3ed83781440c76a28195bd9daef080919c7fc29 100644 (file)
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -127,6 +127,8 @@
      d                 c                   X'00080000'
      d CURL_VERSION_PSL...
      d                 c                   X'00100000'
+     d CURL_VERSION_HTTPS_PROXY...
+     d                 c                   X'00200000'
       *
      d CURL_HTTPPOST_FILENAME...
      d                 c                   X'00000001'
@@ -1296,6 +1298,8 @@
      d                 c                   10262
      d  CURLOPT_SOCKS_PROXYTYPE...
      d                 c                   00263
+     d  CURLOPT_PROXY_PINNEDPUBLICKEY...
+     d                 c                   10264
       *
       /if not defined(CURL_NO_OLDIES)
      d  CURLOPT_FILE   c                   10001