Fossil SCM
Additional formatting fixes: shorten lines to 80 characters or less.
Commit
c1d78e0556d702c93b68f46eb12081e8720ca759
Parent
636804745b08ede…
1 file changed
+12
-12
+12
-12
| --- src/http_ssl.c | ||
| +++ src/http_ssl.c | ||
| @@ -267,19 +267,19 @@ | ||
| 267 | 267 | |
| 268 | 268 | if( hasSavedCertificate ){ |
| 269 | 269 | warning = "WARNING: Certificate doesn't match the " |
| 270 | 270 | "saved certificate for this host!"; |
| 271 | 271 | } |
| 272 | - prompt = mprintf("\nUnknown SSL certificate:\n\n%s\n\n%s\n" | |
| 273 | - "Either:\n" | |
| 274 | - " * verify the certificate is correct using the " | |
| 275 | - "SHA1 fingerprint above\n" | |
| 276 | - " * use the global ssl-ca-location setting to specify your CA root\n" | |
| 277 | - " certificates list\n\n" | |
| 278 | - "If you are not expecting this message, answer no and " | |
| 279 | - "contact your server\nadministrator.\n\n" | |
| 280 | - "Accept certificate [a=always/y/N]? ", desc, warning); | |
| 272 | + prompt = mprintf( | |
| 273 | + "\nUnknown SSL certificate:\n\n%s\n\n%s\n" | |
| 274 | + "Either:\n" | |
| 275 | + " * verify the certificate is correct using the SHA1 fingerprint above\n" | |
| 276 | + " * use the global ssl-ca-location setting to specify your CA root\n" | |
| 277 | + " certificates list\n\n" | |
| 278 | + "If you are not expecting this message, answer no and " | |
| 279 | + "contact your server\nadministrator.\n\n" | |
| 280 | + "Accept certificate [a=always/y/N]? ", desc, warning); | |
| 281 | 281 | BIO_free(mem); |
| 282 | 282 | |
| 283 | 283 | prompt_user(prompt, &ans); |
| 284 | 284 | free(prompt); |
| 285 | 285 | if( blob_str(&ans)[0]!='y' && blob_str(&ans)[0]!='a' ) { |
| @@ -304,13 +304,13 @@ | ||
| 304 | 304 | /* Set the Global.zIpAddr variable to the server we are talking to. |
| 305 | 305 | ** This is used to populate the ipaddr column of the rcvfrom table, |
| 306 | 306 | ** if any files are received from the server. |
| 307 | 307 | */ |
| 308 | 308 | { |
| 309 | - /* IPv4 only code */ | |
| 310 | - const unsigned char *ip = (const unsigned char *) BIO_get_conn_ip(iBio); | |
| 311 | - g.zIpAddr = mprintf("%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]); | |
| 309 | + /* IPv4 only code */ | |
| 310 | + const unsigned char *ip = (const unsigned char *) BIO_get_conn_ip(iBio); | |
| 311 | + g.zIpAddr = mprintf("%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]); | |
| 312 | 312 | } |
| 313 | 313 | |
| 314 | 314 | X509_free(cert); |
| 315 | 315 | return 0; |
| 316 | 316 | } |
| 317 | 317 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -267,19 +267,19 @@ | |
| 267 | |
| 268 | if( hasSavedCertificate ){ |
| 269 | warning = "WARNING: Certificate doesn't match the " |
| 270 | "saved certificate for this host!"; |
| 271 | } |
| 272 | prompt = mprintf("\nUnknown SSL certificate:\n\n%s\n\n%s\n" |
| 273 | "Either:\n" |
| 274 | " * verify the certificate is correct using the " |
| 275 | "SHA1 fingerprint above\n" |
| 276 | " * use the global ssl-ca-location setting to specify your CA root\n" |
| 277 | " certificates list\n\n" |
| 278 | "If you are not expecting this message, answer no and " |
| 279 | "contact your server\nadministrator.\n\n" |
| 280 | "Accept certificate [a=always/y/N]? ", desc, warning); |
| 281 | BIO_free(mem); |
| 282 | |
| 283 | prompt_user(prompt, &ans); |
| 284 | free(prompt); |
| 285 | if( blob_str(&ans)[0]!='y' && blob_str(&ans)[0]!='a' ) { |
| @@ -304,13 +304,13 @@ | |
| 304 | /* Set the Global.zIpAddr variable to the server we are talking to. |
| 305 | ** This is used to populate the ipaddr column of the rcvfrom table, |
| 306 | ** if any files are received from the server. |
| 307 | */ |
| 308 | { |
| 309 | /* IPv4 only code */ |
| 310 | const unsigned char *ip = (const unsigned char *) BIO_get_conn_ip(iBio); |
| 311 | g.zIpAddr = mprintf("%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]); |
| 312 | } |
| 313 | |
| 314 | X509_free(cert); |
| 315 | return 0; |
| 316 | } |
| 317 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -267,19 +267,19 @@ | |
| 267 | |
| 268 | if( hasSavedCertificate ){ |
| 269 | warning = "WARNING: Certificate doesn't match the " |
| 270 | "saved certificate for this host!"; |
| 271 | } |
| 272 | prompt = mprintf( |
| 273 | "\nUnknown SSL certificate:\n\n%s\n\n%s\n" |
| 274 | "Either:\n" |
| 275 | " * verify the certificate is correct using the SHA1 fingerprint above\n" |
| 276 | " * use the global ssl-ca-location setting to specify your CA root\n" |
| 277 | " certificates list\n\n" |
| 278 | "If you are not expecting this message, answer no and " |
| 279 | "contact your server\nadministrator.\n\n" |
| 280 | "Accept certificate [a=always/y/N]? ", desc, warning); |
| 281 | BIO_free(mem); |
| 282 | |
| 283 | prompt_user(prompt, &ans); |
| 284 | free(prompt); |
| 285 | if( blob_str(&ans)[0]!='y' && blob_str(&ans)[0]!='a' ) { |
| @@ -304,13 +304,13 @@ | |
| 304 | /* Set the Global.zIpAddr variable to the server we are talking to. |
| 305 | ** This is used to populate the ipaddr column of the rcvfrom table, |
| 306 | ** if any files are received from the server. |
| 307 | */ |
| 308 | { |
| 309 | /* IPv4 only code */ |
| 310 | const unsigned char *ip = (const unsigned char *) BIO_get_conn_ip(iBio); |
| 311 | g.zIpAddr = mprintf("%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]); |
| 312 | } |
| 313 | |
| 314 | X509_free(cert); |
| 315 | return 0; |
| 316 | } |
| 317 |