From df678b6d60c656a3e8eadfeda5a6c3e71c9c3acb Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 31 May 2009 22:12:42 +0000 Subject: Basic SSL certificate verification for Amiga version Treeview window is not browseable (TimedDOSRequester is blocking) Needs some strings writing svn path=/trunk/netsurf/; revision=7675 --- Makefile.sources | 2 +- amiga/gui.c | 5 ----- amiga/resources/Themes/AISS/Theme | 1 + amiga/resources/Themes/Default/Theme | 1 + amiga/tree.c | 6 ++++++ amiga/tree.h | 3 ++- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Makefile.sources b/Makefile.sources index ae2047d22..d1f75a8a0 100644 --- a/Makefile.sources +++ b/Makefile.sources @@ -83,7 +83,7 @@ S_AMIGA := compat.c gui.c tree.c history.c hotlist.c schedule.c \ plotters.c object.c menu.c save_pdf.c arexx.c version.c \ cookies.c context_menu.c clipboard.c save_complete.c \ fetch_file.c fetch_mailto.c search.c history_local.c \ - download.c iff_dr2d.c + download.c iff_dr2d.c sslcert.c S_AMIGA := $(addprefix amiga/,$(S_AMIGA)) # S_FRAMEBUFFER are sources purely for the framebuffer build diff --git a/amiga/gui.c b/amiga/gui.c index 02ada81c5..f9a213d86 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -2983,11 +2983,6 @@ uint32 ami_popup_hook(struct Hook *hook,Object *item,APTR reserved) return itemid; } -void gui_cert_verify(struct browser_window *bw, struct content *c, - const struct ssl_cert_info *certs, unsigned long num) -{ -} - static void *myrealloc(void *ptr, size_t len, void *pw) { return realloc(ptr, len); diff --git a/amiga/resources/Themes/AISS/Theme b/amiga/resources/Themes/AISS/Theme index 7b58cc679..b5ec285d7 100755 --- a/amiga/resources/Themes/AISS/Theme +++ b/amiga/resources/Themes/AISS/Theme @@ -26,6 +26,7 @@ theme_list_folder_open:*TBImages:list_folderunfold theme_list_bookmark:*TBImages:list_bookmark theme_list_cookie:*TBImages:list_abstract theme_list_history:*TBImages:list_archive +theme_list_sslcert:*TBImages:list_crypt theme_throbber:Throbber theme_throbber_frames:13 ptr_default:*PROGDIR:Resources/Pointers/Default diff --git a/amiga/resources/Themes/Default/Theme b/amiga/resources/Themes/Default/Theme index 4dd97f7ec..711a7ba42 100755 --- a/amiga/resources/Themes/Default/Theme +++ b/amiga/resources/Themes/Default/Theme @@ -39,6 +39,7 @@ theme_list_folder_open: theme_list_bookmark: theme_list_cookie: theme_list_history: +theme_list_sslcert: theme_throbber:Throbber theme_throbber_frames:9 ptr_default:*PROGDIR:Resources/Pointers/Default diff --git a/amiga/tree.c b/amiga/tree.c index 540dd4f3a..15d65b283 100755 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -238,6 +238,11 @@ void ami_open_tree(struct tree *tree,int type) wintitle = (char *)messages_get("GlobalHistory"); ami_get_theme_filename(&item,"theme_list_history"); break; + case AMI_TREE_SSLCERT: + nothl = TRUE; + wintitle = (char *)messages_get("ssl cert"); + ami_get_theme_filename(&item,"theme_list_sslcert"); + break; } NewList(twin->listbrowser_list); @@ -416,6 +421,7 @@ void ami_add_elements(struct treeview_window *twin,struct node *root,WORD *gen) { element = tree_find_element(node, TREE_ELEMENT_NAME); if(!element) element = tree_find_element(node, TREE_ELEMENT_TITLE); + if(!element) element = tree_find_element(node, TREE_ELEMENT_SSL); if(element && element->text) { text1 = (char *)element->text; diff --git a/amiga/tree.h b/amiga/tree.h index a5f590180..335bfd573 100755 --- a/amiga/tree.h +++ b/amiga/tree.h @@ -37,7 +37,8 @@ enum { AMI_TREE_HOTLIST, AMI_TREE_HISTORY, - AMI_TREE_COOKIES + AMI_TREE_COOKIES, + AMI_TREE_SSLCERT }; enum -- cgit v1.2.3