aboutsummaryrefslogtreecommitdiff
path: root/src/testcurl/https/tls_test_common.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testcurl/https/tls_test_common.c')
-rw-r--r--src/testcurl/https/tls_test_common.c24
1 files changed, 16 insertions, 8 deletions
diff --git a/src/testcurl/https/tls_test_common.c b/src/testcurl/https/tls_test_common.c
index 98d62482..044394b9 100644
--- a/src/testcurl/https/tls_test_common.c
+++ b/src/testcurl/https/tls_test_common.c
@@ -98,7 +98,7 @@ const long libcurl_tls_max_vers_map[KNOW_TLS_IDS_COUNT] = {
98/* 98/*
99 * test HTTPS transfer 99 * test HTTPS transfer
100 */ 100 */
101unsigned int 101enum test_get_result
102test_daemon_get (void *cls, 102test_daemon_get (void *cls,
103 const char *cipher_suite, 103 const char *cipher_suite,
104 int proto_version, 104 int proto_version,
@@ -117,7 +117,7 @@ test_daemon_get (void *cls,
117 if (NULL == (cbc.buf = malloc (sizeof (char) * len))) 117 if (NULL == (cbc.buf = malloc (sizeof (char) * len)))
118 { 118 {
119 fprintf (stderr, MHD_E_MEM); 119 fprintf (stderr, MHD_E_MEM);
120 return 1; 120 return TEST_GET_HARD_ERROR;
121 } 121 }
122 cbc.size = len; 122 cbc.size = len;
123 cbc.pos = 0; 123 cbc.pos = 0;
@@ -146,7 +146,7 @@ test_daemon_get (void *cls,
146 curl_easy_strerror (e)); 146 curl_easy_strerror (e));
147 curl_easy_cleanup (c); 147 curl_easy_cleanup (c);
148 free (cbc.buf); 148 free (cbc.buf);
149 return 1; 149 return TEST_GET_CURL_GEN_ERROR;
150 } 150 }
151 151
152 /* TLS options */ 152 /* TLS options */
@@ -166,7 +166,7 @@ test_daemon_get (void *cls,
166 curl_easy_strerror (e)); 166 curl_easy_strerror (e));
167 curl_easy_cleanup (c); 167 curl_easy_cleanup (c);
168 free (cbc.buf); 168 free (cbc.buf);
169 return 1; 169 return TEST_GET_CURL_GEN_ERROR;
170 } 170 }
171 if (ver_peer && 171 if (ver_peer &&
172 (CURLE_OK != 172 (CURLE_OK !=
@@ -176,7 +176,7 @@ test_daemon_get (void *cls,
176 curl_easy_strerror (e)); 176 curl_easy_strerror (e));
177 curl_easy_cleanup (c); 177 curl_easy_cleanup (c);
178 free (cbc.buf); 178 free (cbc.buf);
179 return 1; 179 return TEST_GET_CURL_CA_ERROR;
180 } 180 }
181 if (CURLE_OK != (errornum = curl_easy_perform (c))) 181 if (CURLE_OK != (errornum = curl_easy_perform (c)))
182 { 182 {
@@ -184,7 +184,15 @@ test_daemon_get (void *cls,
184 curl_easy_strerror (errornum)); 184 curl_easy_strerror (errornum));
185 curl_easy_cleanup (c); 185 curl_easy_cleanup (c);
186 free (cbc.buf); 186 free (cbc.buf);
187 return 1; 187 if ((CURLE_SSL_CACERT_BADFILE == errornum)
188#if CURL_AT_LEAST_VERSION (7,21,5)
189 || (CURLE_NOT_BUILT_IN == errornum)
190#endif /* CURL_AT_LEAST_VERSION (7,21,5) */
191 )
192 return TEST_GET_CURL_CA_ERROR;
193 if (CURLE_OUT_OF_MEMORY == errornum)
194 return TEST_GET_HARD_ERROR;
195 return TEST_GET_ERROR;
188 } 196 }
189 197
190 curl_easy_cleanup (c); 198 curl_easy_cleanup (c);
@@ -193,11 +201,11 @@ test_daemon_get (void *cls,
193 { 201 {
194 fprintf (stderr, "Error: local data & received data differ.\n"); 202 fprintf (stderr, "Error: local data & received data differ.\n");
195 free (cbc.buf); 203 free (cbc.buf);
196 return 1; 204 return TEST_GET_TRANSFER_ERROR;
197 } 205 }
198 206
199 free (cbc.buf); 207 free (cbc.buf);
200 return 0; 208 return TEST_GET_OK;
201} 209}
202 210
203 211