Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch httpmsg-debug Excluding Merge-Ins
This is equivalent to a diff from 6bb5ff4aea to 735bd3dccb
|
2024-11-06
| ||
| 12:44 | Mention the SQLite and OpenSSL versions in the change log for 2.25. check-in: 5c8b678103 user: drh tags: trunk | |
|
2024-11-05
| ||
| 09:55 | Merge from trunk check-in: e367ca7373 user: brickviking tags: bv-corrections01 | |
| 05:57 | Create new branch named "bv-infotool" check-in: e413dc32f0 user: brickviking tags: bv-infotool | |
|
2024-11-04
| ||
| 13:09 | Fix (harmless) off-by-one error in the new test-trust-store command. Leaf check-in: 735bd3dccb user: drh tags: httpmsg-debug | |
| 12:54 | Improvements to the diagnostic output from the test-trust-store command. check-in: aa5bddda68 user: drh tags: httpmsg-debug | |
| 11:22 | Add the test-trust-store command for debugging TLS problems. *Updated 2024-11-06:* These changes should not be in a release candidate. Therefore moved into a branch. check-in: 28ea88e770 user: drh tags: httpmsg-debug | |
|
2024-11-01
| ||
| 21:23 | Help edit to tree command. check-in: 6bb5ff4aea user: brickviking tags: trunk | |
| 17:06 | Mention the `fossil status -b|--brief' option in the change log. check-in: 0cf722b5e6 user: florian tags: trunk | |
Changes to src/http.c.
| ︙ | |||
766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 | 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 | + + + + |
** is written into that second file instead of being written on standard
** output. Use the "--out OUTPUT" option to specify an output file for
** a GET request where there is no PAYLOAD.
**
** Options:
** --compress Use ZLIB compression on the payload
** --mimetype TYPE Mimetype of the payload
** --no-cert-verify Disable TLS cert verification
** --out FILE Store the reply in FILE
** -v Verbose output
** --xfer PAYLOAD in a Fossil xfer protocol message
*/
void test_httpmsg_command(void){
const char *zMimetype;
const char *zInFile;
const char *zOutFile;
Blob in, out;
unsigned int mHttpFlags = HTTP_GENERIC|HTTP_NOCOMPRESS;
zMimetype = find_option("mimetype",0,1);
zOutFile = find_option("out","o",1);
if( find_option("verbose","v",0)!=0 ) mHttpFlags |= HTTP_VERBOSE;
if( find_option("compress",0,0)!=0 ) mHttpFlags &= ~HTTP_NOCOMPRESS;
if( find_option("no-cert-verify",0,0)!=0 ){
ssl_disable_cert_verification();
}
if( find_option("xfer",0,0)!=0 ){
mHttpFlags |= HTTP_USE_LOGIN;
mHttpFlags &= ~HTTP_GENERIC;
}
verify_all_options();
if( g.argc<3 || g.argc>5 ){
usage("URL ?PAYLOAD? ?OUTPUT?");
|
| ︙ |
Changes to src/http_ssl.c.
| ︙ | |||
245 246 247 248 249 250 251 | 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 | - + | } } /* ** Call this routine once before any other use of the SSL interface. ** This routine does initial configuration of the SSL module. */ |
| ︙ | |||
299 300 301 302 303 304 305 306 307 308 309 310 311 312 | 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 | + + + + + + + + + + + + + + + + + + + + |
}
case 2: { /* file */
zCaFile = zFile;
zCaDirectory = 0;
break;
}
}
if( zFile ) break;
}
if( bDebug ){
fossil_print("case-0: X509_get_default_cert_file_env = %s\n",
X509_get_default_cert_file_env());
fossil_print("case-1: X509_get_default_cert_dir_env = %s\n",
X509_get_default_cert_dir_env());
fossil_print("case-2: ssl-ca-location = %s\n",
g.repositoryOpen ? db_get("ssl-ca-location","(none)") : "(none)");
fossil_print("case-3: X509_get_default_cert_file = %s\n",
X509_get_default_cert_file());
fossil_print("case-4: X509_get_default_cert_dir = %s\n",
X509_get_default_cert_dir());
if( i>=5 ){
fossil_print("No trust store found.\n");
}else{
fossil_print("case-used = %d\n"
"zCaFile = %s\n"
"zCaDirectory = %s\n", i, zCaFile, zCaDirectory);
}
}
if( zFile==0 ){
/* fossil_fatal("Cannot find a trust store"); */
}else if( SSL_CTX_load_verify_locations(sslCtx, zCaFile, zCaDirectory)==0 ){
fossil_fatal("Cannot load CA root certificates from %s", zFile);
}
|
| ︙ | |||
331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 | 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 | + + + + + + + |
** command line */
if( g.zSSLIdentity!=0 ){
identityFile = g.zSSLIdentity;
}else{
identityFile = db_get("ssl-identity", 0);
}
if( identityFile!=0 && identityFile[0]!='\0' ){
if( bDebug ){
fossil_print("identifyFile = %s\n", identityFile);
}
if( SSL_CTX_use_certificate_chain_file(sslCtx,identityFile)!=1
|| SSL_CTX_use_PrivateKey_file(sslCtx,identityFile,SSL_FILETYPE_PEM)!=1
){
fossil_fatal("Could not load SSL identity from %s", identityFile);
}
}else{
if( bDebug ){
fossil_print("No identify file found.\n");
}
}
/* Register a callback to tell the user what to do when the server asks
** for a cert */
SSL_CTX_set_client_cert_cb(sslCtx, ssl_client_cert_callback);
sslIsInit = 1;
}else{
|
| ︙ | |||
357 358 359 360 361 362 363 364 365 366 367 368 369 370 | 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 | + + + + + + + + + + + |
void ssl_global_shutdown(void){
if( sslIsInit ){
SSL_CTX_free(sslCtx);
ssl_clear_errmsg();
sslIsInit = 0;
}
}
/*
** COMMAND: test-trust-store
**
** Show the trust store that is used by OpenSSL.
*/
void test_openssl_trust_store(void){
ssl_global_init_client(1);
ssl_global_shutdown();
}
/*
** Close the currently open client SSL connection. If no connection is open,
** this routine is a no-op.
*/
void ssl_close_client(void){
if( iBio!=NULL ){
|
| ︙ | |||
444 445 446 447 448 449 450 | 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 | - + |
**
** Return the number of errors.
*/
int ssl_open_client(UrlData *pUrlData){
X509 *cert;
const char *zRemoteHost;
|
| ︙ |