New options added to OS400 wrapper and ILERPG definitions.

Wrong defines (typos) for QSSL layer fixed.

diff --git a/lib/qssl.h b/lib/qssl.h
index 64b9134..e7bc2b1 100644 (file)
--- a/lib/qssl.h
+++ b/lib/qssl.h
@@ -51,9 +51,9 @@ size_t Curl_qsossl_version(char * buffer, size_t size);
 int Curl_qsossl_check_cxn(struct connectdata * cxn);
 
 /* API setup for QsoSSL */
-#define curlssl_init Curl_qossl_init
-#define curlssl_cleanup Curl_qossl_cleanup
-#define curlssl_connect Curl_qossl_connect
+#define curlssl_init Curl_qsossl_init
+#define curlssl_cleanup Curl_qsossl_cleanup
+#define curlssl_connect Curl_qsossl_connect
 
 /*  No session handling for QsoSSL */
 #define curlssl_session_free(x)

diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index 17f5c85..c44db0e 100644 (file)
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -1030,7 +1030,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
   if (testwarn) {
     testwarn = 0;
 
-    if ((int) STRING_LAST != (int) STRING_SSH_HOST_PUBLIC_KEY_MD5 + 1)
+    if ((int) STRING_LAST != (int) STRING_SSL_ISSUERCERT + 1)
       curl_mfprintf(stderr,
        "*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n");
     }
@@ -1073,6 +1073,8 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
   case CURLOPT_USERAGENT:
   case CURLOPT_USERPWD:
   case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5:
+  case CURLOPT_CRLFILE:
+  case CURLOPT_ISSUERCERT:
     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 23808f4..56927f3 100644 (file)
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -384,6 +384,10 @@
      d                 c                   80
      d  CURLE_AGAIN...
      d                 c                   81
+     d  CURLE_SSL_CRL_BADFILE...
+     d                 c                   82
+     d  CURLE_SSL_ISSUER_ERROR...
+     d                 c                   83
       *
      d curlioerr       s             10i 0 based(######ptr######)               Enum
      d  CURLIOE_OK     c                   0
@@ -761,6 +765,10 @@
      d                 c                   20167
      d  CURLOPT_SEEKDATA...
      d                 c                   10168
+     d  CURLOPT_CRLFILE...
+     d                 c                   10169
+     d  CURLOPT_ISSUERCERT...
+     d                 c                   10170
       *
      d CURLFORMcode    s             10i 0 based(######ptr######)               Enum
      d  CURL_FORMADD_OK...
@@ -885,6 +893,10 @@
      d                 c                   X'0010001E'
      d  CURLINFO_REDIRECT_URL...                                                CURLINFO_STRING + 31
      d                 c                   X'0010001F'
+     d  CURLINFO_PRIMARY_IP...                                                  CURLINFO_STRING + 32
+     d                 c                   X'00100020'
+     d  CURLINFO_APPCONNECT_TIME...                                             CURLINFO_DOUBLE + 33
+     d                 c                   X'00300021'
      d  CURLINFO_HTTP_CODE...                                                   Old ...RESPONSE_CODE
      d                 c                   X'00200002'
       *