Commit a08b6ae8 authored by Patrick Monnerat's avatar Patrick Monnerat
Browse files

Adapt OS400 SSL (qssl.h) to V5R4 

Fix qssl.c wrong error message
Upgrade OS400 wrappers and makefiles to 7.18.1
parent 74c500b6

lib/qssl.c

+4 −4
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static CURLcode Curl_qsossl_init_session(struct SessionHandle * data) 
  memset((char *) &initappstr, 0, sizeof initappstr);

  initappstr.applicationID = certname;

  initappstr.applicationIDLen = strlen(certname);

  initappstr.protocol = TLSV1_SSLV3;

  initappstr.protocol = SSL_VERSION_CURRENT;    /* TLSV1 compat. SSLV[23]. */

  initappstr.sessionType = SSL_REGISTERED_AS_CLIENT;

  rc = SSL_Init_Application(&initappstr);
@@ -190,7 +190,7 @@ static CURLcode Curl_qsossl_handshake(struct connectdata * conn, int sockindex) 


  default:

  case CURL_SSLVERSION_DEFAULT:

    h->protocol = TLSV1_SSLV3;

    h->protocol = SSL_VERSION_CURRENT;          /* TLSV1 compat. SSLV[23]. */

    break;



  case CURL_SSLVERSION_TLSv1:
@@ -228,11 +228,11 @@ static CURLcode Curl_qsossl_handshake(struct connectdata * conn, int sockindex) 
    return CURLE_SSL_CERTPROBLEM;



  case SSL_ERROR_IO:

    failf(data, "SSL_Handshake(): %s", SSL_Strerror(rc, NULL));

    failf(data, "SSL_Handshake() I/O error: %s", strerror(errno));

    return CURLE_SSL_CONNECT_ERROR;



  default:

    failf(data, "SSL_Init(): %s", SSL_Strerror(rc, NULL));

    failf(data, "SSL_Handshake(): %s", SSL_Strerror(rc, NULL));

    return CURLE_SSL_CONNECT_ERROR;

  }

packages/OS400/ccsidcurl.c

+6 −0
Original line number Diff line number Diff line
@@ -867,6 +867,12 @@ curl_formadd_ccsid(struct curl_httppost * * httppost, 


      break;



    case CURLFORM_STREAM:

      if (!forms)

        value = (char *) va_arg(arg, void *);



      break;



    case CURLFORM_CONTENTTYPE:

      /* If a previous content has been encountered, convert it now. */

packages/OS400/curl.inc.in

+5 −0
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ 
     d                 c                   X'00000010'

     d HTTPPOST_PTRBUFFER...

     d                 c                   X'00000020'

     d HTTPPOST_CALLBACK...

     d                 c                   X'00000040'

      *

     d CURL_READFUNC_ABORT...

     d                 c                   X'10000000'
@@ -815,6 +817,8 @@ 
     d                 c                   17

     d  CURLFORM_OBSOLETE2...

     d                 c                   18

     d  CURLFORM_STREAM...

     d                 c                   19

      *

     d CURLINFO        s             10i 0 based(######ptr######)               Enum

     d  CURLINFO_EFFECTIVE_URL...                                               CURLINFO_STRING + 1
@@ -1035,6 +1039,7 @@ 
     d  more                           *                                        curl_httppost *

     d  flags                        10i 0                                      long

     d  showfilename                   *                                        char *

     d  userp                          *                                        void *

      *

     d curl_sockaddr   ds                  based(######ptr######)

     d                                     qualified

packages/OS400/initscript.sh

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ db2_name() 


{

        basename "${1}"                                                 |

        tr '[a-z]' '[A-Z]'                                              |

        tr '[a-z-]' '[A-Z_]'                                              |

        sed -e 's/\..*//'                                               \

            -e 's/^\(..........\).*/\1/'

}