diff options
| -rw-r--r-- | dlib/Makefile.am | 1 | ||||
| -rw-r--r-- | dpi/https.c | 37 | ||||
| -rw-r--r-- | dw/fltkimgbuf.cc | 2 | ||||
| -rw-r--r-- | src/gif.c | 2 | ||||
| -rw-r--r-- | src/html.cc | 7 | ||||
| -rw-r--r-- | src/jpeg.c | 2 | ||||
| -rw-r--r-- | src/png.c | 2 |
7 files changed, 43 insertions, 10 deletions
diff --git a/dlib/Makefile.am b/dlib/Makefile.am index a45d6a57..0d44c139 100644 --- a/dlib/Makefile.am +++ b/dlib/Makefile.am @@ -6,4 +6,3 @@ noinst_LIBRARIES = libDlib.a libDlib_a_SOURCES = \ dlib.h \ dlib.c - diff --git a/dpi/https.c b/dpi/https.c index 3f474b81..71b0c0f9 100644 --- a/dpi/https.c +++ b/dpi/https.c @@ -409,6 +409,9 @@ static int get_network_connection(char * url) * allow the user to decide what to do. It may save the * certificate to the user's .dillo directory if it is * trusted. + * + * TODO: Rearrange this to get rid of redundancy. + * * Return value: -1 on abort, 0 or higher on continue */ static int handle_certificate_problem(SSL * ssl_connection) @@ -613,6 +616,40 @@ static int handle_certificate_problem(SSL * ssl_connection) "Continue", "Cancel"); a_Dpip_dsh_write_str(sh, 1, d_cmd); dFree(d_cmd); + response_number = dialog_get_answer_number(); + if (response_number == 1) { + ret = 0; + } + break; + case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN: + d_cmd = a_Dpip_build_cmd( + "cmd=%s msg=%s alt1=%s alt2=%s", + "dialog", + "Self signed certificate in certificate chain. The certificate " + "chain could be built up using the untrusted certificates but the " + "root could not be found locally.", + "Continue", "Cancel"); + a_Dpip_dsh_write_str(sh, 1, d_cmd); + dFree(d_cmd); + response_number = dialog_get_answer_number(); + if (response_number == 1) { + ret = 0; + } + break; + case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY: + d_cmd = a_Dpip_build_cmd( + "cmd=%s msg=%s alt1=%s alt2=%s", + "dialog", + "Unable to get local issuer certificate. The issuer certificate " + "of an untrusted certificate cannot be found.", + "Continue", "Cancel"); + a_Dpip_dsh_write_str(sh, 1, d_cmd); + dFree(d_cmd); + response_number = dialog_get_answer_number(); + if (response_number == 1) { + ret = 0; + } + break; default: /*Need to add more options later*/ snprintf(buf, 80, "The remote certificate cannot be verified (code %ld)", st); diff --git a/dw/fltkimgbuf.cc b/dw/fltkimgbuf.cc index ad010b8f..97cbc1b4 100644 --- a/dw/fltkimgbuf.cc +++ b/dw/fltkimgbuf.cc @@ -190,7 +190,7 @@ core::Imgbuf* FltkImgbuf::getScaledBuf (int width, int height) */ if (width <= 0 || height <= 0 || width > IMAGE_MAX_AREA / height) { - MSG("FltkImgbuf::getScaledBuf: suspicious image size request %dx%d\n", + MSG("FltkImgbuf::getScaledBuf: suspicious image size request %d x %d\n", width, height); ref (); return this; @@ -804,7 +804,7 @@ static size_t Gif_do_img_desc(DilloGif *gif, void *Buf, /* check max image size */ if (gif->Width <= 0 || gif->Height <= 0 || gif->Width > IMAGE_MAX_AREA / gif->Height) { - MSG("Gif_do_img_desc: suspicious image size request %ux%u\n", + MSG("Gif_do_img_desc: suspicious image size request %u x %u\n", gif->Width, gif->Height); gif->state = 999; return 0; diff --git a/src/html.cc b/src/html.cc index 2ba4329a..ede391a3 100644 --- a/src/html.cc +++ b/src/html.cc @@ -2044,7 +2044,7 @@ DilloImage *a_Html_image_new(DilloHtml *html, const char *tag, dFree(width_ptr); dFree(height_ptr); width_ptr = height_ptr = NULL; - MSG("a_Html_image_new: suspicious image size request %dx%d\n", w, h); + MSG("a_Html_image_new: suspicious image size request %d x %d\n", w, h); } else { if (CSS_LENGTH_TYPE(l_w) != CSS_LENGTH_TYPE_AUTO) html->styleEngine->setNonCssHint (CSS_PROPERTY_WIDTH, @@ -3720,11 +3720,8 @@ static void Html_callback(int Op, CacheClient_t *Client) static int Html_write_raw(DilloHtml *html, char *buf, int bufsize, int Eof) { char ch = 0, *p, *text; - Textblock *textblock; int token_start, buf_index; - dReturn_val_if_fail ((textblock = HT2TB(html)) != NULL, 0); - /* Now, 'buf' and 'bufsize' define a buffer aligned to start at a token * boundary. Iterate through tokens until end of buffer is reached. */ buf_index = 0; @@ -3843,7 +3840,7 @@ static int Html_write_raw(DilloHtml *html, char *buf, int bufsize, int Eof) } }/*while*/ - textblock->flush (); + HT2TB(html)->flush (); return token_start; } @@ -291,7 +291,7 @@ static void Jpeg_write(DilloJpeg *jpeg, void *Buf, uint_t BufSize) if (jpeg->cinfo.image_width <= 0 || jpeg->cinfo.image_height <= 0 || jpeg->cinfo.image_width > IMAGE_MAX_AREA / jpeg->cinfo.image_height) { - MSG("Jpeg_write: suspicious image size request %ux%u\n", + MSG("Jpeg_write: suspicious image size request %u x %u\n", (uint_t)jpeg->cinfo.image_width, (uint_t)jpeg->cinfo.image_height); jpeg->state = DILLO_JPEG_ERROR; @@ -137,7 +137,7 @@ Png_datainfo_callback(png_structp png_ptr, png_infop info_ptr) /* check max image size */ if (png->width == 0 || png->height == 0 || png->width > IMAGE_MAX_AREA / png->height) { - MSG("Png_datainfo_callback: suspicious image size request %lux%lu\n", + MSG("Png_datainfo_callback: suspicious image size request %lu x %lu\n", (ulong_t) png->width, (ulong_t) png->height); Png_error_handling(png_ptr, "Aborting..."); return; /* not reached */ |