diff options
Diffstat (limited to 'packages/OS400')
| -rw-r--r-- | packages/OS400/ccsidcurl.c | 2 | ||||
| -rw-r--r-- | packages/OS400/curl.inc.in | 48 | ||||
| -rw-r--r-- | packages/OS400/make-tests.sh | 4 |
3 files changed, 51 insertions, 3 deletions
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c index 14630b633..d64672dab 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -1080,6 +1080,8 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) case CURLOPT_PROXYUSERNAME: case CURLOPT_PROXYPASSWORD: case CURLOPT_NOPROXY: + /* SSH2 not (yet) implemented on OS400. */ + /* case CURLOPT_SSH_KNOWNHOSTS: */ case CURLOPT_SOCKS5_GSSAPI_SERVICE: s = va_arg(arg, char *); ccsid = va_arg(arg, unsigned int); diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index cda482733..4b2af311b 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -453,6 +453,28 @@ d CURLPROXY_SOCKS5_HOSTNAME... d c 7 * + d curl_khstat s 10i 0 based(######ptr######) Enum + d CURLKHSTAT_FINE_ADD_TO_FILE... + d c 0 + d CURLKHSTAT_FINE... + d c 1 + d CURLKHSTAT_REJECT... + d c 2 + d CURLKHSTAT_DEFER... + d c 3 + d CURLKHSTAT_LAST... + d c 4 + * + d curl_khmatch s 10i 0 based(######ptr######) Enum + d CURLKHMATCH_OK... + d c 0 + d CURLKHMATCH_MISMATCH... + d c 1 + d CURLKHMATCH_MISSING... + d c 2 + d CURLKHMATCH_LAST... + d c 3 + * d curl_usessl s 10i 0 based(######ptr######) Enum d CURLUSESSL_NONE... d c 0 @@ -842,13 +864,19 @@ d CURLOPT_TFTP_BLKSIZE... d c 00178 d CURLOPT_SOCKS5_GSSAPI_SERVICE... - d c 00179 + d c 10179 d CURLOPT_SOCKS5_GSSAPI_NEC... d c 00180 d CURLOPT_PROTOCOLS... d c 00181 d CURLOPT_REDIR_PROTOCOLS... d c 00182 + d CURLOPT_SSH_KNOWNHOSTS... + d c 10183 + d CURLOPT_SSH_KEYFUNCTION... + d c 20184 + d CURLOPT_SSH_KEYDATA... + d c 10185 * d CURLOPT_POST301... d c 00161 Obsolescent @@ -1153,6 +1181,21 @@ d addrlen 10u 0 d addr 16 struct sockaddr * + d curl_khkey ds based(######ptr######) + d qualified + d key * const char * + d len 10u 0 + d keytype 10i 0 + * + d CURLKHTYPE_UNKNOWN... + d c 0 + d CURLKHTYPE_RSA1... + d c 1 + d CURLKHTYPE_RSA... + d c 2 + d CURLKHTYPE_DSS... + d c 3 + * d curl_forms ds based(######ptr######) d qualified d option like(CURLformoption) @@ -1249,6 +1292,9 @@ d curl_opensocket_callback... d s * based(######ptr######) procptr * + d curl_sshkeycallback... + d s * based(######ptr######) procptr + * ************************************************************************** * Prototypes ************************************************************************** diff --git a/packages/OS400/make-tests.sh b/packages/OS400/make-tests.sh index 6ef6af914..71943bae4 100644 --- a/packages/OS400/make-tests.sh +++ b/packages/OS400/make-tests.sh @@ -17,7 +17,7 @@ cd "${TOPDIR}/tests" cd libtest -# Get definitions from the Makefile.am file. +# Get definitions from the Makefile.inc file. # The `sed' statement works as follows: # _ Join \nl-separated lines. # _ Retain only lines that begins with "identifier =". @@ -35,7 +35,7 @@ eval "`sed -e ': begin' \ -e 's/[ ]*=[ ]*/=/' \ -e 's/=\\(.*[^ ]\\)[ ]*$/=\\"\\1\\"/' \ -e 's/\\$(\\([^)]*\\))/${\\1}/g' \ - < Makefile.am`" + < Makefile.inc`" # Compile all programs. # The list is found in variable "noinst_PROGRAMS" |