moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 17:31:46 -05:00
Code Issues Releases Wiki Activity

Adapt OS400 SSL (qssl.h) to V5R4

Browse Source 
Fix qssl.c wrong error message
Upgrade OS400 wrappers and makefiles to 7.18.1
This commit is contained in:
Patrick Monnerat 2008-04-07 13:09:17 +00:00
parent 74c500b6ec
commit a08b6ae813
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/qssl.c
View File

@ -90,7 +90,7 @@ static CURLcode Curl_qsossl_init_session(struct SessionHandle * data)
memset((char *) &initappstr, 0, sizeof initappstr); memset((char *) &initappstr, 0, sizeof initappstr);
initappstr.applicationID = certname; initappstr.applicationID = certname;
initappstr.applicationIDLen = strlen(certname); initappstr.applicationIDLen = strlen(certname);
initappstr.protocol = TLSV1_SSLV3; initappstr.protocol = SSL_VERSION_CURRENT; /* TLSV1 compat. SSLV[23]. */
initappstr.sessionType = SSL_REGISTERED_AS_CLIENT; initappstr.sessionType = SSL_REGISTERED_AS_CLIENT;
rc = SSL_Init_Application(&initappstr); rc = SSL_Init_Application(&initappstr);
@ -190,7 +190,7 @@ static CURLcode Curl_qsossl_handshake(struct connectdata * conn, int sockindex)
default: default:
case CURL_SSLVERSION_DEFAULT: case CURL_SSLVERSION_DEFAULT:
h->protocol = TLSV1_SSLV3; h->protocol = SSL_VERSION_CURRENT; /* TLSV1 compat. SSLV[23]. */
break; break;
case CURL_SSLVERSION_TLSv1: case CURL_SSLVERSION_TLSv1:
@ -228,11 +228,11 @@ static CURLcode Curl_qsossl_handshake(struct connectdata * conn, int sockindex)
return CURLE_SSL_CERTPROBLEM; return CURLE_SSL_CERTPROBLEM;
case SSL_ERROR_IO: 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; return CURLE_SSL_CONNECT_ERROR;
default: default:
failf(data, "SSL_Init(): %s", SSL_Strerror(rc, NULL)); failf(data, "SSL_Handshake(): %s", SSL_Strerror(rc, NULL));
return CURLE_SSL_CONNECT_ERROR; return CURLE_SSL_CONNECT_ERROR;
} }

6
packages/OS400/ccsidcurl.c
View File

@ -867,6 +867,12 @@ curl_formadd_ccsid(struct curl_httppost * * httppost,
break; break;
case CURLFORM_STREAM:
if (!forms)
value = (char *) va_arg(arg, void *);
break;
case CURLFORM_CONTENTTYPE: case CURLFORM_CONTENTTYPE:
/* If a previous content has been encountered, convert it now. */ /* If a previous content has been encountered, convert it now. */

5
packages/OS400/curl.inc.in
View File

@ -109,6 +109,8 @@
d c X'00000010' d c X'00000010'
d HTTPPOST_PTRBUFFER... d HTTPPOST_PTRBUFFER...
d c X'00000020' d c X'00000020'
d HTTPPOST_CALLBACK...
d c X'00000040'
* *
d CURL_READFUNC_ABORT... d CURL_READFUNC_ABORT...
d c X'10000000' d c X'10000000'
@ -815,6 +817,8 @@
d c 17 d c 17
d CURLFORM_OBSOLETE2... d CURLFORM_OBSOLETE2...
d c 18 d c 18
d CURLFORM_STREAM...
d c 19
* *
d CURLINFO s 10i 0 based(######ptr######) Enum d CURLINFO s 10i 0 based(######ptr######) Enum
d CURLINFO_EFFECTIVE_URL... CURLINFO_STRING + 1 d CURLINFO_EFFECTIVE_URL... CURLINFO_STRING + 1
@ -1035,6 +1039,7 @@
d more * curl_httppost * d more * curl_httppost *
d flags 10i 0 long d flags 10i 0 long
d showfilename * char * d showfilename * char *
d userp * void *
* *
d curl_sockaddr ds based(######ptr######) d curl_sockaddr ds based(######ptr######)
d qualified d qualified

2
packages/OS400/initscript.sh
View File

@ -156,7 +156,7 @@ db2_name()
{ {
basename "${1}" | basename "${1}" |
tr '[a-z]' '[A-Z]' | tr '[a-z-]' '[A-Z_]' |
sed -e 's/\..*//' \ sed -e 's/\..*//' \
-e 's/^\(..........\).*/\1/' -e 's/^\(..........\).*/\1/'
} }