Fossil SCM
Cosmetic: Removed some tabbed indentation.
Commit
b261c4a33b62092284f65752eace50263cc48ff5
Parent
b28995ccbdbb54b…
1 file changed
+9
-9
+9
-9
| --- src/http_ssl.c | ||
| +++ src/http_ssl.c | ||
| @@ -314,23 +314,23 @@ | ||
| 314 | 314 | /* The OpenSSL documentation warns that if several CA certificates match |
| 315 | 315 | * the same name, key identifier and serial number conditions, only the |
| 316 | 316 | * first will be examined. The caveat situation is when one stores an |
| 317 | 317 | * expired CA certificate among the valid ones. |
| 318 | 318 | * Simply put: Do not mix expired and valid certificates. |
| 319 | - */ | |
| 320 | - if( SSL_CTX_load_verify_locations(sslCtx, cafile, capath) == 0){ | |
| 321 | - fossil_fatal("SSL: Unable to load CA verification file/path"); | |
| 322 | - } | |
| 319 | + */ | |
| 320 | + if( SSL_CTX_load_verify_locations(sslCtx, cafile, capath) == 0){ | |
| 321 | + fossil_fatal("SSL: Unable to load CA verification file/path"); | |
| 322 | + } | |
| 323 | 323 | }else{ |
| 324 | 324 | fossil_warning("SSL: CA file/path missing for certificate verification."); |
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | certfile = ssl_get_and_set_file_ref("FOSSIL_CCERT", "ccert"); |
| 328 | 328 | if( !certfile ){ |
| 329 | - free(capath); | |
| 330 | - free(cafile); | |
| 331 | - return; | |
| 329 | + free(capath); | |
| 330 | + free(cafile); | |
| 331 | + return; | |
| 332 | 332 | } |
| 333 | 333 | |
| 334 | 334 | keyfile = ssl_get_and_set_file_ref("FOSSIL_CKEY", "ckey"); |
| 335 | 335 | |
| 336 | 336 | /* Assume the key is in the certificate file if key file was not specified */ |
| @@ -368,13 +368,13 @@ | ||
| 368 | 368 | zTmp = mprintf("%s:%s", dbvar, g.urlName); |
| 369 | 369 | |
| 370 | 370 | zVar = getenv(envvar); |
| 371 | 371 | if( zVar ){ |
| 372 | 372 | zVar = strdup(zVar); |
| 373 | - if( zVar == NULL ){ | |
| 373 | + if( zVar == NULL ){ | |
| 374 | 374 | fossil_fatal("Unable to allocate memory for %s value.", envvar); |
| 375 | - } | |
| 375 | + } | |
| 376 | 376 | db_set(zTmp, zVar, 1); |
| 377 | 377 | }else{ |
| 378 | 378 | zVar = db_get(zTmp, NULL); |
| 379 | 379 | } |
| 380 | 380 | free(zTmp); |
| 381 | 381 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -314,23 +314,23 @@ | |
| 314 | /* The OpenSSL documentation warns that if several CA certificates match |
| 315 | * the same name, key identifier and serial number conditions, only the |
| 316 | * first will be examined. The caveat situation is when one stores an |
| 317 | * expired CA certificate among the valid ones. |
| 318 | * Simply put: Do not mix expired and valid certificates. |
| 319 | */ |
| 320 | if( SSL_CTX_load_verify_locations(sslCtx, cafile, capath) == 0){ |
| 321 | fossil_fatal("SSL: Unable to load CA verification file/path"); |
| 322 | } |
| 323 | }else{ |
| 324 | fossil_warning("SSL: CA file/path missing for certificate verification."); |
| 325 | } |
| 326 | |
| 327 | certfile = ssl_get_and_set_file_ref("FOSSIL_CCERT", "ccert"); |
| 328 | if( !certfile ){ |
| 329 | free(capath); |
| 330 | free(cafile); |
| 331 | return; |
| 332 | } |
| 333 | |
| 334 | keyfile = ssl_get_and_set_file_ref("FOSSIL_CKEY", "ckey"); |
| 335 | |
| 336 | /* Assume the key is in the certificate file if key file was not specified */ |
| @@ -368,13 +368,13 @@ | |
| 368 | zTmp = mprintf("%s:%s", dbvar, g.urlName); |
| 369 | |
| 370 | zVar = getenv(envvar); |
| 371 | if( zVar ){ |
| 372 | zVar = strdup(zVar); |
| 373 | if( zVar == NULL ){ |
| 374 | fossil_fatal("Unable to allocate memory for %s value.", envvar); |
| 375 | } |
| 376 | db_set(zTmp, zVar, 1); |
| 377 | }else{ |
| 378 | zVar = db_get(zTmp, NULL); |
| 379 | } |
| 380 | free(zTmp); |
| 381 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -314,23 +314,23 @@ | |
| 314 | /* The OpenSSL documentation warns that if several CA certificates match |
| 315 | * the same name, key identifier and serial number conditions, only the |
| 316 | * first will be examined. The caveat situation is when one stores an |
| 317 | * expired CA certificate among the valid ones. |
| 318 | * Simply put: Do not mix expired and valid certificates. |
| 319 | */ |
| 320 | if( SSL_CTX_load_verify_locations(sslCtx, cafile, capath) == 0){ |
| 321 | fossil_fatal("SSL: Unable to load CA verification file/path"); |
| 322 | } |
| 323 | }else{ |
| 324 | fossil_warning("SSL: CA file/path missing for certificate verification."); |
| 325 | } |
| 326 | |
| 327 | certfile = ssl_get_and_set_file_ref("FOSSIL_CCERT", "ccert"); |
| 328 | if( !certfile ){ |
| 329 | free(capath); |
| 330 | free(cafile); |
| 331 | return; |
| 332 | } |
| 333 | |
| 334 | keyfile = ssl_get_and_set_file_ref("FOSSIL_CKEY", "ckey"); |
| 335 | |
| 336 | /* Assume the key is in the certificate file if key file was not specified */ |
| @@ -368,13 +368,13 @@ | |
| 368 | zTmp = mprintf("%s:%s", dbvar, g.urlName); |
| 369 | |
| 370 | zVar = getenv(envvar); |
| 371 | if( zVar ){ |
| 372 | zVar = strdup(zVar); |
| 373 | if( zVar == NULL ){ |
| 374 | fossil_fatal("Unable to allocate memory for %s value.", envvar); |
| 375 | } |
| 376 | db_set(zTmp, zVar, 1); |
| 377 | }else{ |
| 378 | zVar = db_get(zTmp, NULL); |
| 379 | } |
| 380 | free(zTmp); |
| 381 |