Fossil SCM
Minor fixes to the previous check-in.
Commit
9f8dc18f702a3490821c2b2807ecba95c0357efbd948c13810d18ba1e193adb3
Parent
3c194e2b893134b…
1 file changed
+3
-4
+3
-4
| --- src/http_ssl.c | ||
| +++ src/http_ssl.c | ||
| @@ -236,11 +236,11 @@ | ||
| 236 | 236 | ** this call is made, any SSL cert that the server provides will |
| 237 | 237 | ** be accepted. Communication will still be encrypted, but the |
| 238 | 238 | ** client has no way of knowing whether it is talking to the |
| 239 | 239 | ** real server or a man-in-the-middle imposter. |
| 240 | 240 | */ |
| 241 | -int ssl_disable_cert_verification(void){ | |
| 241 | +void ssl_disable_cert_verification(void){ | |
| 242 | 242 | sslNoCertVerify = 1; |
| 243 | 243 | } |
| 244 | 244 | |
| 245 | 245 | /* |
| 246 | 246 | ** Open an SSL connection. The identify of the server is determined |
| @@ -252,11 +252,10 @@ | ||
| 252 | 252 | ** |
| 253 | 253 | ** Return the number of errors. |
| 254 | 254 | */ |
| 255 | 255 | int ssl_open(UrlData *pUrlData){ |
| 256 | 256 | X509 *cert; |
| 257 | - unsigned long e; | |
| 258 | 257 | |
| 259 | 258 | ssl_global_init(); |
| 260 | 259 | if( pUrlData->useProxy ){ |
| 261 | 260 | int rc; |
| 262 | 261 | char *connStr = mprintf("%s:%d", g.url.name, pUrlData->port); |
| @@ -448,18 +447,18 @@ | ||
| 448 | 447 | } |
| 449 | 448 | |
| 450 | 449 | /* |
| 451 | 450 | ** Remember zHash as an acceptable certificate for this session only. |
| 452 | 451 | */ |
| 453 | -LOCAL int ssl_one_time_exception( | |
| 452 | +LOCAL void ssl_one_time_exception( | |
| 454 | 453 | UrlData *pUrlData, |
| 455 | 454 | const char *zHash |
| 456 | 455 | ){ |
| 457 | 456 | fossil_free(sException.zHost); |
| 458 | 457 | sException.zHost = fossil_strdup(pUrlData->name); |
| 459 | 458 | fossil_free(sException.zHash); |
| 460 | - sException.zHost = fossil_strdup(zHash); | |
| 459 | + sException.zHash = fossil_strdup(zHash); | |
| 461 | 460 | } |
| 462 | 461 | |
| 463 | 462 | /* |
| 464 | 463 | ** Send content out over the SSL connection. |
| 465 | 464 | */ |
| 466 | 465 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -236,11 +236,11 @@ | |
| 236 | ** this call is made, any SSL cert that the server provides will |
| 237 | ** be accepted. Communication will still be encrypted, but the |
| 238 | ** client has no way of knowing whether it is talking to the |
| 239 | ** real server or a man-in-the-middle imposter. |
| 240 | */ |
| 241 | int ssl_disable_cert_verification(void){ |
| 242 | sslNoCertVerify = 1; |
| 243 | } |
| 244 | |
| 245 | /* |
| 246 | ** Open an SSL connection. The identify of the server is determined |
| @@ -252,11 +252,10 @@ | |
| 252 | ** |
| 253 | ** Return the number of errors. |
| 254 | */ |
| 255 | int ssl_open(UrlData *pUrlData){ |
| 256 | X509 *cert; |
| 257 | unsigned long e; |
| 258 | |
| 259 | ssl_global_init(); |
| 260 | if( pUrlData->useProxy ){ |
| 261 | int rc; |
| 262 | char *connStr = mprintf("%s:%d", g.url.name, pUrlData->port); |
| @@ -448,18 +447,18 @@ | |
| 448 | } |
| 449 | |
| 450 | /* |
| 451 | ** Remember zHash as an acceptable certificate for this session only. |
| 452 | */ |
| 453 | LOCAL int ssl_one_time_exception( |
| 454 | UrlData *pUrlData, |
| 455 | const char *zHash |
| 456 | ){ |
| 457 | fossil_free(sException.zHost); |
| 458 | sException.zHost = fossil_strdup(pUrlData->name); |
| 459 | fossil_free(sException.zHash); |
| 460 | sException.zHost = fossil_strdup(zHash); |
| 461 | } |
| 462 | |
| 463 | /* |
| 464 | ** Send content out over the SSL connection. |
| 465 | */ |
| 466 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -236,11 +236,11 @@ | |
| 236 | ** this call is made, any SSL cert that the server provides will |
| 237 | ** be accepted. Communication will still be encrypted, but the |
| 238 | ** client has no way of knowing whether it is talking to the |
| 239 | ** real server or a man-in-the-middle imposter. |
| 240 | */ |
| 241 | void ssl_disable_cert_verification(void){ |
| 242 | sslNoCertVerify = 1; |
| 243 | } |
| 244 | |
| 245 | /* |
| 246 | ** Open an SSL connection. The identify of the server is determined |
| @@ -252,11 +252,10 @@ | |
| 252 | ** |
| 253 | ** Return the number of errors. |
| 254 | */ |
| 255 | int ssl_open(UrlData *pUrlData){ |
| 256 | X509 *cert; |
| 257 | |
| 258 | ssl_global_init(); |
| 259 | if( pUrlData->useProxy ){ |
| 260 | int rc; |
| 261 | char *connStr = mprintf("%s:%d", g.url.name, pUrlData->port); |
| @@ -448,18 +447,18 @@ | |
| 447 | } |
| 448 | |
| 449 | /* |
| 450 | ** Remember zHash as an acceptable certificate for this session only. |
| 451 | */ |
| 452 | LOCAL void ssl_one_time_exception( |
| 453 | UrlData *pUrlData, |
| 454 | const char *zHash |
| 455 | ){ |
| 456 | fossil_free(sException.zHost); |
| 457 | sException.zHost = fossil_strdup(pUrlData->name); |
| 458 | fossil_free(sException.zHash); |
| 459 | sException.zHash = fossil_strdup(zHash); |
| 460 | } |
| 461 | |
| 462 | /* |
| 463 | ** Send content out over the SSL connection. |
| 464 | */ |
| 465 |